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

change js file

Browse Source
This commit is contained in:
phyusin
2018-05-04 11:18:53 +06:30
parent 8cc81a6bad
commit 135ccae8a6
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/order_reservation.js
View File

@@ -68,11 +68,13 @@ $(function() {
if(waiting_time.getTime() < requested_time.getTime()){ if(waiting_time.getTime() < requested_time.getTime()){
var time_diff = (requested_time.getTime() - waiting_time.getTime()); var time_diff = (requested_time.getTime() - waiting_time.getTime());
var expected_time = (Math.floor(time_diff) / 1000) / 60; var expected_time = (Math.floor(time_diff) / 1000) / 60;
callback_url(callback,ref_no,order_id,status,expected_time,waiting_time);
}else{ }else{
$("#waiting_time").val(""); var time_diff = (waiting_time.getTime() - requested_time.getTime());
$("#waiting_timeErr").text("Expected waiting time is greater than requested time!"); 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);
}); });
}); });

6
config/schedule.rb
View File

@@ -14,14 +14,14 @@ every 1.minutes do
runner "DiningFacility.checkin_time" runner "DiningFacility.checkin_time"
end end
every 3.minutes do every 10.minutes do
runner "OrderReservation.check_new_order" runner "OrderReservation.check_new_order"
end end
every 5.minutes do every 10.minutes do
runner "OrderReservation.check_order_send_to_kitchen" runner "OrderReservation.check_order_send_to_kitchen"
end end
every 5.minutes do every 10.minutes do
runner "OrderReservation.check_order_ready_to_delivery" runner "OrderReservation.check_order_ready_to_delivery"
end end