diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index ed42f1ef..90130757 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -610,7 +610,7 @@ class Origami::PaymentsController < BaseOrigamiController end # get printer info - print_settings = PrintSetting.find_by_unique_code(unique_code) + # print_settings = PrintSetting.find_by_unique_code(unique_code) printer = Printer::ReceiptPrinter.new(print_settings) printer.print_receipt_pdf(filename,receipt_no,print_settings.print_copies,printer_name) diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 81a5ea62..83abc672 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -115,7 +115,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker filename = "#{directory_name}/receipt_bill_#{sale_data.receipt_no}#{count != 1 ? "_#{count}" : ''}.pdf" pdf.render_file filename - if !Lookup.where(lookup_type: "ReceiptPdfView").pluck(:value).include?('1') + if ['Frt', 'Re-print'].include? printed_status || !Lookup.where(lookup_type: "ReceiptPdfView").pluck(:value).include?('1') #no print in cloud server puts "SERVER_MODE #{ENV["SERVER_MODE"]}" if ENV["SERVER_MODE"] != "cloud" @@ -125,7 +125,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker Rails.logger.debug "############## filename::" + filename else - if !Lookup.where(lookup_type: "ReceiptPdfView").pluck(:value).include?('1') + if ['Frt', 'Re-print'].include? printed_status || !Lookup.where(lookup_type: "ReceiptPdfView").pluck(:value).include?('1') sale_payments = SalePayment .select(:payment_method, 'SUM(`sale_payments`.`payment_amount`) AS `payment_amount`') .where(sale_id: sale_data.sale_id).group(:payment_method)