Procházet zdrojové kódy

fix: deleteOrder and deleteOrderItem can both receive order_flag as 'a' and 'p'

EduLascala před 4 měsíci
rodič
revize
1c068de2c9
2 změnil soubory, kde provedl 3 přidání a 3 odebrání
  1. 1 1
      models/OrderItemModel.php
  2. 2 2
      models/OrderModel.php

+ 1 - 1
models/OrderItemModel.php

@@ -91,7 +91,7 @@ class OrderItemModel
             DELETE FROM order_item
             WHERE order_item_id = :order_item_id
               AND order_id IN (
-                  SELECT order_id FROM `order` WHERE company_id = :company_id AND order_flag = 'a'
+                  SELECT order_id FROM `order` WHERE company_id = :company_id AND order_flag IN ('a', 'p')
               )
         ");
         $executed = $stmt->execute(['order_item_id' => $orderItemId, 'company_id' => $companyId]);

+ 2 - 2
models/OrderModel.php

@@ -141,7 +141,7 @@ class OrderModel
             $stmt = $this->pdo->prepare("
                 UPDATE `order`
                 SET order_flag = 'd', order_finished_at = :order_finished_at
-                WHERE order_id = :order_id AND company_id = :company_id AND order_flag = 'a'
+                WHERE order_id = :order_id AND company_id = :company_id AND order_flag IN ('a', 'p')
             ");
 
             $executed = $stmt->execute([
@@ -207,7 +207,7 @@ public function getOrdersByTable(int $tableId, int $companyId, ?int $statusId =
         if ($onlyActive) {
             $sql .= " AND order_flag IN ('a', 'p')";
         }
-        
+
         $stmt = $this->pdo->prepare($sql);
         $stmt->execute(['order_id' => $orderId, 'company_id' => $companyId]);
         $result = $stmt->fetch(\PDO::FETCH_ASSOC);