git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check shop code for new order

Browse Source
This commit is contained in:
phyusin
2018-05-11 17:03:53 +06:30
parent a896617a4d
commit 0a07b3479d
7 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/api/order_reserve/order_reservation_controller.rb
View File

@@ -64,8 +64,14 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation)
if flag #&& ENV["SERVER_MODE"] != 'cloud'
shop = Shop.find_by_id(1)
if !shop.shop_code.nil?
shop_code = shop.shop_code
else
shop_code = ''
end
order_reservation = OrderReservation.get_pending_orders #find(order_reservation_id)
ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
ActionCable.server.broadcast "order_reservation_channel",data: order_reservation,shop_code: shop_code
end
if flag