From 16427d6cd9818a3230b81fe41ea5d78a7baedf72 Mon Sep 17 00:00:00 2001 From: "mark.vituska" Date: Wed, 14 May 2025 13:49:11 +0200 Subject: [PATCH] FINERACT-2232: add capitalized income amount to loan summary view, remove capitalized income max amount validation --- .../general-tab/general-tab.component.ts | 2 +- .../make-repayment.component.ts | 22 +++++-------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/app/loans/loans-view/general-tab/general-tab.component.ts b/src/app/loans/loans-view/general-tab/general-tab.component.ts index b773b71e8..a6f654bee 100644 --- a/src/app/loans/loans-view/general-tab/general-tab.component.ts +++ b/src/app/loans/loans-view/general-tab/general-tab.component.ts @@ -82,7 +82,7 @@ export class GeneralTabComponent implements OnInit { this.loanSummaryTableData = [ { property: 'Principal', - original: this.loanDetails.summary.principalDisbursed, + original: this.loanDetails.summary.totalPrincipal, adjustment: this.loanDetails.summary.principalAdjustments || 0, paid: this.loanDetails.summary.principalPaid, waived: this.loanDetails.summary.principalWaived || 0, diff --git a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts index ddceadfcc..538ae9b32 100644 --- a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts +++ b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts @@ -82,22 +82,12 @@ export class MakeRepaymentComponent implements OnInit { note: '' }); - if (this.isCapitalizedIncome()) { - this.repaymentLoanForm.addControl( - 'transactionAmount', - new UntypedFormControl('', [ - Validators.required, - Validators.min(0.001), - Validators.max(this.dataObject.amount)]) - ); - } else { - this.repaymentLoanForm.addControl( - 'transactionAmount', - new UntypedFormControl('', [ - Validators.required, - Validators.min(0.001)]) - ); - } + this.repaymentLoanForm.addControl( + 'transactionAmount', + new UntypedFormControl('', [ + Validators.required, + Validators.min(0.001)]) + ); } setRepaymentLoanDetails() {