conflict data

This commit is contained in:
phyusin
2018-05-28 10:46:04 +06:30
8 changed files with 347 additions and 8 deletions

View File

@@ -6,6 +6,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
#Print
printer = PrintSetting.all
pdf = OrderItemPdf.new
if !printer.empty?
printer.each do |printer_setting|
if printer_setting.unique_code == 'OrderItemPdf'
@@ -17,7 +18,9 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
pdf = OrderItemCustomisePdf.new
elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
pdf = OrderSetItemCustomisePdf.new
pdf = OrderSetItemCustomisePdf.new
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
pdf = OrderItemSlimCustomisePdf.new
end
end
end
@@ -35,6 +38,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
filename = "tmp/order_summary_#{booking_id}" + ".pdf"
printer = PrintSetting.all
pdf = OrderSummaryPdf.new
if !printer.empty?
printer.each do |printer_setting|
if printer_setting.unique_code == 'OrderSummaryPdf'
@@ -47,6 +51,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
pdf = OrderSummaryCustomisePdf.new
elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
pdf = OrderSummarySetCustomisePdf.new
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
pdf = OrderSummarySlimCustomisePdf.new
end
end
end
@@ -75,7 +81,9 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
pdf = OrderSummaryCustomisePdf.new
elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
pdf = OrderSummarySetCustomisePdf.new
pdf = OrderSummarySetCustomisePdf.new
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
pdf = OrderSummarySlimCustomisePdf.new
end
end
end
@@ -105,6 +113,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
pdf = OrderSummaryCustomisePdf.new
elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
pdf = OrderSummarySetCustomisePdf.new
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
pdf = OrderSummarySlimCustomisePdf.new
end
end
end
@@ -133,7 +143,9 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
pdf = OrderSummaryCustomisePdf.new
elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
pdf = OrderSummarySetCustomisePdf.new
pdf = OrderSummarySetCustomisePdf.new
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
pdf = OrderSummarySlimCustomisePdf.new
end
end
end
@@ -162,7 +174,9 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
pdf = OrderSummaryCustomisePdf.new
elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
pdf = OrderSummarySetCustomisePdf.new
pdf = OrderSummarySetCustomisePdf.new
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
pdf = OrderSummarySlimCustomisePdf.new
end
end
end