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/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -184,11 +184,9 @@ puts items_arr.to_json
        
          @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
          # for second display 
-            if ENV["SERVER_MODE"] != 'cloud'
-
-            ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"
-            
-           end
+            #if ENV["SERVER_MODE"] != 'cloud'
+            ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"          
+           #end
          result = {:status=> @status, :data => @sale }
          render :json => result.to_json
        end