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

fix print receipt

Browse Source
This commit is contained in:
NyanLinHtut
2020-09-08 15:22:28 +06:30
parent 8c10929eeb
commit 46c61275a4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/payments_controller.rb
View File

@@ -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)

4
app/models/printer/receipt_printer.rb
View File

@@ -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)