git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-05-22 13:26:23 +06:30
parent 574f320dfd
commit f1733d9f06
71 changed files with 1151 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
app/models/order.rb
View File

@@ -71,9 +71,9 @@ class Order < ApplicationRecord
BookingOrder.create({:booking_id => booking.booking_id, :order => self})
#Send order to queue one it done!
if self.source != "quick_service"
process_order_queue
end
# if self.source != "quick_service"
# process_order_queue
# end
#send order to broadcast job
send_order_broadcast(booking)
@@ -108,9 +108,9 @@ class Order < ApplicationRecord
BookingOrder.create({:booking_id => booking.booking_id, :order => self})
#Send order to queue one it done!
if self.source != "quick_service"
process_order_queue
end
# if self.source != "quick_service"
# process_order_queue
# end
#send order to broadcast job
send_order_broadcast(booking)
@@ -283,69 +283,7 @@ class Order < ApplicationRecord
# Counter number of quantityf
end
#Process order items and send to order queue
def process_order_queue
print_status = nil
cup_status = nil
#Send to background job for processing
order = Order.find(self.id)
sidekiq = Lookup.find_by_lookup_type("sidekiq")
if ENV["SERVER_MODE"] != 'cloud'
cup_status = `#{"sudo service cups status"}`
print_status = check_cup_status(cup_status)
end
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
if ENV["SERVER_MODE"] != 'cloud'
cup_start = `#{"sudo service cups start"}`
cup_status = `#{"sudo service cups status"}`
print_status = check_cup_status(cup_status)
end
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
if ENV["SERVER_MODE"] != 'cloud'
msg = ' Print Error ! Please contact to service'
ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
end
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
#Process order items and send to order queue
def self.pay_process_order_queue(id,table_id)
# if ENV["SERVER_MODE"] != 'cloud'
@@ -378,9 +316,13 @@ class Order < ApplicationRecord
type = 'order'
#Send to background job for processing
# OrderBroadcastJob.perform_later(table,type)
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "order_channel",table: table,type:type
#end
if ENV["SERVER_MODE"] == 'cloud'
from = request.subdomain + "." + request.domain
else
from = ""
end
ActionCable.server.broadcast "order_channel",table: table,type:type,from:from
end
end
@@ -534,11 +476,78 @@ class Order < ApplicationRecord
end
end
end
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "second_display_channel",data: @data_array,status:@status
#end
if ENV["SERVER_MODE"] == 'cloud'
from = request.subdomain + "." + request.domain
else
from = ""
end
ActionCable.server.broadcast "second_display_channel",data: @data_array,status:@status,from:from
end
#Process order items and send to order queue
# def process_order_queue
# print_status = nil
# cup_status = nil
# #Send to background job for processing
# order = Order.find(self.id)
# sidekiq = Lookup.find_by_lookup_type("sidekiq")
# if ENV["SERVER_MODE"] != 'cloud'
# cup_status = `#{"sudo service cups status"}`
# print_status = check_cup_status(cup_status)
# end
# 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
# if ENV["SERVER_MODE"] != 'cloud'
# cup_start = `#{"sudo service cups start"}`
# cup_status = `#{"sudo service cups status"}`
# print_status = check_cup_status(cup_status)
# end
# 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
# if ENV["SERVER_MODE"] != 'cloud'
# msg = ' Print Error ! Please contact to service'
# ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
# end
# 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
private
def generate_custom_id