mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-27 01:43:22 +00:00
sorting orders in reverse date order
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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"}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user