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

change UI and add expected waiting time

Browse Source
This commit is contained in:
phyusin
2018-05-02 11:59:35 +06:30
parent 027550121e
commit 7c6d842a31
8 changed files with 145 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,8 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
order_reservation = params
order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation)
order_reservation = OrderReservation.latest_order.where("status = 'new'") #find(order_reservation_id)
order_reservation = OrderReservation.get_pending_orders #find(order_reservation_id)
if flag #&& ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
end