From 7d5d070e0d19b03a38c25f4b3bccf72fba4e15e2 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 19 Apr 2018 17:25:58 +0630 Subject: [PATCH 1/2] fix action contorller --- config/initializers/action_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index 9284042f..92add0d2 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -12,7 +12,7 @@ class ActionController::Base ActiveRecord::Base.establish_connection(website_connection(@license)) # authenticate_session_token # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema - else8 + else # reconnect_default_db logger.info 'License is nil' # redirect_to root_url(:host => request.domain) + "store_error" From c957ef7423f8e390c7340a7f6a3b2fe8b2f88681 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 18:38:08 +0630 Subject: [PATCH 2/2] update order for cloud process order --- app/models/order.rb | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index fcc8b6c2..7cfd09a2 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -285,6 +285,7 @@ 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"}` @@ -299,8 +300,8 @@ class Order < ApplicationRecord 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 + # 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"}` @@ -315,8 +316,8 @@ class Order < ApplicationRecord 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 + # 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' @@ -328,12 +329,14 @@ class Order < ApplicationRecord 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 + # 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 #Process order items and send to order queue