diff --git a/app/controllers/spree/admin/payment_methods_controller.rb b/app/controllers/spree/admin/payment_methods_controller.rb index 8073fb544a..b8ad17a608 100644 --- a/app/controllers/spree/admin/payment_methods_controller.rb +++ b/app/controllers/spree/admin/payment_methods_controller.rb @@ -138,7 +138,7 @@ module Spree providers.delete("Spree::Gateway::StripeSCA") unless show_stripe? - providers.map(&:constantize) + providers end # Show Stripe as an option if enabled, or if the diff --git a/app/helpers/spree/admin/payment_methods_helper.rb b/app/helpers/spree/admin/payment_methods_helper.rb new file mode 100644 index 0000000000..575a205b71 --- /dev/null +++ b/app/helpers/spree/admin/payment_methods_helper.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +module Spree + module Admin + module PaymentMethodsHelper + def payment_method_type_name(class_name) + scope = "spree.admin.payment_methods.providers" + key = class_name.demodulize.downcase + + I18n.t(key, scope:) + end + end + end +end diff --git a/app/views/spree/admin/payment_methods/_providers.html.haml b/app/views/spree/admin/payment_methods/_providers.html.haml index 15bd4ef979..b645c5c083 100644 --- a/app/views/spree/admin/payment_methods/_providers.html.haml +++ b/app/views/spree/admin/payment_methods/_providers.html.haml @@ -3,6 +3,6 @@ .alpha.four.columns = label :payment_method, :type, t('.provider') .omega.twelve.columns - = collection_select(:payment_method, :type, @providers, :to_s, :clean_name, {}, { class: 'select2 fullwidth', 'provider-prefs-for' => "#{@object.id}"}) + = select(:payment_method, :type, @providers.map { |p| [payment_method_type_name(p), p] }, {}, { class: 'select2 fullwidth', 'provider-prefs-for' => "#{@object.id}"}) %div{"ng-include" => "include_html" } diff --git a/app/views/spree/admin/payment_methods/index.html.haml b/app/views/spree/admin/payment_methods/index.html.haml index 1952c60c06..61eb28c63a 100644 --- a/app/views/spree/admin/payment_methods/index.html.haml +++ b/app/views/spree/admin/payment_methods/index.html.haml @@ -37,7 +37,7 @@ - method.distributors.each do |distributor| = distributor.name %br/ - %td= method.class.clean_name + %td= payment_method_type_name(method.class.name) - if spree_current_user.admin? %td.align-center= method.environment.to_s.titleize %td.align-center= method.display_on.blank? ? t('.both') : t('.' + method.display_on.to_s)