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 5fe2764607..ba5fabf74f 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 @@ -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: 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 68ccfe099f..bddeaa6478 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 @@ -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: