From fcfeb6fd98fee84e38d8812e6f184e5d4bd2010c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 21 May 2018 16:57:32 +0630 Subject: [PATCH] update js for precompile --- app/assets/javascripts/addorder.js | 1 - .../javascripts/channels/check_in_booking.js | 17 +++++---- .../javascripts/channels/check_new_order.js | 36 +++++++++---------- .../channels/check_order_ready_to_delivery.js | 1 + .../channels/check_order_send_to_kitchen.js | 1 + 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 611ffb17..78e08b2e 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -119,7 +119,6 @@ $(function() { // $(".menu_sub_category").on("click", function(){ $('.sub_category_list').addClass("hidden"); var menu_id = $(this).attr("data-id"); - console.log(menu_id); var url = "get_menu_category/"+menu_id; show_menu_item_list(url,menu_id); }); diff --git a/app/assets/javascripts/channels/check_in_booking.js b/app/assets/javascripts/channels/check_in_booking.js index d2c85e20..410d1c53 100644 --- a/app/assets/javascripts/channels/check_in_booking.js +++ b/app/assets/javascripts/channels/check_in_booking.js @@ -7,14 +7,13 @@ App.checkin = App.cable.subscriptions.create('CheckInBookingChannel', { received: function(data) { var hostname = location.hostname.trim(); - if(data.from == "" || hostname == data.from) - { - if($('.table_'+data.table.id).hasClass('green')){ - $('.table_'+data.table.id).removeClass('green'); - $('.table_'+data.table.id).addClass('blue'); - } - $('.new_text_'+data.table.id).removeClass('hide'); - } - } + if(data.from == "" || hostname == data.from){ + if($('.table_'+data.table.id).hasClass('green')){ + $('.table_'+data.table.id).removeClass('green'); + $('.table_'+data.table.id).addClass('blue'); + } + $('.new_text_'+data.table.id).removeClass('hide'); + } + } }); diff --git a/app/assets/javascripts/channels/check_new_order.js b/app/assets/javascripts/channels/check_new_order.js index a6d7982b..9cf91522 100644 --- a/app/assets/javascripts/channels/check_new_order.js +++ b/app/assets/javascripts/channels/check_new_order.js @@ -5,8 +5,7 @@ App.check_new_order = App.cable.subscriptions.create('CheckNewOrderChannel', { received: function(data) { var hostname = location.hostname.trim(); - if(data.from == "" || hostname == data.from) - { + if(data.from == "" || hostname == data.from){ var order = data.data; var shop_code = data.shop_code; if(order.length > 0){ @@ -20,23 +19,24 @@ App.check_new_order = App.cable.subscriptions.create('CheckNewOrderChannel', { order_lists += ', ' + value.order_reservation_id; } }); - // alert(order_lists); - if (typeof checkNewOrderAlert !== 'undefined' && $.isFunction(checkNewOrderAlert)) { - checkNewOrderAlert(shop_code, order_lists); + // alert(order_lists); + if (typeof checkNewOrderAlert !== 'undefined' && $.isFunction(checkNewOrderAlert)) { + checkNewOrderAlert(shop_code, 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").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}); } - // $("#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").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 37f4dcf6..54666735 100644 --- a/app/assets/javascripts/channels/check_order_ready_to_delivery.js +++ b/app/assets/javascripts/channels/check_order_ready_to_delivery.js @@ -40,5 +40,6 @@ App.check_order_ready_to_delivery = App.cable.subscriptions.create('CheckOrderRe // }).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 c837fee1..fee2e3f6 100644 --- a/app/assets/javascripts/channels/check_order_send_to_kitchen.js +++ b/app/assets/javascripts/channels/check_order_send_to_kitchen.js @@ -40,5 +40,6 @@ App.check_order_send_to_kitchen = App.cable.subscriptions.create('CheckOrderSend // }).modal({show: true, keyboard: false, backdrop: false}); } } +} });