raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-06 02:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Repair rounding issue on totals in reports

Browse Source
This commit is contained in:
François Turbelin
2025-12-04 16:09:48 +01:00
parent 9f77c5912f
commit 30f702ea96
20 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/reporting/report_template.rb
View File

@@ -88,7 +88,7 @@ module Reporting
# summary_row: proc do |group_key, items, rows|
# {
# quantity: rows.map(&:quantity).sum(&:to_i),
# price: "#{rows.map(&:price).sum(&:to_f)} #{currency_symbol}"
# price: "#{rows.map(&:price).sum(&:to_f).round(2)} #{currency_symbol}"
# }
# end,
# summary_row_class: "", # by default 'text-bold'

2
lib/reporting/reports/bulk_coop/allocation.rb
View File

@@ -32,7 +32,7 @@ module Reporting
summary_row: proc do |_key, items, rows|
line_items = items.flatten
{
sum_total: rows.map(&:sum_total).sum(&:to_f),
sum_total: rows.map(&:sum_total).sum(&:to_f).round(2),
total_available: total_available(line_items),
unallocated: remainder(line_items),
max_quantity_excess: max_quantity_excess(line_items)

4
lib/reporting/reports/bulk_coop/base.rb
View File

@@ -94,7 +94,9 @@ module Reporting
end
def total_amount(line_items)
line_items.map { |li| scaled_final_weight_volume(li) }.sum(&:to_f)
line_items.map { |li|
scaled_final_weight_volume(li)
}.sum(&:to_f).round(2)
end
def scaled_final_weight_volume(line_item)

6
lib/reporting/reports/bulk_coop/customer_payments.rb
View File

@@ -21,15 +21,15 @@ module Reporting
private
def customer_payments_total_cost(line_items)
unique_orders(line_items).map(&:total).sum(&:to_f)
unique_orders(line_items).map(&:total).sum(&:to_f).round(2)
end
def customer_payments_amount_owed(line_items)
unique_orders(line_items).map(&:new_outstanding_balance).sum(&:to_f)
unique_orders(line_items).map(&:new_outstanding_balance).sum(&:to_f).round(2)
end
def customer_payments_amount_paid(line_items)
unique_orders(line_items).map(&:payment_total).sum(&:to_f)
unique_orders(line_items).map(&:payment_total).sum(&:to_f).round(2)
end
def unique_orders(line_items)

2
lib/reporting/reports/bulk_coop/supplier_report.rb
View File

@@ -32,7 +32,7 @@ module Reporting
summary_row: proc do |_key, items, rows|
line_items = items.flatten
{
sum_total: rows.map(&:sum_total).sum(&:to_f),
sum_total: rows.map(&:sum_total).sum(&:to_f).round(2),
units_required: units_required(line_items),
unallocated: remainder(line_items),
max_quantity_excess: max_quantity_excess(line_items)

2
lib/reporting/reports/customers/base.rb
View File

@@ -33,7 +33,7 @@ module Reporting
},
shipping_method: proc { |orders| last_completed_order(orders).shipping_method&.name },
total_orders: proc { |orders| orders.count },
total_incl_tax: proc { |orders| orders.map(&:total).sum(&:to_f) },
total_incl_tax: proc { |orders| orders.map(&:total).sum(&:to_f).round(2) },
last_completed_order_date: proc { |orders| last_completed_order_date(orders) },
}
end

5
lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_order.rb
View File

@@ -158,7 +158,7 @@ module Reporting
end
def enterprise_fees_sum(order)
amount = enterprise_fees(order).map(&:amount).sum(&:to_f)
amount = enterprise_fees(order).map(&:amount).sum(&:to_f).round(2)
apply_voucher_on_amount(order, amount)
end
@@ -182,7 +182,8 @@ module Reporting
query = order.all_adjustments.tax
query = query.inclusive if included == true
query = query.additional if added == true
amount = query.where(adjustable: enterprise_fees(order)).map(&:amount).sum(&:to_f)
amount =
query.where(adjustable: enterprise_fees(order)).map(&:amount).sum(&:to_f).round(2)
apply_voucher_on_amount(order, amount)
end

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

