KYC management: stage-wise notices, pagination, RD base chart
This commit is contained in:
+4
-3
@@ -110,8 +110,8 @@ export class CreateRecurringDepositsAccountComponent {
|
||||
*/
|
||||
setTemplate($event: any) {
|
||||
this.recurringDepositsAccountProductTemplate = $event;
|
||||
this.productsService.getFdBaseInterestRates().subscribe({
|
||||
next: (rates: any[]) => (this.cbsBaseRates = rates || []),
|
||||
this.productsService.getRdBaseInterestRates().subscribe({
|
||||
next: (rates: any) => (this.cbsBaseRates = Array.isArray(rates) ? rates : rates ? [rates] : []),
|
||||
error: () => (this.cbsBaseRates = [])
|
||||
});
|
||||
}
|
||||
@@ -198,7 +198,8 @@ export class CreateRecurringDepositsAccountComponent {
|
||||
if (this.recurringDepositsAccountProductTemplate?.introducerRequired && !detailsStep?.introducerId) {
|
||||
this.alertService.alert({
|
||||
type: 'Error',
|
||||
message: 'This product requires an introducer. Please choose an existing customer as introducer before submitting.'
|
||||
message:
|
||||
'This product requires an introducer. Please choose an existing customer as introducer before submitting.'
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
+2
-2
@@ -144,8 +144,8 @@ export class EditRecurringDepositAccountComponent {
|
||||
|
||||
setTemplate($event: any) {
|
||||
this.recurringDepositsAccountProductTemplate = $event;
|
||||
this.productsService.getFdBaseInterestRates().subscribe({
|
||||
next: (rates: any[]) => (this.cbsBaseRates = rates || []),
|
||||
this.productsService.getRdBaseInterestRates().subscribe({
|
||||
next: (rates: any) => (this.cbsBaseRates = Array.isArray(rates) ? rates : rates ? [rates] : []),
|
||||
error: () => (this.cbsBaseRates = [])
|
||||
});
|
||||
}
|
||||
|
||||
+6
-2
@@ -127,7 +127,8 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
|
||||
}>();
|
||||
|
||||
get activeBase(): any {
|
||||
return (this.cbsBaseRates || []).find((r) => r.fdType === 'DOUBLE' && r.isActive);
|
||||
// The recurring deposit's own CBS base chart; its active version carries the senior citizen rate of each slab.
|
||||
return (this.cbsBaseRates || []).find((r) => r.isActive) ?? (this.cbsBaseRates || [])[0];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -173,7 +174,10 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
|
||||
return baseSlabs;
|
||||
}
|
||||
// Products made before RD charts moved to months still hold the base chart's own year slabs
|
||||
const candidates = [...baseSlabs, ...this.normalizeCbsSlabs(cbsSlabs)];
|
||||
const candidates = [
|
||||
...baseSlabs,
|
||||
...this.normalizeCbsSlabs(cbsSlabs)
|
||||
];
|
||||
return productSlabs.map((slab: any) => {
|
||||
if (slab.seniorCitizenRate != null) {
|
||||
return slab;
|
||||
|
||||
+28
@@ -50,6 +50,34 @@
|
||||
<span class="nx-row__label">{{ 'labels.inputs.Maturity Date' | translate }}</span>
|
||||
<span class="nx-row__value">{{ recurringDepositsAccountData.maturityDate | dateFormat }}</span>
|
||||
</div>
|
||||
@if (installmentPosition) {
|
||||
<div class="nx-row">
|
||||
<span class="nx-row__label">Next Installment Due</span>
|
||||
<span class="nx-row__value">
|
||||
@if (installmentPosition.nextDueDate) {
|
||||
{{ installmentPosition.nextDueDate | dateFormat }} ·
|
||||
{{ installmentPosition.installmentAmount | currency: currency?.code : 'symbol-narrow' : '1.2-2' }}
|
||||
} @else {
|
||||
<span class="nx-muted">All installments paid</span>
|
||||
}
|
||||
</span>
|
||||
</div>
|
||||
<div class="nx-row">
|
||||
<span class="nx-row__label">Installments Paid</span>
|
||||
<span class="nx-row__value"
|
||||
>{{ installmentPosition.paidInstallments }} of {{ installmentPosition.totalInstallments }}</span
|
||||
>
|
||||
</div>
|
||||
@if (installmentPosition.overdueInstallments > 0) {
|
||||
<div class="nx-row">
|
||||
<span class="nx-row__label">Overdue</span>
|
||||
<span class="nx-row__value" style="color: var(--mat-sys-error, #d32f2f)">
|
||||
{{ installmentPosition.overdueInstallments }} installment(s) ·
|
||||
{{ installmentPosition.overdueAmount | currency: currency?.code : 'symbol-narrow' : '1.2-2' }}
|
||||
</span>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
@if (
|
||||
recurringDepositsAccountData.timeline.closedOnDate || recurringDepositsAccountData.summary.totalWitddrawals
|
||||
) {
|
||||
|
||||
+31
@@ -46,11 +46,21 @@ export class GeneralTabComponent {
|
||||
totalLienAmount = 0;
|
||||
/** Loan limit today (Lien Marked products only): % that applies, what it comes to, and what is left. */
|
||||
lienLimit: { percentage: number; maxLoanAmount: number; availableForLoan: number } | null = null;
|
||||
/** When the next installment is expected and how much, plus anything already overdue; null once fully paid. */
|
||||
installmentPosition: {
|
||||
nextDueDate: string | null;
|
||||
installmentAmount: number;
|
||||
paidInstallments: number;
|
||||
totalInstallments: number;
|
||||
overdueInstallments: number;
|
||||
overdueAmount: number;
|
||||
} | null = null;
|
||||
|
||||
constructor() {
|
||||
this.route.parent.data.subscribe((data: { recurringDepositsAccountData: any }) => {
|
||||
this.recurringDepositsAccountData = data.recurringDepositsAccountData;
|
||||
this.loadLiens(this.recurringDepositsAccountData?.id);
|
||||
this.loadInstallmentPosition(this.recurringDepositsAccountData?.id);
|
||||
this.currency = this.recurringDepositsAccountData.currency;
|
||||
this.isprematureAllowed = data.recurringDepositsAccountData.maturityDate != null;
|
||||
if (this.router.url.includes('clients')) {
|
||||
@@ -63,6 +73,27 @@ export class GeneralTabComponent {
|
||||
});
|
||||
}
|
||||
|
||||
private loadInstallmentPosition(accountId: any) {
|
||||
this.installmentPosition = null;
|
||||
if (!accountId) {
|
||||
return;
|
||||
}
|
||||
this.recurringDepositsService.getRecurringDepositInstallmentPosition(accountId).subscribe((response: any) => {
|
||||
const row = (response?.accounts ?? []).find((a: any) => Number(a.id) === Number(accountId));
|
||||
if (!row) {
|
||||
return;
|
||||
}
|
||||
this.installmentPosition = {
|
||||
nextDueDate: row.nextDueDate || null,
|
||||
installmentAmount: Number(row.installmentAmount) || 0,
|
||||
paidInstallments: Number(row.paidInstallments) || 0,
|
||||
totalInstallments: Number(row.totalInstallments) || 0,
|
||||
overdueInstallments: Number(row.overdueInstallments) || 0,
|
||||
overdueAmount: Number(row.overdueAmount) || 0
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
private loadLiens(accountId: any) {
|
||||
this.liens = [];
|
||||
this.totalLienAmount = 0;
|
||||
|
||||
@@ -39,6 +39,16 @@ export class RecurringDepositsService {
|
||||
return this.http.get(`/recurringdepositaccounts/${recurringDepositAccountId}/liens`);
|
||||
}
|
||||
|
||||
/**
|
||||
* This deposit's installment position as of the business date (next due date, overdue count/amount), from the
|
||||
* RD Dashboard endpoint - the same paid/overdue rule the auto-debit and penalty jobs use. Older backends ignore
|
||||
* `accountId` and return every RD, so callers pick the row by id.
|
||||
*/
|
||||
getRecurringDepositInstallmentPosition(recurringDepositAccountId: any): Observable<any> {
|
||||
const httpParams = new HttpParams().set('accountId', recurringDepositAccountId);
|
||||
return this.http.get('/recurringdepositaccounts/dashboard', { params: httpParams });
|
||||
}
|
||||
|
||||
/**
|
||||
* @param clientId Client Id
|
||||
* @param clientName Client Name
|
||||
|
||||
Reference in New Issue
Block a user