Update app.py

app.py

@@ -78,56 +78,30 @@ def generate_custom_dish():
         if not dish_name or not description:
             return jsonify({"success": False, "error": "Both fields are required"}), 400
 
-        # Check if the custom dish already exists (case-sensitive check)
-        query = f"SELECT Id, Name FROM Custom_Dish__c WHERE Name = '{dish_name}'"
-        result = sf.query(query)
-
-        # If the dish exists, use the existing record ID, otherwise create a new one
-        if result['records']:
-            # Custom dish already exists
-            custom_dish_id = result['records'][0]['Id']
-            custom_dish = result['records'][0]  # Get the existing custom dish record
-
-            # No need to create a new dish, just add it to the cart
-            # Set up cart item using the existing custom dish details
-            price = custom_dish['Price__c']  # Use the existing price
-            email = session.get('user_email')  # Assuming you have the user's email in session
-
-            # Create the cart item with custom dish details
-            cart_item = {
-                'Name': dish_name,
-                'Price__c': price,
-                'Base_Price__c': price,
-                'Image1__c': item_image_url,
-                'Quantity__c': 1,  # Assuming a default quantity of 1 for the custom dish
-                'Add_Ons__c': '',  # Set Add_ons__c to empty
-                'Add_Ons_Price__c': 0,  # Set Add_Ons_Price__c to 0
-                'Instructions__c': description,  # Use the custom dish description as the instructions
-                'Customer_Email__c': email,  # Associate the custom dish with the logged-in user
-                'Custom_Dish__c': custom_dish_id  # Link the cart item to the existing custom dish
-            }
-
-            # Insert the cart item as a Cart_Item__c record in Salesforce
-            cart_result = sf.Cart_Item__c.create(cart_item)
-
-            if cart_result.get('success'):
-                return redirect(url_for("cart"))  # Redirect to the cart page after adding to the cart
-            else:
-                return jsonify({"success": False, "error": "Failed to add custom dish to the cart"}), 500
+        # Generate a random price for the custom dish
+        price = random.randint(10, 30)  # Example logic for price setting
 
+        # Determine Veg/Non-Veg
+        veg_keywords = ["paneer", "vegetable", "mushroom", "cheese"]
+        non_veg_keywords = ["chicken", "mutton", "fish", "egg"]
+        
+        category = "Veg" if any(word in description.lower() for word in veg_keywords) else \
+                   "Non veg" if any(word in description.lower() for word in non_veg_keywords) else \
+                   "both"
+
+        # Query to check if the dish already exists in Salesforce
+        existing_dish_query = f"SELECT Id, Name, Price__c, Image1__c, Image2__c, Description__c, Veg_NonVeg__c FROM Custom_Dish__c WHERE Name = '{dish_name}'"
+        existing_dish_result = sf.query(existing_dish_query)
+
+        if existing_dish_result['totalSize'] > 0:
+            # If the dish exists, use the existing details
+            existing_dish = existing_dish_result['records'][0]
+            price = existing_dish['Price__c']
+            item_image_url = existing_dish['Image1__c']
+            item_image_url2 = existing_dish['Image2__c']
+            category = existing_dish['Veg_NonVeg__c']
         else:
-            # Custom dish does not exist, create a new one
-            price = random.randint(10, 30)  # Example logic for price setting
-
-            # Determine Veg/Non-Veg
-            veg_keywords = ["paneer", "vegetable", "mushroom", "cheese"]
-            non_veg_keywords = ["chicken", "mutton", "fish", "egg"]
-
-            category = "Veg" if any(word in description.lower() for word in veg_keywords) else \
-                       "Non veg" if any(word in description.lower() for word in non_veg_keywords) else \
-                       "both"
-
-            # Create a new Custom_Dish__c record in Salesforce
+            # If the dish does not exist, create a new custom dish
             custom_dish = {
                 'Name': dish_name,
                 'Price__c': price,
@@ -141,39 +115,39 @@ def generate_custom_dish():
             # Insert the custom dish into Salesforce
             result = sf.Custom_Dish__c.create(custom_dish)
 
-            if result.get('success'):
-                # After creating the custom dish, add it to the Cart_Item__c
-                email = session.get('user_email')  # Assuming you have the user's email in session
-
-                # Create the cart item with custom dish details and set other fields to default values
-                cart_item = {
-                    'Name': dish_name,
-                    'Price__c': price,
-                    'Base_Price__c': price,
-                    'Image1__c': item_image_url,
-                    'Quantity__c': 1,  # Assuming a default quantity of 1 for the custom dish
-                    'Add_Ons__c': '',  # Set Add_ons__c to empty
-                    'Add_Ons_Price__c': 0,  # Set Add_Ons_Price__c to 0
-                    'Customer_Email__c': email  # Associate the custom dish with the logged-in user
-                }
-
-                # Insert the custom dish as a Cart_Item__c record in Salesforce
-                cart_result = sf.Cart_Item__c.create(cart_item)
-
-                if cart_result.get('success'):
-                    return redirect(url_for("cart"))  # Redirect to the cart page after adding to the cart
-                else:
-                    return jsonify({"success": False, "error": "Failed to add custom dish to the cart"}), 500
-
-            else:
+            if not result.get('success'):
                 return jsonify({"success": False, "error": "Failed to create custom dish in Salesforce"}), 500
 
+        # After ensuring the dish exists, add it to the Cart_Item__c
+        email = session.get('user_email')  # Assuming you have the user's email in session
+        
+        # Create the cart item with custom dish details and set other fields to default values
+        cart_item = {
+            'Name': dish_name,
+            'Price__c': price,
+            'Base_Price__c': price,
+            'Image1__c': item_image_url,
+            'Quantity__c': 1,  # Assuming a default quantity of 1 for the custom dish
+            'Add_Ons__c': '',  # Set Add_ons__c to empty
+            'Add_Ons_Price__c': 0,  # Set Add_ons_Price__c to 0
+            'Customer_Email__c': email  # Associate the custom dish with the logged-in user
+        }
+
+        # Insert the custom dish as a Cart_Item__c record in Salesforce
+        cart_result = sf.Cart_Item__c.create(cart_item)
+
+        if cart_result.get('success'):
+            return redirect(url_for("cart"))  # Redirect to the cart page after adding to the cart
+        else:
+            return jsonify({"success": False, "error": "Failed to add custom dish to the cart"}), 500
+
     except Exception as e:
         return jsonify({"success": False, "error": str(e)}), 500
 
 
 
 
+
 import re
 @app.route("/edit_profile", methods=["GET", "POST"])
 def edit_profile():