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

fix calculation of the summary row's total excl tax

Browse Source
This commit is contained in:
Mohamed ABDELLANI
2023-07-07 09:38:03 +01:00
committed by Konrad
parent a3f012c9fe
commit 624b4c8ad2
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_producer.rb
View File

@@ -60,7 +60,7 @@ module Reporting
def query_result
# The objective is to group the orders by
# [entreprise_fee, tax_rate, supplier_id, distributor_id and order_cycle_id]
# [tax_rate, entreprise_fee, supplier_id, distributor_id and order_cycle_id]
# The order.all_adjustment describes
# - the enterprise fees applied on the order
@@ -218,14 +218,13 @@ module Reporting
def order_cycle_totals_row
proc do |_key, items, rows|
supplier_id = items.first.first[2] # supplier id used in the grouped line items
order_ids = items.flat_map(&:second).map(&:id).uniq
line_items = items.flat_map(&:second).uniq.map(&:line_items).flatten
.filter do |line_item|
line_item.supplier_id == supplier_id
end
tax_for_enterprise_fees = rows.map(&:tax).sum
total_excl_tax = total_fees_excl_tax(order_ids) + line_items_excl_tax(line_items)
total_excl_tax = total_fees_excl_tax(items) + line_items_excl_tax(line_items)
tax = tax_for_enterprise_fees + tax_for_line_items(line_items)
{
total_excl_tax:,
@@ -261,8 +260,14 @@ module Reporting
end
end
def total_fees_excl_tax(order_ids)
enterprise_fees_amount_for_orders(order_ids) - included_tax_for_order_ids(order_ids)
def total_fees_excl_tax(items)
order_ids = items.flat_map(&:second).map(&:id).uniq
enterprise_fee_ids = items.map(&:first).map(&:second)
enterprise_fees_amount_for_orders(
order_ids, enterprise_fee_ids
) - included_tax_for_order_ids(
order_ids, enterprise_fee_ids
)
end
def line_items_excl_tax(line_items)
@@ -280,26 +285,30 @@ module Reporting
end.sum
end
def included_tax_for_order_ids(order_ids)
def included_tax_for_order_ids(order_ids, enterprise_fee_ids)
Spree::Adjustment.tax
.where(order: order_ids)
.where(included: true)
.where(adjustable_type: 'Spree::Adjustment')
.where(adjustable_id: enterprise_fee_adjustment_ids_for_orders(order_ids))
.where(adjustable_id: enterprise_fee_adjustment_ids_for_orders(order_ids,
enterprise_fee_ids))
.pick("sum(amount)") || 0
end
def enterprise_fee_adjustment_ids_for_orders(order_ids)
enterprise_fees_for_orders(order_ids).pluck(:id)
def enterprise_fee_adjustment_ids_for_orders(order_ids, enterprise_fee_ids)
enterprise_fee_adjustments_for_orders(order_ids, enterprise_fee_ids).pluck(:id)
end
def enterprise_fees_amount_for_orders(order_ids)
enterprise_fees_for_orders(order_ids).pick("sum(amount)") || 0
def enterprise_fees_amount_for_orders(order_ids, enterprise_fee_ids)
enterprise_fee_adjustments_for_orders(
order_ids, enterprise_fee_ids
).pick("sum(amount)") || 0
end
def enterprise_fees_for_orders(order_ids)
def enterprise_fee_adjustments_for_orders(order_ids, enterprise_fee_ids)
enterprise_fees = Spree::Adjustment.enterprise_fee
.where(order_id: order_ids)
.where(originator_id: enterprise_fee_ids)
return enterprise_fees unless enterprise_fee_filters?
enterprise_fees.where(

2
spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_producer_spec.rb
View File

@@ -497,8 +497,6 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do
end
it "should filter by distributor and order cycle" do
pending("incorrect totals for orders with more than one supplier")
page.find("#s2id_autogen1").click
find('li', text: distributor.name).click # selects Distributor