git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service

Browse Source
This commit is contained in:
Aung Myo
2018-02-08 14:46:57 +06:30
parent d052fed803 c4452c2730
commit a64fc8a4f5
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/models/printer/order_queue_printer.rb
View File

@@ -76,20 +76,20 @@ 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) pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
if !order_slim_pdf.empty? if !order_slim_pdf.empty?
order_slim_pdf.each do |order_item_slim| order_slim_pdf.each do |order_item_slim|
if order_item_slim[0] == 'OrderSlimPdf' if order_item_slim[0] == 'OrderSlimPdf'
if order_item_slim[1] == '1' 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 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
elsif order_item_slim[0] == 'OrderSetPdf' elsif order_item_slim[0] == 'OrderSetPdf'
if order_item_slim[1] == '1' 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 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 end
end end
@@ -109,20 +109,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
# For Print Order Summary # For Print Order Summary
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) pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
if !order_slim_pdf.empty? if !order_slim_pdf.empty?
order_slim_pdf.each do |order_summary_slim| order_slim_pdf.each do |order_summary_slim|
if order_summary_slim[0] == 'OrderSlimPdf' if order_summary_slim[0] == 'OrderSlimPdf'
if order_summary_slim[1] == '1' 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 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
elsif order_summary_slim[0] == 'OrderSetPdf' elsif order_summary_slim[0] == 'OrderSetPdf'
if order_summary_slim[1] == '1' 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 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 end
end end
@@ -143,7 +143,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
end end
# Print for orders in booking # 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 # Must be one print
if print_settings.print_copies == 0 if print_settings.print_copies == 0
print_settings.print_copies = 1 print_settings.print_copies = 1
@@ -162,20 +162,20 @@ 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) pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
if !order_slim_pdf.empty? if !order_slim_pdf.empty?
order_slim_pdf.each do |order_item_slim| order_slim_pdf.each do |order_item_slim|
if order_item_slim[0] == 'OrderSlimPdf' if order_item_slim[0] == 'OrderSlimPdf'
if order_item_slim[1] == '1' 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 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
elsif order_item_slim[0] == 'OrderSetPdf' elsif order_item_slim[0] == 'OrderSetPdf'
if order_item_slim[1] == '1' 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 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 end
end end
@@ -198,20 +198,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
# For Print Order Summary # For Print Order Summary
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) pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
if !order_slim_pdf.empty? if !order_slim_pdf.empty?
order_slim_pdf.each do |order_summary_slim| order_slim_pdf.each do |order_summary_slim|
if order_summary_slim[0] == 'OrderSlimPdf' if order_summary_slim[0] == 'OrderSlimPdf'
if order_summary_slim[1] == '1' 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 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
elsif order_summary_slim[0] == 'OrderSetPdf' elsif order_summary_slim[0] == 'OrderSetPdf'
if order_summary_slim[1] == '1' 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 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 end
end end