From e843beaf18d7665157c74843475243c7d7e0e79c Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 7 Aug 2015 14:19:48 +1000
Subject: [PATCH] Remove enterprise address from order confirmation and mailer,
 since in these contexts the pickup location will be specified elsewhere. #636

---
 app/views/spree/order_mailer/_shipping.html.haml | 16 +++++-----------
 app/views/spree/shared/_order_details.html.haml  |  6 ------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/app/views/spree/order_mailer/_shipping.html.haml b/app/views/spree/order_mailer/_shipping.html.haml
index cb9cde72ca..b50a03323c 100644
--- a/app/views/spree/order_mailer/_shipping.html.haml
+++ b/app/views/spree/order_mailer/_shipping.html.haml
@@ -8,14 +8,14 @@
         Delivery details
 
   - if @order.order_cycle.andand.pickup_time_for(@order.distributor)
-    %h4 
+    %h4
       Delivery on:
       %strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
     - if @order.shipping_method.andand.description
-      %p 
+      %p
         %em #{@order.shipping_method.description.html_safe}
     %br &nbsp;
-    
+
   - if @order.ship_address
     %h4 Delivery address:
     %p
@@ -37,21 +37,15 @@
         Collection details
 
   - if @order.order_cycle.andand.pickup_time_for(@order.distributor).present?
-    %h4 
+    %h4
       Ready for collection:
       %strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
-  
+
   - if @order.shipping_method.andand.description.present?
     %p
       %em #{@order.shipping_method.description.html_safe}
       %br &nbsp;
 
-  - if @order.ship_address.full_address
-    %p
-      %strong Collecting from: 
-      %br
-      #{@order.ship_address.full_address}
-
   - if @order.order_cycle.andand.pickup_instructions_for(@order.distributor).present?
     %p
       %strong Collection instructions:
diff --git a/app/views/spree/shared/_order_details.html.haml b/app/views/spree/shared/_order_details.html.haml
index 4fe07f07aa..e8315a00e9 100644
--- a/app/views/spree/shared/_order_details.html.haml
+++ b/app/views/spree/shared/_order_details.html.haml
@@ -65,12 +65,6 @@
           %strong #{order.order_cycle.pickup_time_for(order.distributor)}
         %p.text-small.text-skinny.pre-line
           %em= order.shipping_method.description.andand.html_safe || ""
-      .order-summary.text-small
-        %strong
-          Collection Address
-      .pad
-        %p.text-small
-          = order.ship_address.full_address
 
         - if order.order_cycle.pickup_instructions_for(order.distributor).present?
           %br