', methods=['GET', 'POST'])
def enter_tip(receipt_id):
@@ -204,41 +246,77 @@ def calculate_bill(receipt_id):
return jsonify({"error": "Receipt not found"}), 404
items = receipt.get('items', [])
- allocations = receipt.get('allocations', [])
+ allocations = receipt.get('allocations', {})
+ item_counts = receipt.get('item_counts', {})
+ logger.debug(f"Allocations retrieved: {allocations}")
+ logger.debug(f"Item counts retrieved: {item_counts}")
+
+ # Aggregate total appetizer cost
+ appetizer_items = [item for item in items if item.get('is_appetizer', False)]
+ logger.debug(f"Items marked as appetizers: {[(item['description'], item['amount']) for item in appetizer_items]}")
+
+ appetizer_total = sum(item['amount'] for item in appetizer_items if item.get('is_appetizer', False))
+ logger.debug(f"Total appetizer cost: {appetizer_total}")
+
tax = float(receipt.get('tax', 0.00))
subtotal = float(receipt.get('subtotal', 0.00))
-
+
+ logger.debug(f"Subtotal and tax values: Subtotal={subtotal}, Tax={tax}")
+
+ if not items or subtotal <= 0:
+ logger.error("No items found or subtotal is zero or negative.")
+ return jsonify({"error": "Invalid receipt data"}), 400
+
payments = {name: 0 for name in receipt.get('names', [])}
- appetizer_total = sum(item.get('amount', 0.00) for item in items if item.get('is_appetizer', False))
+
num_people = len(receipt.get('names', []))
if num_people == 0:
logger.error("Number of people is zero.")
return jsonify({"error": "Number of people cannot be zero"}), 400
- appetizer_split = appetizer_total / num_people
+ if num_people > 0:
+ appetizer_cost_per_person = appetizer_total / num_people
+ else:
+ appetizer_cost_per_person = 0
+ logger.debug(f"Appetizer cost per person: {appetizer_cost_per_person}")
+ appetizer_cost_per_person = appetizer_total / num_people if num_people else 0
for name in payments:
- payments[name] += appetizer_split
+ payments[name] += appetizer_cost_per_person
+ logger.debug(f"Initial payment for {name}: {payments[name]}")
+
+ # Calculate individual item costs and distribute them
+ for item_id, users in allocations.items():
+ item = next((item for item in items if str(item['_id']) == item_id), None)
+ if item:
+ num_users = item_counts.get(item_id, 1)
+ cost_per_user = item['amount'] / num_users
+ for user in users:
+ payments[user] += cost_per_user
+ logger.debug(f"Allocating ${cost_per_user:.2f} to {user} for item {item['description']}")
+ else:
+ logger.debug(f"Item not found for ID: {item_id}")
+
+
- # Calculating individual payments
- for allocation in allocations:
- for item_index in allocation.get('items', []):
- if item_index.isdigit() and int(item_index) < len(items):
- payments[allocation['name']] += items[int(item_index)].get('amount', 0.00)
total_with_tax = subtotal + tax
total_with_tip = total_with_tax * (1 + tip_percentage)
+ logger.debug(f"Total with tax: {total_with_tax}, Total with tip: {total_with_tip}")
- # Distributing tax and tip across individuals
+ # Apply tax and tip proportionally
+ total_payment = 0
for name, payment in payments.items():
- if subtotal > 0:
- person_share_before_tax = payment / subtotal
- payments[name] = payment + (total_with_tax + total_with_tip - subtotal) * person_share_before_tax
+ person_share_before_tax = payment / subtotal if subtotal > 0 else 0
+ final_payment = payment + (total_with_tax - subtotal) * person_share_before_tax + (total_with_tip - total_with_tax) * person_share_before_tax
+ payments[name] = round(final_payment, 2)
+ total_payment += payments[name]
+ logger.debug(f"Final payment for {name}: {payments[name]}")
db.receipts.update_one({"_id": ObjectId(receipt_id)}, {'$set': {'payments': payments}})
- return render_template('results.html', payments=payments, receipt_id=receipt_id)
+ return render_template('results.html', payments=payments, total_payment=total_payment, receipt_id=receipt_id)
except Exception as e:
logger.error(f"Error in calculate_bill: {str(e)}")
return jsonify({"error": "An unexpected error occurred"}), 500
diff --git a/web-app/response1.json b/web-app/response1.json
new file mode 100644
index 0000000..2400278
--- /dev/null
+++ b/web-app/response1.json
@@ -0,0 +1,166 @@
+{
+ "ocr_type" : "receipts",
+ "request_id" : "P_72.80.97.228_luxbmz9s_bz6",
+ "ref_no" : "ocr_python_123",
+ "file_name" : "RestaurantReceipt1.png",
+ "request_received_on" : 1712965847825,
+ "success" : true,
+ "image_width" : 812,
+ "image_height" : 1354,
+ "image_rotation" : 0,
+ "recognition_completed_on" : 1712965848215,
+ "receipts" : [ {
+ "merchant_name" : "HARBOR LANE CAFE",
+ "merchant_address" : "HARBOR LANE CAFE",
+ "merchant_phone" : null,
+ "merchant_website" : null,
+ "merchant_tax_reg_no" : null,
+ "merchant_company_reg_no" : null,
+ "region" : null,
+ "mall" : null,
+ "country" : "US",
+ "state" : "IL",
+ "city" : "CHICAGO",
+ "receipt_no" : null,
+ "date" : "2019-11-20",
+ "time" : null,
+ "items" : [ {
+ "amount" : 14.98,
+ "category" : null,
+ "description" : "Tacos Del Mal Shrimp",
+ "flags" : "",
+ "qty" : 1,
+ "remarks" : null,
+ "tags" : null,
+ "unitPrice" : null
+ }, {
+ "amount" : 12.50,
+ "category" : null,
+ "description" : "Especial Salad Chicken",
+ "flags" : "",
+ "qty" : 1,
+ "remarks" : null,
+ "tags" : null,
+ "unitPrice" : null
+ }, {
+ "amount" : 1.99,
+ "category" : null,
+ "description" : "Fountain Beverage",
+ "flags" : "",
+ "qty" : 1,
+ "remarks" : null,
+ "tags" : null,
+ "unitPrice" : null
+ } ],
+ "currency" : "USD",
+ "total" : 31.39,
+ "subtotal" : 29.47,
+ "tax" : 1.92,
+ "service_charge" : null,
+ "tip" : null,
+ "payment_method" : null,
+ "payment_details" : null,
+ "credit_card_type" : null,
+ "credit_card_number" : null,
+ "ocr_text" : " HARBOR LANE CAFE\n 3941 GREEN OAKS BLVD\n CHICAGO, IL\n SALE\n 11/20/2019 11:05 AM\n BATCH #: 01A2A\n APPR #: 34362\n TRACE #: 9\n VISA 3483\n 1 Tacos Del Mal Shrimp $14.98\n 1 Especial Salad Chicken $12.50\n 1 Fountain Beverage $1.99\n SUBTOTAL: $29.47\n TAX: $1.92\n TOTAL: $31.39\n TIP:\n TOTAL:\n APPROVED\n THANK YOU\n CUSTOMER COPY",
+ "ocr_confidence" : 98.50,
+ "width" : 596,
+ "height" : 1111,
+ "avg_char_width" : 16.9954,
+ "avg_line_height" : 28.3333,
+ "conf_amount" : 83,
+ "source_locations" : {
+ "date" : [ [ {
+ "x" : 46,
+ "y" : 216
+ }, {
+ "x" : 240,
+ "y" : 216
+ }, {
+ "x" : 240,
+ "y" : 246
+ }, {
+ "x" : 46,
+ "y" : 246
+ } ] ],
+ "total" : [ [ {
+ "x" : 275,
+ "y" : 696
+ }, {
+ "x" : 381,
+ "y" : 696
+ }, {
+ "x" : 381,
+ "y" : 726
+ }, {
+ "x" : 275,
+ "y" : 726
+ } ] ],
+ "subtotal" : [ [ {
+ "x" : 276,
+ "y" : 615
+ }, {
+ "x" : 384,
+ "y" : 615
+ }, {
+ "x" : 384,
+ "y" : 646
+ }, {
+ "x" : 276,
+ "y" : 646
+ } ] ],
+ "merchant_name" : [ [ {
+ "x" : 40,
+ "y" : 13
+ }, {
+ "x" : 357,
+ "y" : 15
+ }, {
+ "x" : 357,
+ "y" : 47
+ }, {
+ "x" : 40,
+ "y" : 46
+ } ] ],
+ "doc" : [ [ {
+ "x" : 24,
+ "y" : -40
+ }, {
+ "x" : 679,
+ "y" : -40
+ }, {
+ "x" : 679,
+ "y" : 1181
+ }, {
+ "x" : 24,
+ "y" : 1181
+ } ] ],
+ "tax" : [ [ {
+ "x" : 277,
+ "y" : 656
+ }, {
+ "x" : 361,
+ "y" : 656
+ }, {
+ "x" : 361,
+ "y" : 685
+ }, {
+ "x" : 277,
+ "y" : 685
+ } ] ],
+ "merchant_address" : [ [ {
+ "x" : 24,
+ "y" : 11
+ }, {
+ "x" : 373,
+ "y" : 13
+ }, {
+ "x" : 373,
+ "y" : 49
+ }, {
+ "x" : 24,
+ "y" : 48
+ } ] ]
+ }
+ } ]
+ }
\ No newline at end of file
diff --git a/web-app/templates/allocateitems.html b/web-app/templates/allocateitems.html
index 3aa4aee..053085b 100644
--- a/web-app/templates/allocateitems.html
+++ b/web-app/templates/allocateitems.html
@@ -8,11 +8,11 @@
Allocate Food Items to Individuals