Merge pull request #136 from PrestaShop/dev

Release 4.2.1

Author: nicosomb

classes/Form/ConfigurationForm.php

@@ -170,7 +170,7 @@ public function generate()
                     'type' => 'select',
                     'label' => $this->module->trans('Canceled order states', [], 'Modules.GAnalytics.Admin'),
                     'name' => 'GA_CANCELLED_STATES',
-                    'desc' => $this->module->trans('Choose order states, in which you consider the given order canceled. This will usually be the default "Canceled" state, but some shops may have extra states like "Returned" etc.', [], 'Modules.GAnalytics.Admin'),
+                    'desc' => $this->module->trans('Choose order states in which you consider the given order canceled. This will usually be the default "Canceled" state, but some stores may have extra states like "Returned", etc.', [], 'Modules.GAnalytics.Admin'),
                     'class' => 'chosen',
                     'multiple' => true,
                     'options' => [

classes/Hook/HookActionCarrierProcess.php

@@ -71,12 +71,18 @@ public function setParams($params)
         $this->params = $params;
     }
 
-    protected function getUniversalAnalytics(string $carrierName)
+    /**
+     * @param string $carrierName
+     */
+    protected function getUniversalAnalytics($carrierName)
     {
         return 'MBG.addCheckoutOption(2,\'' . $carrierName . '\');';
     }
 
-    protected function getGoogleAnalytics4(string $carrierName)
+    /**
+     * @param string $carrierName
+     */
+    protected function getGoogleAnalytics4($carrierName)
     {
         $eventData = [
             'currency' => $this->context->currency->iso_code,

classes/Hook/HookActionOrderStatusPostUpdate.php

@@ -99,11 +99,17 @@ public function setParams($params)
         $this->params = $params;
     }
 
+    /**
+     * @param int $idOrder
+     */
     protected function getUniversalAnalytics($idOrder)
     {
         return 'MBG.refundByOrderId(' . json_encode(['id' => $idOrder]) . ');';
     }
 
+    /**
+     * @param int $idOrder
+     */
     protected function getGoogleAnalytics4($idOrder)
     {
         $eventData = [

classes/Hook/HookActionProductCancel.php

@@ -24,6 +24,7 @@
 use Context;
 use OrderDetail;
 use Ps_Googleanalytics;
+use Validate;
 
 class HookActionProductCancel implements HookInterface
 {
@@ -57,6 +58,12 @@ public function run()
         // Display GA refund product
         $orderDetail = new OrderDetail($this->params['id_order_detail']);
 
+        // Check if the hook provided us with a valid existing ID of order detail.
+        // An example are automatic tests, which do not provide it unfortunately.
+        if (!Validate::isLoadedObject($orderDetail)) {
+            return;
+        }
+
         $idProduct = empty($orderDetail->product_attribute_id) ? $orderDetail->product_id : $orderDetail->product_id . '-' . $orderDetail->product_attribute_id;
         if ((bool) Configuration::get('GA_V4_ENABLED')) {
             $js = $this->getGoogleAnalytics4(
@@ -86,7 +93,12 @@ public function setParams($params)
         $this->params = $params;
     }
 
-    protected function getUniversalAnalytics(int $idOrder, string $idProduct, float $quantity)
+    /**
+     * @param int $idOrder
+     * @param string $idProduct
+     * @param float $quantity
+     */
+    protected function getUniversalAnalytics($idOrder, $idProduct, $quantity)
     {
         $js = 'MBG.add(' . json_encode(
             [
@@ -99,7 +111,13 @@ protected function getUniversalAnalytics(int $idOrder, string $idProduct, float
         return $js;
     }
 
-    protected function getGoogleAnalytics4(int $idOrder, string $idProduct, float $quantity, string $nameProduct)
+    /**
+     * @param int $idOrder
+     * @param string $idProduct
+     * @param float $quantity
+     * @param string $nameProduct
+     */
+    protected function getGoogleAnalytics4($idOrder, $idProduct, $quantity, $nameProduct)
     {
         $eventData = [
             'transaction_id' => (int) $idOrder,

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>ps_googleanalytics</name>
 	<displayName><![CDATA[Google Analytics]]></displayName>
-	<version><![CDATA[4.2.0]]></version>
+	<version><![CDATA[4.2.1]]></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.2.0';
+        $this->version = '4.2.1';
         $this->ps_versions_compliancy = ['min' => '1.6', 'max' => _PS_VERSION_];
         $this->author = 'PrestaShop';
         $this->module_key = 'fd2aaefea84ac1bb512e6f1878d990b8';

views/templates/hook/ps_googleanalytics.tpl

@@ -27,7 +27,7 @@
       'config',
       '{$gaAccountId|escape:'htmlall':'UTF-8'}',
       {ldelim}
-        'debug_mode':true
+        'debug_mode':false
         {if $gaAnonymizeEnabled}, 'anonymize_ip': true{/if}
         {if $userId && !$backOffice}, 'user_id': '{$userId|escape:'htmlall':'UTF-8'}'{/if}
         {if $backOffice && !$trackBackOffice}, 'non_interaction': true, 'send_page_view': false{/if}