Pull from master

2018-05-22 13:26:23 +06:30
parent 574f320dfd
commit f1733d9f06
71 changed files with 1151 additions and 726 deletions
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -6,9 +6,12 @@ class Api::CallWaitersController < ActionController::API
    @time     = params[:time]
    @table    = DiningFacility.find(@table_id)
    # CallWaiterJob.perform_later(@table,@time)
-    #if ENV["SERVER_MODE"] != 'cloud'
-      ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
-    #end
+    if ENV["SERVER_MODE"] == 'cloud'
+        from = request.subdomain  + "." + request.domain
+    else 
+        from = ""
+    end 
+    ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time,from: from 
    # get printer info
    @shop          = Shop.first 
    unique_code    = "CallWaiterPdf"