raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use shop contact email and contact name for subscription emails

Browse Source
This commit is contained in:
Rob Harrington
2018-02-09 14:26:38 +11:00
parent 09b800672d
commit e12207f3de
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/mailers/subscription_mailer.rb
View File

@@ -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

2
app/views/subscription_mailer/confirmation_email.html.haml
View File

@@ -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 &nbsp;
%h4

2
app/views/subscription_mailer/confirmation_summary_email.html.haml
View File

@@ -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"}

2
app/views/subscription_mailer/empty_email.html.haml
View File

@@ -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 &nbsp;
%h4

2
app/views/subscription_mailer/failed_payment_email.html.haml
View File

@@ -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 &nbsp;

2
app/views/subscription_mailer/placement_email.html.haml
View File

@@ -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 &nbsp;
%h4

2
app/views/subscription_mailer/placement_summary_email.html.haml
View File

@@ -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"}