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/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -609,7 +609,12 @@ class SalePayment < ApplicationRecord
        #Send to background job for processing
        # OrderBroadcastJob.perform_later(table,type)
        #if ENV["SERVER_MODE"] != 'cloud'
-          ActionCable.server.broadcast "order_channel",table: table,type:type
+        if ENV["SERVER_MODE"] == 'cloud'
+           from = request.subdomain  + "." + request.domain
+        else 
+          from = ""
+        end
+          ActionCable.server.broadcast "order_channel",table: table,type:type,from:from
        #end
      end
    end