From 568e570b4bcb901c36b8f56f4e447d6ca21d6ece Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sat, 18 Apr 2020 13:09:08 +0100 Subject: [PATCH] Move method to more generic helper to use it in mailers --- app/helpers/admin/orders_helper.rb | 4 ---- app/helpers/order_helper.rb | 7 +++++++ app/mailers/spree/order_mailer_decorator.rb | 1 + app/mailers/subscription_mailer.rb | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 app/helpers/order_helper.rb diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb index cbc31d6ba7..9e16d27ed5 100644 --- a/app/helpers/admin/orders_helper.rb +++ b/app/helpers/admin/orders_helper.rb @@ -9,9 +9,5 @@ module Admin adjustment.originator_type == "Spree::ShippingMethod" end end - - def last_payment_method(order) - OrderPaymentFinder.new(order).last_payment&.payment_method - end end end diff --git a/app/helpers/order_helper.rb b/app/helpers/order_helper.rb new file mode 100644 index 0000000000..157ee212bb --- /dev/null +++ b/app/helpers/order_helper.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module OrderHelper + def last_payment_method(order) + OrderPaymentFinder.new(order).last_payment&.payment_method + end +end diff --git a/app/mailers/spree/order_mailer_decorator.rb b/app/mailers/spree/order_mailer_decorator.rb index bffc26ee46..fbf17013b8 100644 --- a/app/mailers/spree/order_mailer_decorator.rb +++ b/app/mailers/spree/order_mailer_decorator.rb @@ -2,6 +2,7 @@ Spree::OrderMailer.class_eval do helper HtmlHelper helper CheckoutHelper helper SpreeCurrencyHelper + helper OrderHelper include I18nHelper def cancel_email(order_or_order_id, resend = false) diff --git a/app/mailers/subscription_mailer.rb b/app/mailers/subscription_mailer.rb index e2216c01c9..0267e24ef4 100644 --- a/app/mailers/subscription_mailer.rb +++ b/app/mailers/subscription_mailer.rb @@ -1,6 +1,7 @@ class SubscriptionMailer < Spree::BaseMailer helper CheckoutHelper helper ShopMailHelper + helper OrderHelper include I18nHelper def confirmation_email(order)