Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-15 19:14:34 +06:30
parent 79496458e7 14e3ee93b5
commit 0e820f0ee1
3 changed files with 142 additions and 136 deletions
--- 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|