diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index c60accdf..0f438831 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -68,11 +68,13 @@ $(function() { if(waiting_time.getTime() < requested_time.getTime()){ var time_diff = (requested_time.getTime() - waiting_time.getTime()); var expected_time = (Math.floor(time_diff) / 1000) / 60; - callback_url(callback,ref_no,order_id,status,expected_time,waiting_time); }else{ - $("#waiting_time").val(""); - $("#waiting_timeErr").text("Expected waiting time is greater than requested time!"); + var time_diff = (waiting_time.getTime() - requested_time.getTime()); + var expected_time = (Math.floor(time_diff) / 1000) / 60; + // $("#waiting_time").val(""); + // $("#waiting_timeErr").text("Expected waiting time is greater than requested time!"); } + callback_url(callback,ref_no,order_id,status,expected_time,waiting_time); }); }); diff --git a/config/schedule.rb b/config/schedule.rb index 8f151e3d..fc38bc2a 100755 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -14,14 +14,14 @@ every 1.minutes do runner "DiningFacility.checkin_time" end -every 3.minutes do +every 10.minutes do runner "OrderReservation.check_new_order" end -every 5.minutes do +every 10.minutes do runner "OrderReservation.check_order_send_to_kitchen" end -every 5.minutes do +every 10.minutes do runner "OrderReservation.check_order_ready_to_delivery" end \ No newline at end of file