From b9e1a0694c00fc8f02c4f0c19b8e0a24c50ab891 Mon Sep 17 00:00:00 2001 From: Nweni Date: Thu, 15 Jun 2017 19:13:01 +0630 Subject: [PATCH] update api --- app/views/api/bookings/show.json.jbuilder | 7 ++++++- lib/tasks/clear_data.rake | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/api/bookings/show.json.jbuilder b/app/views/api/bookings/show.json.jbuilder index 2e8708d3..e1ebd5a9 100644 --- a/app/views/api/bookings/show.json.jbuilder +++ b/app/views/api/bookings/show.json.jbuilder @@ -1,6 +1,11 @@ if (@booking) json.id @booking.booking_id json.status @booking.booking_status + if Sale.exists?(@booking.sale_id) + json.sale_status Sale.find(@booking.sale_id).sale_status + else + json.sale_status "" + end json.checkin_at @booking.checkin_at.strftime("%d-%m-%Y") json.checkin_by @booking.checkin_by json.table_name @booking.dining_facility.name @@ -12,7 +17,7 @@ if (@booking) end @total_amount = 0.00 @total_tax = 0.00 - + if @booking.booking_orders order_items = [] @booking.booking_orders.each do |bo| diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake index c9e0fe22..552c2a60 100644 --- a/lib/tasks/clear_data.rake +++ b/lib/tasks/clear_data.rake @@ -11,6 +11,7 @@ namespace :clear do Sale.delete_all SaleAudit.delete_all SalePayment.delete_all + puts "Clear Data Done." end end