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

update fixed conflict

Browse Source
This commit is contained in:
Aung Myo
2017-06-28 16:44:31 +06:30
parent 20f89a65f8 d35aa23e34
commit e9e184894d
13 changed files with 175 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,13 +34,13 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
# For Print Per Item
if oqs.cut_per_item
order_items.each do|odi|
order.each do|odi|
filename = "tmp/order_item_#{odi.item_name}" + ".pdf"
# For Item Options
options = odi.options == "[]"? "" : odi.options
# check for item not to show
if odi.price != 0 || odi.price != 10
if odi.price != 0
pdf = OrderItemPdf.new(odi, print_status, options, oqs.use_alternate_name)
# pdf.render_file "tmp/order_item.pdf"
pdf.render_file filename

9
app/models/printer/receipt_printer.rb
View File

@@ -71,8 +71,13 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
#Print
pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info,rebate_amount,shop_details)
pdf.render_file "tmp/receipt_bill.pdf"
self.print("tmp/receipt_bill.pdf")
# print as print copies in printer setting
count = printer_settings.print_copies
begin
pdf.render_file "tmp/receipt_bill.pdf"
self.print("tmp/receipt_bill.pdf")
count -= 1
end until count == 0
end
#Queue No Print