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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01

Browse Source
This commit is contained in:
Aung Myo
2018-04-19 18:39:07 +06:30
parent e640f4b0a0 82d2e73912
commit 86e3b8ee34
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/models/order.rb
View File

@@ -285,6 +285,7 @@ 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'
#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"}` cup_status = `#{"sudo service cups status"}`
@@ -299,8 +300,8 @@ class Order < ApplicationRecord
oqs = OrderQueueStation.new oqs = OrderQueueStation.new
oqs.process_order(order, self.table_id, self.source) oqs.process_order(order, self.table_id, self.source)
end end
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 else
cup_start = `#{"sudo service cups start"}` cup_start = `#{"sudo service cups start"}`
@@ -315,8 +316,8 @@ class Order < ApplicationRecord
oqs = OrderQueueStation.new oqs = OrderQueueStation.new
oqs.process_order(order, self.table_id, self.source) oqs.process_order(order, self.table_id, self.source)
end end
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 else
msg = ' Print Error ! Please contact to service' msg = ' Print Error ! Please contact to service'
@@ -328,12 +329,14 @@ class Order < ApplicationRecord
oqs = OrderQueueStation.new oqs = OrderQueueStation.new
oqs.process_order(order, self.table_id, self.source) oqs.process_order(order, self.table_id, self.source)
end end
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
end 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
#Process order items and send to order queue #Process order items and send to order queue

2
config/initializers/action_controller.rb
View File

@@ -12,7 +12,7 @@ class ActionController::Base
ActiveRecord::Base.establish_connection(website_connection(@license)) ActiveRecord::Base.establish_connection(website_connection(@license))
# authenticate_session_token # authenticate_session_token
# logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
else8 else
# reconnect_default_db # reconnect_default_db
logger.info 'License is nil' logger.info 'License is nil'
# redirect_to root_url(:host => request.domain) + "store_error" # redirect_to root_url(:host => request.domain) + "store_error"