conflit modified changes
This commit is contained in:
38
README.md
38
README.md
@@ -39,19 +39,26 @@ For Extra Time
|
|||||||
* must start with 'Ext'[a..z]'_'[1..100]
|
* must start with 'Ext'[a..z]'_'[1..100]
|
||||||
* note : don't add character after '_'
|
* note : don't add character after '_'
|
||||||
|
|
||||||
For Order Item & Order Summary Slim
|
For Order Printing
|
||||||
*** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf
|
1)) ********* Order Pdf *********
|
||||||
1) settings/print_settings
|
1) settings/print_settings
|
||||||
(a) Font is present => {Header font size:11, Item Font Size:9}
|
(a) Unique Code => OrderItemPdf & OrderSummaryPdf
|
||||||
(b) Font is blank => {Header font size:12, Item Font Size:10}
|
(b) Font is present => {Header font size:11, Item Font Size:9}
|
||||||
2) settings/lookups => { type:print_settings, name:OrderSlimPdf, value:1 }
|
Font is blank => {Header font size:12, Item Font Size:10}
|
||||||
* no need to change these files
|
2)) ********* Order Set Pdf *********
|
||||||
{ app/controllers/oqs/edit_controller.rb
|
1) settings/print_settings
|
||||||
app/controllers/oqs/print_controller.rb
|
(a) Unique Code => OrderSetItemPdf & OrderSummarySetPdf
|
||||||
app/models/order_queue_station.rb
|
(b) Font is present => {Header font size:11, Item Font Size:9}
|
||||||
app/models/printer/order_queue_printer.rb
|
Font is blank => {Header font size:12, Item Font Size:10}
|
||||||
app/models/printer/receipt_printer.rb
|
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
|
For ReceiptBillA5Pdf
|
||||||
*** change ReceiptBillPdf to ReceiptBillA5Pdf
|
*** change ReceiptBillPdf to ReceiptBillA5Pdf
|
||||||
@@ -61,13 +68,6 @@ For ReceiptBillA5Pdf
|
|||||||
For ReceiptBillAltName options
|
For ReceiptBillAltName options
|
||||||
1) settings/lookups => { type:print_settings, name:ReceiptBillAltName, value:1 }
|
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
|
For Bank Integration setting
|
||||||
1) rake db:migrate for card_sale_trans, card_settle_trans
|
1) rake db:migrate for card_sale_trans, card_settle_trans
|
||||||
2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 }
|
2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 }
|
||||||
|
|||||||
@@ -230,28 +230,22 @@ class Api::OrdersController < Api::ApiController
|
|||||||
# order queue stations
|
# order queue stations
|
||||||
oqs = assign_item.order_queue_station
|
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"
|
unique_code="OrderItemPdf"
|
||||||
if !order_slim_pdf.empty?
|
if !order_slim_pdf.empty?
|
||||||
order_slim_pdf.each do |order_item_slim|
|
if !printer.empty?
|
||||||
if order_item_slim[0] == 'OrderSlimPdf'
|
printer.each do |printer_setting|
|
||||||
if order_item_slim[1] == '1'
|
if printer_setting.unique_code == 'OrderItemPdf'
|
||||||
|
unique_code="OrderItemPdf"
|
||||||
|
elsif printer_setting.unique_code == 'OrderItemSlimPdf'
|
||||||
unique_code="OrderItemSlimPdf"
|
unique_code="OrderItemSlimPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSetItemPdf'
|
||||||
unique_code="OrderItemPdf"
|
|
||||||
end
|
|
||||||
elsif order_item_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
unique_code="OrderSetItemPdf"
|
unique_code="OrderSetItemPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
|
||||||
unique_code="OrderItemPdf"
|
|
||||||
end
|
|
||||||
elsif order_item_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
unique_code="OrderItemSlimCustomisePdf"
|
unique_code="OrderItemSlimCustomisePdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
|
||||||
unique_code="OrderItemPdf"
|
unique_code="OrderItemCustomisePdf"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -48,29 +48,21 @@ class Oqs::EditController < BaseOqsController
|
|||||||
# order queue stations
|
# order queue stations
|
||||||
oqs = assign_item.order_queue_station
|
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"
|
unique_code="OrderItemPdf"
|
||||||
if !order_slim_pdf.empty?
|
if !printer.empty?
|
||||||
order_slim_pdf.each do |order_item_slim|
|
printer.each do |printer_setting|
|
||||||
if order_item_slim[0] == 'OrderSlimPdf'
|
if printer_setting.unique_code == 'OrderItemPdf'
|
||||||
if order_item_slim[1] == '1'
|
unique_code="OrderItemPdf"
|
||||||
|
elsif printer_setting.unique_code == 'OrderItemSlimPdf'
|
||||||
unique_code="OrderItemSlimPdf"
|
unique_code="OrderItemSlimPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSetItemPdf'
|
||||||
unique_code="OrderItemPdf"
|
|
||||||
end
|
|
||||||
elsif order_item_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
unique_code="OrderSetItemPdf"
|
unique_code="OrderSetItemPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
|
||||||
unique_code="OrderItemPdf"
|
unique_code="OrderItemCustomisePdf"
|
||||||
end
|
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
|
||||||
elsif order_item_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
unique_code="OrderItemSlimCustomisePdf"
|
unique_code="OrderItemSlimCustomisePdf"
|
||||||
else
|
|
||||||
unique_code="OrderItemPdf"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -4,27 +4,21 @@ class Oqs::PrintController < ApplicationController
|
|||||||
def print
|
def print
|
||||||
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
|
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
|
||||||
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
|
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
|
||||||
|
printer = PrintSetting.all
|
||||||
unique_code="OrderItemPdf"
|
unique_code="OrderItemPdf"
|
||||||
|
|
||||||
if !order_slim_pdf.empty?
|
if !order_slim_pdf.empty?
|
||||||
order_slim_pdf.each do |order_item_slim|
|
if !printer.empty?
|
||||||
if order_item_slim[0] == 'OrderSlimPdf'
|
printer.each do |printer_setting|
|
||||||
if order_item_slim[1] == '1'
|
if printer_setting.unique_code == 'OrderItemPdf'
|
||||||
|
unique_code="OrderItemPdf"
|
||||||
|
elsif printer_setting.unique_code == 'OrderItemSlimPdf'
|
||||||
unique_code="OrderItemSlimPdf"
|
unique_code="OrderItemSlimPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSetItemPdf'
|
||||||
unique_code="OrderItemPdf"
|
|
||||||
end
|
|
||||||
elsif order_item_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
unique_code="OrderSetItemPdf"
|
unique_code="OrderSetItemPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
|
||||||
unique_code="OrderItemPdf"
|
unique_code="OrderItemCustomisePdf"
|
||||||
end
|
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
|
||||||
elsif order_item_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
unique_code="OrderItemSlimCustomisePdf"
|
unique_code="OrderItemSlimCustomisePdf"
|
||||||
else
|
|
||||||
unique_code="OrderItemPdf"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -59,26 +53,21 @@ class Oqs::PrintController < ApplicationController
|
|||||||
def print_order_summary
|
def print_order_summary
|
||||||
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
|
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
|
||||||
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
|
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
|
||||||
|
printer = PrintSetting.all
|
||||||
unique_code="OrderSummaryPdf"
|
unique_code="OrderSummaryPdf"
|
||||||
if !order_slim_pdf.empty?
|
if !order_slim_pdf.empty?
|
||||||
order_slim_pdf.each do |order_summary_slim|
|
if !printer.empty?
|
||||||
if order_summary_slim[0] == 'OrderSlimPdf'
|
printer.each do |printer_setting|
|
||||||
if order_summary_slim[1] == '1'
|
if printer_setting.unique_code == 'OrderSummaryPdf'
|
||||||
|
unique_code="OrderSummaryPdf"
|
||||||
|
elsif printer_setting.unique_code == 'OrderSummarySlimPdf'
|
||||||
unique_code="OrderSummarySlimPdf"
|
unique_code="OrderSummarySlimPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummarySetPdf'
|
||||||
unique_code="OrderSummaryPdf"
|
|
||||||
end
|
|
||||||
elsif order_summary_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
unique_code="OrderSummarySetPdf"
|
unique_code="OrderSummarySetPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
|
||||||
unique_code="OrderSummaryPdf"
|
unique_code="OrderSummaryCustomisePdf"
|
||||||
end
|
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
|
||||||
elsif order_summary_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
unique_code="OrderSummarySlimCustomisePdf"
|
unique_code="OrderSummarySlimCustomisePdf"
|
||||||
else
|
|
||||||
unique_code="OrderSummaryPdf"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -207,28 +207,21 @@ class OrderQueueStation < ApplicationRecord
|
|||||||
private
|
private
|
||||||
#Print order_items in 1 slip
|
#Print order_items in 1 slip
|
||||||
def print_slip(oqs, order, order_items)
|
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"
|
unique_code="OrderSummaryPdf"
|
||||||
if !order_slim_pdf.empty?
|
|
||||||
order_slim_pdf.each do |order_summary_slim|
|
if !printer.empty?
|
||||||
if order_summary_slim[0] == 'OrderSlimPdf'
|
printer.each do |printer_setting|
|
||||||
if order_summary_slim[1] == '1'
|
if printer_setting.unique_code == 'OrderSummaryPdf'
|
||||||
|
unique_code="OrderSummaryPdf"
|
||||||
|
elsif printer_setting.unique_code == 'OrderSummarySlimPdf'
|
||||||
unique_code="OrderSummarySlimPdf"
|
unique_code="OrderSummarySlimPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummarySetPdf'
|
||||||
unique_code="OrderSummaryPdf"
|
|
||||||
end
|
|
||||||
elsif order_summary_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
unique_code="OrderSummarySetPdf"
|
unique_code="OrderSummarySetPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
|
||||||
unique_code="OrderSummaryPdf"
|
unique_code="OrderSummaryCustomisePdf"
|
||||||
end
|
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
|
||||||
elsif order_summary_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
unique_code="OrderSummarySlimCustomisePdf"
|
unique_code="OrderSummarySlimCustomisePdf"
|
||||||
else
|
|
||||||
unique_code="OrderSummaryPdf"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -247,28 +240,21 @@ class OrderQueueStation < ApplicationRecord
|
|||||||
|
|
||||||
#Print order_item in 1 slip per item
|
#Print order_item in 1 slip per item
|
||||||
def print_slip_item(oqs, order, assigned_items)
|
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"
|
unique_code="OrderItemPdf"
|
||||||
if !order_slim_pdf.empty?
|
|
||||||
order_slim_pdf.each do |order_item_slim|
|
if !printer.empty?
|
||||||
if order_item_slim[0] == 'OrderSlimPdf'
|
printer.each do |printer_setting|
|
||||||
if order_item_slim[1] == '1'
|
if printer_setting.unique_code == 'OrderItemPdf'
|
||||||
|
unique_code="OrderItemPdf"
|
||||||
|
elsif printer_setting.unique_code == 'OrderItemSlimPdf'
|
||||||
unique_code="OrderItemSlimPdf"
|
unique_code="OrderItemSlimPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSetItemPdf'
|
||||||
unique_code="OrderItemPdf"
|
|
||||||
end
|
|
||||||
elsif order_item_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
unique_code="OrderSetItemPdf"
|
unique_code="OrderSetItemPdf"
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
|
||||||
unique_code="OrderItemPdf"
|
unique_code="OrderItemCustomisePdf"
|
||||||
end
|
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
|
||||||
elsif order_item_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
unique_code="OrderItemSlimCustomisePdf"
|
unique_code="OrderItemSlimCustomisePdf"
|
||||||
else
|
|
||||||
unique_code="OrderItemPdf"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -15,28 +15,23 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
|
|||||||
filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf"
|
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)
|
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
|
# check for item not to show
|
||||||
# if order_item[0].price != 0
|
|
||||||
if !order_slim_pdf.empty?
|
if order_item[0].price != 0
|
||||||
order_slim_pdf.each do |order_item_slim|
|
if !print_setting.empty?
|
||||||
if order_item_slim[0] == 'OrderSlimPdf'
|
print_setting.each do |print_settings|
|
||||||
if order_item_slim[1] == '1'
|
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)
|
pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
|
||||||
else
|
elsif print_settings.unique_code == 'OrderSetItemPdf'
|
||||||
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)
|
pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
|
||||||
else
|
elsif print_settings.unique_code == 'OrderItemCustomisePdf'
|
||||||
pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
|
pdf = OrderItemCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
|
||||||
end
|
elsif print_settings.unique_code == 'OrderItemSlimCustomisePdf'
|
||||||
elsif order_item_slim[0] == 'OrderSlimCustomisePdf'
|
pdf = OrderItemSlimCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
pdf = OrderItemSlimCustomisePdf.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
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -60,7 +55,6 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
|
|||||||
self.print(filename, oqs.printer_name)
|
self.print(filename, oqs.printer_name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
# end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Query for per order
|
# Query for per order
|
||||||
@@ -74,8 +68,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
|
|||||||
print_settings.save!
|
print_settings.save!
|
||||||
end
|
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)
|
order=print_query('order_summary', order_id)
|
||||||
# For Print Per Item
|
# For Print Per Item
|
||||||
if oqs.cut_per_item
|
if oqs.cut_per_item
|
||||||
@@ -89,29 +82,22 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
|
|||||||
# check for item not to show
|
# check for item not to show
|
||||||
#if odi.price != 0
|
#if odi.price != 0
|
||||||
pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
|
pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
|
||||||
if !order_slim_pdf.empty?
|
if !print_setting.empty?
|
||||||
order_slim_pdf.each do |order_item_slim|
|
print_setting.each do |print_settings|
|
||||||
if order_item_slim[0] == 'OrderSlimPdf'
|
if print_settings.unique_code == 'OrderItemPdf'
|
||||||
if order_item_slim[1] == '1'
|
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)
|
pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
|
||||||
else
|
elsif print_settings.unique_code == 'OrderSetItemPdf'
|
||||||
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)
|
pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
|
||||||
else
|
elsif print_settings.unique_code == 'OrderItemCustomisePdf'
|
||||||
pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
|
pdf = OrderItemCustomisePdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
|
||||||
end
|
elsif print_settings.unique_code == 'OrderItemSlimCustomisePdf'
|
||||||
elsif order_item_slim[0] == 'OrderSlimCustomisePdf'
|
pdf = OrderItemSlimCustomisePdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
pdf = OrderItemSlimCustomisePdf.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
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# pdf.render_file "tmp/order_item.pdf"
|
# pdf.render_file "tmp/order_item.pdf"
|
||||||
pdf.render_file filename
|
pdf.render_file filename
|
||||||
if oqs.print_copy
|
if oqs.print_copy
|
||||||
@@ -134,26 +120,18 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
|
|||||||
else
|
else
|
||||||
filename = "tmp/order_summary_#{order_id}" + ".pdf"
|
filename = "tmp/order_summary_#{order_id}" + ".pdf"
|
||||||
pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
|
pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
|
||||||
if !order_slim_pdf.empty?
|
if !print_setting.empty?
|
||||||
order_slim_pdf.each do |order_summary_slim|
|
print_setting.each do |print_settings|
|
||||||
if order_summary_slim[0] == 'OrderSlimPdf'
|
if print_settings.unique_code == 'OrderSummaryPdf'
|
||||||
if order_summary_slim[1] == '1'
|
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)
|
pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
|
||||||
else
|
elsif print_settings.unique_code == 'OrderSummarySetPdf'
|
||||||
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)
|
pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
|
||||||
else
|
elsif print_settings.unique_code == 'OrderSummaryCustomisePdf'
|
||||||
pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
|
pdf = OrderSummaryCustomisePdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
|
||||||
end
|
elsif print_settings.unique_code == 'OrderSummarySlimCustomisePdf'
|
||||||
elsif order_summary_slim[0] == 'OrderSlimCustomisePdf'
|
pdf = OrderSummarySlimCustomisePdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySlimCustomisePdf.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
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -186,7 +164,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
|
|||||||
print_settings.save!
|
print_settings.save!
|
||||||
end
|
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)
|
order=print_query('booking_summary', booking_id)
|
||||||
# For Print Per Item
|
# For Print Per Item
|
||||||
@@ -199,26 +177,18 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
|
|||||||
# check for item not to show
|
# check for item not to show
|
||||||
#if odi.price != 0
|
#if odi.price != 0
|
||||||
pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
|
pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
|
||||||
if !order_slim_pdf.empty?
|
if !print_setting.empty?
|
||||||
order_slim_pdf.each do |order_item_slim|
|
print_setting.each do |print_settings|
|
||||||
if order_item_slim[0] == 'OrderSlimPdf'
|
if print_settings.unique_code == 'OrderItemPdf'
|
||||||
if order_item_slim[1] == '1'
|
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)
|
pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
|
||||||
else
|
elsif print_settings.unique_code == 'OrderSetItemPdf'
|
||||||
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)
|
pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
|
||||||
else
|
elsif print_settings.unique_code == 'OrderItemCustomisePdf'
|
||||||
pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
|
pdf = OrderItemCustomisePdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
|
||||||
end
|
elsif print_settings.unique_code == 'OrderItemSlimCustomisePdf'
|
||||||
elsif order_item_slim[0] == 'OrderSlimCustomisePdf'
|
pdf = OrderItemSlimCustomisePdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
pdf = OrderItemSlimCustomisePdf.new(print_settings, odi, 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
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -246,26 +216,19 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
|
|||||||
else
|
else
|
||||||
filename = "tmp/booking_summary_#{booking_id}" + ".pdf"
|
filename = "tmp/booking_summary_#{booking_id}" + ".pdf"
|
||||||
pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
|
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 !print_setting.empty?
|
||||||
if order_summary_slim[0] == 'OrderSlimPdf'
|
print_setting.each do |print_settings|
|
||||||
if order_summary_slim[1] == '1'
|
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)
|
pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
|
||||||
else
|
elsif print_settings.unique_code == 'OrderSummarySetPdf'
|
||||||
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)
|
pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
|
||||||
else
|
elsif print_settings.unique_code == 'OrderSummaryCustomisePdf'
|
||||||
pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
|
pdf = OrderSummaryCustomisePdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
|
||||||
end
|
elsif print_settings.unique_code == 'OrderSummarySlimCustomisePdf'
|
||||||
elsif order_summary_slim[0] == 'OrderSlimCustomisePdf'
|
pdf = OrderSummarySlimCustomisePdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySlimCustomisePdf.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
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -4,28 +4,21 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
|
|||||||
#Use CUPS service
|
#Use CUPS service
|
||||||
#Generate PDF
|
#Generate PDF
|
||||||
#Print
|
#Print
|
||||||
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
|
printer = PrintSetting.all
|
||||||
pdf = OrderItemPdf.new
|
pdf = OrderItemPdf.new
|
||||||
if !order_slim_pdf.empty?
|
|
||||||
order_slim_pdf.each do |order_item_slim|
|
if !printer.empty?
|
||||||
if order_item_slim[0] == 'OrderSlimPdf'
|
printer.each do |printer_setting|
|
||||||
if order_item_slim[1] == '1'
|
if printer_setting.unique_code == 'OrderItemPdf'
|
||||||
|
pdf = OrderItemPdf.new
|
||||||
|
elsif printer_setting.unique_code == 'OrderItemSlimPdf'
|
||||||
pdf = OrderItemSlimPdf.new
|
pdf = OrderItemSlimPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSetItemPdf'
|
||||||
pdf = OrderItemPdf.new
|
|
||||||
end
|
|
||||||
elsif order_item_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
pdf = OrderSetItemPdf.new
|
pdf = OrderSetItemPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
|
||||||
pdf = OrderItemPdf.new
|
pdf = OrderItemCustomisePdf.new
|
||||||
end
|
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
|
||||||
elsif order_item_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_item_slim[1] == '1'
|
|
||||||
pdf = OrderItemSlimCustomisePdf.new
|
pdf = OrderItemSlimCustomisePdf.new
|
||||||
else
|
|
||||||
pdf = OrderItemPdf.new
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -41,28 +34,21 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
|
|||||||
#Generate PDF
|
#Generate PDF
|
||||||
#Print
|
#Print
|
||||||
filename = "tmp/order_summary_#{booking_id}" + ".pdf"
|
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
|
pdf = OrderSummaryPdf.new
|
||||||
if !order_slim_pdf.empty?
|
|
||||||
order_slim_pdf.each do |order_summary_slim|
|
if !printer.empty?
|
||||||
if order_summary_slim[0] == 'OrderSlimPdf'
|
printer.each do |printer_setting|
|
||||||
if order_summary_slim[1] == '1'
|
if printer_setting.unique_code == 'OrderSummaryPdf'
|
||||||
|
pdf = OrderSummaryPdf.new
|
||||||
|
elsif printer_setting.unique_code == 'OrderSummarySlimPdf'
|
||||||
pdf = OrderSummarySlimPdf.new
|
pdf = OrderSummarySlimPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummarySetPdf'
|
||||||
pdf = OrderSummaryPdf.new
|
|
||||||
end
|
|
||||||
elsif order_summary_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySetPdf.new
|
pdf = OrderSummarySetPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
|
||||||
pdf = OrderSummaryPdf.new
|
pdf = OrderSummaryCustomisePdf.new
|
||||||
end
|
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
|
||||||
elsif order_summary_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySlimCustomisePdf.new
|
pdf = OrderSummarySlimCustomisePdf.new
|
||||||
else
|
|
||||||
pdf = OrderSummaryPdf.new
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -77,29 +63,21 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
|
|||||||
#Use CUPS service
|
#Use CUPS service
|
||||||
#Generate PDF
|
#Generate PDF
|
||||||
#Print
|
#Print
|
||||||
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
|
printer = PrintSetting.all
|
||||||
filename = "tmp/order_summary_#{booking_id}" + ".pdf"
|
filename = "tmp/order_summary_#{booking_id}" + ".pdf"
|
||||||
pdf = OrderSummaryPdf.new
|
pdf = OrderSummaryPdf.new
|
||||||
if !order_slim_pdf.empty?
|
if !printer.empty?
|
||||||
order_slim_pdf.each do |order_summary_slim|
|
printer.each do |printer_setting|
|
||||||
if order_summary_slim[0] == 'OrderSlimPdf'
|
if printer_setting.unique_code == 'OrderSummaryPdf'
|
||||||
if order_summary_slim[1] == '1'
|
pdf = OrderSummaryPdf.new
|
||||||
|
elsif printer_setting.unique_code == 'OrderSummarySlimPdf'
|
||||||
pdf = OrderSummarySlimPdf.new
|
pdf = OrderSummarySlimPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummarySetPdf'
|
||||||
pdf = OrderSummaryPdf.new
|
|
||||||
end
|
|
||||||
elsif order_summary_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySetPdf.new
|
pdf = OrderSummarySetPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
|
||||||
pdf = OrderSummaryPdf.new
|
pdf = OrderSummaryCustomisePdf.new
|
||||||
end
|
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
|
||||||
elsif order_summary_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySlimCustomisePdf.new
|
pdf = OrderSummarySlimCustomisePdf.new
|
||||||
else
|
|
||||||
pdf = OrderSummaryPdf.new
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -114,29 +92,21 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
|
|||||||
#Use CUPS service
|
#Use CUPS service
|
||||||
#Generate PDF
|
#Generate PDF
|
||||||
#Print
|
#Print
|
||||||
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
|
printer = PrintSetting.all
|
||||||
filename = "tmp/order_summary_#{booking_id}" + ".pdf"
|
filename = "tmp/order_summary_#{booking_id}" + ".pdf"
|
||||||
pdf = OrderSummaryPdf.new
|
pdf = OrderSummaryPdf.new
|
||||||
if !order_slim_pdf.empty?
|
if !printer.empty?
|
||||||
order_slim_pdf.each do |order_summary_slim|
|
printer.each do |printer_setting|
|
||||||
if order_summary_slim[0] == 'OrderSlimPdf'
|
if printer_setting.unique_code == 'OrderSummaryPdf'
|
||||||
if order_summary_slim[1] == '1'
|
pdf = OrderSummaryPdf.new
|
||||||
|
elsif printer_setting.unique_code == 'OrderSummarySlimPdf'
|
||||||
pdf = OrderSummarySlimPdf.new
|
pdf = OrderSummarySlimPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummarySetPdf'
|
||||||
pdf = OrderSummaryPdf.new
|
|
||||||
end
|
|
||||||
elsif order_summary_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySetPdf.new
|
pdf = OrderSummarySetPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
|
||||||
pdf = OrderSummaryPdf.new
|
pdf = OrderSummaryCustomisePdf.new
|
||||||
end
|
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
|
||||||
elsif order_summary_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySlimCustomisePdf.new
|
pdf = OrderSummarySlimCustomisePdf.new
|
||||||
else
|
|
||||||
pdf = OrderSummaryPdf.new
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -151,29 +121,21 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
|
|||||||
#Use CUPS service
|
#Use CUPS service
|
||||||
#Generate PDF
|
#Generate PDF
|
||||||
#Print
|
#Print
|
||||||
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
|
printer = PrintSetting.all
|
||||||
filename = "tmp/order_summary_#{booking_id}" + ".pdf"
|
filename = "tmp/order_summary_#{booking_id}" + ".pdf"
|
||||||
pdf = OrderSummaryPdf.new
|
pdf = OrderSummaryPdf.new
|
||||||
if !order_slim_pdf.empty?
|
if !printer.empty?
|
||||||
order_slim_pdf.each do |order_summary_slim|
|
printer.each do |printer_setting|
|
||||||
if order_summary_slim[0] == 'OrderSlimPdf'
|
if printer_setting.unique_code == 'OrderSummaryPdf'
|
||||||
if order_summary_slim[1] == '1'
|
pdf = OrderSummaryPdf.new
|
||||||
|
elsif printer_setting.unique_code == 'OrderSummarySlimPdf'
|
||||||
pdf = OrderSummarySlimPdf.new
|
pdf = OrderSummarySlimPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummarySetPdf'
|
||||||
pdf = OrderSummaryPdf.new
|
|
||||||
end
|
|
||||||
elsif order_summary_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySetPdf.new
|
pdf = OrderSummarySetPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
|
||||||
pdf = OrderSummaryPdf.new
|
pdf = OrderSummaryCustomisePdf.new
|
||||||
end
|
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
|
||||||
elsif order_summary_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySlimCustomisePdf.new
|
pdf = OrderSummarySlimCustomisePdf.new
|
||||||
else
|
|
||||||
pdf = OrderSummaryPdf.new
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -188,29 +150,21 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
|
|||||||
#Use CUPS service
|
#Use CUPS service
|
||||||
#Generate PDF
|
#Generate PDF
|
||||||
#Print
|
#Print
|
||||||
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
|
printer = PrintSetting.all
|
||||||
filename = "tmp/order_summary_#{booking_id}" + ".pdf"
|
filename = "tmp/order_summary_#{booking_id}" + ".pdf"
|
||||||
pdf = OrderSummaryPdf.new
|
pdf = OrderSummaryPdf.new
|
||||||
if !order_slim_pdf.empty?
|
if !printer.empty?
|
||||||
order_slim_pdf.each do |order_summary_slim|
|
printer.each do |printer_setting|
|
||||||
if order_summary_slim[0] == 'OrderSlimPdf'
|
if printer_setting.unique_code == 'OrderSummaryPdf'
|
||||||
if order_summary_slim[1] == '1'
|
pdf = OrderSummaryPdf.new
|
||||||
|
elsif printer_setting.unique_code == 'OrderSummarySlimPdf'
|
||||||
pdf = OrderSummarySlimPdf.new
|
pdf = OrderSummarySlimPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummarySetPdf'
|
||||||
pdf = OrderSummaryPdf.new
|
|
||||||
end
|
|
||||||
elsif order_summary_slim[0] == 'OrderSetPdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySetPdf.new
|
pdf = OrderSummarySetPdf.new
|
||||||
else
|
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
|
||||||
pdf = OrderSummaryPdf.new
|
pdf = OrderSummaryCustomisePdf.new
|
||||||
end
|
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
|
||||||
elsif order_summary_slim[0] == 'OrderSlimCustomisePdf'
|
|
||||||
if order_summary_slim[1] == '1'
|
|
||||||
pdf = OrderSummarySlimCustomisePdf.new
|
pdf = OrderSummarySlimCustomisePdf.new
|
||||||
else
|
|
||||||
pdf = OrderSummaryPdf.new
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
145
app/pdf/order_item_customise_pdf.rb
Normal file
145
app/pdf/order_item_customise_pdf.rb
Normal file
@@ -0,0 +1,145 @@
|
|||||||
|
class OrderItemCustomisePdf < Prawn::Document
|
||||||
|
include ActionView::Helpers::NumberHelper
|
||||||
|
attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:order_no_font_size,:item_height,:qty_width,:total_width,:item_description_width
|
||||||
|
def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
|
||||||
|
self.page_width = print_settings.page_width
|
||||||
|
self.page_height = print_settings.page_height
|
||||||
|
self.header_font_size = print_settings.header_font_size.to_i
|
||||||
|
self.item_font_size = print_settings.item_font_size.to_i
|
||||||
|
self.order_no_font_size = 8
|
||||||
|
self.margin = 0
|
||||||
|
self.price_width = 40 # No Need for item
|
||||||
|
self.qty_width = 40
|
||||||
|
self.total_width = 40 # No Need for item
|
||||||
|
self.item_width = self.page_width - (self.qty_width - self.margin)
|
||||||
|
self.item_height = 15
|
||||||
|
self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
|
||||||
|
self.label_width=90
|
||||||
|
|
||||||
|
super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
|
||||||
|
# super(:margin => [10, 5, 30, 5], :page_size => [200,400])
|
||||||
|
|
||||||
|
# db font setup
|
||||||
|
if print_settings.font != ""
|
||||||
|
font_families.update("#{print_settings.font}" => {
|
||||||
|
:normal => "public/fonts/#{print_settings.font}.ttf",
|
||||||
|
:italic => "public/fonts/#{print_settings.font}.ttf",
|
||||||
|
:bold => "public/fonts/#{print_settings.font}.ttf",
|
||||||
|
:bold_italic => "public/fonts/#{print_settings.font}.ttf"
|
||||||
|
})
|
||||||
|
|
||||||
|
font "#{print_settings.font}"
|
||||||
|
fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
|
||||||
|
end
|
||||||
|
# font "public/fonts/Zawgyi-One.ttf"
|
||||||
|
# font "public/fonts/padauk.ttf"
|
||||||
|
#font "public/fonts/Chinese.ttf"
|
||||||
|
if !order_item.dining.nil?
|
||||||
|
text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
|
||||||
|
else
|
||||||
|
text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
|
||||||
|
end
|
||||||
|
|
||||||
|
stroke_horizontal_rule
|
||||||
|
move_down 3
|
||||||
|
|
||||||
|
#order_info
|
||||||
|
order_info(order_item.order_id, order_item.order_by,order_item.order_at)
|
||||||
|
|
||||||
|
# order items
|
||||||
|
order_items(order_item, options, alt_name, print_settings.precision, before_updated_qty)
|
||||||
|
end
|
||||||
|
|
||||||
|
# Write Order Information to PDF
|
||||||
|
def order_info(order_no, order_by, order_at)
|
||||||
|
y_position = cursor
|
||||||
|
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
|
||||||
|
text "OrderNo: #{order_no} ", :size => self.order_no_font_size,:align => :left
|
||||||
|
end
|
||||||
|
|
||||||
|
move_down 1
|
||||||
|
y_position = cursor
|
||||||
|
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
|
||||||
|
text "OrderBy: #{order_by} ", :size => self.order_no_font_size,:align => :left
|
||||||
|
end
|
||||||
|
|
||||||
|
move_down 1
|
||||||
|
y_position = cursor
|
||||||
|
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
|
||||||
|
text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.order_no_font_size,:align => :left
|
||||||
|
end
|
||||||
|
|
||||||
|
stroke_horizontal_rule
|
||||||
|
|
||||||
|
move_down 10
|
||||||
|
end
|
||||||
|
|
||||||
|
# Write Order items to PDF
|
||||||
|
def order_items(order_item, options, alt_name, precision, before_updated_qty)
|
||||||
|
y_position = cursor
|
||||||
|
|
||||||
|
#Add Order Item
|
||||||
|
add_order_items(order_item, options, alt_name, precision)
|
||||||
|
|
||||||
|
dash(1, :space => 1, :phase => 1)
|
||||||
|
stroke_horizontal_line 0, (self.page_width - self.margin)
|
||||||
|
add_updated_qty_text(before_updated_qty, order_item.qty, precision)
|
||||||
|
move_down 5
|
||||||
|
end
|
||||||
|
|
||||||
|
# Add order items under order info
|
||||||
|
def add_order_items(order_item, options, alt_name, precision)
|
||||||
|
y_position = cursor
|
||||||
|
|
||||||
|
move_down 5
|
||||||
|
|
||||||
|
bounding_box([0,y_position], :width => self.item_width) do
|
||||||
|
text "#{order_item.item_code} - #{order_item.item_name}", :size => self.item_font_size,:align => :left
|
||||||
|
end
|
||||||
|
|
||||||
|
bounding_box([self.item_width,y_position], :width => self.qty_width) do
|
||||||
|
text "[#{number_with_precision(order_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
|
||||||
|
end
|
||||||
|
|
||||||
|
bounding_box([0,y_position], :width => self.item_width) do
|
||||||
|
text "#{order_item.item_code} - #{order_item.item_name}", :size => self.item_font_size,:align => :left
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
if alt_name
|
||||||
|
if order_item.alt_name
|
||||||
|
move_down 4
|
||||||
|
font("public/fonts/NotoSansCJKtc-Regular.ttf") do
|
||||||
|
text "(#{order_item.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if !options.empty?
|
||||||
|
move_down 5
|
||||||
|
|
||||||
|
# add option
|
||||||
|
y_position = cursor
|
||||||
|
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
|
||||||
|
text "#{options}", :size => self.item_font_size,:align => :left
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
move_down 5
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
#add updated qty text
|
||||||
|
def add_updated_qty_text(before_updated_qty, updated_qty, precision)
|
||||||
|
if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
|
||||||
|
move_down 5
|
||||||
|
|
||||||
|
# add option
|
||||||
|
y_position = cursor
|
||||||
|
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
|
||||||
|
text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
@@ -8,7 +8,7 @@ class OrderItemSlimCustomisePdf < Prawn::Document
|
|||||||
self.item_font_size = print_settings.item_font_size.to_i
|
self.item_font_size = print_settings.item_font_size.to_i
|
||||||
self.margin = 0
|
self.margin = 0
|
||||||
self.price_width = 40 # No Need for item
|
self.price_width = 40 # No Need for item
|
||||||
self.qty_width = 40
|
self.qty_width = 25
|
||||||
self.total_width = 40 # No Need for item
|
self.total_width = 40 # No Need for item
|
||||||
self.item_width = self.page_width - (self.qty_width - self.margin)
|
self.item_width = self.page_width - (self.qty_width - self.margin)
|
||||||
self.item_height = 15
|
self.item_height = 15
|
||||||
|
|||||||
147
app/pdf/order_summary_customise_pdf.rb
Normal file
147
app/pdf/order_summary_customise_pdf.rb
Normal file
@@ -0,0 +1,147 @@
|
|||||||
|
class OrderSummaryCustomisePdf < Prawn::Document
|
||||||
|
include ActionView::Helpers::NumberHelper
|
||||||
|
attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:order_no_font_size,:item_height,:qty_width,:total_width,:item_description_width
|
||||||
|
def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
|
||||||
|
self.page_width = print_settings.page_width
|
||||||
|
self.page_height = print_settings.page_height
|
||||||
|
self.header_font_size = print_settings.header_font_size.to_i
|
||||||
|
self.item_font_size = print_settings.item_font_size.to_i
|
||||||
|
self.order_no_font_size = 8
|
||||||
|
self.margin = 0
|
||||||
|
self.price_width = 40 # No Need for item
|
||||||
|
self.qty_width = 40
|
||||||
|
self.total_width = 40 # No Need for item
|
||||||
|
self.item_width = self.page_width - (self.qty_width - self.margin)
|
||||||
|
self.item_height = 15
|
||||||
|
self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
|
||||||
|
self.label_width=90
|
||||||
|
|
||||||
|
super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
|
||||||
|
|
||||||
|
# db font setup
|
||||||
|
if print_settings.font != ""
|
||||||
|
font_families.update("#{print_settings.font}" => {
|
||||||
|
:normal => "public/fonts/#{print_settings.font}.ttf",
|
||||||
|
:italic => "public/fonts/#{print_settings.font}.ttf",
|
||||||
|
:bold => "public/fonts/#{print_settings.font}.ttf",
|
||||||
|
:bold_italic => "public/fonts/#{print_settings.font}.ttf"
|
||||||
|
})
|
||||||
|
|
||||||
|
font "#{print_settings.font}"
|
||||||
|
fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
|
||||||
|
end
|
||||||
|
|
||||||
|
# font "public/fonts/Zawgyi-One.ttf"
|
||||||
|
# font "public/fonts/padauk.ttf"
|
||||||
|
|
||||||
|
if !order[0].dining.nil?
|
||||||
|
text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
|
||||||
|
else
|
||||||
|
text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
|
||||||
|
end
|
||||||
|
|
||||||
|
stroke_horizontal_rule
|
||||||
|
move_down 5
|
||||||
|
|
||||||
|
#order_info
|
||||||
|
order_info(order[0].order_id, order[0].order_by,order[0].order_at)
|
||||||
|
|
||||||
|
# order items
|
||||||
|
if order_items == nil
|
||||||
|
order_items(order, alt_name, print_settings.precision)
|
||||||
|
else
|
||||||
|
order_items(order_items, alt_name, print_settings.precision)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Write Order Information to PDF
|
||||||
|
def order_info(order_no, order_by, order_at)
|
||||||
|
y_position = cursor
|
||||||
|
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
|
||||||
|
text "OrderNo: #{order_no} ", :size => self.order_no_font_size,:align => :left
|
||||||
|
end
|
||||||
|
|
||||||
|
move_down 1
|
||||||
|
y_position = cursor
|
||||||
|
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
|
||||||
|
text "OrderBy: #{order_by} ", :size => self.order_no_font_size,:align => :left
|
||||||
|
end
|
||||||
|
|
||||||
|
move_down 1
|
||||||
|
y_position = cursor
|
||||||
|
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
|
||||||
|
text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.order_no_font_size,:align => :left
|
||||||
|
end
|
||||||
|
|
||||||
|
stroke_horizontal_rule
|
||||||
|
|
||||||
|
move_down 10
|
||||||
|
end
|
||||||
|
|
||||||
|
# Write Order items to PDF
|
||||||
|
def order_items(order_item, alt_name, precision)
|
||||||
|
y_position = cursor
|
||||||
|
|
||||||
|
#Add Order Item
|
||||||
|
add_order_items(order_item, alt_name, precision)
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
# Add order items under order info
|
||||||
|
def add_order_items(order_item, alt_name, precision)
|
||||||
|
y_position = cursor
|
||||||
|
|
||||||
|
move_down 5
|
||||||
|
|
||||||
|
order_item.each do|odi|
|
||||||
|
# check for item not to show
|
||||||
|
# if odi.price != 0
|
||||||
|
y_position = cursor
|
||||||
|
|
||||||
|
bounding_box([0,y_position], :width => self.item_width) do
|
||||||
|
text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
bounding_box([self.item_width,y_position], :width => self.qty_width) do
|
||||||
|
text " [#{number_with_precision(odi.qty, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
|
||||||
|
end
|
||||||
|
|
||||||
|
bounding_box([0,y_position], :width => self.item_width) do
|
||||||
|
text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
if alt_name
|
||||||
|
if !(odi.alt_name).empty?
|
||||||
|
move_down 4
|
||||||
|
font("public/fonts/NotoSansCJKtc-Regular.ttf") do
|
||||||
|
text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
# add option
|
||||||
|
options = odi.options == "[]"? "" : odi.options
|
||||||
|
|
||||||
|
if options != ""
|
||||||
|
move_down 5
|
||||||
|
|
||||||
|
y_position = cursor
|
||||||
|
bounding_box([0,y_position], :width => self.item_width) do
|
||||||
|
text "#{options}", :size => self.item_font_size,:align => :left
|
||||||
|
end
|
||||||
|
|
||||||
|
move_down 5
|
||||||
|
end
|
||||||
|
|
||||||
|
move_down 5
|
||||||
|
|
||||||
|
dash(1, :space => 1, :phase => 1)
|
||||||
|
stroke_horizontal_line 0, (self.page_width - self.margin)
|
||||||
|
move_down 5
|
||||||
|
# end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -8,7 +8,7 @@ class OrderSummarySlimCustomisePdf < Prawn::Document
|
|||||||
self.item_font_size = print_settings.item_font_size.to_i
|
self.item_font_size = print_settings.item_font_size.to_i
|
||||||
self.margin = 0
|
self.margin = 0
|
||||||
self.price_width = 40 # No Need for item
|
self.price_width = 40 # No Need for item
|
||||||
self.qty_width = 40
|
self.qty_width = 25
|
||||||
self.total_width = 40 # No Need for item
|
self.total_width = 40 # No Need for item
|
||||||
self.item_width = self.page_width - (self.qty_width - self.margin)
|
self.item_width = self.page_width - (self.qty_width - self.margin)
|
||||||
self.item_height = 15
|
self.item_height = 15
|
||||||
|
|||||||
Reference in New Issue
Block a user