Update main.py

main.py

@@ -205,10 +205,20 @@ def handle_manual_entry(uid, user_ref, user_data):
 
 def validate_and_save_transaction(uid, user_data, data, file_hash, image_bytes, manual=False):
     transactions_ref = db.reference('transactions')
-    existing = transactions_ref.order_by_child('receipt_number').equal_to(data['receipt_number']).get()
-    
-    if existing:
-        return jsonify({'error': f"Receipt #{data['receipt_number']} already exists"}), 400
+    receipt_number = data.get('receipt_number')
+    items = data.get('items', [])
+
+    # Fetch existing transactions with the same receipt_number
+    existing_transactions_with_receipt = transactions_ref.order_by_child('receipt_number').equal_to(receipt_number).get()
+
+    if existing_transactions_with_receipt:
+        for transaction_id, existing_transaction_data in existing_transactions_with_receipt.items():
+            # Compare items lists - assuming order doesn't matter, so sorting for comparison
+            existing_items = sorted(existing_transaction_data.get('items', []))
+            current_items = sorted(items)
+
+            if existing_items == current_items:
+                return jsonify({'error': f"Transaction with Receipt #{receipt_number} and identical items already exists"}), 400
 
     total = float(data.get('total', 0))
     if total > user_data['remaining_cash']:
@@ -230,15 +240,15 @@ def validate_and_save_transaction(uid, user_data, data, file_hash, image_bytes,
     transaction_data = {
         'uid': uid,
         'total': total,
-        'items': data.get('items', []),
+        'items': items,
         'date': data.get('date'),
-        'receipt_number': data.get('receipt_number'),
+        'receipt_number': receipt_number,
         'timestamp': datetime.now(pytz.UTC).isoformat(),
         'hash': file_hash,
         'image_url': image_url,
         'manual_entry': manual
     }
-    
+
     new_transaction_ref = transactions_ref.push(transaction_data)
     return jsonify({
         'success': True,