add button actions #2041 for magento 2.4

mailchimp · Dec 10, 2024 · 23ff13f · 23ff13f
1 parent 3491591
commit 23ff13f
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 56 deletions.
diff --git a/Controller/Adminhtml/Ecommerce/CreateWebhook.php b/Controller/Adminhtml/Ecommerce/CreateWebhook.php
@@ -74,15 +74,12 @@ public function execute()
             $message = $return['message'];
         }
         $resultJson = $this->resultJsonFactory->create();
-        $resultJson->setData([
+        $ret = [
             'valid' => (int)$valid,
             'message' => $message,
-        ]);
-        $this->helper->buttonPressed("CreateWebhook", [
-            'valid' => (int)$valid,
-            'message' => $message,
-        ]);
-        return $resultJson;
+        ];
+        $this->helper->buttonPressed("CreateWebhook", $ret);
+        return $resultJson->setData($ret);
     }
     protected function _isAllowed()
     {

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

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

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

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

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

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

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