From b04a76e8bf4d9ac5339c4ff619cf669f89c44094 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 27 Nov 2020 12:31:13 +0000
Subject: [PATCH] Update payments_report totals

---
 lib/open_food_network/payments_report.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/open_food_network/payments_report.rb b/lib/open_food_network/payments_report.rb
index 33bcfadadc..1ee3f0a291 100644
--- a/lib/open_food_network/payments_report.rb
+++ b/lib/open_food_network/payments_report.rb
@@ -92,26 +92,26 @@ module OpenFoodNetwork
         [proc { |payments| payments.first.order.payment_state },
          proc { |payments| payments.first.order.distributor.name },
          proc { |payments| payments.first.payment_method.name },
-         proc { |payments| payments.sum(:amount) }]
+         proc { |payments| payments.sum(&:amount) }]
       when "itemised_payment_totals"
         [proc { |orders| orders.first.payment_state },
          proc { |orders| orders.first.distributor.name },
-         proc { |orders| orders.sum(:item_total) },
+         proc { |orders| orders.to_a.sum(&:item_total) },
          proc { |orders| orders.sum(&:ship_total) },
          proc { |orders| orders.sum(&:outstanding_balance) },
-         proc { |orders| orders.sum(:total) }]
+         proc { |orders| orders.map(&:total).sum }]
       when "payment_totals"
         [proc { |orders| orders.first.payment_state },
          proc { |orders| orders.first.distributor.name },
-         proc { |orders| orders.sum(:item_total) },
+         proc { |orders| orders.to_a.sum(&:item_total) },
          proc { |orders| orders.sum(&:ship_total) },
-         proc { |orders| orders.sum(:total) },
+         proc { |orders| orders.map(&:total).sum },
          proc { |orders|
            orders.sum { |o|
              o.payments.select { |payment|
                payment.completed? &&
                  (payment.payment_method.name.to_s.include? "EFT")
-             }.sum(:amount)
+             }.sum(&:amount)
            }
          },
          proc { |orders|
@@ -119,7 +119,7 @@ module OpenFoodNetwork
              o.payments.select { |payment|
                payment.completed? &&
                  (payment.payment_method.name.to_s.include? "PayPal")
-             }.sum(:amount)
+             }.sum(&:amount)
            }
          },
          proc { |orders| orders.sum(&:outstanding_balance) }]
@@ -127,7 +127,7 @@ module OpenFoodNetwork
         [proc { |payments| payments.first.order.payment_state },
          proc { |payments| payments.first.order.distributor.name },
          proc { |payments| payments.first.payment_method.name },
-         proc { |payments| payments.sum(:amount) }]
+         proc { |payments| payments.sum(&:amount) }]
       end
     end
   end