From ea8354c1e3809b1eb44194e18559983180783605 Mon Sep 17 00:00:00 2001 From: Abdullah Shafiq Date: Wed, 20 Jun 2018 18:30:03 +0500 Subject: [PATCH 1/2] [IMPAC-905] Resolved bug with filtering past due invoices in invoices list widget --- .../accounts-invoices-list.directive.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/widgets-layouts/custom/accounts-invoices-list/accounts-invoices-list.directive.coffee b/src/components/widgets-layouts/custom/accounts-invoices-list/accounts-invoices-list.directive.coffee index dca0ea6e..fa931271 100644 --- a/src/components/widgets-layouts/custom/accounts-invoices-list/accounts-invoices-list.directive.coffee +++ b/src/components/widgets-layouts/custom/accounts-invoices-list/accounts-invoices-list.directive.coffee @@ -68,8 +68,12 @@ module.controller('WidgetAccountsInvoicesListCtrl', ($scope, $q, ImpacRoutes, Bo $scope.trxList.changeOverdueFilter = (overdueFilter) -> return if overdueFilter == $scope.trxList.overdue $scope.trxList.overdue = overdueFilter + todays_date = new Date() + formated_date = [todays_date.getFullYear(), (todays_date.getMonth() + 1), todays_date.getDate()].join('-') $scope.trxList.params.filter.balance = 'gt 0' if overdueFilter == 'overdue' + $scope.trxList.params.filter.due_date = ['lte', formated_date].join(' ') if overdueFilter == 'overdue' delete $scope.trxList.params.filter.balance if overdueFilter == 'all' + delete $scope.trxList.params.filter.due_date if overdueFilter == 'all' $scope.trxList.fetch() $scope.trxList.changeQuery = (query) -> From 48038a0a5143d1da7a1ce3375ae99e47ec51cc15 Mon Sep 17 00:00:00 2001 From: Abdullah Shafiq Date: Mon, 25 Jun 2018 17:56:34 +0500 Subject: [PATCH 2/2] [IMPAC-905] Formatted date using moment js for due_date filter --- .../accounts-invoices-list.directive.coffee | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/widgets-layouts/custom/accounts-invoices-list/accounts-invoices-list.directive.coffee b/src/components/widgets-layouts/custom/accounts-invoices-list/accounts-invoices-list.directive.coffee index fa931271..6cfbbee1 100644 --- a/src/components/widgets-layouts/custom/accounts-invoices-list/accounts-invoices-list.directive.coffee +++ b/src/components/widgets-layouts/custom/accounts-invoices-list/accounts-invoices-list.directive.coffee @@ -68,10 +68,9 @@ module.controller('WidgetAccountsInvoicesListCtrl', ($scope, $q, ImpacRoutes, Bo $scope.trxList.changeOverdueFilter = (overdueFilter) -> return if overdueFilter == $scope.trxList.overdue $scope.trxList.overdue = overdueFilter - todays_date = new Date() - formated_date = [todays_date.getFullYear(), (todays_date.getMonth() + 1), todays_date.getDate()].join('-') + todays_date = moment().format('YYYY-MM-DD') $scope.trxList.params.filter.balance = 'gt 0' if overdueFilter == 'overdue' - $scope.trxList.params.filter.due_date = ['lte', formated_date].join(' ') if overdueFilter == 'overdue' + $scope.trxList.params.filter.due_date = "lte #{todays_date}" if overdueFilter == 'overdue' delete $scope.trxList.params.filter.balance if overdueFilter == 'all' delete $scope.trxList.params.filter.due_date if overdueFilter == 'all' $scope.trxList.fetch()