Update app.py

app.py

@@ -161,8 +161,9 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
         # Mapping mode and entry_type to Salesforce object and field
         object_name = None
         field_name = None
+        field_names = []
         product_field_name = "Product_Name__c"
-        model_field_name = "Modal_Name__c"  # Correct field for model name
+        model_field_name = None  # Correct field for model name
 
         if mode == "Entry":
             if entry_type == "Sales":
@@ -174,12 +175,14 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
         elif mode == "Exit":
             if entry_type == "Sales":
                 object_name = "Inventory_Management__c"
-                field_name = "Quantity_Sold__c"
+                field_names = ["Quantity_Sold__c", "soldstock__c"]
+                model_field_name = "Modal_Name__c"
             elif entry_type == "Non-Sales":
                 object_name = "Un_Billable__c"
-                field_name = "Sold_Out__c"
+                field_names = ["Sold_Out__c", "soldstock__c"]
+                model_field_name = "Model_Name__c"
 
-        if not object_name or not field_name:
+        if not object_name or (not field_name and not field_names):
             return "Invalid mode or entry type."
 
         # Get valid fields for the specified Salesforce object
@@ -205,14 +208,14 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
                 query_conditions.append(f"{model_field_name} = '{model_name}'")
             query_conditions.append(f"{product_field_name} = '{product_name}'")
 
-            query = f"SELECT Id, {field_name} FROM {object_name} WHERE {' OR '.join(query_conditions)} LIMIT 1"
+            query = f"SELECT Id, {', '.join(field_names)} FROM {object_name} WHERE {' OR '.join(query_conditions)} LIMIT 1"
             response = sf.query(query)
 
             if response["records"]:
                 record_id = response["records"][0]["Id"]
-                updated_quantity = quantity  # Overwrite the quantity
-                sf_object.update(record_id, {field_name: updated_quantity})
-                return f"✅ Updated record for product '{product_name}' ({model_name}) in {object_name}. New {field_name}: {updated_quantity}."
+                updated_fields = {field: quantity for field in field_names}
+                sf_object.update(record_id, updated_fields)
+                return f"✅ Updated record for product '{product_name}' ({model_name}) in {object_name}. Updated fields: {updated_fields}."
             else:
                 return f"❌ No matching record found for product '{product_name}' ({model_name}) in {object_name}."
 
@@ -225,6 +228,7 @@ def interact_with_salesforce(mode, entry_type, quantity, extracted_text):
 
     except Exception as e:
         return f"❌ Error interacting with Salesforce: {str(e)}"
+
 # Function to pull structured data from Salesforce and display as a table
 def pull_data_from_salesforce():
     try:
@@ -234,21 +238,29 @@ def pull_data_from_salesforce():
             security_token=SALESFORCE_SECURITY_TOKEN
         )
        
-        query = "SELECT Product_Name__c, Modal_Name__c, Current_Stocks__c FROM Inventory_Management__c LIMIT 100"
-        response = sf.query_all(query)
+        query_inventory = "SELECT Product_Name__c,  Current_Stocks__c, soldstock__c FROM Inventory_Management__c LIMIT 100"
+        query_unbillable = "SELECT Product_Name__c,  Current_Stock__c, soldstock__c FROM Un_Billable__c LIMIT 100"
+        
+        response_inventory = sf.query_all(query_inventory)
+        response_unbillable = sf.query_all(query_unbillable)
        
-        records = response.get("records", [])
-        if not records:
+        records_inventory = response_inventory.get("records", [])
+        records_unbillable = response_unbillable.get("records", [])
+        
+        if not records_inventory and not records_unbillable:
             return "No data found in Salesforce.", None, None, None
-       
+        
+        records = records_inventory + records_unbillable
         df = pd.DataFrame(records)
         df = df.drop(columns=['attributes'], errors='ignore')
        
         # Rename columns for better readability
         df.rename(columns={
             "Product_Name__c": "Product Name",
-            "Modal_Name__c": "Model Name",
-            "Current_Stocks__c": "Current Stocks"
+            "Modal_Name__c": "Model Name (Inventory)",
+            "Model_Name__c": "Model Name (Unbillable)",
+            "Current_Stocks__c": "Current Stocks",
+            "soldstock__c": "Sold Stock"
         }, inplace=True)
        
         excel_path = "salesforce_data.xlsx"