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 updates dealing with pick up instructions.

Browse Source
This commit is contained in:
summerscope
2015-02-27 17:09:59 +11:00
parent ba0d4c2111
commit 12bfb9301a
2 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,10 +106,10 @@
%p #{@order.shipping_method.description.html_safe}
%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)}
/ - 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
@@ -131,24 +131,26 @@
- if @order.ship_address.full_address
%p
%strong Collect from:
%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.shipping_method.andand.description
%br
%em #{@order.shipping_method.description.html_safe}
- if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
%br
%em #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
- if @order.special_instructions.present?
- if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
%p
%small
%strong Your notes / custom delivery instructions:
%br
#{@order.special_instructions}
%strong Collection instructions:
%br
%em #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
- if @order.special_instructions.present?
%p
%small
%strong Customer notes / custom delivery instructions:
%br
#{@order.special_instructions}
%br
%p.callout

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

@@ -106,10 +106,10 @@
%p #{@order.shipping_method.description.html_safe}
%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)}
/ - 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
@@ -135,20 +135,22 @@
%br
#{@order.ship_address.full_address}
- if @order.shipping_method.andand.description
%br
%em #{@order.shipping_method.description.html_safe}
- if @order.shipping_method.andand.description
%br
%em #{@order.shipping_method.description.html_safe}
- if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
%br
%em #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
- if @order.special_instructions.present?
- if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
%p
%small
%strong Customer notes / custom delivery instructions:
%br
#{@order.special_instructions}
%strong Collection instructions:
%br
%em #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
- if @order.special_instructions.present?
%p
%small
%strong Customer notes / custom delivery instructions:
%br
#{@order.special_instructions}
%p  
= render 'shared/mailers/signoff'