Merge pull request #114 from Progi1984/issue27911

Author: Pablo Borowicz

classes/Hook/HookActionProductCancel.php

@@ -23,7 +23,6 @@
 use Context;
 use OrderDetail;
 use Ps_Googleanalytics;
-use Tools;
 
 class HookActionProductCancel implements HookInterface
 {
@@ -44,20 +43,19 @@ public function __construct(Ps_Googleanalytics $module, Context $context)
      */
     public function run()
     {
-        $quantityRefunded = Tools::getValue('cancelQuantity');
-        $gaScripts = '';
-
-        foreach ($quantityRefunded as $orderDetailId => $quantity) {
-            // Display GA refund product
-            $orderDetail = new OrderDetail($orderDetailId);
-            $gaScripts .= 'MBG.add(' . json_encode(
-                [
-                    'id' => empty($orderDetail->product_attribute_id) ? $orderDetail->product_id : $orderDetail->product_id . '-' . $orderDetail->product_attribute_id,
-                    'quantity' => $quantity,
-                ])
-                . ');';
+        if (!isset($this->params['id_order_detail']) || !isset($this->params['cancel_quantity'])) {
+            return;
         }
 
+        // Display GA refund product
+        $orderDetail = new OrderDetail($this->params['id_order_detail']);
+        $gaScripts = 'MBG.add(' . json_encode(
+            [
+                'id' => empty($orderDetail->product_attribute_id) ? $orderDetail->product_id : $orderDetail->product_id . '-' . $orderDetail->product_attribute_id,
+                'quantity' => $this->params['cancel_quantity'],
+            ])
+            . ');';
+
         $this->context->cookie->__set(
             'ga_admin_refund',
             $gaScripts . 'MBG.refundByProduct(' . json_encode(['id' => $this->params['order']->id]) . ');'

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>ps_googleanalytics</name>
 	<displayName><![CDATA[Google Analytics]]></displayName>
-	<version><![CDATA[4.1.1]]></version>
+	<version><![CDATA[4.1.2]]></version>
 	<description><![CDATA[Gain clear insights into important metrics about your customers, using Google Analytics]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[analytics_stats]]></tab>

ps_googleanalytics.php

@@ -54,7 +54,7 @@ public function __construct()
     {
         $this->name = 'ps_googleanalytics';
         $this->tab = 'analytics_stats';
-        $this->version = '4.1.1';
+        $this->version = '4.1.2';
         $this->ps_versions_compliancy = ['min' => '1.6', 'max' => _PS_VERSION_];
         $this->author = 'PrestaShop';
         $this->module_key = 'fd2aaefea84ac1bb512e6f1878d990b8';