Merge pull request #61 from CSCE331-Fall2024/ethan/pos

Ethan/pos
CSCE331-Fall2024 · Dec 4, 2024 · 7cf7fa0 · 7cf7fa0
2 parents 48c83e1 + 8a42580
commit 7cf7fa0
Show file tree

Hide file tree

Showing 14 changed files with 1,576 additions and 30 deletions.
diff --git a/backend/app/kiosk/routes.py b/backend/app/kiosk/routes.py
@@ -21,7 +21,7 @@ def get_menu_items():
     ).fetchall()
 
     single_drink = db.session.execute(
-        text("SELECT * FROM menu_item WHERE item_name = 'drinks' LIMIT 1")
+        text("SELECT * FROM menu_item WHERE item_name = 'drink' LIMIT 1")
     ).fetchall()
 
     all_other_items = db.session.execute(
@@ -30,7 +30,7 @@ def get_menu_items():
             WHERE item_name NOT LIKE 'appetizer%' 
             AND item_name NOT LIKE 'dessert%' 
             AND item_name NOT LIKE 'aLaCarte%'
-            AND item_name NOT LIKE 'drinks%'
+            AND item_name NOT LIKE 'drink%'
             ORDER BY menu_item_id ASC
         """)
     ).fetchall()
@@ -152,8 +152,8 @@ def get_drinks():
     ]
 
     drinks = db.session.execute(
-        text("SELECT * FROM product_item WHERE type = :type ORDER BY product_id ASC"), 
-        {'type': 'drink'}
+        text("SELECT * FROM product_item WHERE type = :type1 OR type = :type2 ORDER BY product_id ASC"), 
+        {'type1': 'drink', 'type2': 'fountainDrink'}
     ).fetchall()
 
     drinks_list = [

diff --git a/backend/app/menu/routes.py b/backend/app/menu/routes.py
@@ -20,7 +20,7 @@ def get_menu_items():
             WHERE item_name NOT LIKE 'appetizer%' 
             AND item_name NOT LIKE 'dessert%' 
             AND item_name NOT LIKE 'aLaCarte%'
-            AND item_name NOT LIKE 'drinks%'
+            AND item_name NOT LIKE 'drink%'
             ORDER BY menu_item_id ASC
         """)
     ).fetchall()