diff --git a/app/helpers/spree/reports_helper.rb b/app/helpers/spree/reports_helper.rb index a06cb9fade..80bafa4c5a 100644 --- a/app/helpers/spree/reports_helper.rb +++ b/app/helpers/spree/reports_helper.rb @@ -6,7 +6,7 @@ module Spree module ReportsHelper def report_payment_method_options(orders) orders.map do |order| - payment_method = order.payments.first&.payment_method + payment_method = order.payments.last&.payment_method next unless payment_method diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb index b08dec9726..d011b66467 100644 --- a/lib/open_food_network/order_cycle_management_report.rb +++ b/lib/open_food_network/order_cycle_management_report.rb @@ -94,7 +94,7 @@ module OpenFoodNetwork order.email, ba&.phone, order.shipping_method&.name, - order.payments.first&.payment_method&.name, + order.payments.last&.payment_method&.name, order.total, balance(order)] end diff --git a/spec/helpers/spree/admin/reports_helper_spec.rb b/spec/helpers/spree/admin/reports_helper_spec.rb index 46f8070a4c..a4460e2b4a 100644 --- a/spec/helpers/spree/admin/reports_helper_spec.rb +++ b/spec/helpers/spree/admin/reports_helper_spec.rb @@ -7,7 +7,7 @@ describe Spree::ReportsHelper, type: :helper do let(:order_with_payments) { create(:order_ready_to_ship) } let(:order_without_payments) { create(:order_with_line_items) } let(:orders) { [order_with_payments, order_without_payments] } - let(:payment_method) { order_with_payments.payments.first.payment_method } + let(:payment_method) { order_with_payments.payments.last.payment_method } it "returns payment method select options for given orders" do select_options = helper.report_payment_method_options([order_with_payments])