Fix tests

Author: Hlavtox

classes/Hook/HookActionCarrierProcess.php

@@ -48,7 +48,7 @@ public function run()
 
             // Load carrier name
             $carrierName = (string) $carrierRepository->findByCarrierId((int) $this->params['cart']->id_carrier);
-            
+
             // Check if we actually have some name
             if (empty($carrierName)) {
                 return;

classes/Hook/HookActionCartUpdateQuantityBefore.php

@@ -51,20 +51,20 @@ public function run()
         /* 
          * The hook passes a legacy Product object to add, but no attribute information.
          * But thankfully, we can use id_product_attribute for this.
-         * 
+         *
          * Other info is fairly standard:
-         * 
+         *
          * Add to cart from product page + up from cart page
          * $this->params['operator'] == up
          * $this->params['quantity'] to determine quantity
-         * 
+         *
          * Down from cart page
          * $this->params['operator'] == down
          * $this->params['quantity'] to determine quantity
          */
 
         // Format product and standardize ID
-        $product = (array) $this->params['product']; 
+        $product = (array) $this->params['product'];
         $product['id_product'] = $product['id'];
 
         // Get some basic information

classes/Hook/HookDisplayBackOfficeHeader.php

@@ -167,7 +167,7 @@ public function processOrder($idOrder)
             [
                 'currency' => $orderData['currency'],
                 'payment_type' => $orderData['payment_type'],
-                'items' => $orderProducts
+                'items' => $orderProducts,
             ]
         );
 

classes/Hook/HookDisplayOrderConfirmation.php

@@ -88,7 +88,7 @@ public function run()
             [
                 'currency' => $orderData['currency'],
                 'payment_type' => $orderData['payment_type'],
-                'items' => $orderProducts
+                'items' => $orderProducts,
             ]
         );
 

classes/Wrapper/ProductWrapper.php

@@ -21,8 +21,9 @@
 namespace PrestaShop\Module\Ps_Googleanalytics\Wrapper;
 
 use Configuration;
-use Db;
 use Context;
+use Db;
+use Manufacturer;
 use PrestaShop\PrestaShop\Adapter\Presenter\Product\ProductLazyArray;
 use PrestaShop\PrestaShop\Adapter\Presenter\Product\ProductListingLazyArray;
 use Product;
@@ -80,7 +81,7 @@ public function prepareItemListFromProductList($productList, $useProvidedQuantit
      * @return array Item data standardized for GA
      */
     public function prepareItemFromProduct($product, $useProvidedQuantity = false)
-    {        
+    {
         // Standardize product ID
         $product_id = 0;
         if (!empty($product['id_product'])) {
@@ -89,7 +90,7 @@ public function prepareItemFromProduct($product, $useProvidedQuantity = false)
             $product_id = $product['id'];
         }
 
-        // Standardize product price
+        // Standardize product price, make sure this price went through calculation before you pass it here
         if (empty($product['price_amount'])) {
             $product['price_amount'] = $product['price'];
         }
@@ -107,7 +108,7 @@ public function prepareItemFromProduct($product, $useProvidedQuantity = false)
         if (!empty($product['manufacturer_name'])) {
             $item['item_brand'] = $product['manufacturer_name'];
         // If we don't, which can happen due to some bugs in getProductProperties, we will fetch it manually
-        } else if (!empty($product['id_manufacturer'])) {
+        } elseif (!empty($product['id_manufacturer'])) {
             $manufacturerName = Manufacturer::getNameById((int) $product['id_manufacturer']);
             if (!empty($manufacturerName)) {
                 $item['item_brand'] = $manufacturerName;
@@ -124,7 +125,7 @@ public function prepareItemFromProduct($product, $useProvidedQuantity = false)
             $item['item_variant'] = $product['attributes_small'];
 
         // If we don't, we will construct it in the same format
-        } else if (!empty($product['id_product_attribute'])) {
+        } elseif (!empty($product['id_product_attribute'])) {
             $variant = $this->getProductVariant((int) $product['id_product_attribute']);
             if (!empty($variant)) {
                 $item['item_variant'] = $variant;