diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee index ecc567c7cc..d0806aaa6d 100644 --- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee +++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee @@ -26,8 +26,19 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $scope.startDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_open_at).format('YYYY-MM-DD') $scope.endDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_close_at).startOf('day').format('YYYY-MM-DD') - RequestMonitor.load $scope.orders = Orders.index("q[state_not_eq]": "canceled", "q[completed_at_not_null]": "true", "q[completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}") - RequestMonitor.load $scope.lineItems = LineItems.index("q[order][state_not_eq]": "canceled", "q[order][completed_at_not_null]": "true", "q[order][completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[order][completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}") + RequestMonitor.load $scope.orders = Orders.index( + "q[state_not_eq]": "canceled", + "q[completed_at_not_null]": "true", + "q[completed_at_gteq]": "#{moment($scope.startDate).format()}", + "q[completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}" + ) + + RequestMonitor.load $scope.lineItems = LineItems.index( + "q[order][state_not_eq]": "canceled", + "q[order][completed_at_not_null]": "true", + "q[order][completed_at_gteq]": "#{moment($scope.startDate).format()}", + "q[order][completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}" + ) unless $scope.initialized RequestMonitor.load $scope.distributors = Enterprises.index(action: "visible", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])