Fix many issues and improve json_decode data retreiving

Author: apacios

classes/Form/ConfigurationForm.php

@@ -69,7 +69,7 @@ public function generate()
         $helper->toolbar_btn = [
             'save' => [
                 'desc' => $this->module->l('Save'),
-                'href' => AdminController::$currentIndex . '&configure=' . $this->module->name . '&save' . $this->module->name .
+                'href' => AdminController::$currentIndex . '&configure=' . $this->module->name . '&save=' . $this->module->name .
                 '&token=' . Tools::getAdminTokenLite('AdminModules'),
             ],
             'back' => [

classes/Handler/GanalyticsDataHandler.php

@@ -93,7 +93,7 @@ private function readData()
             return [];
         }
 
-        return json_decode($dataReturned, true);
+        return $this->jsonDecodeValidJson($dataReturned);
     }
 
     /**
@@ -113,8 +113,7 @@ private function appendData($data)
         if (false === $dataReturned) {
             $newData = [$data];
         } else {
-            $newData = json_decode($dataReturned, true);
-            $newData[] = $data;
+            $newData[] = $this->jsonDecodeValidJson($dataReturned);
         }
 
         return $this->ganalyticsDataRepository->addNewRow(
@@ -123,4 +122,22 @@ private function appendData($data)
             json_encode($newData)
         );
     }
+
+    /**
+     * Check if the json is valid and returns an empty array if not
+     *
+     * @param string $json
+     *
+     * @return array
+     */
+    protected function jsonDecodeValidJson($json)
+    {
+        $array = json_decode($json, true);
+
+        if (JSON_ERROR_NONE === json_last_error()) {
+            return $array;
+        }
+
+        return [];
+    }
 }

classes/Handler/GanalyticsJsHandler.php

@@ -40,11 +40,11 @@ public function __construct(Ps_Googleanalytics $module, Context $context)
      * Generate Google Analytics js
      *
      * @param string $jsCode
-     * @param int $isBackoffice
+     * @param bool $isBackoffice
      *
      * @return void|string
      */
-    public function generate($jsCode, $isBackoffice = 0)
+    public function generate($jsCode, $isBackoffice = false)
     {
         if (Configuration::get('GA_ACCOUNT_ID')) {
             $this->context->smarty->assign(

classes/Hook/HookActionCartSave.php

@@ -72,6 +72,7 @@ public function run()
             foreach ($cartProducts as $cartProduct) {
                 if ($cartProduct['id_product'] == Tools::getValue('id_product')) {
                     $addProduct = $cartProduct;
+                    break;
                 }
             }
         }

classes/Hook/HookDisplayBackOfficeHeader.php

@@ -103,7 +103,7 @@ public function run()
                 }
             }
 
-            return $js . $this->module->hookdisplayHeader(null, true) . $gaTagHandler->generate($gaScripts, 1);
+            return $js . $this->module->hookdisplayHeader(null, true) . $gaTagHandler->generate($gaScripts, true);
         }
 
         return $js;

classes/Wrapper/OrderWrapper.php

@@ -51,7 +51,8 @@ public function wrapOrder($id_order)
                 'shipping' => $order->total_shipping,
                 'tax' => $order->total_paid_tax_incl - $order->total_paid_tax_excl,
                 'url' => $this->context->link->getAdminLink('AdminGanalyticsAjax'),
-                'customer' => $order->id_customer, ];
+                'customer' => $order->id_customer,
+            ];
         }
     }
 }

ps_googleanalytics.php

@@ -141,7 +141,7 @@ public function hookDisplayAdminOrder()
 
         echo $gaTagHandler->generate(
             $this->context->cookie->__get('ga_admin_refund'),
-            1
+            true
         );
         $this->context->cookie->__unset('ga_admin_refund');
     }

views/templates/hook/ga_tag.tpl

@@ -29,7 +29,7 @@
     {/literal}
 {/if}
 
-{if ($jsState != 1 && $isBackoffice == 0)}
+{if ($jsState != 1 && $isBackoffice === true)}
     {literal}
     <script type="text/javascript">
         ga('send', 'pageview');