Merge pull request #646 from mailchimp/missing-check

Add missing check.
mailchimp · Feb 21, 2018 · ed49076 · ed49076
2 parents b42ba7c + e2a5556
commit ed49076
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
@@ -707,25 +707,30 @@ protected function saveSyncData($itemId, $itemType, $mailchimpStoreId, $syncDelt
     protected function addSyncValueToArray($storeId, $syncedDateArray)
     {
         $helper = $this->getHelper();
-        $mailchimpStoreId = $helper->getMCStoreId($storeId);
-        $syncedDate = $helper->getMCIsSyncing($storeId);
-        // Check if $syncedDate is in date format to support previous versions.
-        if (isset($syncedDateArray[$mailchimpStoreId]) && $syncedDateArray[$mailchimpStoreId]) {
-            if ($helper->validateDate($syncedDate)) {
-                if ($syncedDate > $syncedDateArray[$mailchimpStoreId]) {
-                    $syncedDateArray[$mailchimpStoreId] = array($storeId => $syncedDate);
+        $ecomEnabled = $helper->isEcomSyncDataEnabled($storeId);
+
+        if ($ecomEnabled) {
+            $mailchimpStoreId = $helper->getMCStoreId($storeId);
+            $syncedDate = $helper->getMCIsSyncing($storeId);
+
+            // Check if $syncedDate is in date format to support previous versions.
+            if (isset($syncedDateArray[$mailchimpStoreId]) && $syncedDateArray[$mailchimpStoreId]) {
+                if ($helper->validateDate($syncedDate)) {
+                    if ($syncedDate > $syncedDateArray[$mailchimpStoreId]) {
+                        $syncedDateArray[$mailchimpStoreId] = array($storeId => $syncedDate);
+                    }
+                } elseif ((int)$syncedDate === 1) {
+                    $syncedDateArray[$mailchimpStoreId] = array($storeId => false);
                 }
-            } elseif ((int)$syncedDate === 1) {
-                $syncedDateArray[$mailchimpStoreId] = array($storeId => false);
-            }
-        } else {
-            if ($helper->validateDate($syncedDate)) {
-                $syncedDateArray[$mailchimpStoreId] = array($storeId => $syncedDate);
             } else {
-                if ((int)$syncedDate === 1) {
-                    $syncedDateArray[$mailchimpStoreId] = array($storeId => false);
-                } elseif (!isset($syncedDateArray[$mailchimpStoreId])) {
-                    $syncedDateArray[$mailchimpStoreId] = array($storeId => true);
+                if ($helper->validateDate($syncedDate)) {
+                    $syncedDateArray[$mailchimpStoreId] = array($storeId => $syncedDate);
+                } else {
+                    if ((int)$syncedDate === 1) {
+                        $syncedDateArray[$mailchimpStoreId] = array($storeId => false);
+                    } elseif (!isset($syncedDateArray[$mailchimpStoreId])) {
+                        $syncedDateArray[$mailchimpStoreId] = array($storeId => true);
+                    }
                 }
             }
         }