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

Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
phyusin
2018-05-14 18:15:13 +06:30
parent 7d1498931c af9efb5fa0
commit e6883fbf5f
4 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,19 +34,19 @@ App.check_new_order = App.cable.subscriptions.create('CheckNewOrderChannel', {
// swal.close();
// }
// });
$("#notify_new_order_lists").text(order_lists);
// $("#notify_new_order_lists").text(order_lists);
// if($("#"+shop_code+"_notify_new_order").hasClass("hidden")){
$("#"+shop_code+"_notify_new_order").removeClass("hidden");
// $("#"+shop_code+"_notify_new_order").removeClass("hidden");
// }
$("#"+shop_code+"_notify_new_order").on('shown.bs.modal', function(e){
// $(document).off('focusin.modal');
$("#"+shop_code+"_notify_new_order").focus();
$("#"+shop_code+"_doemal_new_order").addClass("hidden");
$("#"+shop_code+"_notify_order_send_to_kitchen").addClass("hidden");
$("#"+shop_code+"_notify_order_ready_to_delivery").addClass("hidden");
}).on('hide.bs.modal', function (e) {
$("#"+shop_code+"_notify_new_order").addClass("hidden");
}).modal({show: true, keyboard: false, backdrop: false});
// $("#"+shop_code+"_notify_new_order").on('shown.bs.modal', function(e){
// // $(document).off('focusin.modal');
// $("#"+shop_code+"_notify_new_order").focus();
// $("#"+shop_code+"_doemal_new_order").addClass("hidden");
// $("#"+shop_code+"_notify_order_send_to_kitchen").addClass("hidden");
// $("#"+shop_code+"_notify_order_ready_to_delivery").addClass("hidden");
// }).on('hide.bs.modal', function (e) {
// $("#"+shop_code+"_notify_new_order").addClass("hidden");
// }).modal({show: true, keyboard: false, backdrop: false});
}
}
});

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

@@ -34,19 +34,19 @@ App.check_order_ready_to_delivery = App.cable.subscriptions.create('CheckOrderRe
// swal.close();
// }
// });
$("#notify_order_ready_to_delivery_lists").text(order_lists);
// $("#notify_order_ready_to_delivery_lists").text(order_lists);
// if($("#notify_order_ready_to_delivery").hasClass("hidden")){
$("#"+shop_code+"_notify_order_ready_to_delivery").removeClass("hidden");
// $("#"+shop_code+"_notify_order_ready_to_delivery").removeClass("hidden");
// }
$("#"+shop_code+"_notify_order_ready_to_delivery").on('shown.bs.modal', function(e){
// $(document).off('focusin.modal');
$("#"+shop_code+"_notify_order_ready_to_delivery").focus();
$("#"+shop_code+"_doemal_new_order").addClass("hidden");
$("#"+shop_code+"_notify_new_order").addClass("hidden");
$("#"+shop_code+"_notify_order_send_to_kitchen").addClass("hidden");
}).on('hide.bs.modal', function (e) {
$("#"+shop_code+"_notify_order_ready_to_delivery").addClass("hidden");
}).modal({show: true, keyboard: false, backdrop: false});
// $("#"+shop_code+"_notify_order_ready_to_delivery").on('shown.bs.modal', function(e){
// // $(document).off('focusin.modal');
// $("#"+shop_code+"_notify_order_ready_to_delivery").focus();
// $("#"+shop_code+"_doemal_new_order").addClass("hidden");
// $("#"+shop_code+"_notify_new_order").addClass("hidden");
// $("#"+shop_code+"_notify_order_send_to_kitchen").addClass("hidden");
// }).on('hide.bs.modal', function (e) {
// $("#"+shop_code+"_notify_order_ready_to_delivery").addClass("hidden");
// }).modal({show: true, keyboard: false, backdrop: false});
}
}
});

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

@@ -34,19 +34,19 @@ App.check_order_send_to_kitchen = App.cable.subscriptions.create('CheckOrderSend
// swal.close();
// }
// });
$("#notify_order_send_to_kitchen_lists").text(order_lists);
// $("#notify_order_send_to_kitchen_lists").text(order_lists);
// if($("#notify_order_send_to_kitchen").hasClass("hidden")){
$("#"+shop_code+"_notify_order_send_to_kitchen").removeClass("hidden");
// $("#"+shop_code+"_notify_order_send_to_kitchen").removeClass("hidden");
// }
$("#"+shop_code+"_notify_order_send_to_kitchen").on('shown.bs.modal', function(e){
// $(document).off('focusin.modal');
$("#"+shop_code+"_notify_order_send_to_kitchen").focus();
$("#"+shop_code+"_doemal_new_order").addClass("hidden");
$("#"+shop_code+"_notify_new_order").addClass("hidden");
$("#"+shop_code+"_notify_order_ready_to_delivery").addClass("hidden");
}).on('hide.bs.modal', function (e) {
$("#"+shop_code+"_notify_order_send_to_kitchen").addClass("hidden");
}).modal({show: true, keyboard: false, backdrop: false});
// $("#"+shop_code+"_notify_order_send_to_kitchen").on('shown.bs.modal', function(e){
// // $(document).off('focusin.modal');
// $("#"+shop_code+"_notify_order_send_to_kitchen").focus();
// $("#"+shop_code+"_doemal_new_order").addClass("hidden");
// $("#"+shop_code+"_notify_new_order").addClass("hidden");
// $("#"+shop_code+"_notify_order_ready_to_delivery").addClass("hidden");
// }).on('hide.bs.modal', function (e) {
// $("#"+shop_code+"_notify_order_send_to_kitchen").addClass("hidden");
// }).modal({show: true, keyboard: false, backdrop: false});
}
}
});

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

@@ -489,20 +489,20 @@ function showNewOrder(order_reservation,shop_code){
audio.play();
// },10000);
$("#new_order").text(order_reservation.order_reservation_id);
$("#new_order_date").text(requested_date);
// $("#new_order").text(order_reservation.order_reservation_id);
// $("#new_order_date").text(requested_date);
// if($("#"+shop_code+"_doemal_new_order").hasClass("hidden")){
$("#"+shop_code+"_doemal_new_order").removeClass("hidden");
// $("#"+shop_code+"_doemal_new_order").removeClass("hidden");
// }
$("#"+shop_code+"_doemal_new_order").on('shown.bs.modal', function(e){
// $(document).off('focusin.modal');
$("#"+shop_code+"_doemal_new_order").focus();
$("#"+shop_code+"_notify_new_order").addClass("hidden");
$("#"+shop_code+"_notify_order_send_to_kitchen").addClass("hidden");
$("#"+shop_code+"_notify_order_ready_to_delivery").addClass("hidden");
}).on('hide.bs.modal', function (e) {
$("#"+shop_code+"_doemal_new_order").addClass("hidden");
}).modal({show: true, keyboard: false, backdrop: false});
// $("#"+shop_code+"_doemal_new_order").on('shown.bs.modal', function(e){
// // $(document).off('focusin.modal');
// $("#"+shop_code+"_doemal_new_order").focus();
// $("#"+shop_code+"_notify_new_order").addClass("hidden");
// $("#"+shop_code+"_notify_order_send_to_kitchen").addClass("hidden");
// $("#"+shop_code+"_notify_order_ready_to_delivery").addClass("hidden");
// }).on('hide.bs.modal', function (e) {
// $("#"+shop_code+"_doemal_new_order").addClass("hidden");
// }).modal({show: true, keyboard: false, backdrop: false});
// swal({
// title: 'Information',
// target: document.getElementById(shop_code+"_notify_new_order"),