udpate order
This commit is contained in:
@@ -184,7 +184,11 @@ puts items_arr.to_json
|
|||||||
|
|
||||||
@status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
|
@status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
|
||||||
# for second display
|
# 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 }
|
result = {:status=> @status, :data => @sale }
|
||||||
render :json => result.to_json
|
render :json => result.to_json
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -13,8 +13,9 @@ class Origami::SecondDisplayController < BaseOrigamiController
|
|||||||
else
|
else
|
||||||
tax_profiles = nil
|
tax_profiles = nil
|
||||||
end
|
end
|
||||||
|
if ENV["SERVER_MODE"] != 'cloud'
|
||||||
ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
|
ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
#Shop Name in Navbor
|
#Shop Name in Navbor
|
||||||
helper_method :shop_detail
|
helper_method :shop_detail
|
||||||
|
|||||||
@@ -285,28 +285,12 @@ class Order < ApplicationRecord
|
|||||||
|
|
||||||
#Process order items and send to order queue
|
#Process order items and send to order queue
|
||||||
def process_order_queue
|
def process_order_queue
|
||||||
if ENV["SERVER_MODE"] != 'cloud'
|
if ENV["SERVER_MODE"] != 'cloud'
|
||||||
#Send to background job for processing
|
#Send to background job for processing
|
||||||
order = Order.find(self.id)
|
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"}`
|
|
||||||
cup_status = `#{"sudo service cups status"}`
|
cup_status = `#{"sudo service cups status"}`
|
||||||
print_status = check_cup_status(cup_status)
|
print_status = check_cup_status(cup_status)
|
||||||
|
sidekiq = Lookup.find_by_lookup_type("sidekiq")
|
||||||
|
|
||||||
if print_status
|
if print_status
|
||||||
if !sidekiq.nil?
|
if !sidekiq.nil?
|
||||||
@@ -320,10 +304,13 @@ class Order < ApplicationRecord
|
|||||||
# ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
|
# ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
msg = ' Print Error ! Please contact to service'
|
cup_start = `#{"sudo service cups start"}`
|
||||||
ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
|
cup_status = `#{"sudo service cups status"}`
|
||||||
|
print_status = check_cup_status(cup_status)
|
||||||
|
|
||||||
|
if print_status
|
||||||
if !sidekiq.nil?
|
if !sidekiq.nil?
|
||||||
OrderQueueProcessorJob.perform_later(self.id, self.table_id)
|
OrderQueueProcessorJob.perform_later(self.id, self.table_id)
|
||||||
else
|
else
|
||||||
if order
|
if order
|
||||||
oqs = OrderQueueStation.new
|
oqs = OrderQueueStation.new
|
||||||
@@ -332,11 +319,24 @@ class Order < ApplicationRecord
|
|||||||
# assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
|
# assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
|
||||||
# ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
|
# ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
|
||||||
end
|
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
|
end
|
||||||
|
assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
|
||||||
|
ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
|
||||||
end
|
end
|
||||||
assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
|
|
||||||
ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user