Pull from master

2018-05-25 16:22:30 +06:30
parent f906134fbf
commit 578c14ccc3
26 changed files with 536 additions and 358 deletions
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -63,7 +63,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			order_reservation = params
 			order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation)

-			if flag #&& ENV["SERVER_MODE"] != 'cloud'
+			if flag
 				shop = Shop.find_by_id(1)
 				if !shop.shop_code.nil?
 					shop_code = shop.shop_code