From a0af22350dbf09687447ebc8a44bfad838065d76 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Thu, 5 Mar 2015 17:21:25 +1100
Subject: [PATCH] Order conf page WIP

---
 .../spree/shared/_order_details.html.haml     | 73 +++++++++----------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/app/views/spree/shared/_order_details.html.haml b/app/views/spree/shared/_order_details.html.haml
index 822d34f984..c66f8d9a92 100644
--- a/app/views/spree/shared/_order_details.html.haml
+++ b/app/views/spree/shared/_order_details.html.haml
@@ -10,7 +10,6 @@
         Total order
         %strong
           = order.display_total.to_html
-          / = link_to "(#{t(:edit)})", checkout_state_path(:payment) unless @order.completed?
     .pad
       %p.text-big
         Paying via:
@@ -22,7 +21,6 @@
     .order-summary.text-small
       %strong
         Billing address
-        = link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed?
     .pad  
       %p.text-small
         = order.bill_address.firstname + " " + order.bill_address.lastname
@@ -34,46 +32,45 @@
   .columns.large-6
     .order-summary.text-small
       %strong= order.shipping_method.name
-
-    - if @order.has_step?("delivery")
-      .pad  
-        %p.text-big
+    
+    .pad  
+      %p.text-big
+        - if @order.shipping_method.andand.require_ship_address
           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
-      .pad  
-        %p.text-small
+        - 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 address
+        - else
+          Collection Address
+    .pad  
+      %p.text-small
+        - if @order.shipping_method.andand.require_ship_address
           = order.ship_address.firstname + " " + order.ship_address.lastname
           %br
-          = order.ship_address.full_address
-          %br
-          = order.ship_address.phone
-          
-        %p.light.small
-          %strong Your notes:
-          %br
-          = order.special_instructions
+        - 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
   
-    - else
-      .order-summary.text-small
-        %strong
-          Shipping address
-          = link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed?
-      .pad
-        %p.text-small
-          = order.ship_address.firstname + " " + order.ship_address.lastname
-          %br
-          = order.ship_address.full_address
-          %br
-          = order.ship_address.phone
-        %p.light.small
-          %strong Your notes:
-          %br
-          = order.special_instructions
       
 %br
 %table#line-items{"data-hook" => "order_details"}