diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 6f3bbb554b..1013c35643 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -931,7 +931,6 @@ Style/FrozenStringLiteralComment: - 'app/helpers/spree/admin/base_helper.rb' - 'app/helpers/spree/admin/general_settings_helper.rb' - 'app/helpers/spree/admin/orders_helper.rb' - - 'app/helpers/spree/admin/payments_helper.rb' - 'app/helpers/spree/admin/taxons_helper.rb' - 'app/helpers/spree/admin/zones_helper.rb' - 'app/helpers/spree/orders_helper.rb' diff --git a/app/helpers/spree/admin/payments_helper.rb b/app/helpers/spree/admin/payments_helper.rb deleted file mode 100644 index 529ef90adf..0000000000 --- a/app/helpers/spree/admin/payments_helper.rb +++ /dev/null @@ -1,11 +0,0 @@ -module Spree - module Admin - module PaymentsHelper - def payment_method_name(payment) - # hack to allow us to retrieve the name of a "deleted" payment method - id = payment.payment_method_id - Spree::PaymentMethod.find_with_destroyed(id).name - end - end - end -end diff --git a/app/helpers/spree/payment_methods_helper.rb b/app/helpers/spree/payment_methods_helper.rb new file mode 100644 index 0000000000..00abd77eef --- /dev/null +++ b/app/helpers/spree/payment_methods_helper.rb @@ -0,0 +1,9 @@ +module Spree + module PaymentMethodsHelper + def payment_method_name(payment) + # hack to allow us to retrieve the name of a "deleted" payment method + id = payment.payment_method_id + Spree::PaymentMethod.find_with_destroyed(id).name + end + end +end diff --git a/app/mailers/spree/order_mailer.rb b/app/mailers/spree/order_mailer.rb index 00002715c3..a8056c1778 100644 --- a/app/mailers/spree/order_mailer.rb +++ b/app/mailers/spree/order_mailer.rb @@ -4,7 +4,7 @@ module Spree class OrderMailer < BaseMailer helper 'checkout' helper SpreeCurrencyHelper - helper Spree::Admin::PaymentsHelper + helper Spree::PaymentMethodsHelper helper OrderHelper helper MailerHelper include I18nHelper diff --git a/app/mailers/subscription_mailer.rb b/app/mailers/subscription_mailer.rb index dd20008bfc..90efc9ee40 100644 --- a/app/mailers/subscription_mailer.rb +++ b/app/mailers/subscription_mailer.rb @@ -3,7 +3,7 @@ class SubscriptionMailer < Spree::BaseMailer helper MailerHelper helper ShopMailHelper helper OrderHelper - helper Spree::Admin::PaymentsHelper + helper Spree::PaymentMethodsHelper include I18nHelper def confirmation_email(order) diff --git a/spec/services/bulk_invoice_service_spec.rb b/spec/services/bulk_invoice_service_spec.rb index 78a324f0f2..b145dc8501 100644 --- a/spec/services/bulk_invoice_service_spec.rb +++ b/spec/services/bulk_invoice_service_spec.rb @@ -1,11 +1,11 @@ # frozen_string_literal: false require 'spec_helper' -require 'spree/admin/payments_helper' +require 'spree/payment_methods_helper' describe BulkInvoiceService do include ActiveJob::TestHelper - include Spree::Admin::PaymentsHelper + include Spree::PaymentMethodsHelper let(:service) { BulkInvoiceService.new } diff --git a/spec/services/invoice_renderer_spec.rb b/spec/services/invoice_renderer_spec.rb index cb861d2da6..2818ee8926 100644 --- a/spec/services/invoice_renderer_spec.rb +++ b/spec/services/invoice_renderer_spec.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true require 'spec_helper' -require 'spree/admin/payments_helper' +require 'spree/payment_methods_helper' describe InvoiceRenderer do - include Spree::Admin::PaymentsHelper + include Spree::PaymentMethodsHelper let(:service) { described_class.new } let(:order) do