raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update adjustment scope use in Xero Invoices report

Browse Source
This commit is contained in:
Matt-Yorkley
2021-02-23 15:45:07 +00:00
parent e33950721c
commit b1bf2487e2
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/open_food_network/xero_invoices_report.rb
View File

@@ -188,23 +188,23 @@ module OpenFoodNetwork
end
def total_untaxable_fees(order)
order.adjustments.enterprise_fee.without_tax.sum(:amount)
order.all_adjustments.enterprise_fee.without_tax.sum(:amount)
end
def total_taxable_fees(order)
order.adjustments.enterprise_fee.with_tax.sum(:amount)
order.all_adjustments.enterprise_fee.with_tax.sum(:amount)
end
def total_shipping(order)
order.adjustments.shipping.sum(:amount)
order.all_adjustments.shipping.sum(:amount)
end
def total_transaction(order)
order.adjustments.payment_fee.sum(:amount)
order.all_adjustments.payment_fee.sum(:amount)
end
def tax_on_shipping_s(order)
tax_on_shipping = order.adjustments.shipping.sum(:included_tax) > 0
tax_on_shipping = order.all_adjustments.shipping.sum(:included_tax) > 0
tax_on_shipping ? I18n.t(:report_header_gst_on_income) : I18n.t(:report_header_gst_free_income)
end

10
spec/features/admin/reports_spec.rb
View File

@@ -394,11 +394,11 @@ feature '
let!(:line_item1) { create(:line_item, variant: product1.master, price: 12.54, quantity: 1, order: order1) }
let!(:line_item2) { create(:line_item, variant: product2.master, price: 500.15, quantity: 3, order: order1) }
let!(:adj_shipping) { create(:adjustment, adjustable: order1, label: "Shipping", originator: shipping_method, amount: 100.55, included_tax: 10.06) }
let!(:adj_fee1) { create(:adjustment, adjustable: order1, originator: enterprise_fee1, label: "Enterprise fee untaxed", amount: 10, included_tax: 0) }
let!(:adj_fee2) { create(:adjustment, adjustable: order1, originator: enterprise_fee2, label: "Enterprise fee taxed", amount: 20, included_tax: 2) }
let!(:adj_manual1) { create(:adjustment, adjustable: order1, originator: nil, source: nil, label: "Manual adjustment", amount: 30, included_tax: 0) }
let!(:adj_manual2) { create(:adjustment, adjustable: order1, originator: nil, source: nil, label: "Manual adjustment", amount: 40, included_tax: 3) }
let!(:adj_shipping) { create(:adjustment, order: order1, adjustable: order1, label: "Shipping", originator: shipping_method, amount: 100.55, included_tax: 10.06) }
let!(:adj_fee1) { create(:adjustment, order: order1, adjustable: order1, originator: enterprise_fee1, label: "Enterprise fee untaxed", amount: 10, included_tax: 0) }
let!(:adj_fee2) { create(:adjustment, order: order1, adjustable: order1, originator: enterprise_fee2, label: "Enterprise fee taxed", amount: 20, included_tax: 2) }
let!(:adj_manual1) { create(:adjustment, order: order1, adjustable: order1, originator: nil, source: nil, label: "Manual adjustment", amount: 30, included_tax: 0) }
let!(:adj_manual2) { create(:adjustment, order: order1, adjustable: order1, originator: nil, source: nil, label: "Manual adjustment", amount: 40, included_tax: 3) }
before do
order1.update_attribute :email, 'customer@email.com'