From 159bbe18e604fa3b9d423efc6fcbd027611d25dd Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 18 Nov 2019 15:07:31 +0000
Subject: [PATCH] Fix shipping_method querying in customer totals reports

---
 .../customer_totals_report.rb                            | 9 +++++++--
 .../customer_totals_report_spec.rb                       | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report.rb b/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report.rb
index 74456d174f..fefaa73b64 100644
--- a/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report.rb
+++ b/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report.rb
@@ -198,8 +198,13 @@ module OpenFoodNetwork
       private
 
       def shipping_method(line_items)
-        line_items.first.order.shipments.first.
-          andand.shipping_rates.andand.first.andand.shipping_method
+        shipping_rates = line_items.first.order.shipments.first.
+          andand.shipping_rates
+
+        return unless shipping_rates
+
+        shipping_rate = shipping_rates.find(&:selected) || shipping_rates.first
+        shipping_rate.try(:shipping_method)
       end
     end
   end
diff --git a/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb b/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb
index ed2db8b767..261e52a925 100644
--- a/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb
+++ b/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb
@@ -57,7 +57,7 @@ RSpec.describe OpenFoodNetwork::OrdersAndFulfillmentsReport::CustomerTotalsRepor
       order.select_shipping_method(shipping_method2.id)
     end
 
-    xit "displays the correct shipping_method" do
+    it "displays the correct shipping_method" do
       shipping_method_name_field = report_table.first[15]
       expect(shipping_method_name_field).to eq shipping_method2.name
     end