Unify order marking functions

Author: Hlavtox

classes/Hook/HookDisplayBackOfficeHeader.php

@@ -81,13 +81,8 @@ public function run()
                         foreach ($gaOrderRecords as $row) {
                             $transaction = $orderWrapper->wrapOrder($row['id_order']);
                             if (!empty($transaction)) {
-                                $ganalyticsRepository->updateData(
-                                    [
-                                        'date_add' => ['value' => 'NOW()', 'type' => 'sql'],
-                                        'sent' => 1,
-                                    ],
-                                    'id_order = ' . (int) $row['id_order'] . ' AND id_shop = ' . (int) $this->context->shop->id
-                                );
+                                // Mark it as successfully sent
+                                $ganalyticsRepository->markOrderAsSent((int) $row['id_order']);
 
                                 // Generate transaction event
                                 $callbackData = [

classes/Repository/GanalyticsRepository.php

@@ -116,4 +116,23 @@ public function updateData($data, $where, $limit = 0)
             $limit
         );
     }
+
+    /**
+     * Marks order as successfully sent to GA via callback
+     *
+     * @param int $idOrder
+     *
+     * @return bool
+     */
+    public function markOrderAsSent($idOrder)
+    {
+        return Db::getInstance()->update(
+            self::TABLE_NAME,
+            [
+                'date_add' => ['value' => 'NOW()', 'type' => 'sql'],
+                'sent' => 1,
+            ],
+            'id_order = ' . (int) $idOrder
+        );
+    }
 }

controllers/admin/AdminGanalyticsAjax.php

@@ -30,14 +30,7 @@ public function init()
         $order = new Order($orderId);
 
         if (Validate::isLoadedObject($order) && (isset($this->context->employee->id) && $this->context->employee->id)) {
-            (new GanalyticsRepository())->updateData(
-                [
-                    'sent' => 1,
-                    'date_add' => ['value' => 'NOW()', 'type' => 'sql'],
-                ],
-                'id_order = ' . $orderId
-            );
-
+            (new GanalyticsRepository())->markOrderAsSent((int) $orderId);
             $this->ajaxDie('OK');
         }
 

controllers/front/ajax.php

@@ -38,14 +38,7 @@ public function initContent()
             $this->ajaxDie('KO');
         }
 
-        (new GanalyticsRepository())->updateData(
-            [
-                'sent' => 1,
-                'date_add' => ['value' => 'NOW()', 'type' => 'sql'],
-            ],
-            'id_order = ' . $orderId,
-            1
-        );
+        (new GanalyticsRepository())->markOrderAsSent((int) $orderId);
 
         $this->ajaxDie('OK');
     }