Update app.py

app.py

@@ -26,50 +26,45 @@ cart = []
 
 
 
-# Function to add item to cart
-def add_to_cart(category, item, quantity):
-    # Check if category and item are selected
-    if not category:
-        return "Please select a category.", [(i["category"], i["item"], i["quantity"], i["price"]) for i in cart], sum([i['price'] for i in cart])
-    if not item:
-        return "Item not selected.", [(i["category"], i["item"], i["quantity"], i["price"]) for i in cart], sum([i['price'] for i in cart])
-
-    # Handle Alfaham special case with list prices
-    try:
-        price = menu_items[category][item] if category != "Alfaham" else menu_items[category][item][min(quantity, len(menu_items[category][item])) - 1]
-    except (IndexError, KeyError) as e:
-        return "Item or quantity selection is invalid.", [(i["category"], i["item"], i["quantity"], i["price"]) for i in cart], sum([i['price'] for i in cart])
-
-    item_total = price * quantity
-    cart.append({"category": category, "item": item, "quantity": quantity, "price": item_total})
-
-    # Calculate total price
-    total_price = sum([i['price'] for i in cart])
-    cart_summary = [(i["category"], i["item"], i["quantity"], i["price"]) for i in cart]
-
-    return "Item added to cart!", cart_summary, total_price
-
 
 
 # Function to remove item from cart
 def remove_from_cart(index):
-    if 0 <= index < len(cart):
-        cart.pop(index)
+    # Convert the index to 0-based for list access and check if it's within bounds
+    item_index = int(index) - 1
+    if item_index < 0 or item_index >= len(cart):
+        # Return a message if the index is out of range
+        return "Invalid index. Please enter a valid index to remove an item.", [(idx + 1, i["category"], i["item"], i["quantity"], i["price"]) for idx, i in enumerate(cart)], sum([i['price'] for i in cart])
 
-    # Calculate total price
+    # Remove the item if the index is valid
+    cart.pop(item_index)
+
+    # Calculate the new total price and update the cart summary with the index starting from 1
     total_price = sum([i['price'] for i in cart])
-    cart_summary = [(i["category"], i["item"], i["quantity"], i["price"]) for i in cart]
+    cart_summary = [(idx + 1, i["category"], i["item"], i["quantity"], i["price"]) for idx, i in enumerate(cart)]
+
+    return "Item removed successfully.", cart_summary, total_price
+
 
-    return cart_summary, total_price
 
 # Function to place final order
 def place_order(name, phone, hostel_name, confirmation):
-    if not cart:
-        return "Your cart is empty. Please add items before placing the order."
-
+    # Check if all required fields are filled
+    if not name:
+        return "Please enter your name."
+    if not phone:
+        return "Please enter your phone number."
+    if not hostel_name:
+        return "Please enter your hostel name."
+
+    # Check if the user confirmed the order
     if confirmation != "Yes":
         return "Order was not placed."
 
+    if not cart:
+        return "Your cart is empty. Please add items before placing the order."
+
+    # Prepare order data
     order_data = {
         "name": name,
         "phone": phone,
@@ -79,26 +74,51 @@ def place_order(name, phone, hostel_name, confirmation):
         "date": datetime.now().strftime("%Y-%m-%d")  # Store date for easier querying
     }
 
+    # Add order to Firestore
     db.collection("orders").add(order_data)
     cart.clear()  # Clear cart after placing order
     return "Order placed successfully!"
 
+
+# Function to add item to cart
+def add_to_cart(category, item, quantity):
+    # Check if category and item are selected
+    if not category:
+        return "Please select a category.", [(i["category"], i["item"], i["quantity"], i["price"]) for i in cart], sum([i['price'] for i in cart])
+    if not item:
+        return "Item not selected.", [(i["category"], i["item"], i["quantity"], i["price"]) for i in cart], sum([i['price'] for i in cart])
+
+    # Handle Alfaham special case with list prices
+    try:
+        price = menu_items[category][item] if category != "Alfaham" else menu_items[category][item][min(quantity, len(menu_items[category][item])) - 1]
+    except (IndexError, KeyError) as e:
+        return "Item or quantity selection is invalid.", [(i["category"], i["item"], i["quantity"], i["price"]) for i in cart], sum([i['price'] for i in cart])
+
+    item_total = price * quantity
+    cart.append({"category": category, "item": item, "quantity": quantity, "price": item_total})
+
+    # Calculate total price and add index to each row
+    total_price = sum([i['price'] for i in cart])
+    cart_summary = [(idx + 1, i["category"], i["item"], i["quantity"], i["price"]) for idx, i in enumerate(cart)]
+
+    return "Item added to cart!", cart_summary, total_price
+
 # Gradio Interface
 def gradio_interface():
     with gr.Blocks() as demo:
         # Display the menu image at the top
         gr.Image("menu.png", label="Menu", interactive=False)  # Replace "menu.jpg" with your actual menu image path
 
-    
+        
 
         name = gr.Textbox(label="Name")
         phone = gr.Textbox(label="Phone Number")
-        hostel_name = gr.Textbox(label="Hostel Name")  # New hostel name input field
+        hostel_name = gr.Textbox(label="Hostel Name")
 
         # Set "Shawarma" as the default selected category
         category = gr.Dropdown(list(menu_items.keys()), label="Select Category", value="Shawarma")
         item = gr.Dropdown(list(menu_items["Shawarma"].keys()), label="Select Item")
-        quantity = gr.Slider(1, 10, step=1, label="Quantity", value=1)  # Default quantity set to 1
+        quantity = gr.Slider(1, 10, step=1, label="Quantity", value=1)
 
         # Update items dropdown based on selected category
         def update_items(selected_category):
@@ -111,7 +131,9 @@ def gradio_interface():
         # Add to Cart button
         add_button = gr.Button("Add to Cart")
         cart_status = gr.Textbox(label="Status")
-        cart_display = gr.Dataframe(value=[], headers=["Category", "Item", "Quantity", "Price"], interactive=False)
+        
+        # Include index in headers for cart display
+        cart_display = gr.Dataframe(value=[], headers=["Index", "Category", "Item", "Quantity", "Price"], interactive=False)
         total_price_display = gr.Number(label="Total Price", interactive=False)
 
         # On Add to Cart button click
@@ -122,13 +144,14 @@ def gradio_interface():
         )
 
         # Remove from Cart button
-        remove_index = gr.Number(label="Index to Remove", interactive=True)
+        remove_index = gr.Number(label="Index to Remove", interactive=True, value=1, minimum=1)
         remove_button = gr.Button("Remove from Cart")
 
+        # Update remove_button click to handle index removal gracefully
         remove_button.click(
             fn=remove_from_cart, 
             inputs=remove_index, 
-            outputs=[cart_display, total_price_display]
+            outputs=[cart_status, cart_display, total_price_display]
         )
 
         # Place Order button