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

print cancel qrpay

Browse Source
This commit is contained in:
Dev Team
2025-06-30 17:07:42 +06:30
parent f22a61f1d9
commit 196f672aba
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/jobs/print_receipt_job.rb
View File

@@ -38,10 +38,13 @@ class PrintReceiptJob < ApplicationJob
other_amount = SaleItem.calculate_other_charges(sale_items) other_amount = SaleItem.calculate_other_charges(sale_items)
printer = Printer::ReceiptPrinter.new(print_settings) printer = Printer::ReceiptPrinter.new(print_settings)
byebug
if saleObj.sale_status == 'completed' if saleObj.sale_status == 'completed'
printer.print_receipt_bill(print_settings, false, nil, cashier_terminal, sale_items, saleObj, customer.paypar_account_no, item_price_by_accounts, discount_price_by_accounts, member_info, rebate_amount, current_shop, 'paid', current_balance, card_data, other_amount, latest_order_no, card_balance_amount, nil, transaction_ref) printer.print_receipt_bill(print_settings, false, nil, cashier_terminal, sale_items, saleObj, customer.paypar_account_no, item_price_by_accounts, discount_price_by_accounts, member_info, rebate_amount, current_shop, 'paid', current_balance, card_data, other_amount, latest_order_no, card_balance_amount, nil, transaction_ref)
elsif saleObj.sale_status == 'void' elsif saleObj.generic_void?
printer.print_receipt_bill(print_settings, false, nil,cashier_terminal, sale_items, saleObj, customer.paypar_account_no, item_price_by_accounts, discount_price_by_accounts, member_info, rebate_amount, current_shop, "VOID", current_balance, card_data, other_amount,nil,nil,nil) printer.print_receipt_bill(print_settings, false, nil,cashier_terminal, sale_items, saleObj, customer.paypar_account_no, item_price_by_accounts, discount_price_by_accounts, member_info, rebate_amount, current_shop, "VOID", current_balance, card_data, other_amount,nil,nil,nil)
elsif saleObj.mmqr_cancel_void?
printer.print_receipt_bill(print_settings, false, nil,cashier_terminal, sale_items, saleObj, customer.paypar_account_no, item_price_by_accounts, discount_price_by_accounts, member_info, rebate_amount, current_shop, "MMQR CANCEL", current_balance, card_data, other_amount,nil,nil,nil)
end end
end end
end end

8
app/models/sale.rb
View File

@@ -222,6 +222,14 @@ class Sale < ApplicationRecord
end end
def generic_void?
self.sale_status == 'void' && self.sale_audits.where(action: 'SALEVOID').exists?
end
def mmqr_cancel_void?
self.sale_status == 'void' && self.sale_audits.where(action: 'CANCEL_MMQR_PAYMENT').exists?
end
def add_item (item) def add_item (item)
#check if the item is on promotion #check if the item is on promotion
menu_category = MenuCategory.get_menu_category(item.item_code) #get menu category for menu items menu_category = MenuCategory.get_menu_category(item.item_code) #get menu category for menu items