remove conflict data

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

app/controllers/origami/request_bills_controller.rb

@@ -39,9 +39,9 @@ class Origami::RequestBillsController < ApplicationController
       # Promotion Activation
       Promotion.promo_activate(@sale)
       #bill channel
-      if ENV["SERVER_MODE"] != 'cloud'
+      #if ENV["SERVER_MODE"] != 'cloud'
         ActionCable.server.broadcast "bill_channel",table: table
-      end
+      #end
       if order.source == "quick_service"
         result = {:status=> @status, :data => @sale.sale_id }
           render :json => result.to_json

app/controllers/origami/second_display_controller.rb

@@ -13,9 +13,9 @@ class Origami::SecondDisplayController < BaseOrigamiController
    else
      tax_profiles = nil
    end
-   if ENV["SERVER_MODE"] != 'cloud'
+   #if ENV["SERVER_MODE"] != 'cloud'
       ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
-   end
+  # end
   end
   #Shop Name in Navbor
   helper_method :shop_detail

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!'}