From a1bdfa0a20107e58a9971b3014b97f382494c1f9 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 7 Jan 2026 16:57:22 +1100 Subject: [PATCH] Move list of payment methods to where it is used --- .../spree/admin/payment_methods_controller.rb | 2 +- app/models/spree/payment_method.rb | 6 +++++- config/application.rb | 10 ---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/controllers/spree/admin/payment_methods_controller.rb b/app/controllers/spree/admin/payment_methods_controller.rb index 97f77420fd..4e74e11247 100644 --- a/app/controllers/spree/admin/payment_methods_controller.rb +++ b/app/controllers/spree/admin/payment_methods_controller.rb @@ -117,7 +117,7 @@ module Spree end def validate_payment_method_provider - valid_payment_methods = Rails.application.config.spree.payment_methods.map(&:to_s) + valid_payment_methods = Spree::PaymentMethod.providers.map(&:to_s) return if valid_payment_methods.include?(params[:payment_method][:type]) flash[:error] = Spree.t(:invalid_payment_provider) diff --git a/app/models/spree/payment_method.rb b/app/models/spree/payment_method.rb index b66d8d239b..d8c63d9746 100644 --- a/app/models/spree/payment_method.rb +++ b/app/models/spree/payment_method.rb @@ -53,7 +53,11 @@ module Spree } def self.providers - Rails.application.config.spree.payment_methods + [ + Spree::PaymentMethod::Check, + Spree::Gateway::StripeSCA, + Spree::Gateway::PayPalExpress, + ] end def configured? diff --git a/config/application.rb b/config/application.rb index a91177cc49..37961e5757 100644 --- a/config/application.rb +++ b/config/application.rb @@ -76,16 +76,6 @@ module Openfoodnetwork end end - initializer "spree.register.payment_methods" do |app| - Rails.application.reloader.to_prepare do - app.config.spree.payment_methods = [ - Spree::PaymentMethod::Check, - Spree::Gateway::StripeSCA, - Spree::Gateway::PayPalExpress, - ] - end - end - initializer "spree.mail.settings" do |_app| Rails.application.reloader.to_prepare do Spree::Core::MailSettings.init