From 25d7356c0789ae64a83c8d54ef48dc21c4436bbf Mon Sep 17 00:00:00 2001 From: aungthetkhaing Date: Tue, 3 Jun 2025 12:21:43 +0630 Subject: [PATCH] fixes --- app/controllers/concerns/multi_tenancy.rb | 8 ++++---- app/models/printer/printer_worker.rb | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/controllers/concerns/multi_tenancy.rb b/app/controllers/concerns/multi_tenancy.rb index 5ba6009c..cb44389b 100644 --- a/app/controllers/concerns/multi_tenancy.rb +++ b/app/controllers/concerns/multi_tenancy.rb @@ -13,11 +13,11 @@ module MultiTenancy end def find_tenant_by_subdomain_or_name - # if request.subdomains.first && request.subdomains.first != "www" - # set_current_tenant(Shop.find_by(subdomain: request.subdomains.first)) - # elsif Shop.count == 1 + if request.subdomains.first && request.subdomains.first != "www" + set_current_tenant(Shop.find_by(subdomain: request.subdomains.first)) + elsif Shop.count == 1 set_current_tenant(Shop.first) - # end + end end def not_found diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb index 5d7cce22..d30af42d 100755 --- a/app/models/printer/printer_worker.rb +++ b/app/models/printer/printer_worker.rb @@ -42,17 +42,17 @@ class Printer::PrinterWorker end def print(file_path, printer_destination = nil ) - # if printer_destination.nil? - # printer_destination = self.printer_destination - # end + if printer_destination.nil? + printer_destination = self.printer_destination + end - # copy = self.print_copies - # #Print only when printer information is not null - # if !self.printer_destination.nil? - # (1..copy).each do - # page = Cups::PrintJob.new(file_path, printer_destination) - # page.print - # end - # end + copy = self.print_copies + #Print only when printer information is not null + if !self.printer_destination.nil? + (1..copy).each do + page = Cups::PrintJob.new(file_path, printer_destination) + page.print + end + end end end