From 5b73b80e81af4f2933e688b4f25444c85fb60eed Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Thu, 28 Jan 2016 23:10:27 +0000
Subject: [PATCH] sorting orders in reverse date order

---
 app/models/spree/user_decorator.rb   | 2 +-
 app/views/spree/users/_fat.html.haml | 6 +++---
 app/views/spree/users/show.html.haml | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/models/spree/user_decorator.rb b/app/models/spree/user_decorator.rb
index 7a808e6547..2578f417cc 100644
--- a/app/models/spree/user_decorator.rb
+++ b/app/models/spree/user_decorator.rb
@@ -56,7 +56,7 @@ Spree.user_class.class_eval do
 
   # Returns orders and their associated payments for all distributors that have been ordered from
   def orders_by_distributor
-    Enterprise.includes(distributed_orders: :payments).where(enterprises: {id: self.enterprises_ordered_from }, spree_orders: {state: :complete, user_id: self.id})
+    Enterprise.includes(distributed_orders: :payments).where(enterprises: {id: self.enterprises_ordered_from }, spree_orders: {state: 'complete', user_id: self.id}).order('spree_orders.completed_at DESC')
   end
 
   private
diff --git a/app/views/spree/users/_fat.html.haml b/app/views/spree/users/_fat.html.haml
index 3716210d2a..ce6f956bb7 100644
--- a/app/views/spree/users/_fat.html.haml
+++ b/app/views/spree/users/_fat.html.haml
@@ -8,8 +8,8 @@
         %th.order4{"bo-text" => "'shipping_state' | t"}
         %th.order5{"bo-text" => "'value' | t"}
         %th.order6{"bo-text" => "'balance' | t"}
-      %tbody{"ng-repeat" => "order in distributor.distributed_orders"}
-        %tr
+      %tbody.transaction-group{"ng-repeat" => "order in distributor.distributed_orders"}
+        %tr.order-row
           %td.order1
             %a{"bo-href" => "order.path", "bo-text" => "('order' | t )+ ' ' + order.number"}
           %td.order2{"bo-text" => "order.completed_at"}
@@ -17,7 +17,7 @@
           %td.order4{"bo-text" => "order.shipment_state | t"}
           %td.order5.text-right{"bo-text" => "order.total | localizeCurrency"}
           %td.order6.text-right{"ng-class" => "{'credit' : order.outstanding_balance < 0, 'debit' : order.outstanding_balance > 0, 'paid' : order.outstanding_balance == 0}", "bo-text" => "order.outstanding_balance | localizeCurrency"}
-          %tr{"ng-repeat" => "payment in order.payments"}
+          %tr.payment-row{"ng-repeat" => "payment in order.payments"}
             %td.order1{"bo-text" => "'Payment '+ payment.identifier"}
             %td.order2{"bo-text" => "payment.updated_at"}
             %td.order3{"bo-text" => "payment.payment_method"}
diff --git a/app/views/spree/users/show.html.haml b/app/views/spree/users/show.html.haml
index 290d1ed36a..482dac507a 100644
--- a/app/views/spree/users/show.html.haml
+++ b/app/views/spree/users/show.html.haml
@@ -23,3 +23,4 @@
                   = render partial: "spree/users/skinny"
                   = render partial: "spree/users/fat"
           .message{"ng-if" => "Orders.orders_by_distributor.length == 0", "bo-text" => "'you_have_no_orders_yet' | t"}
+-# TODO: Add footer