Merge pull request #710 from mailchimp/changes-requested

Changes requested
mailchimp · May 11, 2018 · b366b45 · b366b45
2 parents 4329dcb + c96f3d8
commit b366b45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Stores.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Stores.php
@@ -55,7 +55,7 @@ public function createMailChimpStore($mailChimpStoreId, $listId = null, $scopeId
             } catch (MailChimp_Error $e) {
                 $adminSession = Mage::getSingleton('adminhtml/session');
                 if (strstr($e->getFriendlyMessage(), 'A store with the domain')) {
-                    $errorMessage = $helper->__("A MailChimp store with the same domain already exists in this account. You need to have a different URLs for each scope you set up the ecommerce data.");
+                    $errorMessage = $helper->__("A MailChimp store with the same domain already exists in this account. You need to have a different URLs for each scope you set up the ecommerce data. Possible solutions <a href='https://docs.magento.com/m1/ce/user_guide/stores/store-urls.html'>HERE</a>");
                     $adminSession->addError($errorMessage);
                 }
                 $helper->logError($e->getFriendlyMessage());

diff --git a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/Account.php b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/Account.php
@@ -71,7 +71,7 @@ public function __construct()
                             $totalCarts = $api->ecommerce->carts->getAll($mcStoreId, 'total_items');
                             $this->_accountDetails['total_carts'] = $totalCarts['total_items'];
                         } catch (MailChimp_Error $e) {
-                            if ($helper->isEcommerceEnabled($scopeArray['scope_id'], $scopeArray['scope'])) {
+                            if ($helper->isEcomSyncDataEnabled($scopeArray['scope_id'], $scopeArray['scope'])) {
                                 $helper->deleteLocalMCStoreData($mcStoreId, $scopeArray['scope_id'], $scopeArray['scope']);
                                 if ($listId) {
                                     $helper->createStore($listId, $scopeArray['scope_id'], $scopeArray['scope']);