Issue361

Controller/Adminhtml/Stores/Delete.php

@@ -29,6 +29,7 @@ public function execute()
                 return $resultRedirect->setPath('mailchimp/stores');
             } catch (\Mailchimp_Error $e) {
                 $this->messageManager->addError(__('Store could not be deleted.'.$e->getMessage()));
+                $this->_helper->log($e->getFriendlyMessage());
                 return $resultRedirect->setPath('mailchimp/stores/edit', ['id'=>$storeId]);
             }
         }

Controller/Adminhtml/Stores/Save.php

@@ -42,6 +42,7 @@ public function execute()
                 }
             } catch (\Mailchimp_Error $e) {
                 $this->messageManager->addErrorMessage(__('Store could not be saved.'.$e->getMessage()));
+                $this->_helper->log($e->getFriendlyMessage());
                 return $resultRedirect->setPath('mailchimp/stores/edit', ['id'=>$storeId]);
             }
         }

Cron/Ecommerce.php

@@ -168,6 +168,7 @@ protected function _processStore($storeId, $mailchimpStoreId, $listId)
         $countProducts = 0;
         $countOrders = 0;
         $batchArray = [];
+        $this->_helper->resetCounters();
         $results = $this->_apiSubscribers->sendSubscribers($storeId, $listId);
         if ($this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_PATH_ECOMMERCE_ACTIVE, $storeId)) {
             $products = $this->_apiProduct->_sendProducts($storeId);
@@ -206,7 +207,7 @@ protected function _processStore($storeId, $mailchimpStoreId, $listId)
                         $this->_mailChimpSyncBatches->setMailchimpStoreId($mailchimpStoreId);
                         $this->_mailChimpSyncBatches->getResource()->save($this->_mailChimpSyncBatches);
                         $batchId = $batchResponse['id'];
-                        $this->_helper->log("Sent batch $batchId");
+                        $this->_showResume($batchId);
                     }
                 }
             } catch (\Mailchimp_Error $e) {
@@ -260,4 +261,10 @@ protected function _ping($storeId)
         }
         return true;
     }
+    protected function _showResume($batchId)
+    {
+        $this->_helper->log("Sent batch $batchId");
+        $this->_helper->log($this->_helper->getCounters());
+
+    }
 }

Helper/Data.php

@@ -59,6 +59,18 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     const PLATFORM      = 'Magento2';
     const MAXSTORES     = 200;
 
+    const SUB_MOD       = "SubscriberModified";
+    const SUB_NEW       = "SubscriberNew";
+    const PRO_MOD       = "ProductModified";
+    const PRO_NEW       = "ProductNew";
+    const CUS_MOD       = "CustomerModified";
+    const CUS_NEW       = "CustomerNew";
+    const ORD_MOD       = "OrderModified";
+    const ORD_NEW       = "OrderNew";
+    const QUO_MOD       = "QuoteModified";
+    const QUO_NEW       = "QuoteNew";
+
+    protected $counters = [];
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
@@ -1060,4 +1072,20 @@ public function getAllApiKeys() {
         }
         return $apiKeys;
     }
+    public function modifyCounter($index, $increment=1)
+    {
+        if(array_key_exists($index,$this->counters)) {
+            $this->counters[$index] = $this->counters[$index] + $increment;
+        } else {
+            $this->counters[$index] = 1;
+        }
+    }
+    public function resetCounters()
+    {
+        $this->counters = [];
+    }
+    public function getCounters()
+    {
+        return $this->counters;
+    }
 }

Model/Api/Cart.php

