diff --git a/qorder.php b/qorder.php index 1df23b3..77a03a5 100644 --- a/qorder.php +++ b/qorder.php @@ -17,7 +17,6 @@ if ($table_id <= 0) { // Fetch table and outlet info try { - // Using standard aliases without backticks for better compatibility $stmt = $pdo->prepare(" SELECT t.id, t.table_number AS table_name, a.outlet_id, o.name AS outlet_name FROM `tables` t @@ -37,10 +36,10 @@ try { $outlet_id = (int)$table_info['outlet_id']; $categories = $pdo->query("SELECT * FROM categories ORDER BY sort_order")->fetchAll(); -$all_products = $pdo->query("SELECT p.*, c.name as category_name, c.name_ar as category_name_ar FROM products p JOIN categories c ON p.category_id = c.id")->fetchAll(); +$all_products = $pdo->query("SELECT p.*, c.name as category_name, c.name_ar as category_name_ar FROM products p JOIN categories c ON p.category_id = c.id WHERE p.deleted_at IS NULL")->fetchAll(); // Fetch variants -$variants_raw = $pdo->query("SELECT * FROM product_variants ORDER BY price_adjustment ASC")->fetchAll(); +$variants_raw = $pdo->query("SELECT * FROM product_variants WHERE deleted_at IS NULL ORDER BY price_adjustment ASC")->fetchAll(); $variants_by_product = []; foreach ($variants_raw as $v) { $variants_by_product[$v['product_id']][] = $v; @@ -58,138 +57,302 @@ foreach ($variants_raw as $v) { - + - -
-
- - Logo - - -
-
-
AR
-
Table
-
-
- - -
-
- -
- All - الكل -
-
- -
- - - - + +
+
+
+ + -
- - - - - - -
+

+

+ • + + Table + +

- +
+
AR
+
+
-
-
+ +
+
+
+ +
+ All + الكل +
+
+ +
+ + + + + +
+ + +
+
+ +
+
+ +
+
-
-
+
-
+ +
+ + SALE + + - <?= htmlspecialchars($product['name']) ?> - -
- -
- -
+ <?= htmlspecialchars($product['name']) ?> + +
+ +
+ +
+ +
+

+ + +

+
- - + +
- -
- SALE -
- -
-
-
- - -
-

- - -

@@ -197,66 +360,87 @@ foreach ($variants_raw as $v) {
- -