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

change order reservation

Browse Source
This commit is contained in:
phyusin
2018-05-12 11:38:43 +06:30
parent 34e2bdb0d1
commit c7c32ffff4
10 changed files with 131 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/channels/check_new_order.js
View File

@@ -34,13 +34,16 @@ App.check_new_order = App.cable.subscriptions.create('CheckNewOrderChannel', {
// }
// });
$("#notify_new_order_lists").text(order_lists);
// if($("#notify_new_order").hasClass("hidden")){
$("#notify_new_order").removeClass("hidden");
// }
$("#notify_new_order").on('show.bs.modal', function(e){
$("#notify_order_send_to_kitchen").modal('hide');
$("#notify_order_ready_to_delivery").modal('hide');
$("#notify_order_send_to_kitchen").addClass("hidden");
$("#notify_order_ready_to_delivery").addClass("hidden");
}).on('shown.bs.modal', function(e){
$("#notify_new_order").focus();
}).on('hide.bs.modal', function (e) {
$("#notify_new_order").modal("hide");
$("#notify_new_order").addClass("hidden");
}).modal({show: true, keyboard: false, backdrop: false});
}
}

9
app/assets/javascripts/channels/check_order_ready_to_delivery.js
View File

@@ -34,13 +34,16 @@ App.check_order_ready_to_delivery = App.cable.subscriptions.create('CheckOrderRe
// }
// });
$("#notify_order_ready_to_delivery_lists").text(order_lists);
// if($("#notify_order_ready_to_delivery").hasClass("hidden")){
$("#notify_order_ready_to_delivery").removeClass("hidden");
// }
$("#notify_order_ready_to_delivery").on('shown.bs.modal', function(e){
$("#notify_new_order").modal('hide');
$("#notify_order_send_to_kitchen").modal('hide');
$("#notify_new_order").addClass("hidden");
$("#notify_order_send_to_kitchen").addClass("hidden");
}).on('shown.bs.modal', function(e){
$("#notify_order_ready_to_delivery").focus();
}).on('hide.bs.modal', function (e) {
$("#notify_order_ready_to_delivery").modal("hide");
$("#notify_order_ready_to_delivery").addClass("hidden");
}).modal({show: true, keyboard: false, backdrop: false});
}
}

9
app/assets/javascripts/channels/check_order_send_to_kitchen.js
View File

@@ -34,13 +34,16 @@ App.check_order_send_to_kitchen = App.cable.subscriptions.create('CheckOrderSend
// }
// });
$("#notify_order_send_to_kitchen_lists").text(order_lists);
// if($("#notify_order_send_to_kitchen").hasClass("hidden")){
$("#notify_order_send_to_kitchen").removeClass("hidden");
// }
$("#notify_order_send_to_kitchen").on('show.bs.modal', function(e){
$("#notify_new_order").modal('hide');
$("#notify_order_ready_to_delivery").modal('hide');
$("#notify_new_order").addClass("hidden");
$("#notify_order_ready_to_delivery").addClass("hidden");
}).on('shown.bs.modal', function(e){
$("#notify_order_send_to_kitchen").focus();
}).on('hide.bs.modal', function (e) {
$("#notify_order_send_to_kitchen").modal("hide");
$("#notify_order_send_to_kitchen").addClass("hidden");
}).modal({show: true, keyboard: false, backdrop: false});
}
}

4
app/assets/javascripts/channels/order_reservation.js
View File

@@ -21,9 +21,9 @@ App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel'
var created_at = date.getFullYear() +'-'+ (date.getMonth() >= 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate() >=10?date.getDate() : '0'+date.getDate());
var delivery_type = "";
if(value.delivery_type == "service"){
if(value.provider == "food2u" || value.provider == "yangondoor2door"){
delivery_type = "DELIVERY";
}else if(value.delivery_type == "pick_up"){
}else if(value.provider == "pick_up"){
delivery_type = "PICK-UP";
}else{
delivery_type = "DIRECT DELIVERY";