From f5a5b93c2238036ef5b287250c802a0efc0860ea Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Thu, 20 Nov 2014 15:45:12 +1100 Subject: [PATCH] Can use relative paths for assets in emails because roadie --- app/helpers/spree/mailer_helper.rb | 7 ------- app/mailers/spree/base_mailer_decorator.rb | 6 ++++++ app/views/layouts/mailer.html.haml | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 app/helpers/spree/mailer_helper.rb diff --git a/app/helpers/spree/mailer_helper.rb b/app/helpers/spree/mailer_helper.rb deleted file mode 100644 index f0e4a777a1..0000000000 --- a/app/helpers/spree/mailer_helper.rb +++ /dev/null @@ -1,7 +0,0 @@ -module Spree - module MailerHelper - def email_asset_url(asset) - URI.join(root_url, asset_path(asset)).to_s - end - end -end \ No newline at end of file diff --git a/app/mailers/spree/base_mailer_decorator.rb b/app/mailers/spree/base_mailer_decorator.rb index a776eb8946..e02751e574 100644 --- a/app/mailers/spree/base_mailer_decorator.rb +++ b/app/mailers/spree/base_mailer_decorator.rb @@ -5,4 +5,10 @@ Spree::BaseMailer.class_eval do # Define layout layout 'mailer' helper Spree::MailerHelper + + protected + def roadie_options + binding.pry + super.merge(url_options: {host: URI(spree.root_url).host }) + end end \ No newline at end of file diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml index 1f3dbdb2cf..554c80a320 100644 --- a/app/views/layouts/mailer.html.haml +++ b/app/views/layouts/mailer.html.haml @@ -15,7 +15,7 @@ %table{:bgcolor => "#333333"} %tr %td - %img{:src => "#{ email_asset_url 'open-food-network-beta.png' }", srcset: "#{ email_asset_url 'open-food-network-beta.svg' }", :width => "200"}/ + %img{:src => "#{ asset_path 'open-food-network-beta.png' }", srcset: "#{ asset_path 'open-food-network-beta.svg' }", :width => "200"}/ %td{:align => "right"} %h6.collapse Open Food Network