raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-12 03:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix aggregation of taxes for taxes on adjustments

Browse Source
This commit is contained in:
Pierre de Lacroix
2017-02-27 20:29:54 +01:00
committed by Rob Harrington
parent d22f5678be
commit 3fc2070b2c
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/open_food_network/sales_tax_report.rb
View File

@@ -26,7 +26,7 @@ module OpenFoodNetwork
else
[I18n.t(:report_header_order_number),
I18n.t(:report_header_total_excl_vat, currency_symbol: currency_symbol)] +
relevant_rates.map { |rate| "%s (%.1f%%) (%s)" % [rate.name, rate.amount.to_f * 100, currency_symbol] } +
relevant_rates.map { |rate| "%.1f%% (%s)" % [rate.to_f * 100, currency_symbol] } +
[I18n.t(:report_header_total_tax, currency_symbol: currency_symbol),
I18n.t(:report_header_total_incl_vat, currency_symbol: currency_symbol)]
end
@@ -66,9 +66,7 @@ module OpenFoodNetwork
def relevant_rates
return @relevant_rates unless @relevant_rates.nil?
item_rate_ids = search.result.joins(:line_items => {:adjustments => :tax_rate}).select('spree_tax_rates.id').uniq
order_rate_ids = search.result.joins(:adjustments => :tax_rate).select('spree_tax_rates.id').uniq
@relevant_rates = Spree::TaxRate.where(id: item_rate_ids | order_rate_ids)
@relevant_rates = Spree::TaxRate.pluck(:amount).uniq
end
def totals_of(line_items)