From ad6d0c1c73660254d9088ae54d6e80bdfd2415c1 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Thu, 8 Jun 2023 22:31:00 +0100
Subject: [PATCH] Add nil safety in reports for zero priced orders with no
 payment method

---
 lib/reporting/reports/payments/payment_totals.rb           | 2 +-
 lib/reporting/reports/payments/payments_by_payment_type.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/reporting/reports/payments/payment_totals.rb b/lib/reporting/reports/payments/payment_totals.rb
index 06a6d1cdb4..4e1b561994 100644
--- a/lib/reporting/reports/payments/payment_totals.rb
+++ b/lib/reporting/reports/payments/payment_totals.rb
@@ -23,7 +23,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)
+            payment.completed? && payment.payment_method&.name.to_s.include?(pay_method)
           }.sum(&:amount)
         end
       end
diff --git a/lib/reporting/reports/payments/payments_by_payment_type.rb b/lib/reporting/reports/payments/payments_by_payment_type.rb
index 67d96236be..89003205df 100644
--- a/lib/reporting/reports/payments/payments_by_payment_type.rb
+++ b/lib/reporting/reports/payments/payments_by_payment_type.rb
@@ -17,7 +17,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 },
+            payment_type: proc { |payments| payments.first.payment_method&.name },
             total_price: proc { |payments| payments.sum(&:amount) }
           }
         end