Update app.py

app.py

@@ -120,186 +120,116 @@ def login():
     return render_template("login.html")
 
 # Assuming you're fetching the order details and processing them like this
-@app.route('/reward_status')
-def reward_status():
-    # Get the user email from session (assuming the session is already set during checkout)
+@@app.route('/combined_summary')
+def combined_summary():
     email = session.get('user_email')
-    
     if not email:
         return "User not logged in", 400
 
-    # Query Salesforce to fetch the user's reward points
     try:
-        # Query the Customer_Login__c object based on the user's email
-        query = f"SELECT Id, Reward_Points__c FROM Customer_Login__c WHERE Email__c = '{email}'"
-        user_data = sf.query(query)
-
-        # Check if the user record was found
-        if not user_data.get("records"):
-            return "User not found", 400
-
-        # Get the user's reward points from Salesforce
-        user_points = user_data["records"][0].get("Reward_Points__c", 0)
-    
-    except Exception as e:
-        return f"Error querying Salesforce: {str(e)}", 500
-
-    # Define point ranges for each tier
-    tiers = {
-        "Bronze": 100,  # Example: 0 to 100 for Bronze
-        "Silver": 200,  # Example: 100 to 200 for Silver
-        "Gold": 300,    # Example: 200 to 300 for Gold
-        "Platinum": 500
-    }
-
-    # Logic for calculating the next tier's range and current progress
-    current_tier = "Silver"  # Example, dynamically determine this
-
-    # Calculate the range for the current tier
-    if current_tier == "Silver":
-        start_point = 100  # Silver starts at 100
-        end_point = 200    # Silver ends at 200
-    elif current_tier == "Gold":
-        start_point = 200  # Gold starts at 200
-        end_point = 300    # Gold ends at 300
-    else:
-        start_point = 0    # Default start point for other tiers
-        end_point = 100    # Default end point for other tiers
-
-    # Calculate progress as a percentage
-    if user_points >= start_point:
-        progress_percentage = ((user_points - start_point) / (end_point - start_point)) * 100
-    else:
-        progress_percentage = 0
-
-    # Calculate points to next tier
-    points_needed_for_next_tier = end_point - user_points
-    next_tier = "Gold"  # Next tier name (you can dynamically calculate this)
-    # Round the points before passing to the template
-    user_points = round(user_points)
-    points_needed_for_next_tier = round(points_needed_for_next_tier)
-
-    # Pass these values to your template
-    return render_template(
-        'reward_status.html',
-        user_points=user_points,
-        current_tier=current_tier,
-        progress_percentage=progress_percentage,
-        points_needed_for_next_tier=points_needed_for_next_tier,
-        start_point=start_point,
-        end_point=end_point,
-        next_tier=next_tier,
-        tiers=tiers
-    )
-@app.route('/order_summary')
-def order_summary():
-    email = session.get('user_email')
-
-    if not email:
-        print("User not logged in. Redirecting to login.")
-        return "User not logged in", 400
-
-    try:
-        print(f"Fetching order details for email: {email}")
-
-        query = f"""
-            SELECT Id, Customer_Name__c, Customer_Email__c, Total_Amount__c, Order_Details__c, Order_Status__c, Discount__c, Total_Bill__c
+        # ====== FETCH REWARDS ======
+        reward_query = f"SELECT Id, Reward_Points__c FROM Customer_Login__c WHERE Email__c = '{email}'"
+        reward_data = sf.query(reward_query)
+        if not reward_data.get("records"):
+            return "Reward info not found", 400
+
+        user_points = reward_data["records"][0].get("Reward_Points__c", 0)
+
+        # Determine tier
+        tiers = {
+            "Bronze": 100,
+            "Silver": 200,
+            "Gold": 300,
+            "Platinum": 500
+        }
+        current_tier, next_tier = "Bronze", "Silver"
+        start_point, end_point = 0, 100
+        if user_points >= 100 and user_points < 200:
+            current_tier, next_tier = "Silver", "Gold"
+            start_point, end_point = 100, 200
+        elif user_points >= 200 and user_points < 300:
+            current_tier, next_tier = "Gold", "Platinum"
+            start_point, end_point = 200, 300
+        elif user_points >= 300:
+            current_tier, next_tier = "Platinum", "N/A"
+            start_point, end_point = 300, 500
+
+        progress_percentage = ((user_points - start_point) / (end_point - start_point)) * 100 if end_point != start_point else 100
+        points_needed_for_next_tier = max(0, end_point - user_points)
+
+        # ====== FETCH ORDER SUMMARY ======
+        order_query = f"""
+            SELECT Id, Customer_Name__c, Customer_Email__c, Total_Amount__c, Order_Details__c, 
+                   Order_Status__c, Discount__c, Total_Bill__c
             FROM Order__c
             WHERE Customer_Email__c = '{email}'
             ORDER BY CreatedDate DESC
             LIMIT 1
         """
-        result = sf.query(query)
+        order_result = sf.query(order_query)
+        if not order_result.get("records"):
+            return "No order found", 400
 
-        if not result.get("records"):
-            print("No order found for this user.")
-            return "No order found for this user", 400
-
-        order = result["records"][0]
+        order = order_result["records"][0]
         order_details = order.get("Order_Details__c", "")
-
         order_items = []
 
-        if order_details:
-            print("Processing order details...")
-            for line in order_details.split('\n'):
-                item_parts = line.split('|')
-                if len(item_parts) >= 5:
-                    item_name = item_parts[0].strip()
-                    item_name_cleaned = ' '.join(item_name.split(' ')[:-1]).strip()
-
-                    print(f"Processing Item: {item_name_cleaned}")
-
-                    menu_query = f"""
-                        SELECT Name, Price__c, Image1__c, Ingredient_1__r.Ingredient_Name__c, 
-                               Ingredient_1__r.Ingredient_Image__c, Ingredient_1__r.Health_Benefits__c, 
-                               Ingredient_1__r.Fun_Facts__c, Ingredient_2__r.Ingredient_Name__c, 
-                               Ingredient_2__r.Ingredient_Image__c, Ingredient_2__r.Health_Benefits__c, 
-                               Ingredient_2__r.Fun_Facts__c
-                        FROM Menu_Item__c
-                        WHERE Name = '{item_name_cleaned}'
-                    """
-                    print(f"Executing Query for {item_name_cleaned}: {menu_query}")
-
-                    menu_result = sf.query(menu_query)
-                    print(f"Menu Result for {item_name_cleaned}: {menu_result}")
-
-                    if menu_result.get("records"):
-                        menu_item = menu_result["records"][0]
-                        ingredients = []
-                        
-                        # Check and add Ingredient 1
-                        if 'Ingredient_1__r' in menu_item:
-                            print(f"Ingredient 1 Found for {item_name_cleaned}: {menu_item['Ingredient_1__r']}")
-                            ingredients.append({
-                                "name": menu_item['Ingredient_1__r']['Ingredient_Name__c'],
-                                "image": menu_item['Ingredient_1__r']['Ingredient_Image__c'],
-                                "health_benefits": menu_item['Ingredient_1__r']['Health_Benefits__c'] or "No health benefits available",
-                                "fun_facts": menu_item['Ingredient_1__r']['Fun_Facts__c'] or "No fun facts available"
-                            })
-                        else:
-                            print(f"Ingredient 1 missing for {item_name_cleaned}")
-                        
-                        # Check and add Ingredient 2
-                        if 'Ingredient_2__r' in menu_item:
-                            print(f"Ingredient 2 Found for {item_name_cleaned}: {menu_item['Ingredient_2__r']}")
-                            ingredients.append({
-                                "name": menu_item['Ingredient_2__r']['Ingredient_Name__c'],
-                                "image": menu_item['Ingredient_2__r']['Ingredient_Image__c'],
-                                "health_benefits": menu_item['Ingredient_2__r']['Health_Benefits__c'] or "No health benefits available",
-                                "fun_facts": menu_item['Ingredient_2__r']['Fun_Facts__c'] or "No fun facts available"
-                            })
-                        else:
-                            print(f"Ingredient 2 missing for {item_name_cleaned}")
-                        
-                        # If ingredients are missing, log the missing item
-                        if not ingredients:
-                            print(f"No ingredients found for {item_name_cleaned}")
-
-                        order_items.append({
-                            "name": item_name_cleaned,
-                            "price": menu_item.get("Price__c"),
-                            "image_url": menu_item.get("Image1__c"),
-                            "ingredients": ingredients
+        for line in order_details.split('\n'):
+            item_parts = line.split('|')
+            if len(item_parts) >= 5:
+                item_name_raw = item_parts[0].strip()
+                item_name = ' '.join(item_name_raw.split(' ')[:-1]).strip()
+
+                menu_query = f"""
+                    SELECT Name, Price__c, Image1__c,
+                        Ingredient_1__r.Ingredient_Name__c, Ingredient_1__r.Ingredient_Image__c, 
+                        Ingredient_1__r.Health_Benefits__c, Ingredient_1__r.Fun_Facts__c,
+                        Ingredient_2__r.Ingredient_Name__c, Ingredient_2__r.Ingredient_Image__c, 
+                        Ingredient_2__r.Health_Benefits__c, Ingredient_2__r.Fun_Facts__c
+                    FROM Menu_Item__c
+                    WHERE Name = '{item_name}'
+                """
+                menu_result = sf.query(menu_query)
+                ingredients = []
+
+                if menu_result.get("records"):
+                    menu_item = menu_result["records"][0]
+                    if 'Ingredient_1__r' in menu_item:
+                        ingredients.append({
+                            "name": menu_item['Ingredient_1__r']['Ingredient_Name__c'],
+                            "image": menu_item['Ingredient_1__r']['Ingredient_Image__c'],
+                            "health_benefits": menu_item['Ingredient_1__r']['Health_Benefits__c'] or "",
+                            "fun_facts": menu_item['Ingredient_1__r']['Fun_Facts__c'] or ""
+                        })
+                    if 'Ingredient_2__r' in menu_item:
+                        ingredients.append({
+                            "name": menu_item['Ingredient_2__r']['Ingredient_Name__c'],
+                            "image": menu_item['Ingredient_2__r']['Ingredient_Image__c'],
+                            "health_benefits": menu_item['Ingredient_2__r']['Health_Benefits__c'] or "",
+                            "fun_facts": menu_item['Ingredient_2__r']['Fun_Facts__c'] or ""
                         })
 
-                    else:
-                        print(f"Item not found in menu: {item_name_cleaned}")
-
-        if not order_items:
-            print("No items found in order details.")
-        else:
-            print(f"Total items extracted: {len(order_items)}")
+                    order_items.append({
+                        "name": item_name,
+                        "price": menu_item.get("Price__c"),
+                        "image_url": menu_item.get("Image1__c"),
+                        "ingredients": ingredients
+                    })
 
-        # Pass the order_items to the template
         return render_template(
-            'reward_status.html',
+            'combined_summary.html',
+            user_points=round(user_points),
+            current_tier=current_tier,
+            next_tier=next_tier,
+            start_point=start_point,
+            end_point=end_point,
+            progress_percentage=round(progress_percentage),
+            points_needed_for_next_tier=round(points_needed_for_next_tier),
             order_items=order_items
         )
 
     except Exception as e:
-        print(f"Error querying Salesforce: {str(e)}")
-        return f"Error querying Salesforce: {str(e)}", 500
+        return f"Error: {str(e)}", 500