raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changing explain text on confirm email

Browse Source 
Removing mention of making changes
This commit is contained in:
Rob Harrington
2016-12-15 11:51:25 +11:00
parent 994baf12c4
commit 1e0d43e975
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/spree/order_mailer/standing_order_email.html.haml
View File

@@ -18,7 +18,7 @@
%span.clear
%p.callout
= t("email_so_explainer_html", orders_close_at: l(@order.order_cycle.orders_close_at, format: "%a %b %d @ %I%p"))
= t("email_so_#{@type}_explainer_html", orders_close_at: l(@order.order_cycle.orders_close_at, format: "%a %b %d @ %I%p"))
= t("email_so_contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.email)
%p  

3
config/locales/en.yml
View File

@@ -1169,9 +1169,10 @@ See the %{link} to find out more about %{sitename}'s features and to start using
email_so_placement_details_html: "Here are the details of your order for <strong>%{distributor}</strong>:"
email_so_placement_changes: "Unfortunately, not all products that you requested were available. The original quantities that you requested appear crossed-out below."
email_so_payment_success_intro_html: "An automatic payment has been processed for your order from <strong>%{distributor}</strong>."
email_so_explainer_html: "This order was automatically created on your behalf. You can make changes until orders close on %{orders_close_at}."
email_so_placement_explainer_html: "This order was automatically created for you. You can make changes until orders close on %{orders_close_at}."
email_so_contact_distributor_html: "If you have any questions you can contact <strong>%{distributor}</strong> via %{email}."
email_so_confirmation_intro_html: "Your order with <strong>%{distributor}</strong> is now confirmed"
email_so_confirmation_explainer_html: "This order was automatically placed for you, and it has now been finalised."
email_so_confirmation_details_html: "Here's everything you need to know about your order from <strong>%{distributor}</strong>:"
email_shipping_delivery_details: Delivery details
email_shipping_delivery_time: "Delivery on:"

21
spec/mailers/order_mailer_spec.rb
View File

@@ -72,7 +72,7 @@ describe Spree::OrderMailer do
it "sends the email, which notifies the customer of changes made" do
body = Spree::OrderMailer.deliveries.last.body.encoded
expect(body).to include "This order was automatically created on your behalf."
expect(body).to include "This order was automatically created for you."
expect(body).to include "Unfortunately, not all products that you requested were available."
end
end
@@ -86,9 +86,26 @@ describe Spree::OrderMailer do
it "sends the email" do
body = Spree::OrderMailer.deliveries.last.body.encoded
expect(body).to include "This order was automatically created on your behalf."
expect(body).to include "This order was automatically created for you."
expect(body).to_not include "Unfortunately, not all products that you requested were available."
end
end
end
describe "order confirmation for standing orders" do
let(:standing_order) { create(:standing_order, with_items: true) }
let(:proxy_order) { create(:proxy_order, standing_order: standing_order) }
let!(:order) { proxy_order.initialise_order! }
before do
expect do
Spree::OrderMailer.standing_order_email(order.id, 'confirmation', {}).deliver
end.to change{Spree::OrderMailer.deliveries.count}.by(1)
end
it "sends the email" do
body = Spree::OrderMailer.deliveries.last.body.encoded
expect(body).to include "This order was automatically placed for you"
end
end
end