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

Merge pull request #7334 from Matt-Yorkley/payment-reports-error

Browse Source 
Fix outstanding balance sum in payment report
This commit is contained in:
Matt-Yorkley
2021-04-07 13:47:45 +02:00
committed by GitHub
parent 1ce3103aa7 05b8b8e9db
commit 52c7abf1c0
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/payments_report.rb
View File

@@ -100,7 +100,7 @@ module OpenFoodNetwork
proc { |orders| orders.first.distributor.name },
proc { |orders| orders.to_a.sum(&:item_total) },
proc { |orders| orders.sum(&:ship_total) },
proc { |orders| orders.sum(&:outstanding_balance) },
proc { |orders| orders.sum{ |order| order.outstanding_balance.to_f } },
proc { |orders| orders.map(&:total).sum }]
when "payment_totals"
[proc { |orders| orders.first.payment_state },
@@ -124,7 +124,7 @@ module OpenFoodNetwork
}.sum(&:amount)
}
},
proc { |orders| orders.sum(&:outstanding_balance) }]
proc { |orders| orders.sum{ |order| order.outstanding_balance.to_f } }]
else
[proc { |payments| payments.first.order.payment_state },
proc { |payments| payments.first.order.distributor.name },