@@ -232,7 +232,7 @@ module Reporting
line_item.supplier_id == supplier_id
end
tax_for_enterprise_fees = rows.map(&:tax).sum(&:to_f)
tax_for_enterprise_fees = rows.map(&:tax).sum(&:to_f).round(2)
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)
{
@@ -280,18 +280,18 @@ module Reporting
end
def line_items_excl_tax(line_items)
cost_of_line_items(line_items) - line_items.map(&:included_tax).sum(&:to_f)
cost_of_line_items(line_items) - line_items.map(&:included_tax).sum(&:to_f).round(2)
end
def cost_of_line_items(line_items)
line_items.map(&:amount).sum(&:to_f)
line_items.map(&:amount).sum(&:to_f).round(2)
end
# This query gets called twice for each set of line_items, ideally it would be cached.
def tax_for_line_items(line_items)
line_items.map do |line_item|
line_item.adjustments.eligible.tax.map(&:amount).sum(&:to_f)
end.sum(&:to_f)
end.sum(&:to_f).round(2)
end
def included_tax_for_order_ids(order_ids, enterprise_fee_ids)

10
lib/reporting/reports/orders_and_fulfillment/order_cycle_customer_totals.rb
View File

@@ -23,9 +23,9 @@ module Reporting
variant: variant_name,
quantity: proc { |line_items| line_items.map(&:quantity).sum(&:to_i) },
item_price: proc { |line_items| line_items.map(&:amount).sum(&:to_f) },
item_price: proc { |line_items| line_items.map(&:amount).sum(&:to_f).round(2) },
item_fees_price: proc { |line_items|
line_items.map(&:amount_with_adjustments).sum(&:to_f)
line_items.map(&:amount_with_adjustments).sum(&:to_f).round(2)
},
admin_handling_fees: proc { |_line_items| "" },
ship_price: proc { |_line_items| "" },
@@ -68,7 +68,7 @@ module Reporting
order_number: proc { |line_items| line_items.first.order.number },
date: proc { |line_items| line_items.first.order.completed_at.strftime("%F %T") },
final_weight_volume: proc { |line_items|
line_items.map(&:final_weight_volume).sum(&:to_f)
line_items.map(&:final_weight_volume).sum(&:to_f).round(2)
},
shipment_state: proc { |line_items| line_items.first.order.shipment_state },
}
@@ -129,8 +129,8 @@ module Reporting
{
hub: rows.last.hub,
customer: rows.last.customer,
item_price: rows.map(&:item_price).sum(&:to_f),
item_fees_price: rows.map(&:item_fees_price).sum(&:to_f),
item_price: rows.map(&:item_price).sum(&:to_f).round(2),
item_fees_price: rows.map(&:item_fees_price).sum(&:to_f).round(2),
admin_handling_fees: order.admin_and_handling_total,
ship_price: order.ship_total,
pay_fee_price: order.payment_fee,

6
lib/reporting/reports/orders_and_fulfillment/order_cycle_distributor_totals_by_supplier.rb
View File

@@ -12,7 +12,7 @@ module Reporting
variant: variant_name,
quantity: proc { |line_items| line_items.to_a.map(&:quantity).sum(&:to_i) },
curr_cost_per_unit: proc { |line_items| line_items.first.price },
total_cost: proc { |line_items| line_items.map(&:amount).sum(&:to_f) },
total_cost: proc { |line_items| line_items.map(&:amount).sum(&:to_f).round(2) },
total_shipping_cost: proc { |_line_items| "" },
shipping_method: proc { |line_items| line_items.first.order.shipping_method&.name }
}
@@ -25,9 +25,9 @@ module Reporting
header: proc { |key, _items, _rows| "#{I18n.t(:report_header_hub)} #{key}" },
summary_row: proc do |_key, line_items, rows|
{
total_cost: rows.map(&:total_cost).sum(&:to_f),
total_cost: rows.map(&:total_cost).sum(&:to_f).round(2),
total_shipping_cost:
line_items.map(&:first).map(&:order).uniq.map(&:ship_total).sum(&:to_f)
line_items.map(&:first).map(&:order).uniq.map(&:ship_total).sum(&:to_f).round(2)
}
end
}

4
lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals.rb
View File

@@ -12,7 +12,7 @@ module Reporting
quantity: proc { |line_items| line_items.map(&:quantity).sum(&:to_i) },
total_units: proc { |line_items| total_units(line_items) },
curr_cost_per_unit: proc { |line_items| line_items.first.price },
total_cost: proc { |line_items| line_items.map(&:amount).sum(&:to_f) },
total_cost: proc { |line_items| line_items.map(&:amount).sum(&:to_f).round(2) },
sku: variant_sku,
producer_charges_sales_tax?: supplier_charges_sales_tax?,
product_tax_category:
@@ -34,7 +34,7 @@ module Reporting
{
quantity: rows.map(&:quantity).sum(&:to_i),
total_units: summary_total_units,
total_cost: rows.map(&:total_cost).sum(&:to_f)
total_cost: rows.map(&:total_cost).sum(&:to_f).round(2)
}
end
}

