From 12bfb9301aa373363a63bed32920086052a5d5f4 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 27 Feb 2015 17:09:59 +1100 Subject: [PATCH] More updates dealing with pick up instructions. --- .../confirm_email_for_customer.html.haml | 36 ++++++++++--------- .../confirm_email_for_shop.html.haml | 34 +++++++++--------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/app/views/spree/order_mailer/confirm_email_for_customer.html.haml b/app/views/spree/order_mailer/confirm_email_for_customer.html.haml index 4ee414b614..83f0f66505 100644 --- a/app/views/spree/order_mailer/confirm_email_for_customer.html.haml +++ b/app/views/spree/order_mailer/confirm_email_for_customer.html.haml @@ -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 diff --git a/app/views/spree/order_mailer/confirm_email_for_shop.html.haml b/app/views/spree/order_mailer/confirm_email_for_shop.html.haml index 87ed2e7166..35c7593f45 100644 --- a/app/views/spree/order_mailer/confirm_email_for_shop.html.haml +++ b/app/views/spree/order_mailer/confirm_email_for_shop.html.haml @@ -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'