From b18a39a852b424b5d63a9014e1fec29dc2226728 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Fri, 6 May 2011 16:01:18 -0300 Subject: [PATCH] Mailer domain --- plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb b/plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb index 140f6c7..e43d5d3 100644 --- a/plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb +++ b/plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb @@ -5,8 +5,10 @@ class ShoppingCartPlugin::Mailer < ActionMailer::Base prepend_view_path(ShoppingCartPlugin.root_path+'/views') def customer_notification(customer, supplier, items) + domain = supplier.domains.first || supplier.environment.domains.first recipients customer[:email] - from supplier.contact_email + from 'no-reply@' + domain.name + reply_to supplier.contact_email subject _("[%s] Your buy request was performed successfully.") % supplier[:name] content_type 'text/html' body :customer => customer, @@ -16,10 +18,12 @@ class ShoppingCartPlugin::Mailer < ActionMailer::Base end def supplier_notification(customer, supplier, items) - recipients supplier.contact_email - from customer[:email] - subject _("[%s] You have a new buy request from %s.") % [supplier.environment.name, customer[:name]] - content_type 'text/html' + domain = supplier.environment.domains.first + recipients supplier.contact_email + from 'no-reply@' + domain.name + reply_to customer[:email] + subject _("[%s] You have a new buy request from %s.") % [supplier.environment.name, customer[:name]] + content_type 'text/html' body :customer => customer, :supplier => supplier, :items => items, -- libgit2 0.21.2