app/views/orders/show.html.haml in artfully_ose-1.2.0 vs app/views/orders/show.html.haml in artfully_ose-1.3.0.pre1

@@ -2,23 +2,42 @@
 - content_for :header do
   %h1="Order #{@order.id}"
 
 .row
   .span3
-    = render :partial => 'order_sidebar', :locals => { :order => @order, :person => @person, :total => @total }
+    = render :partial => 'order_sidebar', :locals => { :order => @order, :person => @person, :total => @total, :pledge_commitment_date => @order.pledge_commitment_date }
   .span9
     - unless @order.all_items.empty?
-      = render :partial => 'refunds/grouped_form', :locals => { :order => @order }
-      = render :partial => 'exchanges/grouped_form', :locals => { :order => @order }
-      = render :partial => 'returns/grouped_form', :locals => { :order => @order }
+      - if current_user.can? :manage, Order
+        = render :partial => 'refunds/grouped_form', :locals => { :order => @order }
+        = render :partial => 'exchanges/grouped_form', :locals => { :order => @order }
+        = render :partial => 'returns/grouped_form', :locals => { :order => @order }
+        - if current_user.current_organization.has_kit?(:regular_donation)
+          = render :partial => 'converts/grouped_form', :locals => { :order => @order }
 
-      = render :partial => 'item_table', :locals => { :order => @order, :is_child => false }
+      = render :partial => 'item_table', :locals => { :order => @order, :is_child => false}
 
+      - if @order.is_pledge && (@order.scheduled_pledge_payments.any? || !@order.fully_paid?)
+        #pledges
+          .row-fluid
+            .span4
+              %h3 Scheduled Payments
+          - if @order.scheduled_pledge_payments.any?
+            = render :partial => 'pledges/scheduled_payments_table', :locals => {:scheduled_pledge_payments => @order.scheduled_pledge_payments}
+          - elsif !@order.fully_paid?
+            = render :partial => 'pledges/none_scheduled_payment_table', :locals => {:order_id => @order.id}
+
+      - if !@order.is_pledge && @order.parent.nil? && @order.assignable_pledges.any?
+        = render :partial => 'orders/assignable_pledges', :locals => {:order_id => @order.id}
+      - if @order.scheduled_pledge_payments.not_received.empty? && !@order.fully_paid?
+        = render :partial => 'pledges/receive_pledge', :locals => {:spp_id => 0, :order_id => @order.id, :person_id => @person.id, :amount => @order.outstanding_amount}
+
+
 - unless @order.children.empty?
   - @order.children.each do |child|
     %hr
     .row
       .span3
-        = render :partial => 'order_sidebar', :locals => { :order => child, :person => @person, :total => child.total, :work_with => false }
+        = render :partial => 'order_sidebar', :locals => { :order => child, :person => child.person, :total => child.total, :work_with => false, :pledge_commitment_date => nil }
       .span9
         - unless child.items.empty?
-          = render :partial => 'item_table', :locals => { :order => child, :is_child => true }
+          = render :partial => 'item_table', :locals => { :order => child, :is_child => true}
\ No newline at end of file