From 21b18a8cc54c482bc12dcea2e76e7fafb8dd8855 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Tue, 10 Mar 2015 12:31:53 +1100
Subject: [PATCH] WIP commit so i can see what i messed up.

---
 .../spree/shared/_order_details.html.haml     | 82 ++++++++++---------
 1 file changed, 45 insertions(+), 37 deletions(-)

diff --git a/app/views/spree/shared/_order_details.html.haml b/app/views/spree/shared/_order_details.html.haml
index c6a8090bf1..370e6fbe22 100644
--- a/app/views/spree/shared/_order_details.html.haml
+++ b/app/views/spree/shared/_order_details.html.haml
@@ -30,46 +30,54 @@
         = order.bill_address.phone
 
   .columns.large-6
-    .order-summary.text-small
-      %strong= order.shipping_method.name
-    
-    .pad  
-      %p.text-big
-        - if @order.shipping_method.andand.require_ship_address
-          Delivery on
-        - else
-          Ready for collection
-        %strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
-        %br
-        %span.text-small
-          %em= order.shipping_method.description.html_safe
-    .order-summary.text-small
-      %strong 
-        - if @order.shipping_method.andand.require_ship_address
+    // Delivery option
+    - if @order.shipping_method.andand.require_ship_address
+      .order-summary.text-small
+        %strong= order.shipping_method.name
+      .pad  
+        %p.text-big
+            Delivery on
+          %strong= @order.order_cycle.pickup_time_for(@order.distributor)
+          %br
+          %span.text-small
+            %em= order.shipping_method.description.html_safe
+      .order-summary.text-small
+        %strong
           Delivery address
-        - else
-          Collection Address
-    .pad  
-      %p.text-small
-        - if @order.shipping_method.andand.require_ship_address
+      .pad  
+        %p.text-small
           = order.ship_address.firstname + " " + order.ship_address.lastname
           %br
-        - else
-          / Do nothing
-        
-        = order.ship_address.full_address
-        %br
-        = order.ship_address.phone
-        
-        - if @order.shipping_method.andand.require_ship_address
-          / Do nothing
-        - else
-          / Collection instructions
-        
-      %p.light.small
-        %strong Your notes:
-        %br
-        = order.special_instructions
+          = order.ship_address.full_address
+          %br
+          = order.ship_address.phone
+    // Collection option
+    - else
+      .order-summary.text-small
+        %strong= order.shipping_method.name
+      .pad  
+        %p.text-big
+          Ready for collection 
+          %strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
+          %br
+          %span.text-small
+            %em= order.shipping_method.description.html_safe
+      .order-summary.text-small
+        %strong 
+          Collection Address
+      .pad  
+        %p.text-small
+          = order.ship_address.full_address
+      .order-summary.text-small
+        %strong 
+          Collection Instructions
+      .pad  
+        %p.text-small #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
+          
+    %p.light.small
+      %strong Your notes:
+      %br
+      = order.special_instructions
   
       
 %br