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

Update order confirmation email in line with changes in spree

Browse Source
This commit is contained in:
Rohan Mitchell
2013-07-23 14:00:29 +10:00
parent 3315191b81
commit b73c584c3b
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/spree/order_mailer/confirm_email.text.erb
View File

@@ -7,20 +7,20 @@ Order Summary
============================================================
Order for: <%= @order.bill_address.full_name %>
<% @order.line_items.each do |item| %>
<%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
<%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
<% end %>
============================================================
Subtotal: <%= number_to_currency @order.item_total %>
Subtotal: <%= @order.display_item_total %>
<% @order.adjustments.each do |adjustment| %>
<%= raw(adjustment.label) %> <%= number_to_currency(adjustment.amount) %>
<%= raw(adjustment.label) %> <%= adjustment.display_amount %>
<% end %>
Order Total: <%= number_to_currency(@order.total) %>
Order Total: <%= @order.display_total %>
<% if @order.payment_method.name.include? "EFT" %>
<% if @order.payments.first.payment_method.name.include? "EFT" %>
============================================================
Payment Details
============================================================
<%= @order.payment_method.description.html_safe %>
<%= @order.payments.first.payment_method.description.html_safe %>
<% end %>
============================================================

14
lib/chili/enterprises_distributor_info_rich_text_feature/app/views/spree/order_mailer/confirm_email_with_distributor_info.text.erb
View File

@@ -7,20 +7,20 @@ Order Summary
============================================================
Order for: <%= @order.bill_address.full_name %>
<% @order.line_items.each do |item| %>
<%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
<%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
<% end %>
============================================================
Subtotal: <%= number_to_currency @order.item_total %>
<% @order.adjustments.each do |adjustment| %>
<%= raw(adjustment.label) %> <%= number_to_currency(adjustment.amount) %>
Subtotal: <%= @order.display_item_total %>
<% @order.adjustments.eligible.each do |adjustment| %>
<%= raw(adjustment.label) %> <%= adjustment.display_amount %>
<% end %>
Order Total: <%= number_to_currency(@order.total) %>
Order Total: <%= @order.display_total %>
<% if @order.payment_method.name.include? "EFT" %>
<% if @order.payments.first.payment_method.name.include? "EFT" %>
============================================================
Payment Details
============================================================
<%= @order.payment_method.description.html_safe %>
<%= @order.payments.first.payment_method.description.html_safe %>
<% end %>
============================================================

8
lib/chili/enterprises_distributor_info_rich_text_feature/lib/enterprises_distributor_info_rich_text_feature/engine.rb
View File

@@ -8,12 +8,10 @@ module EnterprisesDistributorInfoRichTextFeature
if OpenFoodWeb::FeatureToggle.enabled? :enterprises_distributor_info_rich_text
::Spree::OrderMailer.class_eval do
def confirm_email(order, resend = false)
@order = order
find_order(order)
subject = (resend ? "[#{t(:resend).upcase}] " : '')
subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{order.number}"
mail(:to => order.email,
:subject => subject,
subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{@order.number}"
mail(:to => @order.email, :from => from_address, :subject => subject,
:template_name => 'confirm_email_with_distributor_info')
end
end