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

update comflix

Browse Source
This commit is contained in:
Aung Myo
2018-05-03 09:55:36 +06:30
parent 28dc5faada 0e87ba87f3
commit a7721fb706
10 changed files with 165 additions and 126 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

7
app/controllers/origami/order_reservation_controller.rb
View File

@@ -7,7 +7,8 @@ class Origami::OrderReservationController < BaseOrigamiController
def update
@id = params[:order_id]
@status = params[:status]
@status = params[:status]
expected_waiting_time = params[:expected_time]
@order_reservation = OrderReservation.find(@id)
status = true
@@ -26,7 +27,7 @@ class Origami::OrderReservationController < BaseOrigamiController
OrderReservation.update_order_reservation(@id, nil, "cancelled")
result = {:status=> true, :message => "rejected" }
else
OrderReservation.update_order_reservation(@id, nil, "accepted")
OrderReservation.update_order_reservation(@id, nil, "accepted", expected_waiting_time)
result = {:status=> true, :message => "accepted" }
end
end
@@ -51,7 +52,7 @@ class Origami::OrderReservationController < BaseOrigamiController
status = params[:status]
end
response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status)
response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status,params[:waiting_time])
render :json => response
end