add button actions #2041 for magento 2.4

mailchimp · Dec 9, 2024 · 3491591 · 3491591
1 parent c279f8f
commit 3491591
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 17 deletions.
diff --git a/Controller/Adminhtml/Ecommerce/CreateWebhook.php b/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,15 @@ public function execute()
             $message = $return['message'];
         }
         $resultJson = $this->resultJsonFactory->create();
-
-        return $resultJson->setData([
+        $resultJson->setData([
+            'valid' => (int)$valid,
+            'message' => $message,
+        ]);
+        $this->helper->buttonPressed("CreateWebhook", [
             'valid' => (int)$valid,
             'message' => $message,
         ]);
+        return $resultJson;
     }
     protected function _isAllowed()
     {

diff --git a/Controller/Adminhtml/Ecommerce/DeleteStore.php b/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,15 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $resultJson->setData([
+            'valid' => (int)$valid,
+            'message' => $message,
+        ]);
+        $this->helper->buttonPressed("DeleteStore", [
             'valid' => (int)$valid,
             'message' => $message,
         ]);
+        return $resultJson;
     }
     protected function _isAllowed()
     {

diff --git a/Controller/Adminhtml/Ecommerce/FixMailchimpJS.php b/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,15 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-
-        return $resultJson->setData([
+        $resultJson->setData([
+            'valid' => (int)$valid,
+            'message' => $message,
+        ]);
+        $this->helper->buttonPressed("FixMailchimpJS", [
             'valid' => (int)$valid,
             'message' => $message,
         ]);
+        return $resultJson;
     }
     protected function _isAllowed()
     {

diff --git a/Controller/Adminhtml/Ecommerce/ResetLocalErrors.php b/Controller/Adminhtml/Ecommerce/ResetLocalErrors.php
@@ -93,10 +93,15 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $resultJson->setData([
             'valid' => (int)$valid,
             'message' => $message,
         ]);
+        $this->helper->buttonPressed("ResetLocalErrors",[
+            'valid' => (int)$valid,
+            'message' => $message,
+        ]);
+        return $resultJson;
     }
     protected function _isAllowed()
     {

diff --git a/Controller/Adminhtml/Ecommerce/ResetLocalErrorsNoRetry.php b/Controller/Adminhtml/Ecommerce/ResetLocalErrorsNoRetry.php
@@ -93,10 +93,15 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $resultJson->setData([
             'valid' => (int)$valid,
             'message' => $message,
         ]);
+        $this->helper->buttonPressed("ResetLocalErrorNoRetry",[
+            'valid' => (int)$valid,
+            'message' => $message,
+        ]);
+        return $resultJson;
     }
     protected function _isAllowed()
     {

diff --git a/Controller/Adminhtml/Ecommerce/ResetStore.php b/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,15 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $resultJson->setData([
+            'valid' => (int)$valid,
+            'message' => $message,
+        ]);
+        $this->helper->buttonPressed("ResetStore", [
             'valid' => (int)$valid,
             'message' => $message,
         ]);
+        return $resultJson;
     }
     protected function _isAllowed()
     {

diff --git a/Controller/Adminhtml/Ecommerce/ResyncProducts.php b/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,15 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $resultJson->setData([
+            'valid' => (int)$valid,
+            'message' => $message,
+        ]);
+        $this->helper->buttonPressed("ResyncProducts", [
             'valid' => (int)$valid,
             'message' => $message,
         ]);
+        return $resultJson;
     }
     protected function _isAllowed()
     {

diff --git a/Controller/Adminhtml/Ecommerce/ResyncSubscribers.php b/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,15 @@ public function execute()
             $valid = 0;
             $message = $e->getMessage();
         }
-        return $resultJson->setData([
+        $resultJson->setData([
+            'valid' => (int)$valid,
+            'message' => $message,
+        ]);
+        $this->helper->buttonPressed("ResyncSubscribers", [
             'valid' => (int)$valid,
             'message' => $message,
         ]);
+        return $resultJson;
     }
     protected function _isAllowed()
     {

diff --git a/Cron/GenerateStatistics.php b/Cron/GenerateStatistics.php
@@ -86,6 +86,7 @@ public function __construct(
     public function execute()
     {
         $data = [];
+        $data['storeURL'] = $this->storeManager->getStore()->getBaseUrl();
         $data['time'] = $this->helper->getGmtDate();
         foreach ($this->storeManager->getStores() as $storeId => $val)
         {

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -331,6 +331,7 @@ public function getApi($store = null, $scope = null)
         $timeOut = $this->getTimeOut($store,$scope);
         $this->_api->setApiKey($apiKey);
         $this->_api->setHelper($this);
+        $this->_api->setStoreURL($this->_storeManager->getStore($store)->getBaseUrl());
         $this->_api->setUserAgent('Mailchimp4Magento' . (string)$this->getModuleVersion());
         if ($timeOut) {
             $this->_api->setTimeOut($timeOut);
@@ -461,8 +462,10 @@ public function getApiByApiKey($apiKey, $encrypted = false)
         } else {
             $this->_api->setApiKey($apiKey);
         }
+
         $this->_api->setUserAgent('Mailchimp4Magento' . (string)$this->getModuleVersion());
         $this->_api->setHelper($this);
+        $this->_api->setStoreURL($this->_storeManager->getStore()->getBaseUrl());
 
         return $this->_api;
     }
@@ -1233,4 +1236,14 @@ public function encrypt($value)
     {
         return $this->_encryptor->encrypt($value);
     }
+    public function buttonPressed($button, $result)
+    {
+        $data = [];
+        $data['storeURL'] = $this->_storeManager->getStore()->getBaseUrl();
+        $data['time'] = $this->getGmtDate();
+        $data['button']['action'] = $button;
+        $data['button']['result'] = $result;
+        $this->saveNotification($data);
+
+    }
 }
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
   },
   "require" : {
     "magento/framework": "103.0.*",
-    "ebizmarts/mailchimp-lib": ">=3.0.42",
+    "ebizmarts/mailchimp-lib": ">=3.0.43",
     "ext-json": "*"
   }
 }