remove conflict data

app/controllers/api/bill_controller.rb

@@ -47,9 +47,9 @@ class Api::BillController < Api::ApiController
       Promotion.promo_activate(@sale)
 
       #BillBroadcastJob.perform_later(table)
-      if ENV["SERVER_MODE"] != 'cloud'
+      #if ENV["SERVER_MODE"] != 'cloud'
         ActionCable.server.broadcast "bill_channel",table: table
-      end
+      #end
     else
       @status = false
       @error_message = "No Current Open Shift"

app/controllers/api/call_waiters_controller.rb

@@ -6,9 +6,9 @@ class Api::CallWaitersController < ActionController::API
     @time     = params[:time]
     @table    = DiningFacility.find(@table_id)
     # CallWaiterJob.perform_later(@table,@time)
-    if ENV["SERVER_MODE"] != 'cloud'
+    #if ENV["SERVER_MODE"] != 'cloud'
       ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
-    end
+    #end
     # get printer info
     @shop          = Shop.first 
     unique_code    = "CallWaiterPdf" 

app/controllers/api/order_reserve/order_reservation_controller.rb

@@ -63,6 +63,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			if flag #&& ENV["SERVER_MODE"] != 'cloud'
 				ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
 			end
+			
 			if flag
 				render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is successfully created!" }
 			else