From c24ceac0636f9a3acbc0673f9272524eb68a7f8d Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Mon, 3 May 2021 10:49:08 +0100 Subject: [PATCH] Extract default-setting to comment method --- .../orders/controllers/orders_controller.js.coffee | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 a449431165..b526001a80 100644 --- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee +++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee @@ -20,13 +20,16 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque $scope.initialise = -> unless QueryPersistence.restoreFilters($scope) - $scope.per_page = 15 - $scope.q = { - completed_at_not_null: true - } + $scope.setDefaults() $scope.fetchResults() + $scope.setDefaults = -> + $scope.per_page = 15 + $scope.q = { + completed_at_not_null: true + } + $scope.fetchResults = (page=1) -> startDateWithTime = $scope.appendStringIfNotEmpty($scope['q']['completed_at_gteq'], ' 00:00:00') endDateWithTime = $scope.appendStringIfNotEmpty($scope['q']['completed_at_lteq'], ' 23:59:59')