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/origami/second_display_controller.rb
+++ b/app/controllers/origami/second_display_controller.rb
@@ -13,8 +13,12 @@ class Origami::SecondDisplayController < BaseOrigamiController
   else
     tax_profiles = nil
   end
-   #if ENV["SERVER_MODE"] != 'cloud'
-      ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
+   if ENV["SERVER_MODE"] == 'cloud'
+        from = request.subdomain  + "." + request.domain
+      else 
+        from = ""
+      end
+      ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status],from:from
  # end
  end
  #Shop Name in Navbor