merge with origin master

2017-06-30 13:39:52 +06:30
parent cae7157d8b 5e3935f176
commit 34166a1387
16 changed files with 220 additions and 96 deletions
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -96,14 +96,15 @@ class Api::OrdersController <  Api::ApiController
        end
      end

-    @status, @booking = @order.generate
+     @status, @booking = @order.generate
  end

  # render json for http status code
  def return_json_status_with_code(code, msg)
    render status: code, json: {
-      message: msg
-    }.to_json    
+      message: msg,
+      booking_id: booking_id
+    }.to_json
  end

  def check_order_with_table(table_id)