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

.ruby-version

@@ -0,0 +1 @@
+2.3.3

app/views/api/bookings/show.json.jbuilder

@@ -12,22 +12,25 @@ if (@booking)
   @total_tax = 0.00
 
   if @booking.booking_orders
+    order_items = []
     @booking.booking_orders.each do |bo|
       order = Order.find(bo.order_id)
       if (order.status == "new")
-        order_items = order.order_items
+        order_items = order_items + order.order_items
-        json.order_items order_items do |item|
-            json.item_instance_code    item.item_code
-            json.item_name             item.item_name
-            json.price                 item.price
-            json.qty                   item.qty
-            json.options               item.options
-            json.remark                item.remark
-            json.item_status           item.order_item_status
-            @total_amount = @total_amount + (item.price * item.qty)
-        end
       end
     end
+
+    json.order_items order_items do |item|
+        json.item_instance_code    item.item_code
+        json.item_name             item.item_name
+        json.price                 item.price
+        json.qty                   item.qty
+        json.options               item.options
+        json.remark                item.remark
+        json.item_status           item.order_item_status
+        @total_amount = @total_amount + (item.price * item.qty)
+    end
+
   end
 
   json.sub_total @total_amount