confict clear

2017-06-02 19:22:01 +06:30
parent 01fefe3b79 7146a1028a
commit 030d3ffb0f
15 changed files with 264 additions and 253 deletions
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -40,6 +40,7 @@ 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.booking_id = params[:booking_id]
      end