From 1b39d5780099ae793d6dc3e35dbc6b6caad0c8b8 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Wed, 7 Mar 2018 15:56:50 +0100 Subject: [PATCH] Remove deprecated reference to Spree::MailMethod Said class is removed in https://github.com/spree/spree/pull/2643 in Spree. --- app/mailers/spree/base_mailer_decorator.rb | 3 +-- app/models/spree/app_configuration_decorator.rb | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/mailers/spree/base_mailer_decorator.rb b/app/mailers/spree/base_mailer_decorator.rb index bd7fd617ca..f6cd835f84 100644 --- a/app/mailers/spree/base_mailer_decorator.rb +++ b/app/mailers/spree/base_mailer_decorator.rb @@ -8,8 +8,7 @@ Spree::BaseMailer.class_eval do protected def from_address - Spree::MailMethod.current.andand.preferred_mails_from || - 'test@example.com' + Spree::Config[:mails_from] || 'test@example.com' end def roadie_options diff --git a/app/models/spree/app_configuration_decorator.rb b/app/models/spree/app_configuration_decorator.rb index 53cf81b3b7..c00c9bea27 100644 --- a/app/models/spree/app_configuration_decorator.rb +++ b/app/models/spree/app_configuration_decorator.rb @@ -4,6 +4,8 @@ Spree::AppConfiguration.class_eval do # we can allow to be modified in the UI by adding appropriate form # elements to existing or new configuration pages. + preference :mails_from, :string, default: 'no-reply@example.com' + # Embedded Shopfronts preference :enable_embedded_shopfronts, :boolean, default: false preference :embedded_shopfronts_whitelist, :text, default: nil