Unify adding order to repository

Author: Hlavtox

classes/Hook/HookDisplayBackOfficeHeader.php

@@ -69,14 +69,8 @@ public function run()
                     if (Validate::isLoadedObject($order) && strtotime('+1 day', strtotime($order->date_add)) > time()) {
                         $gaOrderSent = $ganalyticsRepository->findGaOrderByOrderId((int) Tools::getValue('id_order'));
                         if ($gaOrderSent === false) {
-                            $ganalyticsRepository->addNewRow(
-                                [
-                                    'id_order' => (int) Tools::getValue('id_order'),
-                                    'id_shop' => (int) $this->context->shop->id,
-                                    'sent' => 0,
-                                    'date_add' => ['value' => 'NOW()', 'type' => 'sql'],
-                                ]
-                            );
+                            // Add order to repository, so we can later mark it as sent
+                            $ganalyticsRepository->addOrder((int) $order->id, (int) $order->id_shop);
                         }
                     }
                 } else {

classes/Hook/HookDisplayOrderConfirmation.php

@@ -56,14 +56,8 @@ public function run()
             $gaOrderSent = $ganalyticsRepository->findGaOrderByOrderId((int) $order->id);
 
             if (false === $gaOrderSent) {
-                $ganalyticsRepository->addNewRow(
-                    [
-                        'id_order' => (int) $order->id,
-                        'id_shop' => (int) $this->context->shop->id,
-                        'sent' => 0,
-                        'date_add' => ['value' => 'NOW()', 'type' => 'sql'],
-                    ]
-                );
+                // Add order to repository, so we can later mark it as sent
+                $ganalyticsRepository->addOrder((int) $order->id, (int) $order->id_shop);
 
                 $cart = new Cart($order->id_cart);
                 $gaTagHandler = new GanalyticsJsHandler($this->module, $this->context);
@@ -96,6 +90,8 @@ public function run()
                 foreach ($cart->getProducts() as $order_product) {
                     $orderProducts[] = $productWrapper->wrapProduct($order_product);
                 }
+
+                // Render transaction code
                 $gaScripts .= $this->module->getTools()->addTransaction($orderProducts, $transaction);
 
                 return $gaTagHandler->generate($gaScripts);

classes/Repository/GanalyticsRepository.php

@@ -78,6 +78,26 @@ public function addNewRow(array $data, $type = Db::INSERT_IGNORE)
         );
     }
 
+    /**
+     * Adds new order into repository
+     *
+     * @param int $idOrder
+     * @param int $idShop
+     *
+     * @return bool
+     */
+    public function addOrder(int $idOrder, int $idShop)
+    {
+        return $this->addNewRow(
+            [
+                'id_order' => (int) $idOrder,
+                'id_shop' => (int) $idShop,
+                'sent' => 0,
+                'date_add' => ['value' => 'NOW()', 'type' => 'sql'],
+            ]
+        );
+    }
+
     /**
      * updateData
      *