change order reservation data

2018-05-09 19:10:11 +06:30
parent fe306dc26b
commit 0127b23e93
9 changed files with 113 additions and 78 deletions
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -9,7 +9,12 @@ class Origami::OrderReservationController < BaseOrigamiController
  def update
  	@id     = params[:order_id]
    @status = params[:status]
-    expected_waiting_time = params[:expected_time]
+    min_type = params[:min_type]
+    if min_type != ""
+      expected_waiting_time = params[:expected_time]
+    else
+      expected_waiting_time = min_type + " " +params[:expected_time]
+    end
    remark = params[:remark]
  	access_code = params[:access_code]
  	@order_reservation  = OrderReservation.find(@id)