From eefae8182ca33a6904ac662e14c4784f0ba81448 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 15 Jun 2018 16:20:27 +0530 Subject: [PATCH] fees status changes done --- .../assets/js/controllers/feesStatusCtrl.js | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index e44dd0c8..a7dee8bf 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -1876,26 +1876,18 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n * created by kms * */ $scope.calculateDueAmount = function (beforeTot,afterTot) { - if(parseInt(beforeTot)0 && parseInt(afterTot)>parseInt($scope.getInsTotAmt)){ + $scope.finalTotAmt=parseInt(afterTot)-parseInt($scope.getInsTotAmt); + $rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount = parseInt($scope.finalTotAmt); + } else{ - $scope.finalTotAmt=parseInt(afterTot)-parseInt(beforeTot); - } - if($rootScope.updateMoreItems.length>0){ - if(parseInt($scope.finalTotAmt)>0){ - $rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount = parseInt($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount) + parseInt($scope.finalTotAmt); - - } - else{ - if(parseInt($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount)