diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 8dbf4f95..4a8b1653 100755 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -76,20 +76,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # check for item not to show #if odi.price != 0 - pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name) + pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) if !order_slim_pdf.empty? order_slim_pdf.each do |order_item_slim| if order_item_slim[0] == 'OrderSlimPdf' if order_item_slim[1] == '1' - pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name) + pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) else - pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name) + pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) end elsif order_item_slim[0] == 'OrderSetPdf' if order_item_slim[1] == '1' - pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name) + pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) else - pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name) + pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) end end end @@ -109,20 +109,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # For Print Order Summary else filename = "tmp/order_summary_#{order_id}" + ".pdf" - pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name) + pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) if !order_slim_pdf.empty? order_slim_pdf.each do |order_summary_slim| if order_summary_slim[0] == 'OrderSlimPdf' if order_summary_slim[1] == '1' - pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name) + pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) else - pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name) + pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) end elsif order_summary_slim[0] == 'OrderSetPdf' if order_summary_slim[1] == '1' - pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name) + pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) else - pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name) + pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) end end end @@ -143,7 +143,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end # Print for orders in booking - def print_booking_summary(print_settings,oqs, booking_id, print_status) + def print_booking_summary(print_settings,oqs, booking_id, print_status,before_updated_qty="") # Must be one print if print_settings.print_copies == 0 print_settings.print_copies = 1 @@ -162,20 +162,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # check for item not to show #if odi.price != 0 - pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name) + pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) if !order_slim_pdf.empty? order_slim_pdf.each do |order_item_slim| if order_item_slim[0] == 'OrderSlimPdf' if order_item_slim[1] == '1' - pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name) + pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) else - pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name) + pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) end elsif order_item_slim[0] == 'OrderSetPdf' if order_item_slim[1] == '1' - pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name) + pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) else - pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name) + pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) end end end @@ -198,20 +198,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # For Print Order Summary else filename = "tmp/booking_summary_#{booking_id}" + ".pdf" - pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name) + pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) if !order_slim_pdf.empty? order_slim_pdf.each do |order_summary_slim| if order_summary_slim[0] == 'OrderSlimPdf' if order_summary_slim[1] == '1' - pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name) + pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) else - pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name) + pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) end elsif order_summary_slim[0] == 'OrderSetPdf' if order_summary_slim[1] == '1' - pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name) + pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) else - pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name) + pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) end end end