Merge pull request #1075 from mailchimp/pre-release/1.1.18

Pre release/1.1.18
mailchimp · Oct 7, 2019 · 38deee5 · 38deee5
2 parents b613647 + 5950285
commit 38deee5
Show file tree

Hide file tree

Showing 171 changed files with 11,798 additions and 4,968 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,17 +1,34 @@
 # Changelog
-## [1.1.17](https://github.com/mailchimp/mc-magento/releases/tag/1.1.17) - 2019-07-04
+## [1.1.18](https://github.com/mailchimp/mc-magento/releases/tag/1.1.18) - 2019-09-13
 **Fixed**
-- Currency discrepancy in order confirmation email  [\#982](https://github.com/mailchimp/mc-magento/issues/982)
-- Fix subscription confirmation email when "Subscribe all customers to the newsletter" is enabled [\#978](https://github.com/mailchimp/mc-magento/issues/978)
-- Errors saved in mailchimp_sync_ecommerce_data table may not set the sync_modified value to 0 [\#976](https://github.com/mailchimp/mc-magento/issues/976)
-- Fix for infinite sync of modified orders containing only unsupported products [\#970](https://github.com/mailchimp/mc-magento/issues/970)
-- Promo codes unexpectedly deleted from Mailchimp [\#967](https://github.com/mailchimp/mc-magento/issues/967)
-- Unknown column 'at_special_from_date_default.value' in 'on clause' [\#964](https://github.com/mailchimp/mc-magento/issues/964)
-- Remove error message when resend an item with error [\#963](https://github.com/mailchimp/mc-magento/issues/963)
-- Customer and subscriber with same email sent to mailchimp with different id [\#952](https://github.com/mailchimp/mc-magento/issues/952)
-- getLastRealOrder() doesn't exist [\#946](https://github.com/mailchimp/mc-magento/issues/946)
+- Product resend internal problem [\#1066](https://github.com/mailchimp/mc-magento/issues/1066)
+- Notice: Undefined index: NOT SENT  in app/code/community/Ebizmarts/MailChimp/Helper/Data.php [\#1050](https://github.com/mailchimp/mc-magento/issues/1050)
+- Use empty function correctly [\#1039](https://github.com/mailchimp/mc-magento/issues/1039)
+- Fix for bug preventing carts from synchronising [\#1029](https://github.com/mailchimp/mc-magento/issues/1029)
+- Problems when resending Ecommerce Data [\#1024](https://github.com/mailchimp/mc-magento/issues/1024)
+- PHP notice when MC API call fails [\#1021](https://github.com/mailchimp/mc-magento/issues/1021)
+- Cannot resend Ecommerce data from particular scope [\#1017](https://github.com/mailchimp/mc-magento/issues/1017)
+- Handle json_encode errors correctly [\#1010](https://github.com/mailchimp/mc-magento/issues/1010)
 
 **Changed**
+- Fix for re-using synch batch models causing batch responses to not be processed [\#1057](https://github.com/mailchimp/mc-magento/issues/1057)
+- Apply MEQP1 code standar [\#1055](https://github.com/mailchimp/mc-magento/issues/1055)
+- Validate API key field at Mailchimp configuration [\#1052](https://github.com/mailchimp/mc-magento/issues/1052)
+- Add Invalid API Key message when adding a new Mailchimp Store [\#1045](https://github.com/mailchimp/mc-magento/issues/1045)
+- Remove redundant system config and template file [\#1043](https://github.com/mailchimp/mc-magento/pull/1043)
+- Stop flagging Customers as modified after an order is made. [\#1027](https://github.com/mailchimp/mc-magento/issues/1027)
+- Improve batch behavior [\#1025](https://github.com/mailchimp/mc-magento/issues/1025)
+- Serialize/Unserialize deprecated - MEQP [\#1019](https://github.com/mailchimp/mc-magento/issues/1019)
+- Improve performance when resetting errors [\#975](https://github.com/mailchimp/mc-magento/issues/975)
+- Maximum # Merge fields in MC [\#957](https://github.com/mailchimp/mc-magento/issues/957)
+- How can we clean the table mailchimp_ecommerce_sync_data [\#897](https://github.com/mailchimp/mc-magento/issues/897)
+- Certain Merge fields not transferred [\#425](https://github.com/mailchimp/mc-magento/issues/425)
+
+## [1.1.17](https://github.com/mailchimp/mc-magento/releases/tag/1.1.17) - 2019-07-23
+**Changed**
+- Avoid sending Subscriber via cron job when setting "Use Magento Emails" enabled. [\#996](https://github.com/mailchimp/mc-magento/issues/996)
+- Rename delete customer account option [\#992](https://github.com/mailchimp/mc-magento/issues/992)
+- Coding standards fix [\#989](https://github.com/mailchimp/mc-magento/pull/989)
 - Change "List" appearances to "Audience" [\#977](https://github.com/mailchimp/mc-magento/issues/977)
 - Encrypt sensitive data [\#955](https://github.com/mailchimp/mc-magento/issues/955)
 - Improve logging [\#947](https://github.com/mailchimp/mc-magento/pull/947)
@@ -21,6 +38,18 @@
 - Add some js in the admin to avoid save before continue [\#649](https://github.com/mailchimp/mc-magento/issues/649)
 - Get guest information from orders made with the same email address [\#545](https://github.com/mailchimp/mc-magento/issues/545)
 
+**Fixed**
+- Error subscribing customer from backend. [\#990](https://github.com/mailchimp/mc-magento/issues/990)
+- Currency discrepancy in order confirmation email  [\#982](https://github.com/mailchimp/mc-magento/issues/982)
+- Fix subscription confirmation email when "Subscribe all customers to the newsletter" is enabled [\#978](https://github.com/mailchimp/mc-magento/issues/978)
+- Errors saved in mailchimp_sync_ecommerce_data table may not set the sync_modified value to 0 [\#976](https://github.com/mailchimp/mc-magento/issues/976)
+- Fix for infinite sync of modified orders containing only unsupported products [\#970](https://github.com/mailchimp/mc-magento/issues/970)
+- Promo codes unexpectedly deleted from Mailchimp [\#967](https://github.com/mailchimp/mc-magento/issues/967)
+- Unknown column 'at_special_from_date_default.value' in 'on clause' [\#964](https://github.com/mailchimp/mc-magento/issues/964)
+- Remove error message when resend an item with error [\#963](https://github.com/mailchimp/mc-magento/issues/963)
+- Customer and subscriber with same email sent to mailchimp with different id [\#952](https://github.com/mailchimp/mc-magento/issues/952)
+- getLastRealOrder() doesn't exist [\#946](https://github.com/mailchimp/mc-magento/issues/946)
+
 ## [1.1.16](https://github.com/mailchimp/mc-magento/releases/tag/1.1.16) - 2019-04-30
 **Fixed**
 - Error syncing order with disabled product [\#943](https://github.com/mailchimp/mc-magento/issues/943)

diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Customer/Edit/Tab/Mailchimp.php b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Customer/Edit/Tab/Mailchimp.php
@@ -23,18 +23,18 @@ class Ebizmarts_MailChimp_Block_Adminhtml_Customer_Edit_Tab_Mailchimp extends Ma
     /**
      * @var Ebizmarts_MailChimp_Helper_Data
      */
-    protected $helper;
-    protected $storeId;
+    protected $_helper;
+    protected $_storeId;
 
     public function __construct()
     {
         parent::__construct();
         $this->setTemplate('ebizmarts/mailchimp/customer/tab/mailchimp.phtml');
-        $this->helper = $this->makeHelper();
+        $this->_helper = $this->makeHelper();
         $customerId = (int) $this->getRequest()->getParam('id');
         if ($customerId) {
             $this->_customer = $this->getCustomerModel()->load($customerId);
-            $this->storeId = $this->getCustomer()->getStoreId();
+            $this->_storeId = $this->getCustomer()->getStoreId();
         }
     }
 
@@ -46,7 +46,7 @@ public function getInterest()
         $subscriberId = $subscriber->getSubscriberId();
         $customerId = $customer->getId();
         $storeId = $this->getStoreId();
-        $interest = $this->helper->getInterestGroups($customerId, $subscriberId, $storeId);
+        $interest = $this->_helper->getInterestGroups($customerId, $subscriberId, $storeId);
 
         return $interest;
     }
@@ -90,10 +90,11 @@ protected function getCustomer()
      */
     protected function getStoreId()
     {
-        $storeId = $this->storeId;
+        $storeId = $this->_storeId;
         if (!$storeId) {
             $storeId = $this->_customer->getMailchimpStoreView();
         }
+
         return $storeId;
     }
 }
diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Ecommerce/Resendecommercedata.php b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Ecommerce/Resendecommercedata.php
@@ -1,6 +1,7 @@
 <?php
 
-class Ebizmarts_MailChimp_Block_Adminhtml_Ecommerce_Resendecommercedata extends Mage_Adminhtml_Block_Widget_Form_Container
+class Ebizmarts_MailChimp_Block_Adminhtml_Ecommerce_Resendecommercedata
+    extends Mage_Adminhtml_Block_Widget_Form_Container
 {
     protected $_mode = 'resendecommercedata';
     public function __construct()
@@ -18,8 +19,4 @@ public function getHeaderText()
     {
         return Mage::helper('mailchimp')->__('Data to send');
     }
-
-    public function _prepareForm()
-    {
-    }
 }
diff --git a/...code/community/Ebizmarts/MailChimp/Block/Adminhtml/Ecommerce/Resendecommercedata/Form.php b/...code/community/Ebizmarts/MailChimp/Block/Adminhtml/Ecommerce/Resendecommercedata/Form.php
@@ -1,11 +1,27 @@
 <?php
 
-class Ebizmarts_MailChimp_Block_Adminhtml_Ecommerce_Resendecommercedata_Form extends Mage_Adminhtml_Block_Widget_Form
+class Ebizmarts_MailChimp_Block_Adminhtml_Ecommerce_Resendecommercedata_Form
+    extends Mage_Adminhtml_Block_Widget_Form
 {
     protected function _prepareForm()
     {
-        $form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getUrl('*/*/resendEcommerceData'), 'method' => 'post'));
-        $fieldset = $form->addFieldset('base_fieldset', array('legend' => Mage::helper('mailchimp')->__('Resend Data')));
+        $request = $this->getRequest();
+        $scope = $request->getParam('scope');
+        $scopeId = $request->getParam('scope_id');
+
+        $form = new Varien_Data_Form(
+            array(
+                'id' => 'edit_form',
+                'action' => $this->getUrl('*/*/resendEcommerceData'),
+                'method' => 'post'
+            )
+        );
+        $fieldset = $form->addFieldset(
+            'base_fieldset',
+            array(
+                'legend' => Mage::helper('mailchimp')->__('Resend Data')
+            )
+        );
 
 
         $fieldset->addField(
@@ -68,11 +84,31 @@ protected function _prepareForm()
                 'label' => "Promo Rules",
                 'id' => 'promo',
                 'title' => 'Promo Rules',
-                'value' => Ebizmarts_MailChimp_Model_Config::IS_PROMO_CODE. ', ' . Ebizmarts_MailChimp_Model_Config::IS_PROMO_RULE,
+                'value' => Ebizmarts_MailChimp_Model_Config::IS_PROMO_CODE. ', '
+                    . Ebizmarts_MailChimp_Model_Config::IS_PROMO_RULE,
                 'required' => false,
                 'checked'  => '1',
             )
         );
+        $fieldset->addField(
+            'scope',
+            'hidden',
+            array(
+                'name' => 'scope',
+                'id' => 'scope',
+                'value' => $scope
+            )
+        );
+        $fieldset->addField(
+            'scopeId',
+            'hidden',
+            array(
+                'name' => 'scope_id',
+                'id' => 'scopeId',
+                'value' => $scopeId
+            )
+        );
+
 
         $form->setUseContainer(true);
         $this->setForm($form);

diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Mailchimperrors/Link.php b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Mailchimperrors/Link.php
@@ -10,39 +10,49 @@
  * @date:     6/10/16 2:23 PM
  * @file:     Link.php
  */
-class Ebizmarts_MailChimp_Block_Adminhtml_Mailchimperrors_Link extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+class Ebizmarts_MailChimp_Block_Adminhtml_Mailchimperrors_Link
+    extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
 {
     public function render(Varien_Object $row)
     {
         $id = $row->getData('original_id');
         switch ($row->getData('regtype')) {
-            case Ebizmarts_MailChimp_Model_Config::IS_CUSTOMER:
-                $url = Mage::helper("adminhtml")->getUrl("adminhtml/customer/edit", array('id'=>$id));
-                $displayText = '<a href="' . $url . '" target="_blank">' . $this->__('Go to Customer view. Id:') . ' ' . $id . '</a>';
-                break;
-            case Ebizmarts_MailChimp_Model_Config::IS_ORDER:
-                $url = Mage::helper("adminhtml")->getUrl("adminhtml/sales_order/view", array('order_id'=>$id));
-                $displayText = '<a href="' . $url . '" target="_blank">' . $this->__('Go to Order view. Id:') . ' ' . $id . '</a>';
-                break;
-            case Ebizmarts_MailChimp_Model_Config::IS_PRODUCT:
-                $url = Mage::helper("adminhtml")->getUrl("adminhtml/catalog_product/edit", array('id'=>$id));
-                $displayText = '<a href="' . $url . '" target="_blank">' . $this->__('Go to Product view. Id:') . ' ' . $id . '</a>';
-                break;
-            case Ebizmarts_MailChimp_Model_Config::IS_QUOTE:
-                $displayText = $this->__('Quote view not available. Id:') . ' ' . $id;
-                break;
-            case Ebizmarts_MailChimp_Model_Config::IS_SUBSCRIBER:
-                $displayText = $this->__('Subscriber view not available. Id:') . ' ' . $id;
-                break;
-            case Ebizmarts_MailChimp_Model_Config::IS_PROMO_RULE:
-                $displayText = $this->__('Promo Rule view not available. Id:') . ' ' . $id;
-                break;
-            case Ebizmarts_MailChimp_Model_Config::IS_PROMO_CODE:
-                $displayText = $this->__('Promo Code view not available. Id:') . ' ' . $id;
-                break;
-            default:
-                $displayText = $this->__('Something went wrong when retrieving original item.');
-                break;
+        case Ebizmarts_MailChimp_Model_Config::IS_CUSTOMER:
+            $url = Mage::helper("adminhtml")->getUrl("adminhtml/customer/edit", array('id'=>$id));
+            $displayText =
+                '<a href="' . $url . '" target="_blank">'
+                . $this->__('Go to Customer view. Id:') . ' ' . $id
+                . '</a>';
+            break;
+        case Ebizmarts_MailChimp_Model_Config::IS_ORDER:
+            $url = Mage::helper("adminhtml")->getUrl("adminhtml/sales_order/view", array('order_id'=>$id));
+            $displayText =
+                '<a href="' . $url . '" target="_blank">'
+                . $this->__('Go to Order view. Id:') . ' ' . $id
+                . '</a>';
+            break;
+        case Ebizmarts_MailChimp_Model_Config::IS_PRODUCT:
+            $url = Mage::helper("adminhtml")->getUrl("adminhtml/catalog_product/edit", array('id'=>$id));
+            $displayText =
+                '<a href="' . $url . '" target="_blank">'
+                . $this->__('Go to Product view. Id:') . ' ' . $id
+                . '</a>';
+            break;
+        case Ebizmarts_MailChimp_Model_Config::IS_QUOTE:
+            $displayText = $this->__('Quote view not available. Id:') . ' ' . $id;
+            break;
+        case Ebizmarts_MailChimp_Model_Config::IS_SUBSCRIBER:
+            $displayText = $this->__('Subscriber view not available. Id:') . ' ' . $id;
+            break;
+        case Ebizmarts_MailChimp_Model_Config::IS_PROMO_RULE:
+            $displayText = $this->__('Promo Rule view not available. Id:') . ' ' . $id;
+            break;
+        case Ebizmarts_MailChimp_Model_Config::IS_PROMO_CODE:
+            $displayText = $this->__('Promo Code view not available. Id:') . ' ' . $id;
+            break;
+        default:
+            $displayText = $this->__('Something went wrong when retrieving original item.');
+            break;
         }
 
         return $displayText;

diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Mailchimpstores/Edit.php b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Mailchimpstores/Edit.php
@@ -20,7 +20,8 @@ public function __construct()
         parent::__construct();
 
         $this->removeButton('reset');
-        $this->updateButton('delete', null, array(
+        $this->updateButton(
+            'delete', null, array(
             'label'     => Mage::helper('adminhtml')->__('Delete Store'),
             'class'     => 'delete',
             'onclick'   => 'deleteMCStoreConfirm(\''
@@ -31,14 +32,16 @@ public function __construct()
                 . $this->getDeleteUrl()
                 . '\')',
             'sort_order' => 0
-        ));
+            )
+        );
 
         $scopeArray = $this->getScopeArrayIfValueExists();
         if ($scopeArray !== false) {
             $jsCondition = 'true';
         } else {
             $jsCondition = 'false';
         }
+
         $mcInUseMessage = $this->getMCInUseMessage($scopeArray);
         $this->_formScripts[] = "function deleteMCStoreConfirm(message, url) {
             if ($jsCondition) {
@@ -83,10 +86,16 @@ protected function getMCInUseMessage($scope)
         $helper = $this->makeHelper();
         if ($scope !== false) {
             $scopeName = $helper->getScopeName($scope);
-            $message = $helper->__("This store is currently in use for this Magento store at %s scope. Do you want to proceed anyways?", $scopeName);
+            $message = $helper->__(
+                "This store is currently in use for this Magento store at %s scope. Do you want to proceed anyways?",
+                $scopeName
+            );
         } else {
-            $message = $helper->__("This store is currently in use for this Magento store. Do you want to proceed anyways?");
+            $message = $helper->__(
+                "This store is currently in use for this Magento store. Do you want to proceed anyways?"
+            );
         }
+
         return $message;
     }
 
@@ -101,6 +110,7 @@ protected function getScopeArrayIfValueExists()
         if ($keyIfExist === null) {
             $keyIfExist = 'false';
         }
+
         return $keyIfExist;
     }