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

Tweaking email template to be more like order confirmation

Browse Source
This commit is contained in:
summerscope
2015-03-04 17:18:37 +11:00
parent b097a62c7a
commit 163035dcad
2 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/views/spree/order_mailer/confirm_email_for_customer.html.haml
View File

@@ -41,7 +41,7 @@
- else
%strong
%span= "#{raw(item.variant.product.name)}"
%span.light= "- " + "#{raw(item.variant.name_to_display)}"
%span= "- " + "#{raw(item.variant.name_to_display)}"
- if item.variant.options_text
= "(" + "#{raw(item.variant.options_text)}" + ")"
%br
@@ -98,24 +98,21 @@
%h4
Delivery on:
%strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
%br  
%h4 Delivery address:
%p
#{@order.ship_address.full_name}
%br
#{@order.ship_address.full_address}
%br
#{@order.ship_address.phone}
- if @order.shipping_method.andand.description
%p #{@order.shipping_method.description.html_safe}
%p
%em #{@order.shipping_method.description.html_safe}
%br  
- if @order.ship_address
%h4 Delivery address:
%p
#{@order.ship_address.full_name}
%br
#{@order.ship_address.full_address}
%br
#{@order.ship_address.phone}
%br  
/ - if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
/ %h4 Other delivery info:
/ %p
/ %strong #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
- else
/ Collection details
@@ -155,7 +152,7 @@
%br
%p
%small
%strong Customer notes / custom delivery instructions:
%strong Your notes / custom delivery instructions:
%br
#{@order.special_instructions}

38
app/views/spree/order_mailer/confirm_email_for_shop.html.haml
View File

@@ -36,8 +36,14 @@
- @order.line_items.each do |item|
%tr
%td
%strong= "#{raw(item.variant.product.name)}"
= "#{raw(item.variant.options_text)}"
- if item.variant.product.name == item.variant.name_to_display
%strong= "#{raw(item.variant.product.name)}"
- else
%strong
%span= "#{raw(item.variant.product.name)}"
%span= "- " + "#{raw(item.variant.name_to_display)}"
- if item.variant.options_text
= "(" + "#{raw(item.variant.options_text)}" + ")"
%br
%small
%em= raw(item.variant.product.supplier.name)
@@ -92,25 +98,21 @@
%h4
Delivery on:
%strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
%br  
%h4 Delivery address:
%p
#{@order.ship_address.full_name}
%br
#{@order.ship_address.full_address}
%br
#{@order.ship_address.phone}
- if @order.shipping_method.andand.description
%p #{@order.shipping_method.description.html_safe}
%p
%em #{@order.shipping_method.description.html_safe}
%br  
- if @order.ship_address
%h4 Delivery address:
%p
#{@order.ship_address.full_name}
%br
#{@order.ship_address.full_address}
%br
#{@order.ship_address.phone}
%br  
/ - if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
/ %h4 Other delivery info:
/ %p
/ %strong #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
- else
/ Collection details
%p.callout