diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 0f16b981..e3122ded 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -184,7 +184,11 @@ puts items_arr.to_json @status, @sale = Sale.request_bill(@order,current_user,current_login_employee) # for second display - ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale" + 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 diff --git a/app/controllers/origami/second_display_controller.rb b/app/controllers/origami/second_display_controller.rb index a2bf34fd..87368470 100644 --- a/app/controllers/origami/second_display_controller.rb +++ b/app/controllers/origami/second_display_controller.rb @@ -13,8 +13,9 @@ class Origami::SecondDisplayController < BaseOrigamiController else tax_profiles = nil end - + if ENV["SERVER_MODE"] != 'cloud' ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status] + end end #Shop Name in Navbor helper_method :shop_detail diff --git a/app/models/order.rb b/app/models/order.rb index 3f3414e1..ef8127f5 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -285,29 +285,13 @@ class Order < ApplicationRecord #Process order items and send to order queue def process_order_queue - if ENV["SERVER_MODE"] != 'cloud' - #Send to background job for processing - order = Order.find(self.id) - cup_status = `#{"sudo service cups status"}` - print_status = check_cup_status(cup_status) - sidekiq = Lookup.find_by_lookup_type("sidekiq") - - if print_status - if !sidekiq.nil? - OrderQueueProcessorJob.perform_later(self.id, self.table_id) - else - if order - oqs = OrderQueueStation.new - oqs.process_order(order, self.table_id, self.source) - end - # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) - # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order - end - else - cup_start = `#{"sudo service cups start"}` + if ENV["SERVER_MODE"] != 'cloud' + #Send to background job for processing + order = Order.find(self.id) cup_status = `#{"sudo service cups status"}` print_status = check_cup_status(cup_status) - + sidekiq = Lookup.find_by_lookup_type("sidekiq") + if print_status if !sidekiq.nil? OrderQueueProcessorJob.perform_later(self.id, self.table_id) @@ -320,10 +304,13 @@ class Order < ApplicationRecord # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end else - msg = ' Print Error ! Please contact to service' - ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error' + cup_start = `#{"sudo service cups start"}` + cup_status = `#{"sudo service cups status"}` + print_status = check_cup_status(cup_status) + + if print_status if !sidekiq.nil? - OrderQueueProcessorJob.perform_later(self.id, self.table_id) + OrderQueueProcessorJob.perform_later(self.id, self.table_id) else if order oqs = OrderQueueStation.new @@ -332,11 +319,24 @@ class Order < ApplicationRecord # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end + else + msg = ' Print Error ! Please contact to service' + ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error' + if !sidekiq.nil? + OrderQueueProcessorJob.perform_later(self.id, self.table_id) + else + if order + oqs = OrderQueueStation.new + oqs.process_order(order, self.table_id, self.source) + end + # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) + # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order + end + end end + assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) + ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end - assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) - ActionCable.server.broadcast "order_queue_station_channel",order: assign_order - end end