4
lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor.rb
View File

@@ -12,7 +12,7 @@ module Reporting
hub: hub_name,
quantity: proc { |line_items| line_items.to_a.map(&:quantity).sum(&:to_i) },
curr_cost_per_unit: proc { |line_items| line_items.first.price },
total_cost: proc { |line_items| line_items.map(&:amount).sum(&:to_f) },
total_cost: proc { |line_items| line_items.map(&:amount).sum(&:to_f).round(2) },
shipping_method: proc { |line_items| line_items.first.order.shipping_method&.name }
}
end
@@ -32,7 +32,7 @@ module Reporting
summary_row: proc do |_key, _items, rows|
{
quantity: rows.map(&:quantity).sum(&:to_i),
total_cost: rows.map(&:total_cost).sum(&:to_f)
total_cost: rows.map(&:total_cost).sum(&:to_f).round(2)
}
end,
}

2
lib/reporting/reports/packing/base.rb
View File

@@ -73,7 +73,7 @@ module Reporting
proc do |_key, _items, rows|
{
quantity: rows.map(&:quantity).sum(&:to_i),
price: rows.map(&:price).sum(&:to_f)
price: rows.map(&:price).sum(&:to_f).round(2)
}
end
end

8
lib/reporting/reports/payments/itemised_payment_totals.rb
View File

@@ -8,12 +8,12 @@ module Reporting
{
payment_state: proc { |orders| payment_state(orders.first) },
distributor: proc { |orders| orders.first.distributor.name },
product_total_price: proc { |orders| orders.map(&:item_total).sum(&:to_f) },
shipping_total_price: proc { |orders| orders.map(&:ship_total).sum(&:to_f) },
product_total_price: proc { |orders| orders.map(&:item_total).sum(&:to_f).round(2) },
shipping_total_price: proc { |orders| orders.map(&:ship_total).sum(&:to_f).round(2) },
outstanding_balance_price: proc do |orders|
orders.map(&:outstanding_balance).sum(&:to_f)
orders.map(&:outstanding_balance).sum(&:to_f).round(2)
end,
total_price: proc { |orders| orders.map(&:total).sum(&:to_f) }
total_price: proc { |orders| orders.map(&:total).sum(&:to_f).round(2) }
}
end
end

10
lib/reporting/reports/payments/payment_totals.rb
View File

@@ -8,13 +8,13 @@ module Reporting
{
payment_state: proc { |orders| payment_state(orders.first) },
distributor: proc { |orders| orders.first.distributor.name },
product_total_price: proc { |orders| orders.map(&:item_total).sum(&:to_f) },
shipping_total_price: proc { |orders| orders.map(&:ship_total).sum(&:to_f) },
total_price: proc { |orders| orders.map(&:total).sum(&:to_f) },
product_total_price: proc { |orders| orders.map(&:item_total).sum(&:to_f).round(2) },
shipping_total_price: proc { |orders| orders.map(&:ship_total).sum(&:to_f).round(2) },
total_price: proc { |orders| orders.map(&:total).sum(&:to_f).round(2) },
eft_price: proc { |orders| total_by_payment_method(orders, "EFT") },
paypal_price: proc { |orders| total_by_payment_method(orders, "PayPal") },
outstanding_balance_price: proc { |orders|
orders.map(&:outstanding_balance).sum(&:to_f)
orders.map(&:outstanding_balance).sum(&:to_f).round(2)
}
}
end
@@ -24,7 +24,7 @@ module Reporting
def total_by_payment_method(orders, pay_method)
orders.map(&:payments).flatten.select { |payment|
payment.completed? && payment.payment_method&.name.to_s.include?(pay_method)
}.map(&:amount).sum(&:to_f)
}.map(&:amount).sum(&:to_f).round(2)
end
end
end

2
lib/reporting/reports/payments/payments_by_payment_type.rb
View File

@@ -18,7 +18,7 @@ module Reporting
payment_state: proc { |payments| payment_state(payments.first.order) },
distributor: proc { |payments| payments.first.order.distributor.name },
payment_type: proc { |payments| payments.first.payment_method&.name },
total_price: proc { |payments| payments.map(&:amount).sum(&:to_f) }
total_price: proc { |payments| payments.map(&:amount).sum(&:to_f).round(2) }
}
end
end

4
lib/reporting/reports/revenues_by_hub/base.rb
View File

