Minor fixes.

mailchimp · Sep 30, 2019 · f19b057 · f19b057
1 parent 37026f7
commit f19b057
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/app/code/community/Ebizmarts/MailChimp/Helper/Data.php b/app/code/community/Ebizmarts/MailChimp/Helper/Data.php
@@ -4845,17 +4845,16 @@ public function getCountersSubscribers()
     public function modifyCounterDataSentToMailchimp($index, $hasError = false, $increment = 1)
     {
         $counterGetResponsesBatch = $this->getCountersDataSentToMailchimp();
-        $counterGetResponsesBatchAtIndex = $counterGetResponsesBatch[$index];
         $statusChanged = self::DATA_SENT_TO_MAILCHIMP;
 
         if ($hasError === true) {
-            $count = isset($counterGetResponsesBatchAtIndex[self::DATA_NOT_SENT_TO_MAILCHIMP])
-                ? $counterGetResponsesBatchAtIndex[self::DATA_NOT_SENT_TO_MAILCHIMP]
+            $count = isset($counterGetResponsesBatch[$index][self::DATA_NOT_SENT_TO_MAILCHIMP])
+                ? $counterGetResponsesBatch[$index][self::DATA_NOT_SENT_TO_MAILCHIMP]
                 : $increment;
             $statusChanged = self::DATA_NOT_SENT_TO_MAILCHIMP;
         } else {
-            $count = isset($counterGetResponsesBatchAtIndex[self::DATA_SENT_TO_MAILCHIMP])
-                ? $counterGetResponsesBatchAtIndex[self::DATA_SENT_TO_MAILCHIMP]
+            $count = isset($counterGetResponsesBatch[$index][self::DATA_SENT_TO_MAILCHIMP])
+                ? $counterGetResponsesBatch[$index][self::DATA_SENT_TO_MAILCHIMP]
                 : $increment;
         }
 

diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
@@ -267,7 +267,7 @@ public function _getResults(
         }
 
         if ($enabled) {
-            $helper->logBatchStatus('Get results from Mailchimp');
+            $helper->logBatchStatus('Get results from Mailchimp for Magento store '.$magentoStoreId);
 
             foreach ($collection as $item) {
                 try {
@@ -1169,7 +1169,7 @@ protected function _showResumeEcommerce($batchId, $storeId)
         $countersSentPerBatch = $helper->getCountersSentPerBatch();
 
         if (!empty($countersSentPerBatch) || $helper->getCountersSentPerBatch() != null) {
-            $helper->logBatchStatus("Sent batch $batchId for store $storeId");
+            $helper->logBatchStatus("Sent batch $batchId for Magento store $storeId");
             $helper->logBatchQuantity($helper->getCountersSentPerBatch());
         } else {
             $helper->logBatchStatus("Nothing to sync for store $storeId");
@@ -1187,7 +1187,7 @@ protected function _showResumeSubscriber($batchId, $storeId)
         $countersSubscribers = $helper->getCountersSubscribers();
 
         if (!empty($countersSubscribers) || $helper->getCountersSubscribers() != null) {
-            $helper->logBatchStatus("Sent batch $batchId for store $storeId");
+            $helper->logBatchStatus("Sent batch $batchId for Magento store $storeId");
             $helper->logBatchQuantity($helper->getCountersSubscribers());
         } else {
             $helper->logBatchStatus("Nothing to sync for store $storeId");

diff --git a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/List.php b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/List.php
@@ -55,7 +55,7 @@ public function __construct($params)
                             $this->_lists['lists'][0] = $api->getLists()->getLists($listId);
                         }
                     } else {
-                        $this->_lists = $api->getLists()->getLists(null, 'lists', null, 100);
+                        $this->_lists = $api->getLists()->getLists(null, 'lists');
                     }
 
                     if (isset($this->_lists['lists']) && count($this->_lists['lists']) == 0) {

diff --git a/lib/Ebizmarts/MailChimp/Lists.php b/lib/Ebizmarts/MailChimp/Lists.php
@@ -122,7 +122,7 @@ public function getLists(
         $id = null,
         $fields = null,
         $excludeFields = null,
-        $count = null,
+        $count = 100,
         $offset = null,
         $beforeDateCreated = null,
         $sinceDateCreated = null,