Compare commits

...

1 Commits

Author SHA1 Message Date
Matt-Yorkley
05ac1a9861 Fix outstanding balance sum in payment report 2021-04-07 11:17:51 +01:00

View File

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