From 2e84a8f6266cc6aaf7674bb371a668085af1b3f0 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Thu, 20 Nov 2014 15:05:19 +1100 Subject: [PATCH] Pull layout and roadie style inlining out into spree's base mailer so it applies to all mailers --- app/mailers/enterprise_mailer.rb | 3 --- app/mailers/spree/base_mailer_decorator.rb | 8 ++++++++ app/mailers/spree/order_mailer_decorator.rb | 2 -- app/mailers/spree/user_mailer_decorator.rb | 3 --- 4 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 app/mailers/spree/base_mailer_decorator.rb diff --git a/app/mailers/enterprise_mailer.rb b/app/mailers/enterprise_mailer.rb index dc7b9d8695..8ef7e74044 100644 --- a/app/mailers/enterprise_mailer.rb +++ b/app/mailers/enterprise_mailer.rb @@ -2,9 +2,6 @@ require 'devise/mailers/helpers' class EnterpriseMailer < Spree::BaseMailer include Devise::Mailers::Helpers - layout 'mailer' - helper Spree::MailerHelper - def welcome(enterprise) @enterprise = enterprise mail(:to => enterprise.email, :from => from_address, diff --git a/app/mailers/spree/base_mailer_decorator.rb b/app/mailers/spree/base_mailer_decorator.rb new file mode 100644 index 0000000000..a776eb8946 --- /dev/null +++ b/app/mailers/spree/base_mailer_decorator.rb @@ -0,0 +1,8 @@ +Spree::BaseMailer.class_eval do + # Inline stylesheets + include Roadie::Rails::Automatic + + # Define layout + layout 'mailer' + helper Spree::MailerHelper +end \ No newline at end of file diff --git a/app/mailers/spree/order_mailer_decorator.rb b/app/mailers/spree/order_mailer_decorator.rb index e2c63257ae..c6eeb31df8 100644 --- a/app/mailers/spree/order_mailer_decorator.rb +++ b/app/mailers/spree/order_mailer_decorator.rb @@ -1,6 +1,4 @@ Spree::OrderMailer.class_eval do - layout 'mailer' - helper Spree::MailerHelper helper HtmlHelper helper CheckoutHelper helper SpreeCurrencyHelper diff --git a/app/mailers/spree/user_mailer_decorator.rb b/app/mailers/spree/user_mailer_decorator.rb index 3663212299..40313d1b66 100644 --- a/app/mailers/spree/user_mailer_decorator.rb +++ b/app/mailers/spree/user_mailer_decorator.rb @@ -1,7 +1,4 @@ Spree::UserMailer.class_eval do - layout 'mailer' - helper Spree::MailerHelper - def signup_confirmation(user) @user = user mail(:to => user.email, :from => from_address,