Issue2041 2.4

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

@@ -79,7 +79,7 @@ protected function _getMailchimpTags()
                     $ret[$item['tag']] = $item['tag'] . ' (' . $item['name'] . ' : ' . $item['type'] . ')';
                 }
             }
-        } catch (\Mailchimp_Error $e) {
+        } catch (\Mailchimp_Error | \Mailchimp_HttpError $e) {
             $this->_helper->log($e->getFriendlyMessage());
         }
         return $ret;

Controller/Adminhtml/Ecommerce/CreateWebhook.php

@@ -47,7 +47,7 @@ public function __construct(
         \Ebizmarts\MailChimp\Helper\Data $helper,
         \Magento\Config\Model\ResourceModel\Config $config
     ) {
-    
+
         parent::__construct($context);
         $this->resultJsonFactory    = $resultJsonFactory;
         $this->helper               = $helper;
@@ -74,11 +74,12 @@ public function execute()
             $message = $return['message'];
         }
         $resultJson = $this->resultJsonFactory->create();
-
-        return $resultJson->setData([
+        $ret = [
             'valid' => (int)$valid,
             'message' => $message,
-        ]);
+        ];
+        $this->helper->buttonPressed("CreateWebhook", $ret);
+        return $resultJson->setData($ret);
     }
     protected function _isAllowed()
     {

Controller/Adminhtml/Ecommerce/DeleteStore.php

@@ -51,7 +51,7 @@ public function __construct(
         \Ebizmarts\MailChimp\Helper\Data $helper,
         \Magento\Config\Model\ResourceModel\Config $config
     ) {
-    
+
         parent::__construct($context);
         $this->resultJsonFactory    = $resultJsonFactory;
         $this->helper               = $helper;
@@ -89,10 +89,12 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $ret = [
             'valid' => (int)$valid,
             'message' => $message,
-        ]);
+        ];
+        $this->helper->buttonPressed("DeleteStore",$ret);
+        return $resultJson->setData($ret);
     }
     protected function _isAllowed()
     {

Controller/Adminhtml/Ecommerce/FixMailchimpJS.php

@@ -48,7 +48,7 @@ public function __construct(
         \Magento\Framework\App\Cache\TypeListInterface $typeList,
         \Ebizmarts\MailChimp\Helper\Data $helper
     ) {
-    
+
         parent::__construct($context);
         $this->resultJsonFactory    = $resultJsonFactory;
         $this->helper               = $helper;
@@ -76,11 +76,12 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-
-        return $resultJson->setData([
+        $ret = [
             'valid' => (int)$valid,
             'message' => $message,
-        ]);
+        ];
+        $this->helper->buttonPressed("FixMailchimpJS", $ret);
+        return $resultJson->setData($ret);
     }
     protected function _isAllowed()
     {

Controller/Adminhtml/Ecommerce/GetInterest.php

@@ -73,7 +73,7 @@ public function execute()
                 if (is_array($result['categories']) && count($result['categories'])) {
                     $rc = $result['categories'];
                 }
-            } catch (\Mailchimp_Error $e) {
+            } catch (\Mailchimp_Error | \Mailchimp_HttpError $e) {
                 $this->_helper->log($e->getFriendlyMessage());
                 $error = 1;
             }

Controller/Adminhtml/Ecommerce/Getaccountdetails.php

@@ -86,7 +86,7 @@ public function execute()
                     $options['nostore'] = ['label' => __('Ecommerce disabled, only subscribers will be synchronized (your orders, products,etc will be not synchronized)'), 'value' => ''];
                 }
             }
-        } catch (\Mailchimp_Error $e) {
+        } catch (\Mailchimp_Error | \Mailchimp_HttpError $e) {
             $this->_helper->log($e->getFriendlyMessage());
             $options['error'] = ['label' => 'Error', 'value' => __('--- Invalid API Key ---')];
         }

Controller/Adminhtml/Ecommerce/ResetLocalErrors.php

@@ -93,10 +93,12 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $ret = [
             'valid' => (int)$valid,
             'message' => $message,
-        ]);
+        ];
+        $this->helper->buttonPressed("ResetLocalErrors",$ret);
+        return $resultJson->setData($ret);
     }
     protected function _isAllowed()
     {

Controller/Adminhtml/Ecommerce/ResetLocalErrorsNoRetry.php

@@ -93,10 +93,12 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $ret = [
             'valid' => (int)$valid,
             'message' => $message,
-        ]);
+        ];
+        $this->helper->buttonPressed("ResetLocalErrorNoRetry",$ret);
+        return $resultJson->setData($ret);
     }
     protected function _isAllowed()
     {

Controller/Adminhtml/Ecommerce/ResetStore.php

@@ -45,7 +45,7 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManagerInterface,
         \Ebizmarts\MailChimp\Helper\Data $helper
     ) {
-    
+
         parent::__construct($context);
         $this->resultJsonFactory    = $resultJsonFactory;
         $this->helper               = $helper;
@@ -82,10 +82,12 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $ret = [
             'valid' => (int)$valid,
             'message' => $message,
-        ]);
+        ];
+        $this->helper->buttonPressed("ResetStore",$ret);
+        return $resultJson->setData($ret);
     }
     protected function _isAllowed()
     {

Controller/Adminhtml/Ecommerce/ResyncProducts.php

@@ -32,23 +32,30 @@ class ResyncProducts extends \Magento\Backend\App\Action
      * @var SyncHelper
      */
     private $syncHelper;
+    /**
+     * @var \Ebizmarts\MailChimp\Helper\Data
+     */
+    private $helper;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param JsonFactory $resultJsonFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManagerInterface
      * @param SyncHelper $syncHelper
+     * @param \Ebizmarts\MailChimp\Helper\Data $helper
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         JsonFactory $resultJsonFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManagerInterface,
-        SyncHelper $syncHelper
+        SyncHelper $syncHelper,
+        \Ebizmarts\MailChimp\Helper\Data $helper
     ) {
         parent::__construct($context);
         $this->resultJsonFactory    = $resultJsonFactory;
         $this->storeManager         = $storeManagerInterface;
         $this->syncHelper           = $syncHelper;
+        $this->helper               = $helper;
     }
 
     public function execute()
