closes #939 for magento 2.3

mailchimp · Dec 27, 2019 · 08ada7e · 08ada7e
1 parent 22ea314
commit 08ada7e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -916,6 +916,30 @@ public function loadStores()
             }
         }
     }
+    public function saveJsUrl($storeId, $scope = null, $mailChimpStoreId = null)
+    {
+        if (!$scope) {
+            $scope = \Magento\Store\Model\ScopeInterface::SCOPE_STORES;
+        }
+        if ($this->getConfigValue(self::XML_PATH_ACTIVE, $storeId, $scope)) {
+            try {
+                $api = $this->getApi($storeId);
+                $storeData = $api->ecommerce->stores->get($mailChimpStoreId);
+                if (isset($storeData['connected_site']['site_script']['url'])) {
+                    $url = $storeData['connected_site']['site_script']['url'];
+                    $this->_config->saveConfig(
+                        self::XML_MAILCHIMP_JS_URL,
+                        $url,
+                        $scope,
+                        $storeId
+                    );
+                }
+            } catch (\Mailchimp_Error $e) {
+                $this->log($e->getFriendlyMessage());
+            }
+        }
+
+    }
     public function getJsUrl($storeId)
     {
         $url = $this->getConfigValue(self::XML_MAILCHIMP_JS_URL, $storeId);

diff --git a/Model/Config/Backend/MonkeyStore.php b/Model/Config/Backend/MonkeyStore.php
@@ -107,6 +107,13 @@ public function beforeSave()
             );
 
             $createWebhook = true;
+            $this->_helper->deleteConfig(
+                \Ebizmarts\MailChimp\Helper\Data::XML_MAILCHIMP_JS_URL,
+                $this->getScopeId(),
+                $this->getScope()
+            );
+            $this->_helper->saveJsUrl($this->getScopeId(),$this->getScope(),$this->getValue());
+
             foreach ($this->_storeManager->getStores() as $storeId => $val) {
                 $mstoreId = $this->_helper->getConfigValue(
                     \Ebizmarts\MailChimp\Helper\Data::XML_MAILCHIMP_STORE,
@@ -119,11 +126,6 @@ public function beforeSave()
                 if ($listId == $newListId) {
                     $createWebhook = false;
                 }
-                $this->_helper->deleteConfig(
-                    \Ebizmarts\MailChimp\Helper\Data::XML_MAILCHIMP_JS_URL,
-                    $storeId,
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORES
-                );
             }
             if ($found==1) {
                 $this->_helper->cancelAllPendingBatches($mailchimpStore);

diff --git a/Observer/ConfigObserver.php b/Observer/ConfigObserver.php
@@ -53,9 +53,9 @@ public function execute(EventObserver $observer)
         $oldListId  = $this->_registry->registry('oldListId');
         $apiKey     = $this->_registry->registry('apiKey');
         $mustDelete = true;
+
         foreach ($this->_storeManager->getStores() as $storeId => $val) {
             $listId = $this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_PATH_LIST, $storeId);
-            $this->_helper->deleteConfig(\Ebizmarts\MailChimp\Helper\Data::XML_MAILCHIMP_JS_URL, $storeId, 'stores');
             if ($listId == $oldListId) {
                 $mustDelete = false;
             }