raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

More tweaking for email templates for use case of Collection from hub. Need to tweak logic on Order confiramtion page.

Browse Source
This commit is contained in:
summerscope
2015-03-04 17:34:24 +11:00
parent 5b6bff1691
commit e6591be55c
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,26 +122,23 @@
#{@order.shipping_method.name.html_safe}
- else
Collection details
- if @order.shipping_method.andand.description
%p
@order.shipping_method.description.html_safe
- if @order.order_cycle.andand.pickup_time_for(@order.distributor)
%h4
Ready for collection:
%strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
- if @order.shipping_method.andand.description
%p
%em #{@order.shipping_method.description.html_safe}
%br  
- if @order.ship_address.full_address
%p
%strong Collecting from:
%br
#{@order.ship_address.full_address}
- if @order.shipping_method.andand.description
%br
%em #{@order.shipping_method.description.html_safe}
- if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
%p
%strong Collection instructions:

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

@@ -121,26 +121,23 @@
#{@order.shipping_method.name.html_safe}
- else
Collection details
- if @order.shipping_method.andand.description
%p
@order.shipping_method.description.html_safe
- if @order.order_cycle.andand.pickup_time_for(@order.distributor)
%h4
Ready for collection:
%strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
- if @order.shipping_method.andand.description
%p
%em #{@order.shipping_method.description.html_safe}
%br  
- if @order.ship_address.full_address
%p
%strong Collecting from:
%br
#{@order.ship_address.full_address}
- if @order.shipping_method.andand.description
%br
%em #{@order.shipping_method.description.html_safe}
- if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
%p
%strong Collection instructions: