From 975372e467fb0fdf90d6c2312dc9d443e1c42a17 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 11 Jul 2017 11:03:21 +0630 Subject: [PATCH] update for all print with filenamme --- app/models/printer/cashier_station_printer.rb | 8 ++++++-- app/models/printer/order_queue_printer.rb | 10 +++++----- app/models/printer/receipt_printer.rb | 10 ++++++++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index 564b4909..267073d8 100644 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -26,9 +26,13 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker #Use CUPS service #Generate PDF #Print + cashier = shift_sale.employee.name + shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details) - pdf.render_file "tmp/print_close_cashier.pdf" - self.print("tmp/print_close_cashier.pdf") + filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" + pdf.render_file filename + self.print(filename) end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 6c8ba7e2..f66f1bc9 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -6,7 +6,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker #Print order_item = print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) - filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf" + filename = "tmp/order_item.pdf" # check for item not to show if order_item[0].price != 0 @@ -35,7 +35,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # For Print Per Item if oqs.cut_per_item order.each do|odi| - filename = "tmp/order_item_#{odi.item_name}" + ".pdf" + filename = "tmp/order_item.pdf" # For Item Options options = odi.options == "[]"? "" : odi.options @@ -54,7 +54,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end # For Print Order Summary else - filename = "tmp/order_summary_#{ order_id }" + ".pdf" + filename = "tmp/order_summary.pdf" pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name) pdf.render_file filename if oqs.print_copy @@ -75,7 +75,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # For Print Per Item if oqs.cut_per_item order.each do|odi| - filename = "tmp/order_item_#{odi.item_name}" + ".pdf" + filename = "tmp/order_item.pdf" # For Item Options options = odi.options == "[]"? "" : odi.options @@ -97,7 +97,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end # For Print Order Summary else - filename = "tmp/booking_summary_#{ booking_id }" + ".pdf" + filename = "tmp/booking_summary.pdf" pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name) pdf.render_file filename if oqs.print_copy diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 652339b9..4bd25201 100644 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -75,8 +75,14 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker # print as print copies in printer setting count = printer_settings.print_copies begin - pdf.render_file "tmp/receipt_bill.pdf" - self.print("tmp/receipt_bill.pdf") + if count == 1 + pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}.pdf" + self.print("tmp/receipt_bill_#{sale_data.receipt_no}.pdf") + else + pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf" + self.print("tmp/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf") + end + count -= 1 end until count == 0 end