@@ -264,6 +264,7 @@ protected function _getModifiedQuotes($mailchimpStoreId, $magentoStoreId)
             if (count($cart->getAllVisibleItems())) {
                 $cartJson = $this->_makeCart($cart, $mailchimpStoreId, $magentoStoreId);
                 if ($cartJson!="") {
+                    $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::QUO_MOD);
                     $allCarts[$this->_counter]['method'] = 'POST';
                     $allCarts[$this->_counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/carts';
                     $allCarts[$this->_counter]['operation_id'] = $this->_batchId . '_' . $cartId;
@@ -362,6 +363,7 @@ protected function _getNewQuotes($mailchimpStoreId, $magentoStoreId)
 
             $cartJson = $this->_makeCart($cart, $mailchimpStoreId, $magentoStoreId);
             if ($cartJson!="") {
+                $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::ORD_NEW);
                 $allCarts[$this->_counter]['method'] = 'POST';
                 $allCarts[$this->_counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/carts';
                 $allCarts[$this->_counter]['operation_id'] = $this->_batchId . '_' . $cartId;

Model/Api/Customer.php

@@ -106,6 +106,11 @@ public function sendCustomers($storeId)
                 $this->_helper->log('Customer: '.$customer->getId().' json encode failed');
             }
             if (!empty($customerJson)) {
+                if($item->getMailchimpSyncModified() == 1) {
+                    $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::CUS_MOD);
+                } else {
+                    $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::CUS_NEW);
+                }
                 $customerArray[$counter]['method'] = "PUT";
                 $customerArray[$counter]['path'] = "/ecommerce/stores/" . $mailchimpStoreId . "/customers/" . $customer->getId();
                 $customerArray[$counter]['operation_id'] = $this->_batchId . '_' . $customer->getId();

Model/Api/Order.php

@@ -178,6 +178,7 @@ protected function _getModifiedOrders($magentoStoreId)
 
                 $orderJson = $this->GeneratePOSTPayload($order, $mailchimpStoreId, $magentoStoreId, true);
                 if (!empty($orderJson)) {
+                    $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::ORD_MOD);
                     $batchArray[$this->_counter]['method'] = "PATCH";
                     $batchArray[$this->_counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/orders/' . $order->getIncrementId();
                     $batchArray[$this->_counter]['operation_id'] = $this->_batchId . '_' . $orderId;
@@ -245,6 +246,7 @@ protected function _getNewOrders($magentoStoreId)
                 }
                 $orderJson = $this->GeneratePOSTPayload($order, $mailchimpStoreId, $magentoStoreId);
                 if (!empty($orderJson)) {
+                    $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::ORD_NEW);
                     $batchArray[$this->_counter]['method'] = "POST";
                     $batchArray[$this->_counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/orders';
                     $batchArray[$this->_counter]['operation_id'] = $this->_batchId . '_' . $orderId;

Model/Api/Product.php

@@ -251,6 +251,7 @@ protected function _buildNewProductRequest(
             $this->_helper->log("Product " . $product->getId() . " json encode failed");
             return [];
         }
+        $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::PRO_NEW);
         $data = [];
         $data['method'] = "POST";
         $data['path'] = "/ecommerce/stores/" . $mailchimpStoreId . "/products";
@@ -328,6 +329,7 @@ protected function _buildOldProductRequest(
             $this->_helper->log("Product " . $product->getId() . " json encode failed");
             return [];
         }
+        $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::PRO_MOD);
         $data = [];
         $data['method'] = "PATCH";
         $data['path'] = "/ecommerce/stores/" . $mailchimpStoreId . "/products/".$product->getId();

Model/Api/Subscriber.php

@@ -91,6 +91,11 @@ public function sendSubscribers($storeId, $listId)
                 $this->_helper->log($errorMessage, $storeId);
             }
             if (!empty($subscriberJson)) {
+                if($subscriber->getMailchimpSyncModified()==1) {
+                    $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::SUB_MOD);
+                } else {
+                    $this->_helper->modifyCounter( \Ebizmarts\MailChimp\Helper\Data::SUB_NEW);
+                }
                 $subscriberArray[$counter]['method'] = "PUT";
                 $subscriberArray[$counter]['path'] = "/lists/" . $listId . "/members/" . $md5HashEmail;
                 $subscriberArray[$counter]['operation_id'] = $batchId . '_' . $subscriber->getSubscriberId();

composer.json

@@ -24,6 +24,6 @@
     "forum": "http://ebizmarts.com/forums/view/6"
   },
   "require" : {
-    "ebizmarts/mailchimp-lib": ">=3.0.26"
+    "ebizmarts/mailchimp-lib": ">=3.0.27"
   }
 }