mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-24 20:36:49 +00:00
Merge pull request #2589 from luisramos0/spree2_base_mailer_dec_update
Spree 2 Upgrade - MailMethod - Delete outdated base_mailer_decorator.from_address
This commit is contained in:
@@ -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 })
|
||||
|
||||
Reference in New Issue
Block a user