Fixes

Author: Hlavtox

classes/Hook/HookDisplayBackOfficeHeader.php

@@ -104,8 +104,8 @@ protected function backloadFailedOrders()
         );
 
         // Process each failed order
-        foreach ($failedOrders as $idOrder) {
-            $gaScripts .= $this->processOrder((int) $idOrder);
+        foreach ($failedOrders as $row) {
+            $gaScripts .= $this->processOrder((int) $row['id_order']);
         }
 
         return $gaScripts;
@@ -155,17 +155,18 @@ public function processOrder($idOrder)
         $productWrapper = new ProductWrapper($this->context);
         $orderWrapper = new OrderWrapper($this->context);
 
+        // If it's a completely new order, add order to repository, so we can later mark it as sent
+        if (empty($ganalyticsRepository->findGaOrderByOrderId((int) $order->id))) {
+            $ganalyticsRepository->addOrder((int) $order->id, (int) $order->id_shop);
+        }
+
         // If the order was already sent for some reason, don't do anything
         if ($ganalyticsRepository->orderAlreadySent((int) $order->id)) {
             return $gaScripts;
         }
-        
-        // Add order to repository, so we can later mark it as sent
-        // If revisiting this page, repository inserts ignore, so no worries
-        $ganalyticsRepository->addOrder((int) $order->id, (int) $order->id_shop);
 
         // Prepare transaction data
-        $orderData = $orderWrapper->wrapOrder((int) $order->id);
+        $orderData = $orderWrapper->wrapOrder($order);
 
         // Add payment event
         $gaScripts .= $this->module->getTools()->renderEvent(

classes/Hook/HookDisplayOrderConfirmation.php

@@ -63,17 +63,18 @@ public function run()
         $productWrapper = new ProductWrapper($this->context);
         $orderWrapper = new OrderWrapper($this->context);
 
+        // If it's a completely new order, add order to repository, so we can later mark it as sent
+        if (empty($ganalyticsRepository->findGaOrderByOrderId((int) $order->id))) {
+            $ganalyticsRepository->addOrder((int) $order->id, (int) $order->id_shop);
+        }
+
         // If the customer is revisiting confirmation screen and the order was already sent, we don't do anything
         if ($ganalyticsRepository->orderAlreadySent((int) $order->id)) {
             return $gaScripts;
         }
-        
-        // Add order to repository, so we can later mark it as sent
-        // If revisiting this page, repository inserts ignore, so no worries
-        $ganalyticsRepository->addOrder((int) $order->id, (int) $order->id_shop);
 
         // Prepare transaction data
-        $orderData = $orderWrapper->wrapOrder((int) $order->id);
+        $orderData = $orderWrapper->wrapOrder($order);
 
         // Add payment event
         $gaScripts .= $this->module->getTools()->renderEvent(

classes/Repository/GanalyticsRepository.php

@@ -27,7 +27,7 @@ class GanalyticsRepository
     const TABLE_NAME = 'ganalytics';
 
     /**
-     * findGaOrderByOrderId
+     * Finds if we have a record for this order ID.
      *
      * @param int $orderId
      *

classes/Wrapper/OrderWrapper.php

@@ -40,15 +40,8 @@ public function __construct(Context $context)
     /**
      * Return a detailed transaction for Google Analytics
      */
-    public function wrapOrder($id_order)
+    public function wrapOrder($order)
     {
-        $order = new Order((int) $id_order);
-
-        // Check order still exists
-        if (!Validate::isLoadedObject($order)) {
-            return;
-        }
-
         // Prepare currency information
         $currency = new Currency((int) $order->id_currency);