Pull from master

2018-05-03 09:31:36 +06:30
parent caa0180e8c
commit 45531453c7
47 changed files with 1042 additions and 263 deletions
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -335,9 +335,9 @@ class Origami::SplitBillController < BaseOrigamiController
 	    	end

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