From 5bb0365c58f6d0e17a95f9458a1143d2e8d3f4d2 Mon Sep 17 00:00:00 2001
From: gonzalo <gonzalo@ebizmarts.com>
Date: Thu, 13 Sep 2018 16:45:34 -0300
Subject: [PATCH 1/2] changelog version 1.0.30

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a06c3c14..fe671b72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # Change Log
 
-## [1.0.30](https://github.com/mailchimp/mc-magento2/tree/1.0.30) (2018-08-27)
+## [1.0.30](https://github.com/mailchimp/mc-magento2/tree/1.0.30)
 
 [Full Changelog](https://github.com/mailchimp/mc-magento2/compare/1.0.29...1.0.30)
 
 **Implemented enhancements:**
 
+- Adding extra logging on import parts of the Cronjob [\#393](https://github.com/mailchimp/mc-magento2/issues/393)
 - Add an option to choose between send MailChimp or Magento mails [\#372](https://github.com/mailchimp/mc-magento2/issues/372)
 - Log batch totals for each run [\#361](https://github.com/mailchimp/mc-magento2/issues/361)
 -  Add debug information [\#359](https://github.com/mailchimp/mc-magento2/issues/359)
@@ -13,10 +14,13 @@
 
 **Fixed bugs:**
 
+- Special prices management in Magento Enterprise [\#391](https://github.com/mailchimp/mc-magento2/issues/391)
+- Failed to open stream: No such file or directory [\#388](https://github.com/mailchimp/mc-magento2/issues/388)
 - MailChimp breaks order processing when it's done through CLI [\#378](https://github.com/mailchimp/mc-magento2/issues/378)
 - Promo rules are not updated [\#370](https://github.com/mailchimp/mc-magento2/issues/370)
 - Error in the configuration when selecting other website than default [\#368](https://github.com/mailchimp/mc-magento2/issues/368)
 - Orders not synced when products in the order not already synced [\#366](https://github.com/mailchimp/mc-magento2/issues/366)
+- Wrong website set on customer [\#357](https://github.com/mailchimp/mc-magento2/issues/357)
 - Issue with coupons for free shipping [\#355](https://github.com/mailchimp/mc-magento2/issues/355)
 - Error downloading response from error grid when batch not exist [\#351](https://github.com/mailchimp/mc-magento2/issues/351)
 - Unable to set custom Env.php API Credentials  [\#345](https://github.com/mailchimp/mc-magento2/issues/345)
@@ -24,6 +28,7 @@
 - Webhook processing fails when list id does not match any list configured in Magento [\#337](https://github.com/mailchimp/mc-magento2/issues/337)
 - Sending modified products in order or cart [\#335](https://github.com/mailchimp/mc-magento2/issues/335)
 - Base table or view not found Magento 2.2.4 [\#321](https://github.com/mailchimp/mc-magento2/issues/321)
+- Unknown column 'at\_special\_from\_date\_default.value' in 'on clause' [\#309](https://github.com/mailchimp/mc-magento2/issues/309)
 
 ## [1.0.29](https://github.com/mailchimp/mc-magento2/tree/1.0.29) (2018-05-31)
 [Full Changelog](https://github.com/mailchimp/mc-magento2/compare/1.0.28...1.0.29)

From 6de738766bf044678ab841f34a072f79672054b3 Mon Sep 17 00:00:00 2001
From: gonzalo <gonzalo@ebizmarts.com>
Date: Tue, 18 Sep 2018 12:55:50 -0300
Subject: [PATCH 2/2] #361

---
 Model/Api/Cart.php    | 4 +++-
 Model/Api/Product.php | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Model/Api/Cart.php b/Model/Api/Cart.php
index 926a5ffc..7640e499 100644
--- a/Model/Api/Cart.php
+++ b/Model/Api/Cart.php
@@ -305,6 +305,8 @@ protected function _getNewQuotes($mailchimpStoreId, $magentoStoreId)
         );
         // be sure that the quotes are already in mailchimp and not deleted
         $newCarts->getSelect()->where("m4m.mailchimp_sync_delta IS NULL");
+
+
         // limit the collection
         $newCarts->getSelect()->limit(self::BATCH_LIMIT);
         /**
@@ -363,7 +365,7 @@ protected function _getNewQuotes($mailchimpStoreId, $magentoStoreId)
 
             $cartJson = $this->_makeCart($cart, $mailchimpStoreId, $magentoStoreId);
             if ($cartJson!="") {
-                $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::ORD_NEW);
+                $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::QUO_NEW);
                 $allCarts[$this->_counter]['method'] = 'POST';
                 $allCarts[$this->_counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/carts';
                 $allCarts[$this->_counter]['operation_id'] = $this->_batchId . '_' . $cartId;
diff --git a/Model/Api/Product.php b/Model/Api/Product.php
index 4696f178..f275fde2 100644
--- a/Model/Api/Product.php
+++ b/Model/Api/Product.php
@@ -246,6 +246,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";
@@ -322,6 +323,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();