diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 5634d7b2..f5464221 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -865,9 +865,9 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n }; $http(setFees).then(function (response) { if (response.data.status==200 && response.data.feesStatus) { - + $scope.masterSessionDetails = response.data.sessionDetails; - + // service call for session master list in desc order based on date angular.forEach($scope.masterSessionDetails,function (fvalue,fkey) { var parts = fvalue.SessionDate.split("-"); @@ -1070,8 +1070,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n else{ $scope.convertGetDate=new Date($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].DueDate).toDateString(); $scope.pushDueDate = $filter('date')(new Date($scope.convertGetDate), 'dd-MM-yyyy'); - - } + } var MoreInsAmt= Math.round($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount * 50 / 100); var afterMoreInsAmt = parseInt($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount)-parseInt(MoreInsAmt); $rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount = MoreInsAmt; @@ -1374,8 +1373,9 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n startPayableAmt = parseInt(totAmt); var percentage = Math.round(startPayableAmt * 70 / 100); percentage = Math.round(percentage / 10) * 10; + startPayableAmt = startPayableAmt - percentage; - + // alert(startPayableAmt); $scope.insFirstDate = $filter('date')(new Date(cDate), 'dd-MM-yyyy'); $scope.insSecondDate = $filter('date')(new Date(cDate), 'dd-MM-yyyy'); @@ -1389,7 +1389,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } else { - startPayableAmt = Math.round(startPayableAmt / 10) * 10; + startPayableAmt = Math.round(startPayableAmt); $scope.updateMoreItems.push({ ID: "", Name: installmentService.installmentWords(i),