From b1b04b505e1c68f68e861f186f67a7f09e0c5488 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Thu, 15 Nov 2018 14:26:49 +0100 Subject: [PATCH] Fetch orders sorted by completion date --- .../admin/orders/controllers/orders_controller.js.coffee | 2 +- .../orders/controllers/orders_controller_spec.js.coffee | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee index b2c1e692f0..d7f024e011 100644 --- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee +++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee @@ -30,7 +30,7 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor, 'q[distributor_id_in]': $scope['q']['distributor_id_in'], 'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'], 'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'], - 'q[s]': $scope.sorting || 'id desc', + 'q[s]': $scope.sorting || 'completed_at desc', per_page: $scope.per_page, page: page }) diff --git a/spec/javascripts/unit/admin/orders/controllers/orders_controller_spec.js.coffee b/spec/javascripts/unit/admin/orders/controllers/orders_controller_spec.js.coffee index 4aed599140..7886d8ddd6 100644 --- a/spec/javascripts/unit/admin/orders/controllers/orders_controller_spec.js.coffee +++ b/spec/javascripts/unit/admin/orders/controllers/orders_controller_spec.js.coffee @@ -30,6 +30,13 @@ describe "ordersCtrl", -> expect(Orders.index).toHaveBeenCalled() expect($scope.orders).toEqual orders + it "fetches them sorted by completed_at by default", -> + $scope.initialise() + expect(Orders.index).toHaveBeenCalledWith(jasmine.objectContaining({ + 'q[s]': 'completed_at desc' + })) + + describe "using pagination", -> it "changes the page", -> $scope.changePage(2)