update vodi and pay foc waste and spoil for other paymtnt amount in receipt pdf

This commit is contained in:
Aung Myo
2018-07-10 16:05:37 +06:30
parent 5c8fd3666d
commit 158760abdb
3 changed files with 10 additions and 7 deletions

View File

@@ -105,9 +105,9 @@ class Origami::WasteSpoileController < BaseOrigamiController
# Calculate Food and Beverage Total
item_price_by_accounts = SaleItem.calculate_price_by_accounts(sale.sale_items)
discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
other_amount = SaleItem.calculate_other_charges(sale_items)
printer = Printer::ReceiptPrinter.new(print_settings)
filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, remark,current_balance,nil)
filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, remark,current_balance,nil,other_amount)
result = {
:filepath => filename,
:printer_model => print_settings.brand_name,