diff --git a/README.md b/README.md index 4e817c7a..fd8ad10d 100755 --- a/README.md +++ b/README.md @@ -39,30 +39,26 @@ For Extra Time * must start with 'Ext'[a..z]'_'[1..100] * note : don't add character after '_' -For Order Item & Order Summary Slim - *** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf - 1) settings/print_settings - (a) Font is present => {Header font size:11, Item Font Size:9} - (b) Font is blank => {Header font size:12, Item Font Size:10} - 2) settings/lookups => { type:print_settings, name:OrderSlimPdf, value:1 } - * no need to change these files - { app/controllers/oqs/edit_controller.rb - app/controllers/oqs/print_controller.rb - app/models/order_queue_station.rb - app/models/printer/order_queue_printer.rb - app/models/printer/receipt_printer.rb - } - -For Order Item & Order Summary Customise PDF - *** change OrderItemPdf to OrderItemCustomisePdf and OrderSummaryPdf to OrderSummaryCustomisePdf - 1) settings/lookups => { type:print_settings, name:OrderCustomisePdf, value:1 } - * no need to change these files - { app/controllers/oqs/edit_controller.rb - app/controllers/oqs/print_controller.rb - app/models/order_queue_station.rb - app/models/printer/order_queue_printer.rb - app/models/printer/receipt_printer.rb - * Can change Header font size and Item Font Size as you like +For Order Printing + 1)) ********* Order Pdf ********* + 1) settings/print_settings + (a) Unique Code => OrderItemPdf & OrderSummaryPdf + (b) Font is present => {Header font size:11, Item Font Size:9} + Font is blank => {Header font size:12, Item Font Size:10} + 2)) ********* Order Set Pdf ********* + 1) settings/print_settings + (a) Unique Code => OrderSetItemPdf & OrderSummarySetPdf + (b) Font is present => {Header font size:11, Item Font Size:9} + Font is blank => {Header font size:12, Item Font Size:10} + 3)) ********* Order Slim Pdf ********* + 1) settings/print_settings + (a) Unique Code => OrderItemSlimPdf & OrderSummarySlimPdf + (b) Font is present => {Header font size:11, Item Font Size:9} + Font is blank => {Header font size:12, Item Font Size:10} + 4)) ********* Order Customise PDF ********* + 1) settings/print_settings + (a) Unique Code => OrderItemCustomisePdf & OrderSummaryCustomisePdf + (b) Can change Header font size and Item Font Size as you like For ReceiptBillA5Pdf *** change ReceiptBillPdf to ReceiptBillA5Pdf @@ -72,13 +68,6 @@ For ReceiptBillA5Pdf For ReceiptBillAltName options 1) settings/lookups => { type:print_settings, name:ReceiptBillAltName, value:1 } -For OrderSetPdf options - *** change OrderItemPdf to OrderSetItemPdf and OrderSummaryPdf to OrderSummarySetPdf - 1) settings/lookups => { type:print_settings, name:OrderSetPdf, value:1 } - 2) settings/print_settings - (a) Font is present => {Header font size:11, Item Font Size:9} - (b) Font is blank => {Header font size:12, Item Font Size:10} - For Bank Integration setting 1) rake db:migrate for card_sale_trans, card_settle_trans 2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 } diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 1e010007..187d1139 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -227,32 +227,24 @@ class Api::OrdersController < Api::ApiController # order queue stations oqs = assign_item.order_queue_station - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + printer = PrintSetting.all unique_code="OrderItemPdf" 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' + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderItemPdf' + unique_code="OrderItemPdf" + elsif printer_setting.unique_code == 'OrderItemSlimPdf' unique_code="OrderItemSlimPdf" - else - unique_code="OrderItemPdf" - end - elsif order_item_slim[0] == 'OrderSetPdf' - if order_item_slim[1] == '1' + elsif printer_setting.unique_code == 'OrderSetItemPdf' unique_code="OrderSetItemPdf" - else - unique_code="OrderItemPdf" - end - elsif order_item_slim[0] == 'OrderCustomisePdf' - if order_item_slim[1] == '1' + elsif printer_setting.unique_code == 'OrderItemCustomisePdf' unique_code="OrderItemCustomisePdf" - else - unique_code="OrderItemPdf" end end end - end + end print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb index 49addea1..f86db74b 100644 --- a/app/controllers/oqs/edit_controller.rb +++ b/app/controllers/oqs/edit_controller.rb @@ -48,32 +48,22 @@ class Oqs::EditController < BaseOqsController # order queue stations oqs = assign_item.order_queue_station - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf - + printer = PrintSetting.all + unique_code="OrderItemPdf" - 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' - unique_code="OrderItemSlimPdf" - else - unique_code="OrderItemPdf" - end - elsif order_item_slim[0] == 'OrderSetPdf' - if order_item_slim[1] == '1' - unique_code="OrderSetItemPdf" - else - unique_code="OrderItemPdf" - end - elsif order_item_slim[0] == 'OrderCustomisePdf' - if order_item_slim[1] == '1' - unique_code="OrderItemCustomisePdf" - else - unique_code="OrderItemPdf" - end - end + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderItemPdf' + unique_code="OrderItemPdf" + elsif printer_setting.unique_code == 'OrderItemSlimPdf' + unique_code="OrderItemSlimPdf" + elsif printer_setting.unique_code == 'OrderSetItemPdf' + unique_code="OrderSetItemPdf" + elsif printer_setting.unique_code == 'OrderItemCustomisePdf' + unique_code="OrderItemCustomisePdf" + end end - end + end print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index 1fd3f7f1..170add96 100755 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -4,32 +4,24 @@ class Oqs::PrintController < ApplicationController def print if ENV["SERVER_MODE"] != "cloud" #no print in cloud server order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + printer = PrintSetting.all unique_code="OrderItemPdf" - 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' + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderItemPdf' + unique_code="OrderItemPdf" + elsif printer_setting.unique_code == 'OrderItemSlimPdf' unique_code="OrderItemSlimPdf" - else - unique_code="OrderItemPdf" - end - elsif order_item_slim[0] == 'OrderSetPdf' - if order_item_slim[1] == '1' + elsif printer_setting.unique_code == 'OrderSetItemPdf' unique_code="OrderSetItemPdf" - else - unique_code="OrderItemPdf" - end - elsif order_item_slim[0] == 'OrderCustomisePdf' - if order_item_slim[1] == '1' + elsif printer_setting.unique_code == 'OrderItemCustomisePdf' unique_code="OrderItemCustomisePdf" - else - unique_code="OrderItemPdf" end end end end - + assigned_item_id = params[:id] options = params[:options] assigned_item = AssignedOrderItem.find(assigned_item_id) @@ -59,26 +51,19 @@ class Oqs::PrintController < ApplicationController def print_order_summary if ENV["SERVER_MODE"] != "cloud" #no print in cloud server order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + printer = PrintSetting.all unique_code="OrderSummaryPdf" 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' + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderSummaryPdf' + unique_code="OrderSummaryPdf" + elsif printer_setting.unique_code == 'OrderSummarySlimPdf' unique_code="OrderSummarySlimPdf" - else - unique_code="OrderSummaryPdf" - end - elsif order_summary_slim[0] == 'OrderSetPdf' - if order_summary_slim[1] == '1' + elsif printer_setting.unique_code == 'OrderSummarySetPdf' unique_code="OrderSummarySetPdf" - else - unique_code="OrderSummaryPdf" - end - elsif order_summary_slim[0] == 'OrderCustomisePdf' - if order_summary_slim[1] == '1' + elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' unique_code="OrderSummaryCustomisePdf" - else - unique_code="OrderSummaryPdf" end end end diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 54435658..0f67349f 100755 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -207,31 +207,21 @@ class OrderQueueStation < ApplicationRecord private #Print order_items in 1 slip def print_slip(oqs, order, order_items) - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + printer = PrintSetting.all unique_code="OrderSummaryPdf" - 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' - unique_code="OrderSummarySlimPdf" - else - unique_code="OrderSummaryPdf" - end - elsif order_summary_slim[0] == 'OrderSetPdf' - if order_summary_slim[1] == '1' - unique_code="OrderSummarySetPdf" - else - unique_code="OrderSummaryPdf" - end - elsif order_summary_slim[0] == 'OrderCustomisePdf' - if order_summary_slim[1] == '1' - unique_code="OrderSummaryCustomisePdf" - else - unique_code="OrderSummaryPdf" - end - end + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderSummaryPdf' + unique_code="OrderSummaryPdf" + elsif printer_setting.unique_code == 'OrderSummarySlimPdf' + unique_code="OrderSummarySlimPdf" + elsif printer_setting.unique_code == 'OrderSummarySetPdf' + unique_code="OrderSummarySetPdf" + elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' + unique_code="OrderSummaryCustomisePdf" + end end - end + end print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) @@ -247,31 +237,21 @@ class OrderQueueStation < ApplicationRecord #Print order_item in 1 slip per item def print_slip_item(oqs, order, assigned_items) - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + printer = PrintSetting.all unique_code="OrderItemPdf" - 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' - unique_code="OrderItemSlimPdf" - else - unique_code="OrderItemPdf" - end - elsif order_item_slim[0] == 'OrderSetPdf' - if order_item_slim[1] == '1' - unique_code="OrderSetItemPdf" - else - unique_code="OrderItemPdf" - end - elsif order_item_slim[0] == 'OrderCustomisePdf' - if order_item_slim[1] == '1' - unique_code="OrderItemCustomisePdf" - else - unique_code="OrderItemPdf" - end - end + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderItemPdf' + unique_code="OrderItemPdf" + elsif printer_setting.unique_code == 'OrderItemSlimPdf' + unique_code="OrderItemSlimPdf" + elsif printer_setting.unique_code == 'OrderSetItemPdf' + unique_code="OrderSetItemPdf" + elsif printer_setting.unique_code == 'OrderItemCustomisePdf' + unique_code="OrderItemCustomisePdf" + end end - end + end # order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first() # print when complete click diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index f00d898f..e4e493b7 100755 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -15,52 +15,43 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + print_setting = PrintSetting.all + # check for item not to show - # if order_item[0].price != 0 - 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,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) - else - pdf = OrderItemPdf.new(print_settings,order_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,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) - else - pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) - end - elsif order_item_slim[0] == 'OrderCustomisePdf' - if order_item_slim[1] == '1' - pdf = OrderItemCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) - else - pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) - end + if order_item[0].price != 0 + if !print_setting.empty? + print_setting.each do |print_settings| + if print_settings.unique_code == 'OrderItemPdf' + pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) + elsif print_settings.unique_code == 'OrderItemSlimPdf' + pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) + elsif print_settings.unique_code == 'OrderSetItemPdf' + pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) + elsif print_settings.unique_code == 'OrderItemCustomisePdf' + pdf = OrderItemCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) end end end + end - pdf.render_file filename + pdf.render_file filename - if oqs.print_copy - #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" - self.print(filename, oqs.printer_name) - end - #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! - #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" - self.print(filename, oqs.printer_name) - end - end - # end + if oqs.print_copy + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end + #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! + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end + end end # Query for per order @@ -74,8 +65,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker print_settings.save! end - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf - + print_setting = PrintSetting.all order=print_query('order_summary', order_id) # For Print Per Item if oqs.cut_per_item @@ -88,30 +78,21 @@ 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,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,before_updated_qty) - else - 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,before_updated_qty) - else - pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) - end - elsif order_item_slim[0] == 'OrderCustomisePdf' - if order_item_slim[1] == '1' - pdf = OrderItemCustomisePdf.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,before_updated_qty) - end + pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) + if !print_setting.empty? + print_setting.each do |print_settings| + if print_settings.unique_code == 'OrderItemPdf' + pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderItemSlimPdf' + pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderSetItemPdf' + pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderItemCustomisePdf' + pdf = OrderItemCustomisePdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) end end - end + end + # pdf.render_file "tmp/order_item.pdf" pdf.render_file filename if oqs.print_copy @@ -134,29 +115,19 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker else filename = "tmp/order_summary_#{order_id}" + ".pdf" 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,before_updated_qty) - else - 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,before_updated_qty) - else - pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) - end - elsif order_summary_slim[0] == 'OrderCustomisePdf' - if order_summary_slim[1] == '1' - pdf = OrderSummaryCustomisePdf.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,before_updated_qty) - end + if !print_setting.empty? + print_setting.each do |print_settings| + if print_settings.unique_code == 'OrderSummaryPdf' + pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderSummarySlimPdf' + pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderSummarySetPdf' + pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderSummaryCustomisePdf' + pdf = OrderSummaryCustomisePdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) end end - end + end pdf.render_file filename if oqs.print_copy @@ -186,7 +157,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker print_settings.save! end - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + print_setting = PrintSetting.all order=print_query('booking_summary', booking_id) # For Print Per Item @@ -199,29 +170,19 @@ 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,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,before_updated_qty) - else - 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,before_updated_qty) - else - pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) - end - elsif order_item_slim[0] == 'OrderCustomisePdf' - if order_item_slim[1] == '1' - pdf = OrderItemCustomisePdf.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,before_updated_qty) - end + if !print_setting.empty? + print_setting.each do |print_settings| + if print_settings.unique_code == 'OrderItemPdf' + pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderItemSlimPdf' + pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderSetItemPdf' + pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderItemCustomisePdf' + pdf = OrderItemCustomisePdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) end end - end + end pdf.render_file filename if oqs.print_copy @@ -246,29 +207,19 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker else filename = "tmp/booking_summary_#{booking_id}" + ".pdf" 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,before_updated_qty) - else - 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,before_updated_qty) - else - pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) - end - elsif order_summary_slim[0] == 'OrderCustomisePdf' - if order_summary_slim[1] == '1' - pdf = OrderSummaryCustomisePdf.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,before_updated_qty) - end + if !print_setting.empty? + print_setting.each do |print_settings| + if print_settings.unique_code == 'OrderSummaryPdf' + pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderSummarySlimPdf' + pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderSummarySetPdf' + pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderSummaryCustomisePdf' + pdf = OrderSummaryCustomisePdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) end end - end + end 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 b9a693aa..24ac1259 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -4,31 +4,21 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker #Use CUPS service #Generate PDF #Print - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + printer = PrintSetting.all pdf = OrderItemPdf.new - 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 - else - pdf = OrderItemPdf.new - end - elsif order_item_slim[0] == 'OrderSetPdf' - if order_item_slim[1] == '1' - pdf = OrderSetItemPdf.new - else - pdf = OrderItemPdf.new - end - elsif order_item_slim[0] == 'OrderCustomisePdf' - if order_item_slim[1] == '1' - pdf = OrderItemCustomisePdf.new - else - pdf = OrderItemPdf.new - end - end + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderItemPdf' + pdf = OrderItemPdf.new + elsif printer_setting.unique_code == 'OrderItemSlimPdf' + pdf = OrderItemSlimPdf.new + elsif printer_setting.unique_code == 'OrderSetItemPdf' + pdf = OrderSetItemPdf.new + elsif printer_setting.unique_code == 'OrderItemCustomisePdf' + pdf = OrderItemCustomisePdf.new + end end - end + end pdf.render_file "tmp/order_item_queue_#{order_id}_#{order_item_id}" + ".pdf" #no print in cloud server if ENV["SERVER_MODE"] != "cloud" @@ -41,31 +31,21 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker #Generate PDF #Print filename = "tmp/order_summary_#{booking_id}" + ".pdf" - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + printer = PrintSetting.all pdf = OrderSummaryPdf.new - 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 - else - pdf = OrderSummaryPdf.new - end - elsif order_summary_slim[0] == 'OrderSetPdf' - if order_summary_slim[1] == '1' - pdf = OrderSummarySetPdf.new - else - pdf = OrderSummaryPdf.new - end - elsif order_summary_slim[0] == 'OrderCustomisePdf' - if order_summary_slim[1] == '1' - pdf = OrderSummaryCustomisePdf.new - else - pdf = OrderSummaryPdf.new - end - end + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderSummaryPdf' + pdf = OrderSummaryPdf.new + elsif printer_setting.unique_code == 'OrderSummarySlimPdf' + pdf = OrderSummarySlimPdf.new + elsif printer_setting.unique_code == 'OrderSummarySetPdf' + pdf = OrderSummarySetPdf.new + elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' + pdf = OrderSummaryCustomisePdf.new + end end - end + end pdf.render_file filename #no print in cloud server if ENV["SERVER_MODE"] != "cloud" @@ -77,32 +57,22 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker #Use CUPS service #Generate PDF #Print - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + printer = PrintSetting.all filename = "tmp/order_summary_#{booking_id}" + ".pdf" pdf = OrderSummaryPdf.new - 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 - else - pdf = OrderSummaryPdf.new - end - elsif order_summary_slim[0] == 'OrderSetPdf' - if order_summary_slim[1] == '1' - pdf = OrderSummarySetPdf.new - else - pdf = OrderSummaryPdf.new - end - elsif order_summary_slim[0] == 'OrderCustomisePdf' - if order_summary_slim[1] == '1' - pdf = OrderSummaryCustomisePdf.new - else - pdf = OrderSummaryPdf.new - end - end + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderSummaryPdf' + pdf = OrderSummaryPdf.new + elsif printer_setting.unique_code == 'OrderSummarySlimPdf' + pdf = OrderSummarySlimPdf.new + elsif printer_setting.unique_code == 'OrderSummarySetPdf' + pdf = OrderSummarySetPdf.new + elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' + pdf = OrderSummaryCustomisePdf.new + end end - end + end pdf.render_file filename #no print in cloud server if ENV["SERVER_MODE"] != "cloud" @@ -114,32 +84,22 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker #Use CUPS service #Generate PDF #Print - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + printer = PrintSetting.all filename = "tmp/order_summary_#{booking_id}" + ".pdf" pdf = OrderSummaryPdf.new - 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 - else - pdf = OrderSummaryPdf.new - end - elsif order_summary_slim[0] == 'OrderSetPdf' - if order_summary_slim[1] == '1' - pdf = OrderSummarySetPdf.new - else - pdf = OrderSummaryPdf.new - end - elsif order_summary_slim[0] == 'OrderCustomisePdf' - if order_summary_slim[1] == '1' - pdf = OrderSummaryCustomisePdf.new - else - pdf = OrderSummaryPdf.new - end - end + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderSummaryPdf' + pdf = OrderSummaryPdf.new + elsif printer_setting.unique_code == 'OrderSummarySlimPdf' + pdf = OrderSummarySlimPdf.new + elsif printer_setting.unique_code == 'OrderSummarySetPdf' + pdf = OrderSummarySetPdf.new + elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' + pdf = OrderSummaryCustomisePdf.new + end end - end + end pdf.render_file filename #no print in cloud server if ENV["SERVER_MODE"] != "cloud" @@ -151,32 +111,22 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker #Use CUPS service #Generate PDF #Print - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + printer = PrintSetting.all filename = "tmp/order_summary_#{booking_id}" + ".pdf" pdf = OrderSummaryPdf.new - 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 - else - pdf = OrderSummaryPdf.new - end - elsif order_summary_slim[0] == 'OrderSetPdf' - if order_summary_slim[1] == '1' - pdf = OrderSummarySetPdf.new - else - pdf = OrderSummaryPdf.new - end - elsif order_summary_slim[0] == 'OrderCustomisePdf' - if order_summary_slim[1] == '1' - pdf = OrderSummaryCustomisePdf.new - else - pdf = OrderSummaryPdf.new - end - end + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderSummaryPdf' + pdf = OrderSummaryPdf.new + elsif printer_setting.unique_code == 'OrderSummarySlimPdf' + pdf = OrderSummarySlimPdf.new + elsif printer_setting.unique_code == 'OrderSummarySetPdf' + pdf = OrderSummarySetPdf.new + elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' + pdf = OrderSummaryCustomisePdf.new + end end - end + end pdf.render_file filename #no print in cloud server if ENV["SERVER_MODE"] != "cloud" @@ -188,32 +138,22 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker #Use CUPS service #Generate PDF #Print - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + printer = PrintSetting.all filename = "tmp/order_summary_#{booking_id}" + ".pdf" pdf = OrderSummaryPdf.new - 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 - else - pdf = OrderSummaryPdf.new - end - elsif order_summary_slim[0] == 'OrderSetPdf' - if order_summary_slim[1] == '1' - pdf = OrderSummarySetPdf.new - else - pdf = OrderSummaryPdf.new - end - elsif order_summary_slim[0] == 'OrderCustomisePdf' - if order_summary_slim[1] == '1' - pdf = OrderSummaryCustomisePdf.new - else - pdf = OrderSummaryPdf.new - end - end + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'OrderSummaryPdf' + pdf = OrderSummaryPdf.new + elsif printer_setting.unique_code == 'OrderSummarySlimPdf' + pdf = OrderSummarySlimPdf.new + elsif printer_setting.unique_code == 'OrderSummarySetPdf' + pdf = OrderSummarySetPdf.new + elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' + pdf = OrderSummaryCustomisePdf.new + end end - end + end pdf.render_file filename #no print in cloud server if ENV["SERVER_MODE"] != "cloud"