closes #1640 for magento 2.4

mailchimp · Dec 27, 2022 · bb818a9 · bb818a9
1 parent 1ceac7a
commit bb818a9
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 77 deletions.
diff --git a/Controller/Adminhtml/Ecommerce/ResyncProducts.php b/Controller/Adminhtml/Ecommerce/ResyncProducts.php
@@ -45,7 +45,7 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManagerInterface,
         \Ebizmarts\MailChimp\Helper\Data $helper
     ) {
-    
+
         parent::__construct($context);
         $this->resultJsonFactory    = $resultJsonFactory;
         $this->helper               = $helper;
@@ -57,25 +57,7 @@ public function execute()
         $valid = 1;
         $message = '';
         $params = $this->getRequest()->getParams();
-        if (isset($params['website'])) {
-            $mailchimpStore = $this->helper->getConfigValue(
-                \Ebizmarts\MailChimp\Helper\Data::XML_MAILCHIMP_STORE,
-                $params['website'],
-                'website'
-            );
-        } elseif (isset($params['store'])) {
-            $mailchimpStore = $this->helper->getConfigValue(
-                \Ebizmarts\MailChimp\Helper\Data::XML_MAILCHIMP_STORE,
-                $params['store'],
-                'store'
-            );
-        } else {
-            $mailchimpStore = $this->helper->getConfigValue(
-                \Ebizmarts\MailChimp\Helper\Data::XML_MAILCHIMP_STORE,
-                $this->storeManager->getStore()
-            );
-        }
-
+        $mailchimpStore = $params['mailchimpStoreId'];
         $resultJson = $this->resultJsonFactory->create();
         try {
             $this->helper->resyncProducts($mailchimpStore);

diff --git a/Controller/Adminhtml/Ecommerce/ResyncSubscribers.php b/Controller/Adminhtml/Ecommerce/ResyncSubscribers.php
@@ -45,7 +45,7 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManagerInterface,
         \Ebizmarts\MailChimp\Helper\Data $helper
     ) {
-    
+
         parent::__construct($context);
         $this->resultJsonFactory    = $resultJsonFactory;
         $this->helper               = $helper;
@@ -57,25 +57,7 @@ public function execute()
         $valid = 1;
         $message = '';
         $params = $this->getRequest()->getParams();
-        if (isset($params['website'])) {
-            $mailchimpList = $this->helper->getConfigValue(
-                \Ebizmarts\MailChimp\Helper\Data::XML_PATH_LIST,
-                $params['website'],
-                'website'
-            );
-        } elseif (isset($params['store'])) {
-            $mailchimpList = $this->helper->getConfigValue(
-                \Ebizmarts\MailChimp\Helper\Data::XML_PATH_LIST,
-                $params['store'],
-                'store'
-            );
-        } else {
-            $mailchimpList = $this->helper->getConfigValue(
-                \Ebizmarts\MailChimp\Helper\Data::XML_PATH_LIST,
-                $this->storeManager->getStore()
-            );
-        }
-
+        $mailchimpList = $params['listId'];
         $resultJson = $this->resultJsonFactory->create();
         try {
             $this->helper->resyncAllSubscribers($mailchimpList);

diff --git a/view/adminhtml/web/js/configapikey.js b/view/adminhtml/web/js/configapikey.js
@@ -52,8 +52,8 @@ define(
                     self._createWebhook(apiKey, listId);
                 });
                 $('#mailchimp_general_resync_subscribers').click(function () {
-                    var mailchimpStoreId = $('#mailchimp_general_monkeystore').find(':selected').val();
-                    self._resyncSubscribers(mailchimpStoreId);
+                    var listId = $('#mailchimp_general_monkeylist').find(':selected').val();
+                    self._resyncSubscribers(listId);
                 });
                 $('#mailchimp_ecommerce_resync_products').click(function () {
                     var mailchimpStoreId = $('#mailchimp_general_monkeystore').find(':selected').val();
@@ -85,40 +85,40 @@ define(
             },
             _changeEcommerce: function () {
                 var self = this;
-              confirmation( {
-                  content: "If you disable Ecommerce, we will disable Abandoned Cart",
-                  actions: {
-                      confirm: function () {
-                          var tag = '#mailchimp_abandonedcart_active'
-                          $(tag).empty();
-                          $(tag).append($('<option>', {
-                              value: "0",
-                              text: 'No',
-                              selected: "selected"
-                          }));
-                          $(tag).append($('<option>', {
-                              value: "1",
-                              text: 'Yes'
-                          }));
-                          self._hideAbandonedCart();
-                      },
-                      cancel: function () {
-                          var tag = '#mailchimp_ecommerce_active'
-                          $(tag).empty();
-                          $(tag).append($('<option>', {
-                              value: "0",
-                              text: 'No',
-                          }));
-                          $(tag).append($('<option>', {
-                              value: "1",
-                              text: 'Yes',
-                              selected: "selected"
-                          }));
-                          self._showEcommerce();
-                      }
+                confirmation( {
+                        content: "If you disable Ecommerce, we will disable Abandoned Cart",
+                        actions: {
+                            confirm: function () {
+                                var tag = '#mailchimp_abandonedcart_active'
+                                $(tag).empty();
+                                $(tag).append($('<option>', {
+                                    value: "0",
+                                    text: 'No',
+                                    selected: "selected"
+                                }));
+                                $(tag).append($('<option>', {
+                                    value: "1",
+                                    text: 'Yes'
+                                }));
+                                self._hideAbandonedCart();
+                            },
+                            cancel: function () {
+                                var tag = '#mailchimp_ecommerce_active'
+                                $(tag).empty();
+                                $(tag).append($('<option>', {
+                                    value: "0",
+                                    text: 'No',
+                                }));
+                                $(tag).append($('<option>', {
+                                    value: "1",
+                                    text: 'Yes',
+                                    selected: "selected"
+                                }));
+                                self._showEcommerce();
+                            }
+                        }
                     }
-                  }
-              );
+                );
             },
             _changeAbandonedCart: function () {
                 var self = this;
@@ -236,11 +236,11 @@ define(
                     }
                 });
             },
-            _resyncSubscribers: function (mailchimpStoreId) {
+            _resyncSubscribers: function (listId) {
                 var resyncSubscribersUrl = this.options.resyncSubscribersUrl;
                 $.ajax({
                     url: resyncSubscribersUrl,
-                    data: {'form_key': window.FORM_KEY, 'mailchimpStoreId': mailchimpStoreId},
+                    data: {'form_key': window.FORM_KEY, 'listId': listId},
                     type: 'GET',
                     dataType: 'json',
                     showLoader: true