From 0de691b8216f5ec183c7098021b6d37cecd2b6ad Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 25 Aug 2018 13:47:05 +0100 Subject: [PATCH] Delete outdated base_mailer_decorator.from_address (it used old MailMethod). This way we rely on the correct spree base_mailer.from_address (that gets it from Spree::Config --- app/mailers/spree/base_mailer_decorator.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/mailers/spree/base_mailer_decorator.rb b/app/mailers/spree/base_mailer_decorator.rb index 863f97033a..44e2b53614 100644 --- a/app/mailers/spree/base_mailer_decorator.rb +++ b/app/mailers/spree/base_mailer_decorator.rb @@ -7,13 +7,6 @@ Spree::BaseMailer.class_eval do protected - # This method copies the one defined in Spree's mailers. It should be removed - # once in Spree v2.0 and Spree's BaseMailer class lands in our codebase. - # Then, we'll be able to rely on its #from_address. - def from_address - Spree::MailMethod.current.preferred_mails_from - end - def roadie_options # This lets us specify assets using relative paths in email templates super.merge(url_options: {host: URI(spree.root_url).host })