raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Xero Invoices scopes for taxable fees

Browse Source 
Taxable enterprise fee adjustments now have a tax_category
This commit is contained in:
Matt-Yorkley
2021-06-04 20:35:31 +01:00
parent 7bcb0bcaa8
commit 7b641ace23
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/open_food_network/xero_invoices_report.rb
View File

@@ -188,11 +188,11 @@ module OpenFoodNetwork
end
def total_untaxable_fees(order)
order.all_adjustments.enterprise_fee.without_tax.sum(:amount)
order.all_adjustments.enterprise_fee.where(tax_category: nil).sum(:amount)
end
def total_taxable_fees(order)
order.all_adjustments.enterprise_fee.with_tax.sum(:amount)
order.all_adjustments.enterprise_fee.where.not(tax_category: nil).sum(:amount)
end
def total_shipping(order)