origin pull master

2017-06-03 13:44:10 +06:30
parent 7529d23147
commit 138850fb24
119 changed files with 2531 additions and 462 deletions
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -39,8 +39,8 @@ class Api::OrdersController <  Api::ApiController

      #Create Table Booking or Room Booking
      if !params["booking_id"].nil? && params[:booking_id].to_i > 0
-        @order.new_booking = false
-        # @order.new_booking = true
+         #@order.new_booking = false
+         @order.new_booking = true
        @order.booking_id = params[:booking_id]
      end