Update utility.py

utility.py

@@ -336,7 +336,7 @@ def create_or_update_inventory_or_service_offering(user_phone: str, transaction_
 
 def create_sale(user_phone: str, transaction_data: List[Dict]) -> tuple[bool, str]:
     """Process sales of goods or services, validate stock/units, and record sale."""
-    inventory_ref = db.collection("users").document(user_phone).collection("inventory_and_services") # Unified collection
+    inventory_ref = db.collection("users").document(user_phone).collection("inventory_and_services")
     sales_ref = db.collection("users").document(user_phone).collection("sales")
     feedback_messages = []
     all_successful = True
@@ -351,8 +351,8 @@ def create_sale(user_phone: str, transaction_data: List[Dict]) -> tuple[bool, st
             service_name = sale_details.get('service_name')
             
             doc_id_for_stock_check = None
-            quantity_key_for_sale = None # Key like 'quantity' or 'hours' from the *sale details*
-            quantity_key_for_stock = None # Key like 'quantity' or 'units_available' from the *inventory/service offering*
+            quantity_key_for_sale = None
+            quantity_key_for_stock = None
             quantity_sold = 0
             
             if item_name:
@@ -362,8 +362,14 @@ def create_sale(user_phone: str, transaction_data: List[Dict]) -> tuple[bool, st
                 display_name = f"'{item_name}' (good)"
             elif service_name:
                 doc_id_for_stock_check = service_name
-                quantity_key_for_sale = 'hours' if 'hours' in sale_details else 'units' # 'units' for general services
-                quantity_key_for_stock = 'units_available' # Reflects available units in service offering
+                # Check for both 'hours' and 'units' in sale details
+                if 'hours' in sale_details:
+                    quantity_key_for_sale = 'hours'
+                elif 'units' in sale_details:
+                    quantity_key_for_sale = 'units'
+                else:
+                    quantity_key_for_sale = 'quantity'  # fallback
+                quantity_key_for_stock = 'units_available'
                 display_name = f"'{service_name}' (service)"
             else:
                 feedback_messages.append("Sale skipped: Missing item name or service name.")
@@ -373,11 +379,11 @@ def create_sale(user_phone: str, transaction_data: List[Dict]) -> tuple[bool, st
             try:
                 quantity_sold = int(sale_details.get(quantity_key_for_sale, 0))
                 if quantity_sold <= 0:
-                    feedback_messages.append(f"Sale skipped for {display_name}: Invalid quantity/hours ({quantity_sold}).")
+                    feedback_messages.append(f"Sale skipped for {display_name}: Invalid quantity/hours/units ({quantity_sold}).")
                     all_successful = False
                     continue
             except (ValueError, TypeError):
-                feedback_messages.append(f"Sale skipped for {display_name}: Invalid quantity/hours format.")
+                feedback_messages.append(f"Sale skipped for {display_name}: Invalid quantity/hours/units format.")
                 all_successful = False
                 continue
 
@@ -391,7 +397,7 @@ def create_sale(user_phone: str, transaction_data: List[Dict]) -> tuple[bool, st
                 if service_name:
                     perform_stock_check = False
                     logger.info(f"Ad-hoc service sale for '{service_name}'. Skipping stock check.")
-                else: # For physical item, must exist in inventory
+                else:
                     feedback_messages.append(f"Sale failed for {display_name}: Not found in inventory/service offerings.")
                     all_successful = False
                     continue
@@ -418,7 +424,7 @@ def create_sale(user_phone: str, transaction_data: List[Dict]) -> tuple[bool, st
                 **sale_details,
                 'timestamp': datetime.now().isoformat(),
                 'status': 'completed',
-                'transaction_id': sale_doc_ref.id # Store the generated ID
+                'transaction_id': sale_doc_ref.id
             }
             sale_batch.set(sale_doc_ref, sale_record)
 
@@ -426,8 +432,13 @@ def create_sale(user_phone: str, transaction_data: List[Dict]) -> tuple[bool, st
 
         return sale_batch
 
-
-    sales_to_process = [t for t in transaction_data if t.get('transaction_type') == 'sale' and t.get('intent') == 'create']
+    # Extract sale details from transaction data - key fix here
+    sales_to_process = []
+    for t in transaction_data:
+        if t.get('transaction_type') == 'sale' and t.get('intent') == 'create':
+            # Get the details dict, or use the transaction dict itself if no details key
+            sale_details = t.get('details', t)
+            sales_to_process.append(sale_details)
 
     if not sales_to_process:
          return False, "No valid sale transactions found."
@@ -444,7 +455,6 @@ def create_sale(user_phone: str, transaction_data: List[Dict]) -> tuple[bool, st
         else:
              logger.info(f"No sales to record for user {user_phone}.")
 
-
         return all_successful, "\n".join(feedback_messages)
 
     except Exception as e: