From e12207f3de197b52f1862cf1e4ce2f2694ef08de Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 9 Feb 2018 14:26:38 +1100 Subject: [PATCH] Use shop contact email and contact name for subscription emails --- app/mailers/subscription_mailer.rb | 6 +++--- app/views/subscription_mailer/confirmation_email.html.haml | 2 +- .../confirmation_summary_email.html.haml | 2 +- app/views/subscription_mailer/empty_email.html.haml | 2 +- .../subscription_mailer/failed_payment_email.html.haml | 2 +- app/views/subscription_mailer/placement_email.html.haml | 2 +- .../subscription_mailer/placement_summary_email.html.haml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/mailers/subscription_mailer.rb b/app/mailers/subscription_mailer.rb index cdabddd68e..bcb0448214 100644 --- a/app/mailers/subscription_mailer.rb +++ b/app/mailers/subscription_mailer.rb @@ -29,7 +29,7 @@ class SubscriptionMailer < Spree::BaseMailer def placement_summary_email(summary) @shop = Enterprise.find(summary.shop_id) @summary = summary - mail(to: @shop.email, + mail(to: @shop.contact.email, from: from_address, subject: "#{Spree::Config[:site_name]} #{t('subscription_mailer.placement_summary_email.subject')}") end @@ -37,7 +37,7 @@ class SubscriptionMailer < Spree::BaseMailer def confirmation_summary_email(summary) @shop = Enterprise.find(summary.shop_id) @summary = summary - mail(to: @shop.email, + mail(to: @shop.contact.email, from: from_address, subject: "#{Spree::Config[:site_name]} #{t('subscription_mailer.confirmation_summary_email.subject')}") end @@ -49,6 +49,6 @@ class SubscriptionMailer < Spree::BaseMailer mail(to: order.email, from: from_address, subject: subject, - reply_to: order.distributor.email) + reply_to: order.distributor.contact.email) end end diff --git a/app/views/subscription_mailer/confirmation_email.html.haml b/app/views/subscription_mailer/confirmation_email.html.haml index d5deaf7860..2001c5ba0e 100644 --- a/app/views/subscription_mailer/confirmation_email.html.haml +++ b/app/views/subscription_mailer/confirmation_email.html.haml @@ -6,7 +6,7 @@ = t("email_so_edit_false_html", orders_close_at: l(@order.order_cycle.orders_close_at, format: "%a %b %d @ %l:%M%p"), order_url: spree.order_url(@order)) - = t("email_so_contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.email) + = t("email_so_contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.contact.email) %p   %h4 diff --git a/app/views/subscription_mailer/confirmation_summary_email.html.haml b/app/views/subscription_mailer/confirmation_summary_email.html.haml index 1f08ba24d1..febfb2c6cf 100644 --- a/app/views/subscription_mailer/confirmation_summary_email.html.haml +++ b/app/views/subscription_mailer/confirmation_summary_email.html.haml @@ -5,7 +5,7 @@ %tr %td %h3 - = t(".greeting", name: @shop.contact) + = t(".greeting", name: @shop.contact_name) %h4 = t(".intro", shop: @shop.name) %table.column{:align => "left"} diff --git a/app/views/subscription_mailer/empty_email.html.haml b/app/views/subscription_mailer/empty_email.html.haml index eedc723641..f80db3cc04 100644 --- a/app/views/subscription_mailer/empty_email.html.haml +++ b/app/views/subscription_mailer/empty_email.html.haml @@ -3,7 +3,7 @@ %p.callout = t("email_so_empty_explainer_html") - = t("email_so_contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.email) + = t("email_so_contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.contact.email) %p   %h4 diff --git a/app/views/subscription_mailer/failed_payment_email.html.haml b/app/views/subscription_mailer/failed_payment_email.html.haml index b14e7830fb..b8728a3319 100644 --- a/app/views/subscription_mailer/failed_payment_email.html.haml +++ b/app/views/subscription_mailer/failed_payment_email.html.haml @@ -5,7 +5,7 @@ = t("email_so_edit_false_html", orders_close_at: l(@order.order_cycle.orders_close_at, format: "%a %b %d @ %l:%M%p"), order_url: spree.order_url(@order)) - = t("email_so_contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.email) + = t("email_so_contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.contact.email) - if @order.errors.any? %p   diff --git a/app/views/subscription_mailer/placement_email.html.haml b/app/views/subscription_mailer/placement_email.html.haml index 8f7ee4b5f7..78f107a76a 100644 --- a/app/views/subscription_mailer/placement_email.html.haml +++ b/app/views/subscription_mailer/placement_email.html.haml @@ -7,7 +7,7 @@ = t("email_so_edit_#{allow_changes}_html", orders_close_at: l(@order.order_cycle.orders_close_at, format: "%a %b %d @ %l:%M%p"), order_url: spree.order_url(@order)) - = t("email_so_contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.email) + = t("email_so_contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.contact.email) %p   %h4 diff --git a/app/views/subscription_mailer/placement_summary_email.html.haml b/app/views/subscription_mailer/placement_summary_email.html.haml index 1f08ba24d1..febfb2c6cf 100644 --- a/app/views/subscription_mailer/placement_summary_email.html.haml +++ b/app/views/subscription_mailer/placement_summary_email.html.haml @@ -5,7 +5,7 @@ %tr %td %h3 - = t(".greeting", name: @shop.contact) + = t(".greeting", name: @shop.contact_name) %h4 = t(".intro", shop: @shop.name) %table.column{:align => "left"}