Merge

Block/Adminhtml/System/Config/Form/Field/CustomerMap.php

@@ -19,6 +19,7 @@ class CustomerMap  extends \Magento\Config\Block\System\Config\Form\Field\FieldA
      * @var VarsMap
      */
     protected $_varsRenderer=null;
+    protected $_mailchimpRenderer=null;
 
     protected function _getVarsRenderer()
     {
@@ -32,10 +33,26 @@ protected function _getVarsRenderer()
         }
         return $this->_varsRenderer;
     }
+    protected function _getMailchimpRenderer()
+    {
+        if (!$this->_mailchimpRenderer) {
+            $this->_mailchimpRenderer = $this->getLayout()->createBlock(
+                'Ebizmarts\MailChimp\Block\Adminhtml\System\Config\Form\Field\MailchimpMap',
+                '',
+                ['data' => ['is_render_to_js_template' => true]]
+            );
+            $this->_mailchimpRenderer->setClass('mailchimp_field_select');
+        }
+        return $this->_mailchimpRenderer;
+    }
 
     protected function _prepareToRender()
     {
-        $this->addColumn('mailchimp', ['label' => __('Mailchimp')]);
+//        $this->addColumn('mailchimp', ['label' => __('Mailchimp')]);
+        $this->addColumn(
+            'mailchimp_field_id',
+            ['label' => __('Mailchimp'), 'renderer' => $this->_getMailchimpRenderer()]
+        );
         $this->addColumn(
             'customer_field_id',
             ['label' => __('Magento'), 'renderer' => $this->_getVarsRenderer()]
@@ -48,6 +65,8 @@ protected function _prepareArrayRow(\Magento\Framework\DataObject $row)
         $optionExtraAttr = [];
         $optionExtraAttr['option_' . $this->_getVarsRenderer()->calcOptionHash($row->getData('customer_field_id'))] =
             'selected="selected"';
+        $optionExtraAttr['option_' . $this->_getMailchimpRenderer()->calcOptionHash($row->getData('mailchimp_field_id'))] =
+            'selected="selected"';
         $row->setData(
             'option_extra_attrs',
             $optionExtraAttr

Block/Adminhtml/System/Config/Form/Field/MailchimpMap.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * mc-magento2 Magento Component
+ *
+ * @category Ebizmarts
+ * @package mc-magento2
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 10/9/18 1:17 PM
+ * @file: MailchimpMap.php
+ */
+
+namespace Ebizmarts\MailChimp\Block\Adminhtml\System\Config\Form\Field;
+
+class MailchimpMap  extends \Magento\Framework\View\Element\Html\Select
+{
+    /**
+     * @var \Ebizmarts\MailChimp\Helper\Data
+     */
+    private $_helper;
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $_storeManager;
+
+    /**
+     * MailchimpMap constructor.
+     * @param \Magento\Framework\View\Element\Context $context
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Ebizmarts\MailChimp\Helper\Data $helper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Context $context,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Ebizmarts\MailChimp\Helper\Data $helper,
+        array $data=[]
+    )
+    {
+        parent::__construct($context, $data);
+        $this->_helper          = $helper;
+        $this->_storeManager    = $storeManager;
+    }
+
+    protected function _getMailchimpTags()
+    {
+        $ret = [];
+        $api = $this->_helper->getApi($this->_storeManager->getStore()->getId());
+        $merge = $api->lists->mergeFields->getAll($this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_PATH_LIST));
+        foreach($merge['merge_fields'] as $item) {
+            $ret[$item['tag']] = $item['tag'].' ('.$item['name'].' : '.$item['type'].')';
+        }
+        return $ret;
+    }
+    public function setInputName($value)
+    {
+        return $this->setName($value);
+    }
+
+    /**
+     * Render block HTML
+     *
+     * @return string
+     */
+    public function _toHtml()
+    {
+        if (!$this->getOptions()) {
+            foreach ($this->_getMailchimpTags() as $attId => $attLabel) {
+                $this->addOption($attId, addslashes($attLabel));
+            }
+        }
+        return parent::_toHtml();
+    }
+}

CHANGELOG.md

@@ -1,7 +1,36 @@
 # Change Log
 
-## [1.0.29](https://github.com/mailchimp/mc-magento2/tree/1.0.29) (2018-05-31)
+## [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)
+- High CPU load when API not available [\#325](https://github.com/mailchimp/mc-magento2/issues/325)
 
+**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)
+- Disabled in Admin Panel Mailchimp block Magento default newsletter flow. [\#339](https://github.com/mailchimp/mc-magento2/issues/339)
+- 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)
 
 **Implemented enhancements:**
@@ -24,7 +53,11 @@
 - Bad registers are generated in mailchimp\_sync\_ecommerce table [\#267](https://github.com/mailchimp/mc-magento2/issues/267)
 - PHP warning in Helper/Data.php line 340 [\#266](https://github.com/mailchimp/mc-magento2/issues/266)
 - Subscriber fields not updated when Ecommerce Data not enabled [\#258](https://github.com/mailchimp/mc-magento2/issues/258)
+- The instest groups are not reloaded when the list changes [\#257](https://github.com/mailchimp/mc-magento2/issues/257)
+- The user can select non existing group in admin [\#256](https://github.com/mailchimp/mc-magento2/issues/256)
+- Don't process stores with no mailchimp store [\#255](https://github.com/mailchimp/mc-magento2/issues/255)
 - Error when attempting to edit a customer from the backend [\#240](https://github.com/mailchimp/mc-magento2/issues/240)
+- 2.2 Error Importing Configuration [\#223](https://github.com/mailchimp/mc-magento2/issues/223)
 - No Abandoned Cart Data Sent [\#220](https://github.com/mailchimp/mc-magento2/issues/220)
 - Magento 2.2.1: Changes like "unsubscribe" and "delete" to subscribers in Magento backend aren't synched [\#147](https://github.com/mailchimp/mc-magento2/issues/147)
 - Change cron group id to 'mailchimp'. [\#282](https://github.com/mailchimp/mc-magento2/pull/282) ([jhruehl](https://github.com/jhruehl))
@@ -43,10 +76,6 @@
 
 **Fixed bugs:**
 
-- The instest groups are not reloaded when the list changes [\#257](https://github.com/mailchimp/mc-magento2/issues/257)
-- The user can select non existing group in admin [\#256](https://github.com/mailchimp/mc-magento2/issues/256)
-- Don't process stores with no mailchimp store [\#255](https://github.com/mailchimp/mc-magento2/issues/255)
-- 2.2 Error Importing Configuration [\#223](https://github.com/mailchimp/mc-magento2/issues/223)
 - Wrong product marked as modified in ecommerce table [\#253](https://github.com/mailchimp/mc-magento2/issues/253)
 - Don't delete the batch\_id when modify a register [\#246](https://github.com/mailchimp/mc-magento2/issues/246)
 - Invalid argument supplied for foreach\(\) [\#243](https://github.com/mailchimp/mc-magento2/issues/243)

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,31 +168,32 @@ 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)) {
             $this->_helper->log('Generate Products payload');
             $products = $this->_apiProduct->_sendProducts($storeId);
             $countProducts = count($products);
             $results = array_merge($results, $products);
-            
+
             $this->_helper->log('Generate Customers payload');
             $customers = $this->_apiCustomer->sendCustomers($storeId);
             $countCustomers = count($customers);
             $results = array_merge($results, $customers);
-            
+
             $this->_helper->log('Generate Orders payload');
             $orders = $this->_apiOrder->sendOrders($storeId);
             $countOrders = count($orders);
             $results = array_merge($results, $orders);
-            
+
             $this->_helper->log('Generate Carts payload');
             $carts = $this->_apiCart->createBatchJson($storeId);
             $results = array_merge($results, $carts);
-            
+
             $this->_helper->log('Generate Rules payload');
             $rules = $this->_apiPromoRules->sendRules($storeId);
             $results = array_merge($results, $rules);
-            
+
             $this->_helper->log('Generate Coupons payload');
             $coupons = $this->_apiPromoCodes->sendCoupons($storeId);
             $results = array_merge($results, $coupons);
@@ -217,7 +218,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) {
@@ -271,4 +272,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

@@ -60,6 +60,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
      */
@@ -1061,4 +1073,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;
+    }
 }

Helper/VarsMap.php

@@ -63,7 +63,7 @@ protected function isEncodedArrayFieldValue($value)
         foreach ($value as $row) {
             if (!is_array($row)
                 || !array_key_exists('customer_field_id', $row)
-                || !array_key_exists('mailchimp', $row)
+                || !array_key_exists('mailchimp_field_id', $row)
             ) {
                 return false;
             }
@@ -77,13 +77,13 @@ protected function decodeArrayFieldValue(array $value)
         foreach ($value as $row) {
             if (!is_array($row)
                 || !array_key_exists('customer_field_id', $row)
-                || !array_key_exists('mailchimp', $row)
+                || !array_key_exists('mailchimp_field_id', $row)
             ) {
                 continue;
             }
-            $groupId = $row['customer_field_id'];
-            $qty = $row['mailchimp'];
-            $result[$groupId] = $qty;
+            $customer_field_id = $row['customer_field_id'];
+            $mailchimp_field_id = $row['mailchimp_field_id'];
+            $result[$customer_field_id] = $mailchimp_field_id;
         }
         return $result;
     }
@@ -114,7 +114,7 @@ protected function encodeArrayFieldValue(array $value)
         $result = [];
         foreach ($value as $customerFieldId => $mailchimpName) {
             $resultId = $this->mathRandom->getUniqueHash('_');
-            $result[$resultId] = ['mailchimp' => $mailchimpName ,'customer_field_id' => $customerFieldId];
+            $result[$resultId] = ['mailchimp_field_id' => $mailchimpName ,'customer_field_id' => $customerFieldId];
         }
         return $result;
     }

Model/Api/Cart.php

@@ -218,7 +218,7 @@ protected function _getModifiedQuotes($mailchimpStoreId, $magentoStoreId)
              * @var $customer \Magento\Customer\Model\Customer
              */
             $customer = $this->_customerFactory->create();
-            $customer->setWebsiteId($magentoStoreId);
+            $customer->setWebsiteId($this->_helper->getWebsiteId($magentoStoreId));
             $customer->loadByEmail($cart->getCustomerEmail());
 
             if ($customer->getEmail() != $cart->getCustomerEmail()) {
@@ -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;
@@ -304,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);
         /**
@@ -321,7 +324,7 @@ protected function _getNewQuotes($mailchimpStoreId, $magentoStoreId)
                 continue;
             }
             $customer = $this->_customerFactory->create();
-            $customer->setWebsiteId($magentoStoreId);
+            $customer->setWebsiteId($this->_helper->getWebsiteId($magentoStoreId));
             $customer->loadByEmail($cart->getCustomerEmail());
 
             if ($customer->getEmail() != $cart->getCustomerEmail()) {
@@ -362,6 +365,7 @@ protected function _getNewQuotes($mailchimpStoreId, $magentoStoreId)
 
             $cartJson = $this->_makeCart($cart, $mailchimpStoreId, $magentoStoreId);
             if ($cartJson!="") {
+                $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;

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();