@@ -64,10 +71,12 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $ret = [
             'valid' => (int)$valid,
             'message' => $message,
-        ]);
+        ];
+        $this->helper->buttonPressed("ResyncProducts",  $ret);
+        return $resultJson->setData($ret);
     }
     protected function _isAllowed()
     {

Controller/Adminhtml/Ecommerce/ResyncSubscribers.php

@@ -32,24 +32,31 @@ class ResyncSubscribers extends \Magento\Backend\App\Action
      * @var SyncHelper
      */
     private $syncHelper;
+    /**
+     * @var \Ebizmarts\MailChimp\Helper\Data
+     */
+    private $helper;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param JsonFactory $resultJsonFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManagerInterface
      * @param SyncHelper $syncHelper
+     * @param \Ebizmarts\MailChimp\Helper\Data $helper
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         JsonFactory $resultJsonFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManagerInterface,
-        SyncHelper $syncHelper
+        SyncHelper $syncHelper,
+        \Ebizmarts\MailChimp\Helper\Data $helper
     ) {
 
         parent::__construct($context);
         $this->resultJsonFactory    = $resultJsonFactory;
         $this->storeManager         = $storeManagerInterface;
         $this->syncHelper           = $syncHelper;
+        $this->helper               = $helper;
     }
 
     public function execute()
@@ -65,10 +72,12 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $ret = [
             'valid' => (int)$valid,
             'message' => $message,
-        ]);
+        ];
+        $this->helper->buttonPressed("ResyncSubscribers",  $ret);
+        return $resultJson->setData($ret);
     }
     protected function _isAllowed()
     {

Controller/Adminhtml/Lists/Get.php

@@ -44,7 +44,7 @@ public function __construct(
         \Ebizmarts\MailChimp\Helper\Data $helper,
         \Magento\Framework\Encryption\Encryptor $encryptor
     ) {
-    
+
         parent::__construct($context);
         $this->_resultFactory       = $context->getResultFactory();
         $this->_helper                  = $helper;
@@ -62,7 +62,7 @@ public function execute()
                 $result['lists'][] = ['id' => $list['id'], 'name' => $list['name']];
             }
             $result['valid'] = 1;
-        } catch (\Mailchimp_Error $e) {
+        } catch (\Mailchimp_Error | \Mailchimp_HttpError $e) {
             $result['valid'] = 0;
             $result['errormsg'] = $e->getTitle();
             $this->_helper->log($e->getFriendlyMessage());

Controller/Adminhtml/Stores/Delete.php

@@ -27,7 +27,7 @@ public function execute()
                 $api->ecommerce->stores->delete($storeModel->getStoreid());
                 $this->messageManager->addSuccess(__('You deleted the store.'));
                 return $resultRedirect->setPath('mailchimp/stores');
-            } catch (\Mailchimp_Error $e) {
+            } catch (\Mailchimp_Error | \Mailchimp_HttpError $e) {
                 $this->messageManager->addError(__('Store could not be deleted.'.$e->getMessage()));
                 $this->_mhelper->log($e->getFriendlyMessage());
                 return $resultRedirect->setPath('mailchimp/stores/edit', ['id'=>$storeId]);

Controller/Adminhtml/Stores/Get.php

@@ -69,7 +69,7 @@ public function execute()
                     $result['valid'] = 1;
                 }
             }
-        } catch (\Mailchimp_Error $e) {
+        } catch (\Mailchimp_Error | \Mailchimp_HttpError $e) {
             $this->_mhelper->log($e->getFriendlyMessage());
             $result['valid'] = 0;
             $result['errormsg'] = $e->getTitle();

Controller/Adminhtml/Stores/Save.php

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

Cron/Ecommerce.php

@@ -282,7 +282,7 @@ protected function _processStore($storeId, $mailchimpStoreId, $listId)
                     $this->markWithError($BadOperations, $mailchimpStoreId, $listId);
                 }
 
-            } catch (\Mailchimp_Error $e) {
+            } catch (\Mailchimp_Error | \Mailchimp_HttpError $e) {
                 $this->_helper->log($e->getFriendlyMessage());
             } catch (\Exception $e) {
                 $this->_helper->log($e->getMessage());
@@ -340,7 +340,7 @@ protected function apiUpdateSyncFlag($storeId, $mailchimpStoreId)
                 null,
                 false
             );
-        } catch (\Mailchimp_Error $e) {
+        } catch (\Mailchimp_Error | \Mailchimp_HttpError $e) {
             $this->_helper->log('MailChimp error when updating syncing flag for store ' . $storeId);
             $this->_helper->log($e->getFriendlyMessage());
         }
@@ -350,7 +350,7 @@ protected function _ping($storeId)
         try {
             $api = $this->_helper->getApi($storeId);
             $api->root->info();
-        } catch (\Mailchimp_Error $e) {
+        } catch (\Mailchimp_Error | \Mailchimp_HttpError $e) {
             $this->_helper->log($e->getFriendlyMessage());
             return false;
         }