From 143b509efef4fb6c53af62693101bcf38a9d3853 Mon Sep 17 00:00:00 2001
From: Zin Moe <zin.moe@code2lab.com>
Date: Wed, 29 Jul 2020 16:26:35 +0630
Subject: [PATCH] modify call waiter

---
 app/assets/javascripts/channels/call_waiter.js | 13 ++++++-------
 app/controllers/api/call_waiters_controller.rb | 17 ++++++++---------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/channels/call_waiter.js b/app/assets/javascripts/channels/call_waiter.js
index 512b2602..012ed9bd 100644
--- a/app/assets/javascripts/channels/call_waiter.js
+++ b/app/assets/javascripts/channels/call_waiter.js
@@ -1,12 +1,12 @@
 App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
-//  App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+//  App.messages = App.cable.subscriptions.create('MessagesChannel', {
 
   connected: function() {},
 
   disconnected: function() {},
 
-  received: function(data) {                 
-   
+  received: function(data) {
+
    var hostname = location.hostname.trim();
     if(data.from == "" || hostname == data.from)
     {
@@ -19,7 +19,7 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
             class_name = ".shift_" + data.shift_ids;
           }
         }
-        var element        = "#notify-wrapper" + class_name;
+        var element        = "#notify-wrapper"; // + class_name;
         var animateEnter   = "";
         var animateExit    = "";
         if (time == 'print_error') {
@@ -35,10 +35,10 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
           var text           = " Calling Waiter <br>  "+table.name ;
           style ="width:180px !important;"
         }
-        
+
 
         if (text != null || colorName != null){
-         showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
+         showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit);
        }
 
        function showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
@@ -79,4 +79,3 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
     }
   }
 });
-
diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index 5beba9a6..beb676c7 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -1,5 +1,4 @@
-class Api::CallWaitersController < ActionController::API
-
+class Api::CallWaitersController < Api::ApiController
   #List all active customers by name
   def index
     @table_id = params[:dining_id]
@@ -18,17 +17,17 @@ class Api::CallWaitersController < ActionController::API
     # CallWaiterJob.perform_later(@table,@time)
     if ENV["SERVER_MODE"] == 'cloud'
         from = request.subdomain  + "." + request.domain
-    else 
+    else
         from = ""
-    end 
-    ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time,from: from, shift_ids: shift_ids 
+    end
+    ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time,from: from, shift_ids: shift_ids
     # get printer info
-    @shop          = Shop.current_shop 
-    unique_code    = "CallWaiterPdf" 
+    @shop          = Shop.current_shop
+    unique_code    = "CallWaiterPdf"
     print_settings = PrintSetting.find_by_unique_code(unique_code)
-    printer        = Printer::ReceiptPrinter.new(print_settings)   
+    printer        = Printer::ReceiptPrinter.new(print_settings)
     printer.print_call_waiter(print_settings,@table,@time,@shop)
   end
 
-  
+
 end