fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30
parent 858ddfd93b 2010b6a4bb
commit d41d957688
37 changed files with 295 additions and 430 deletions
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -96,9 +96,6 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 				result = { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is already existed!" }
 			end
 		end
-		
-		# puts "!!! send doemal ::"
-		# puts result

 		Rails.logger.debug "send status to doemal"
 		Rails.logger.debug result