diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 13d8a20a..554236de 100755 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -4,6 +4,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker #Use CUPS service #Generate PDF #Print + # Must be one print + if print_settings.print_copies == 0 + print_settings.print_copies = 1 + print_settings.save! + end + order_item = print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) filename = "tmp/order_item.pdf" @@ -14,12 +20,13 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf.render_file filename if oqs.print_copy - self.print(filename, oqs.printer_name) - self.print(filename, oqs.printer_name) + self.print(filename, oqs.printer_name) #For print copy # pdf.render_file filename.gsub(".","-copy.") # self.print(filename.gsub(".","-copy."), oqs.printer_name) else + print_settings.print_copies = 1 + print_settings.save! self.print(filename, oqs.printer_name) end # end @@ -29,9 +36,14 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker def print_order_summary(print_settings,oqs, order_id, order_items, print_status) #Use CUPS service #Generate PDF - #Print - order=print_query('order_summary', order_id) + #Print + # Must be one print + if print_settings.print_copies == 0 + print_settings.print_copies = 1 + print_settings.save! + end + order=print_query('order_summary', order_id) # For Print Per Item if oqs.cut_per_item order.each do|odi| @@ -44,11 +56,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf = OrderItemPdf.new(print_settings,odi, print_status, options, oqs.use_alternate_name) # pdf.render_file "tmp/order_item.pdf" pdf.render_file filename - if oqs.print_copy - self.print(filename, oqs.printer_name) + if oqs.print_copy self.print(filename, oqs.printer_name) # self.print(filename.gsub(".","-copy."), oqs.printer_name) else + print_settings.print_copies = 1 + print_settings.save! self.print(filename, oqs.printer_name) end #end @@ -59,12 +72,13 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name) pdf.render_file filename if oqs.print_copy - self.print(filename, oqs.printer_name) - self.print(filename, oqs.printer_name) + self.print(filename, oqs.printer_name) #For print copy # pdf.render_file filename.gsub(".","-copy.") # self.print(filename.gsub(".","-copy."), oqs.printer_name) else + print_settings.print_copies = 1 + print_settings.save! self.print(filename, oqs.printer_name) end end @@ -72,6 +86,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # Print for orders in booking def print_booking_summary(print_settings,oqs, booking_id, print_status) + # Must be one print + if print_settings.print_copies == 0 + print_settings.print_copies = 1 + print_settings.save! + end + order=print_query('booking_summary', booking_id) # For Print Per Item if oqs.cut_per_item @@ -89,9 +109,11 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker self.print(filename, oqs.printer_name) #For print copy - pdf.render_file filename.gsub(".","-copy.") - self.print(filename.gsub(".","-copy."), oqs.printer_name) + # pdf.render_file filename.gsub(".","-copy.") + # self.print(filename.gsub(".","-copy."), oqs.printer_name) else + print_settings.print_copies = 1 + print_settings.save! self.print(filename, oqs.printer_name) end #end @@ -105,9 +127,11 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker self.print(filename, oqs.printer_name) #For print copy - pdf.render_file filename.gsub(".","-copy.") - self.print(filename.gsub(".","-copy."), oqs.printer_name) + # pdf.render_file filename.gsub(".","-copy.") + # self.print(filename.gsub(".","-copy."), oqs.printer_name) else + print_settings.print_copies = 1 + print_settings.save! self.print(filename, oqs.printer_name) end end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 30bd5ed8..852a70fc 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -100,7 +100,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker #Generate PDF #Print pdf = QueueNoPdf.new(printer_settings,queue) - pdf.render_file "tmp/print_queue_no.pdf" + pdf.render_file "tmp/print_queue_no.pdf" self.print("tmp/print_queue_no.pdf") end