|
|
@@ -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);
|