From af9efb5fa0224b2a619f36ea37d1c1b4f489c860 Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 14 May 2018 18:14:23 +0630 Subject: [PATCH] hide popup modal in order reservation --- .../javascripts/channels/check_new_order.js | 22 ++++++++--------- .../channels/check_order_ready_to_delivery.js | 22 ++++++++--------- .../channels/check_order_send_to_kitchen.js | 22 ++++++++--------- app/assets/javascripts/order_reservation.js | 24 +++++++++---------- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/app/assets/javascripts/channels/check_new_order.js b/app/assets/javascripts/channels/check_new_order.js index 5e13ffe2..4aa0f1b0 100644 --- a/app/assets/javascripts/channels/check_new_order.js +++ b/app/assets/javascripts/channels/check_new_order.js @@ -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}); } } }); diff --git a/app/assets/javascripts/channels/check_order_ready_to_delivery.js b/app/assets/javascripts/channels/check_order_ready_to_delivery.js index 96863c1c..dc406d5e 100644 --- a/app/assets/javascripts/channels/check_order_ready_to_delivery.js +++ b/app/assets/javascripts/channels/check_order_ready_to_delivery.js @@ -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}); } } }); diff --git a/app/assets/javascripts/channels/check_order_send_to_kitchen.js b/app/assets/javascripts/channels/check_order_send_to_kitchen.js index a65c1fc8..0d11207e 100644 --- a/app/assets/javascripts/channels/check_order_send_to_kitchen.js +++ b/app/assets/javascripts/channels/check_order_send_to_kitchen.js @@ -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}); } } }); diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index a564411f..9284b889 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -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"),