diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index d551a766..226b3a83 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -17,7 +17,7 @@ class Oqs::HomeController < BaseOqsController @queue_items_details.each do |qid| dining = DiningFacility.find_by_name(qid.zone) que.order_queue_process_by_zones.each do |qz| - if qid.station_id == qz.order_queue_station_id && qid.zone_id == dining.zone_id + if qid.station_id == qz.order_queue_station_id && qid.zone_id == qz.zone_id zone_id = qid.zone_id i=i+1 end diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index c9da3a9f..edd2ace2 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -13,7 +13,7 @@ class OrderQueueStation < ApplicationRecord def process_order (order, table_id) oqs_stations = OrderQueueStation.active dining=DiningFacility.find(table_id) - oqpbz = OrderQueueProcessByZone.find_by_zone_id(dining.zone_id) + # oqpbz = OrderQueueProcessByZone.find_by_zone_id(dining.zone_id) order_items = order.order_items @@ -47,12 +47,16 @@ class OrderQueueStation < ApplicationRecord end # Auto Printing # ToDo per item per printer - if oqs.auto_print && is_auto_printed == false - if oqs_order_items.length > 0 - print_slip(oqs, order, oqs_order_items) - is_auto_printed = true - end - end + OrderQueueProcessByZone.where("zone_id=#{dining.zone_id}").find_each do |oqpbz| + if oqs.id == oqpbz.order_queue_station_id + if oqs.auto_print + if oqs_order_items.length > 0 + print_slip(oqs, order, oqs_order_items) + is_auto_printed = true + end + end + end + end end end diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 12d51c53..938a1085 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -1,7 +1,7 @@ class OrderItemPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width def initialize(print_settings,order_item, print_status, options, alt_name) - self.page_width = 210 + self.page_width = 180 self.page_height = 1450 self.margin = 5 self.price_width = 40 # No Need for item @@ -10,7 +10,7 @@ class OrderItemPdf < Prawn::Document self.item_width = self.page_width - self.qty_width self.item_height = 15 self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) - self.label_width=100 + self.label_width=90 super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) # super(:margin => [10, 5, 30, 5], :page_size => [200,400]) diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 9e8ad10b..35c0c98e 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -1,7 +1,7 @@ class OrderSummaryPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width def initialize(print_settings,order, print_status, order_items = nil,alt_name) - self.page_width = 210 + self.page_width = 180 self.page_height = 1450 self.margin = 5 self.price_width = 40 # No Need for item @@ -10,7 +10,7 @@ class OrderSummaryPdf < Prawn::Document self.item_width = self.page_width - (self.qty_width - self.margin) self.item_height = 15 self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) - self.label_width=100 + self.label_width=90 super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb index 1112f72b..d0d55202 100644 --- a/app/views/settings/employees/index.html.erb +++ b/app/views/settings/employees/index.html.erb @@ -25,7 +25,7 @@ <%= link_to employee.name,settings_employee_path(employee) %> <%= employee.role %> - <%= link_to 'Edit', edit_settings_employee_path(employee) %> | <%= link_to 'Destroy', employee[:setting], method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to 'Edit', edit_settings_employee_path(employee) %> | <%= link_to 'Destroy', settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/config/sidekiq.yml b/config/sidekiq.yml index fa0b1e15..ac1bb2d5 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -1,7 +1,17 @@ +# :concurrency: 25 +# :pidfile: /home/superuser/Application/production/sxrestaurant/tmp/pids/sidekiq.pid +# :logfile: /home/superuser/Application/production/sxrestaurant/log/sidekiq.log +# :queues: +# - default +# - [high_priority, 2] +# :demon: true + +--- :concurrency: 25 -:pidfile: /home/superuser/Application/production/sxrestaurant/tmp/pids/sidekiq.pid -:logfile: /home/superuser/Application/production/sxrestaurant/log/sidekiq.log +:pidfile: ./tmp/pids/sidekiq.pid +:logfile: ./log/sidekiq.log :queues: - default - [high_priority, 2] :demon: true +