@@ -60,8 +60,8 @@ module Reporting
grouped_orders.each do |orders|
voucher_adjustments = calculate_voucher_adjustments(orders)
total_incl_tax = orders.map(&:total).sum(&:to_f)
total_tax = orders.map(&:total_tax).sum(&:to_f) + voucher_adjustments
total_incl_tax = orders.map(&:total).sum(&:to_f).round(2)
total_tax = orders.map(&:total_tax).sum(&:to_f).round(2) + voucher_adjustments
total_excl_tax = total_incl_tax - total_tax
@tax_data[distributor(orders).id] = {

11
lib/reporting/reports/sales_tax/sales_tax_totals_by_producer.rb
View File

@@ -77,10 +77,11 @@ module Reporting
summary_row: proc do |_key, items, _rows|
line_items = items.flat_map(&:second).flatten.uniq
total_excl_tax =
line_items.map(&:amount).sum(&:to_f) - line_items.map(&:included_tax).sum(&:to_f)
line_items.map(&:amount).sum(&:to_f).round(2) -
line_items.map(&:included_tax).sum(&:to_f).round(2)
tax = line_items.map do |line_item|
line_item.adjustments.eligible.tax.map(&:amount).sum(&:to_f)
end.sum(&:to_f)
end.sum(&:to_f).round(2)
{
total_excl_tax:,
tax:,
@@ -126,8 +127,8 @@ module Reporting
end
def total_excl_tax(query_result_row)
line_items(query_result_row).map(&:amount).sum(&:to_f) -
line_items(query_result_row).map(&:included_tax).sum(&:to_f)
line_items(query_result_row).map(&:amount).sum(&:to_f).round(2) -
line_items(query_result_row).map(&:included_tax).sum(&:to_f).round(2)
end
def tax(query_result_row)
@@ -136,7 +137,7 @@ module Reporting
.where(originator_id: tax_rate_id(query_result_row))
.map(&:amount)
.sum(&:to_f)
end&.sum(&:to_f)
end&.sum(&:to_f)&.round(2)
end
def total_incl_tax(query_result_row)

2
lib/reporting/reports/sales_tax/tax_types.rb
View File

@@ -53,7 +53,7 @@ module Reporting
end
def tax_included_in(line_item)
line_item.adjustments.tax.inclusive.map(&:amount).sum(&:to_f)
line_item.adjustments.tax.inclusive.map(&:amount).sum(&:to_f).round(2)
end
end
end

18
lib/reporting/reports/xero_invoices/base.rb
View File

@@ -207,34 +207,36 @@ module Reporting
end
def total_untaxable_products(order)
order.line_items.without_tax.map(&:amount).sum(&:to_f)
order.line_items.without_tax.map(&:amount).sum(&:to_f).round(2)
end
def total_taxable_products(order)
order.line_items.with_tax.map(&:amount).sum(&:to_f)
order.line_items.with_tax.map(&:amount).sum(&:to_f).round(2)
end
def total_untaxable_fees(order)
order.all_adjustments.enterprise_fee.where(tax_category: nil).map(&:amount).sum(&:to_f)
order.all_adjustments.enterprise_fee.where(tax_category: nil)
.map(&:amount).sum(&:to_f).round(2)
end
def total_taxable_fees(order)
order.all_adjustments.enterprise_fee.where.not(tax_category: nil)
.map(&:amount).sum(&:to_f)
.map(&:amount).sum(&:to_f).round(2)
end
def total_shipping(order)
order.all_adjustments.shipping.map(&:amount).sum(&:to_f)
order.all_adjustments.shipping.map(&:amount).sum(&:to_f).round(2)
end
def total_transaction(order)
order.all_adjustments.payment_fee.map(&:amount).sum(&:to_f)
order.all_adjustments.payment_fee.map(&:amount).sum(&:to_f).round(2)
end
def tax_on_shipping_s(order)
tax_on_shipping = order.shipments
.map{ |shipment| shipment.additional_tax_total + shipment.included_tax_total }
.sum(&:to_f)
.round(2)
.positive?
if tax_on_shipping
I18n.t(:report_header_gst_on_income)
@@ -244,11 +246,11 @@ module Reporting
end
def total_untaxable_admin_adjustments(order)
order.adjustments.admin.where(tax_category: nil).map(&:amount).sum(&:to_f)
order.adjustments.admin.where(tax_category: nil).map(&:amount).sum(&:to_f).round(2)
end
def total_taxable_admin_adjustments(order)
order.adjustments.admin.where.not(tax_category: nil).map(&:amount).sum(&:to_f)
order.adjustments.admin.where.not(tax_category: nil).map(&:amount).sum(&:to_f).round(2)
end
def detail?