diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index 60ef1884..607bdf60 100755 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -1677,6 +1677,7 @@ "label.button.Guarantor": "Guarantor", "label.button.undodisbursal": "Undo Disbursal", "label.button.undolastdisbursal": "Undo Last Disbursal", + "label.button.schedulepreview": "Preview Schedule", "label.button.makerepayment": "Make Repayment", "label.button.waiveinterest": "Waive Interest", "label.button.writeoff": "Write-Off", diff --git a/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js b/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js index 57fefb72..41d49908 100755 --- a/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js +++ b/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js @@ -119,6 +119,9 @@ case "undolastdisbursal": location.path('/loanaccount/' + accountId + '/undolastdisbursal'); break; + case "schedulepreview": + scope.previewSchedule(); + break; case "addsubsidy": location.path('/loanaccount/' + accountId + '/addsubsidy'); break; @@ -367,6 +370,10 @@ name: "button.loanscreenreport", taskPermissionName: 'READ_LOAN' }, + { + name: "button.schedulepreview", + taskPermissionName: 'READ_LOAN' + }, { name: "button.listguarantor", taskPermissionName: 'READ_GUARANTOR' @@ -844,6 +851,25 @@ return false; }; + scope.previewSchedule = function () { + $modal.open({ + templateUrl: 'showschedule.html', + controller: PreviewScheduleCtrl, + windowClass: 'app-modal-window' + }); + }; + + var PreviewScheduleCtrl = function ($scope, $modalInstance) { + $scope.loandetails = scope.loandetails; + resourceFactory.loanResource.get({loanId: routeParams.id, resourceType: 'schedulepreview'}, function (data) { + $scope.repaymentscheduleinfo = data; + }); + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + }; + /*** * we are using orderBy(https://docs.angularjs.org/api/ng/filter/orderBy) filter to sort fields in ui * api returns dates in array format[yyyy, mm, dd], converting the array of dates to date object diff --git a/app/scripts/controllers/product/CreateLoanProductController.js b/app/scripts/controllers/product/CreateLoanProductController.js index 9e70fa30..3fae400b 100755 --- a/app/scripts/controllers/product/CreateLoanProductController.js +++ b/app/scripts/controllers/product/CreateLoanProductController.js @@ -82,7 +82,6 @@ scope.formData.daysInYearType = scope.product.daysInYearType.id; scope.formData.daysInMonthType = scope.product.daysInMonthType.id; scope.formData.isInterestRecalculationEnabled = scope.product.isInterestRecalculationEnabled; - scope.formData.considerFutureDisbursmentsInSchedule = scope.product.considerFutureDisbursmentsInSchedule; scope.formData.interestRecalculationCompoundingMethod = scope.product.interestRecalculationData.interestRecalculationCompoundingType.id; scope.formData.rescheduleStrategyMethod = scope.product.interestRecalculationData.rescheduleStrategyType.id; scope.formData.preClosureInterestCalculationStrategy = scope.product.interestRecalculationData.preClosureInterestCalculationStrategy.id; @@ -289,11 +288,6 @@ scope.penaltyToIncomeAccountMappings = []; scope.chargesSelected = []; scope.selectedConfigurableAttributes = []; - if(considerFutureDisbursmentsInSchedule.checked) - scope.formData.considerFutureDisbursmentsInSchedule = true; - else{ - scope.formData.considerFutureDisbursmentsInSchedule = false; - } var temp = ''; //configure fund sources for payment channels diff --git a/app/scripts/controllers/product/EditLoanProductController.js b/app/scripts/controllers/product/EditLoanProductController.js index a5c34633..aab4ac7a 100755 --- a/app/scripts/controllers/product/EditLoanProductController.js +++ b/app/scripts/controllers/product/EditLoanProductController.js @@ -37,7 +37,6 @@ scope.incomeAndLiabilityAccountOptions = scope.incomeAccountOptions.concat(scope.liabilityAccountOptions); scope.penaltyOptions = scope.product.penaltyOptions || []; scope.chargeOptions = scope.product.chargeOptions || []; - scope.considerFutureDisbursmentsInSchedule = scope.product.considerFutureDisbursmentsInSchedule; scope.charges = []; for(var i in scope.product.charges){ if(scope.product.charges[i].chargeData){ @@ -496,11 +495,6 @@ scope.selectedConfigurableAttributes = []; var reqFirstDate = dateFilter(scope.date.first, scope.df); var reqSecondDate = dateFilter(scope.date.second, scope.df); - if(isFutureDisbursementsToBeShown.checked) - scope.formData.considerFutureDisbursmentsInSchedule = true; - else{ - scope.formData.considerFutureDisbursmentsInSchedule = false; - } var temp = ''; //configure fund sources for payment channels for (var i in scope.configureFundOptions) { diff --git a/app/styles/app.css b/app/styles/app.css index 2c060a7b..643ad837 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -1508,4 +1508,8 @@ figure { .border1px { border: 1px solid black; +} + +.app-modal-window .modal-dialog { + width: 900px; } \ No newline at end of file diff --git a/app/views/loans/viewloanaccountdetails.html b/app/views/loans/viewloanaccountdetails.html index c0b772e7..1de63c17 100755 --- a/app/views/loans/viewloanaccountdetails.html +++ b/app/views/loans/viewloanaccountdetails.html @@ -1044,6 +1044,127 @@ + + +
{{'label.button.upload' diff --git a/app/views/products/createloanproduct.html b/app/views/products/createloanproduct.html index eb84cbf6..a85f9812 100755 --- a/app/views/products/createloanproduct.html +++ b/app/views/products/createloanproduct.html @@ -989,17 +989,6 @@
-
- - -
- -
-

{{ 'label.heading.gauranteeRequirements' | translate }}


diff --git a/app/views/products/editloanproduct.html b/app/views/products/editloanproduct.html index 0e4a3a28..a3526489 100755 --- a/app/views/products/editloanproduct.html +++ b/app/views/products/editloanproduct.html @@ -872,17 +872,6 @@
-
- - -
- -
-

{{ 'label.heading.gauranteeRequirements' | translate }}


diff --git a/app/views/products/viewloanproduct.html b/app/views/products/viewloanproduct.html index 2bbd5de3..f23a2e8d 100755 --- a/app/views/products/viewloanproduct.html +++ b/app/views/products/viewloanproduct.html @@ -365,10 +365,6 @@ {{'label.input.issubsidyapplicable' | translate}} {{loanproduct.interestRecalculationData.isSubsidyApplicable | YesOrNo}} - - {{'label.input.allow.future.disbursement' | translate}} - {{loanproduct.considerFutureDisbursmentsInSchedule | YesOrNo}} -