CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2557 from alberto-art3ch/WEB-251/fix_loan_account_creation_view

Browse Source 
fix: Loan create fails if Max allowed outstanding balance value is no…
This commit is contained in:
Felix van Hove
2025-07-12 14:49:10 +02:00
committed by GitHub
parent b9d8bd2b64 af1cb0ee7a
commit 2236f3bf55
2 changed files with 65 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
+32 -19
View File
@@ -45,9 +45,9 @@
loansAccountTermsForm.value.loanTermFrequencyType | find: termFrequencyTypeData : 'id' : 'value'
}}</span>
<h4 class="mat-h4 flex-98">Repayments</h4>
<h4 class="mat-h4 flex-98">{{ 'labels.inputs.Repayments' | translate }}</h4>
<mat-form-field class="flex-48">
<mat-form-field class="flex-fill flex-23">
<mat-label>{{ 'labels.inputs.Number of repayments' | translate }}</mat-label>
<input
type="number"
@@ -61,6 +61,11 @@
</mat-error>
</mat-form-field>
<mat-form-field class="flex-fill flex-23" *ngIf="loansAccountTermsData?.canDefineInstallmentAmount">
<mat-label>{{ 'labels.inputs.Installment Amount' | translate }}</mat-label>
<input type="number" matInput formControlName="fixedEmiAmount" />
</mat-form-field>
<mat-form-field class="flex-fill flex-23" (click)="repaymentsPicker.open()">
<mat-label>{{ 'labels.inputs.First repayment on' | translate }}</mat-label>
<input
@@ -220,7 +225,7 @@
</ng-container>
<ng-container *ngIf="loansAccountTermsData?.isLoanProductLinkedToFloatingRate">
<div class="flex-48 layout-row-wrap gap-2percent layout-xs-column">
<div class="flex-48 layout-row layout-xs-column">
<mat-form-field class="flex-48">
<mat-label>{{ 'labels.inputs.Interest Method' | translate }}</mat-label>
<mat-select formControlName="interestType">
@@ -256,12 +261,14 @@
<h4 class="mat-h4 flex-98">{{ 'labels.inputs.Loan Schedule' | translate }}</h4>
<div class="flex-48" *ngIf="loanScheduleType">
<span class="flex-40"
><p>{{ 'labels.inputs.Loan Schedule Type' | translate }}</p></span
>
<span class="flex-60"
><p>{{ loanScheduleType.value | translateKey: 'catalogs' }}</p></span
>
<div class="layout-row">
<span class="flex-40"
><p>{{ 'labels.inputs.Loan Schedule Type' | translate }}</p></span
>
<span class="flex-60"
><p>{{ loanScheduleType.value | translateKey: 'catalogs' }}</p></span
>
</div>
</div>
<mat-form-field class="flex-48">
@@ -284,14 +291,9 @@
</mat-error>
</mat-form-field>
<mat-form-field class="flex-48" *ngIf="loansAccountTermsData?.canDefineInstallmentAmount">
<mat-label>{{ 'labels.inputs.Installment Amount' | translate }}</mat-label>
<input type="number" matInput formControlName="fixedEmiAmount" />
</mat-form-field>
<h4 class="mat-h4 flex-98">{{ 'labels.heading.Interest Calculations' | translate }}</h4>
<mat-form-field class="flex-40">
<mat-form-field class="flex-48">
<mat-label>{{ 'labels.inputs.Interest calculation period' | translate }}</mat-label>
<mat-select
formControlName="interestCalculationPeriodType"
@@ -307,15 +309,15 @@
</mat-form-field>
<mat-checkbox
class="flex-48"
class="flex-98"
formControlName="allowPartialPeriodInterestCalculation"
matTooltip="{{ 'tooltips.To be used with SAME AS REPAYMENT PERIOD' | translate }}"
>
<p>{{ 'labels.inputs.Calculate interest for exact days in partial period' | translate }}</p>
</mat-checkbox>
<ng-container *ngIf="isProgressive">
<mat-checkbox formControlName="interestRecognitionOnDisbursementDate" class="flex-48">
<ng-container class="flex-98" *ngIf="isProgressive">
<mat-checkbox formControlName="interestRecognitionOnDisbursementDate" class="flex-98">
<p>{{ 'labels.inputs.Is interest recognition on disbursement date?' | translate }}</p>
</mat-checkbox>
</ng-container>
@@ -473,6 +475,13 @@
<span class="flex-40">{{ enableIncomeCapitalization | yesNo }}</span>
</div>
<div class="flex-100 layout-row">
<span class="flex-40"
><b>{{ 'labels.inputs.Enable Buy down fee' | translate }}</b></span
>
<span class="flex-40">{{ enableBuyDownFee | yesNo }}</span>
</div>
<ng-container *ngIf="multiDisburseLoan">
<mat-divider class="flex-98"></mat-divider>
<div class="flex-100 layout-row" *ngIf="allowAddDisbursementDetails()">
@@ -481,7 +490,11 @@
<div class="flex-100 layout-row">
<mat-form-field class="flex-48">
<mat-label>{{ 'labels.inputs.Maximum allowed outstanding balance' | translate }}</mat-label>
<input matInput required formControlName="maxOutstandingLoanBalance" />
<input matInput type="number" formControlName="maxOutstandingLoanBalance" />
<mat-error *ngIf="loansAccountTermsForm.controls.maxOutstandingLoanBalance.hasError('required')">
{{ 'labels.inputs.Maximum allowed outstanding balance' | translate }} {{ 'labels.commons.is' | translate }}
<strong>{{ 'labels.commons.required' | translate }}</strong>
</mat-error>
</mat-form-field>
<span class="flex-48">
<button
src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
+33 -10
View File
@@ -1,15 +1,8 @@
/** Angular Imports */
import { Component, OnInit, Input, OnChanges } from '@angular/core';
import {
UntypedFormGroup,
UntypedFormBuilder,
Validators,
FormArray,
UntypedFormControl,
ReactiveFormsModule
} from '@angular/forms';
import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormControl } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute, RouterLink } from '@angular/router';
import { ActivatedRoute } from '@angular/router';
import { LoansAccountAddCollateralDialogComponent } from 'app/loans/custom-dialog/loans-account-add-collateral-dialog/loans-account-add-collateral-dialog.component';
import { LoanProducts } from 'app/products/loan-products/loan-products';
import { LoanProduct } from 'app/products/loan-products/models/loan-product.model';
@@ -25,7 +18,7 @@ import { InputAmountComponent } from '../../../shared/input-amount/input-amount.
import { MatTooltip } from '@angular/material/tooltip';
import { MatCheckbox } from '@angular/material/checkbox';
import { MatDivider } from '@angular/material/divider';
import { MatIconButton, MatButton } from '@angular/material/button';
import { MatIconButton } from '@angular/material/button';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import {
MatTable,
@@ -161,6 +154,7 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
productEnableDownPayment = false;
enableIncomeCapitalization = false;
enableBuyDownFee = false;
isProgressive = false;
/**
@@ -190,6 +184,7 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
}
this.productEnableDownPayment = this.loansAccountTermsData.product.enableDownPayment;
this.enableIncomeCapitalization = this.loansAccountTermsData.product.enableIncomeCapitalization;
this.enableBuyDownFee = this.loansAccountTermsData.product.enableBuyDownFee;
this.isProgressive =
this.loansAccountTermsData.loanScheduleType.code == LoanProducts.LOAN_SCHEDULE_TYPE_PROGRESSIVE;
if (this.loansAccountTermsData.product) {
@@ -291,6 +286,19 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
this.loansAccountTermsForm.controls.graceOnArrearsAgeing.disable();
}
this.setOptions();
this.loansAccountTermsForm.removeControl('maxOutstandingLoanBalance');
if (this.allowAddDisbursementDetails()) {
this.loansAccountTermsForm.addControl(
'maxOutstandingLoanBalance',
new UntypedFormControl(this.loansAccountTermsData.maxOutstandingLoanBalance, Validators.required)
);
} else {
this.loansAccountTermsForm.addControl(
'maxOutstandingLoanBalance',
new UntypedFormControl(this.loansAccountTermsData.maxOutstandingLoanBalance)
);
}
}
}
@@ -344,11 +352,26 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
this.setAdvancedPaymentStrategyControls();
// this.setCustomValidators();
this.setLoanTermListener();
this.loansAccountTermsForm.removeControl('maxOutstandingLoanBalance');
if (this.allowAddDisbursementDetails()) {
this.loansAccountTermsForm.removeControl('maxOutstandingLoanBalance');
this.loansAccountTermsForm.addControl(
'maxOutstandingLoanBalance',
new UntypedFormControl(this.loansAccountTermsData.maxOutstandingLoanBalance, Validators.required)
);
} else {
this.loansAccountTermsForm.addControl(
'maxOutstandingLoanBalance',
new UntypedFormControl(this.loansAccountTermsData.maxOutstandingLoanBalance)
);
}
}
allowAddDisbursementDetails() {
return this.multiDisburseLoan && !this.loansAccountTermsData.disallowExpectedDisbursements;
}
formatDateToDDMMYYYY(date: Date): string {
const day = date.getDate().toString().padStart(2, '0');
const month = (date.getMonth() + 1).toString().padStart(2, '0');