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

2017-06-22 18:05:38 +06:30
parent 618aed50dc 0c0e44c808
commit 139c3c997a
18 changed files with 177 additions and 91 deletions
--- a/app/views/api/orders/view_orders.json.jbuilder
+++ b/app/views/api/orders/view_orders.json.jbuilder
@@ -23,9 +23,9 @@ if (@booking)
    order_items = []
    @booking.booking_orders.each do |bo|
      order = Order.find(bo.order_id)
-      #if (order.status == "new")
+      if (order.status == "new")
        order_items = order_items + order.order_items
-      #end
+      end
    end

    json.order_items order_items do |item|