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/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -337,9 +337,13 @@ class Origami::SplitBillController < BaseOrigamiController
 	    	end

 			Promotion.promo_activate(sale)
-			#if ENV["SERVER_MODE"] != 'cloud'
-			  ActionCable.server.broadcast "bill_channel",table: table
-			#end
+			if ENV["SERVER_MODE"] == 'cloud'
+              from = request.subdomain  + "." + request.domain
+            else 
+              from = ""
+            end
+			  ActionCable.server.broadcast "bill_channel",table: table,from:from
+		
 			render :json => { status: status }
 	    else
 	      render :json => { status: false, error_message: 'No Current Open Shift!'}