From c9f49d38cfb3433209b254a9b2b9ba8e67939292 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 4 Dec 2017 19:35:26 +0630 Subject: [PATCH] change view order api for ygn bbq --- .../api/orders/view_orders.json.jbuilder | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/app/views/api/orders/view_orders.json.jbuilder b/app/views/api/orders/view_orders.json.jbuilder index 28de2657..0ac1b92f 100755 --- a/app/views/api/orders/view_orders.json.jbuilder +++ b/app/views/api/orders/view_orders.json.jbuilder @@ -19,6 +19,13 @@ if (@booking) @total_amount = 0.00 @total_tax = 0.00 + # For YGN BBQ + adult_count = 0 + child_count = 0 + adult_spent = 0 + child_spent = 0 + # End YGN BBQ + if @booking.booking_orders order_items = [] @booking.booking_orders.each do |bo| @@ -26,14 +33,7 @@ if (@booking) if (order.status == "new") order_items = order_items + order.order_items end - end - - # For YGN BBQ - adult_count = 0 - child_count = 0 - adult_spent = 0 - child_spent = 0 - # End YGN BBQ + end json.order_items order_items do |item| # For YGN BBQ @@ -60,8 +60,16 @@ if (@booking) end # For YGN BBQ - json.per_adult_spent (adult_spent / adult_count) * 0.05 - json.per_child_spent (child_spent / child_count) * 0.05 + if adult_count > 0 + json.per_adult_spent (adult_spent/adult_count) * 0.05 + else + json.per_adult_spent 0 + end + if child_count > 0 + json.per_child_spent (child_spent/child_count) * 0.05 + else + json.per_child_spent 0 + end # End YGN BBQ json.sub_total @total_amount