Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Move MailHelper from core to emails gem (#13668)
Damian Legawiec33b3e2ab5db8
diff --git a/spree/core/app/mailers/spree/base_mailer.rb b/spree/core/app/mailers/spree/base_mailer.rbindex f6b3ab32dd..58f9109890 100644--- a/spree/core/app/mailers/spree/base_mailer.rb+++ b/spree/core/app/mailers/spree/base_mailer.rb@@ -1,7 +1,5 @@module Spreeclass BaseMailer < ActionMailer::Base- helper Spree::MailHelper-def current_store@current_store ||= @order&.store.presence || Spree::Store.current || Spree::Store.defaultenddiff --git a/spree/core/app/helpers/spree/mail_helper.rb b/spree/emails/app/helpers/spree/mail_helper.rbsimilarity index 100%rename from spree/core/app/helpers/spree/mail_helper.rbrename to spree/emails/app/helpers/spree/mail_helper.rbdiff --git a/spree/emails/app/mailers/spree/order_mailer.rb b/spree/emails/app/mailers/spree/order_mailer.rbindex 924100cc96..ee7c50e397 100644--- a/spree/emails/app/mailers/spree/order_mailer.rb+++ b/spree/emails/app/mailers/spree/order_mailer.rb@@ -1,5 +1,7 @@module Spreeclass OrderMailer < BaseMailer+ helper Spree::MailHelper+def confirm_email(order, resend = false)@order = order.respond_to?(:id) ? order : Spree::Order.find(order)current_store = @order.storediff --git a/spree/emails/app/mailers/spree/reimbursement_mailer.rb b/spree/emails/app/mailers/spree/reimbursement_mailer.rbindex 7bd8b3ea93..6fe34c4c09 100644--- a/spree/emails/app/mailers/spree/reimbursement_mailer.rb+++ b/spree/emails/app/mailers/spree/reimbursement_mailer.rb@@ -1,5 +1,7 @@module Spreeclass ReimbursementMailer < BaseMailer+ helper Spree::MailHelper+def reimbursement_email(reimbursement, resend = false)@reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)@order = @reimbursement.orderdiff --git a/spree/emails/app/mailers/spree/shipment_mailer.rb b/spree/emails/app/mailers/spree/shipment_mailer.rbindex fc37de4cd4..797f4dfbd2 100644--- a/spree/emails/app/mailers/spree/shipment_mailer.rb+++ b/spree/emails/app/mailers/spree/shipment_mailer.rb@@ -1,5 +1,6 @@module Spreeclass ShipmentMailer < BaseMailer+ helper Spree::MailHelperhelper Spree::ShipmentHelperdef shipped_email(shipment, resend = false)