Merge remote-tracking branch 'nexora/uate' into merge-uate-into-dev
build-run / Run Lint, Build and Deploy (push) Canceled after 0s
Publish Image in Docker Hub / build (push) Canceled after 0s
Playwright E2E Tests / Run Playwright Tests (push) Canceled after 0s
Tests / testRigor (push) Canceled after 0s

# Conflicts:
#	src/app/core/shell/shell.component.html
#	src/app/tasks/tasks-routing.module.ts
#	src/environments/.env.ts
This commit is contained in:
2026-07-23 17:15:52 +05:30
73 changed files with 8988 additions and 107 deletions
@@ -14,13 +14,37 @@
<p class="nom-page-header__sub">Manage nominees for this account. Nominees are account-specific.</p>
</div>
</div>
@if (!loading && !nomineesLoading && totalShare < 100 && !showAddForm) {
@if (!loading && !nomineesLoading && totalShare < 100 && !showAddForm && !hasPendingEdit) {
<button mat-flat-button color="primary" class="nom-add-btn" (click)="showAddForm = true">
<mat-icon>add</mat-icon> Add Nominee
</button>
}
</div>
@if (pendingEditLoading) {
<div class="esf-loading">
<mat-progress-spinner diameter="20" mode="indeterminate"></mat-progress-spinner>
<span>Checking for pending edits...</span>
</div>
}
@if (!pendingEditLoading && hasPendingEdit) {
<div class="esf-pending-banner">
<mat-icon>hourglass_top</mat-icon>
<div class="esf-pending-banner__text">
<strong>An edit is already pending approval for this account.</strong>
<span>
Submitted by {{ pendingEdit.makerUsername || 'a maker' }} on {{ pendingEdit.createdOn | dateFormat }}. Status:
<span class="esf-pending-banner__status">{{ pendingEdit.status }}</span>
@if (pendingEdit.holdAmount) {
&middot; Hold placed: {{ pendingEdit.holdAmount }}
}
</span>
<span>You cannot submit another edit until this one is approved or rejected.</span>
</div>
</div>
}
@if (loading) {
<div class="nom-loading">
<mat-progress-spinner diameter="24" mode="indeterminate"></mat-progress-spinner>
@@ -98,18 +122,20 @@
<button mat-icon-button type="button" matTooltip="View" (click)="viewNominee(nominee)">
<mat-icon>visibility</mat-icon>
</button>
<button mat-icon-button type="button" matTooltip="Edit" (click)="editNominee(nominee, i)">
<mat-icon>edit</mat-icon>
</button>
<button
mat-icon-button
type="button"
matTooltip="Delete"
class="nom-card__delete"
(click)="deleteNominee(nominee, i)"
>
<mat-icon>delete</mat-icon>
</button>
@if (!hasPendingEdit) {
<button mat-icon-button type="button" matTooltip="Edit" (click)="editNominee(nominee, i)">
<mat-icon>edit</mat-icon>
</button>
<button
mat-icon-button
type="button"
matTooltip="Delete"
class="nom-card__delete"
(click)="deleteNominee(nominee, i)"
>
<mat-icon>delete</mat-icon>
</button>
}
</div>
</div>
@if (nominee.nomineeIsMinor && (nominee.guardianDisplayName || nominee.guardianName)) {
@@ -645,3 +645,56 @@ $primary-light: #e8f0fe;
overflow: hidden;
}
}
$border: #e2e8f0;
$muted: #64748b;
$amber: #92400e;
$amber-bg: #fffbeb;
$amber-border: #fde68a;
.esf-loading {
display: flex;
align-items: center;
gap: 8px;
padding: 20px 0;
justify-content: center;
font-size: 13px;
color: $muted;
&--sm {
padding: 10px 0;
justify-content: flex-start;
}
}
.esf-pending-banner {
display: flex;
align-items: flex-start;
gap: 10px;
padding: 12px 16px;
background: $amber-bg;
border: 1px solid $amber-border;
border-radius: 8px;
margin-bottom: 16px;
color: $amber;
mat-icon {
flex: 0 0 auto;
}
&__text {
display: flex;
flex-direction: column;
gap: 2px;
font-size: 12.5px;
strong {
font-size: 13px;
}
}
&__status {
font-weight: 700;
text-transform: uppercase;
}
}
@@ -20,6 +20,9 @@ import { MatSlideToggle } from '@angular/material/slide-toggle';
import { DateFormatPipe } from '../../pipes/date-format.pipe';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
import { FormsModule } from '@angular/forms';
import { SavingsService } from 'app/savings/savings.service';
import { SuccessDialogComponent } from 'app/shared/success-dialog/success-dialog.component';
import { CurrentAccountsService } from 'app/current-accounts/current-accounts.service';
@Component({
selector: 'mifosx-account-nominees-tab',
@@ -41,11 +44,14 @@ export class AccountNomineesTabComponent implements OnInit {
private clientsService = inject(ClientsService);
private dialog = inject(MatDialog);
private sanitizer = inject(DomSanitizer);
private savingsService = inject(SavingsService);
private currentAccountsService = inject(CurrentAccountsService);
/** Set by route data */
accountDataKey: string = '';
accountType: string = '';
accountId: string = '';
clientId: string = '';
accountNo: string = '';
loading = true;
@@ -53,6 +59,9 @@ export class AccountNomineesTabComponent implements OnInit {
nominees: any[] = [];
nomineesLoading = false;
pendingEdit: any = null;
pendingEditLoading = true;
showAddForm = false;
searchText = '';
searchResults: any[] = [];
@@ -110,15 +119,45 @@ export class AccountNomineesTabComponent implements OnInit {
this.route.parent.data.subscribe((data: any) => {
const accountData = data[this.accountDataKey];
if (accountData) {
this.accountId = accountData.id?.toString() || this.route.parent.snapshot.params['savingAccountId'] || '';
this.clientId = accountData.clientId?.toString() || '';
this.accountNo = accountData.accountNo || '';
this.loading = false;
this.loadPendingEdit();
this.loadNominees();
this.loadTemplate();
}
});
}
private loadPendingEdit(): void {
this.pendingEditLoading = true;
const fetch$ =
this.accountType === 'CB'
? this.currentAccountsService.getPendingCurrentAccountEdit(this.accountId)
: this.savingsService.getPendingSavingsAccountEdit(this.accountId);
fetch$.subscribe({
next: (edit: any) => {
this.pendingEdit = edit && edit.id ? edit : null;
this.pendingEditLoading = false;
},
error: () => {
this.pendingEdit = null;
this.pendingEditLoading = false;
}
});
}
get hasPendingEdit(): boolean {
return !!this.pendingEdit && this.pendingEdit.status === 'PENDING';
}
private todayIso(): string {
const d = new Date();
const pad = (n: number) => String(n).padStart(2, '0');
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
}
private loadTemplate(): void {
this.clientsService.getClientNomineeTemplate(this.clientId).subscribe({
next: (template: any) => {
@@ -356,27 +395,34 @@ export class AccountNomineesTabComponent implements OnInit {
if (this.guardianSameAsNominee) return;
this.nomineeSaving = true;
const payload: any = {
const nomineePayload: any = {
operation: 'ADD',
nomineeId: null,
nomineeClientId: this.selectedClient.id,
accountNo: this.accountNo,
accountType: this.accountType,
nominationType: this.nomineeNomType,
relationshipId: this.nomineeRelationshipId,
percentageShare: this.nomineeShare,
isActive: true,
nomineeIsMinor: this.nomineeIsMinor,
remarks: this.nomineeRemarks || null,
locale: 'en'
guardianClientId: this.nomineeIsMinor && this.selectedGuardian ? this.selectedGuardian.id : null,
guardianRelationshipId: null,
effectiveDate: this.todayIso(),
remarks: this.nomineeRemarks || null
};
if (this.nomineeIsMinor && this.selectedGuardian) {
payload.guardianClientId = this.selectedGuardian.id;
}
const payload = {
locale: 'en',
dateFormat: 'yyyy-MM-dd',
nominee: nomineePayload
};
this.clientsService.addNominee(this.clientId, payload).subscribe({
const submit$ =
this.accountType === 'CB'
? this.currentAccountsService.submitCurrentAccountEdit(this.accountId, payload)
: this.savingsService.submitSavingsAccountEdit(this.accountId, payload);
submit$.subscribe({
next: () => {
this.nomineeSaving = false;
this.loadNominees();
this.resetAddForm();
this.showSuccess();
},
error: () => {
this.nomineeSaving = false;
@@ -384,6 +430,24 @@ export class AccountNomineesTabComponent implements OnInit {
});
}
private showSuccess(): void {
const ref = this.dialog.open(SuccessDialogComponent, {
width: '420px',
maxWidth: '92vw',
autoFocus: false,
data: {
title: 'Submitted for Approval',
message: 'Your changes have been submitted and are awaiting checker approval.',
buttonLabel: 'Done'
}
});
ref.afterClosed().subscribe(() => {
this.loadPendingEdit();
this.loadNominees();
this.resetAddForm();
});
}
viewNominee(nominee: any): void {
const clientId = nominee.nomineeClientId || nominee.linkedClientId || nominee.clientId;
const displayName = nominee.nomineeDisplayName || nominee.firstName || '';
@@ -432,17 +496,33 @@ export class AccountNomineesTabComponent implements OnInit {
if (!this.editRelId || !this.editShare || this.editShare < 1 || this.editShare > this.maxShareForEdit(index))
return;
const payload: any = {
const nomineePayload: any = {
operation: 'UPDATE',
nomineeId: nominee.id,
relationshipId: this.editRelId,
percentageShare: this.editShare,
nominationType: this.editNomType,
locale: 'en'
isActive: nominee.isActive !== undefined ? !!nominee.isActive : true,
nomineeIsMinor: !!nominee.nomineeIsMinor,
guardianClientId: nominee.nomineeIsMinor ? nominee.guardianClientId : null,
guardianRelationshipId: nominee.nomineeIsMinor ? nominee.guardianRelationshipId : null,
effectiveDate: this.todayIso(),
remarks: nominee.remarks || null
};
this.clientsService.updateNominee(this.clientId, nominee.id.toString(), payload).subscribe({
const payload = {
locale: 'en',
dateFormat: 'yyyy-MM-dd',
nominee: nomineePayload
};
const submit$ =
this.accountType === 'CB'
? this.currentAccountsService.submitCurrentAccountEdit(this.accountId, payload)
: this.savingsService.submitSavingsAccountEdit(this.accountId, payload);
submit$.subscribe({
next: () => {
this.loadNominees();
this.editingIndex = null;
this.showSuccess();
},
error: () => {}
});
@@ -454,9 +534,26 @@ export class AccountNomineesTabComponent implements OnInit {
});
ref.afterClosed().subscribe((response: any) => {
if (response?.delete) {
this.clientsService.deleteNominee(this.clientId, nominee.id.toString()).subscribe({
next: () => this.nominees.splice(index, 1),
error: () => this.nominees.splice(index, 1)
const nomineePayload: any = {
operation: 'DELETE',
nomineeId: nominee.id
};
const payload = {
locale: 'en',
dateFormat: 'yyyy-MM-dd',
nominee: nomineePayload
};
const submit$ =
this.accountType === 'CB'
? this.currentAccountsService.submitCurrentAccountEdit(this.accountId, payload)
: this.savingsService.submitSavingsAccountEdit(this.accountId, payload);
submit$.subscribe({
next: () => {
this.showSuccess();
},
error: () => {}
});
}
});
@@ -0,0 +1,307 @@
/**
* Copyright since 2025 Mifos Initiative
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
import { Component, OnInit, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { HttpClient, HttpParams } from '@angular/common/http';
import { FormsModule, ReactiveFormsModule, FormBuilder, FormGroup } from '@angular/forms';
import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatButtonModule } from '@angular/material/button';
import { MatTableModule } from '@angular/material/table';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
export interface CustomerSearchResult {
clientId: number;
displayName: string;
mobileNo: string | null;
officeName: string | null;
accountNo: string | null;
accountType: 'SAVINGS' | 'CURRENT' | 'FIXED_DEPOSIT' | 'RECURRING_DEPOSIT' | null;
panNumber: string | null;
aadhaarNumber: string | null;
address: string | null;
}
@Component({
selector: 'mifosx-customer-search-dialog',
standalone: true,
imports: [
CommonModule,
FormsModule,
ReactiveFormsModule,
MatDialogModule,
MatFormFieldModule,
MatInputModule,
MatButtonModule,
MatTableModule,
MatCheckboxModule,
MatSnackBarModule
],
template: `
<h2 mat-dialog-title>Search Customer</h2>
<mat-dialog-content>
<p class="hint-text">
Fill in any one field, or combine several to narrow the search (e.g. name + account number).
</p>
<form [formGroup]="form" class="search-form">
<mat-form-field appearance="outline" class="field">
<mat-label>Name</mat-label>
<input matInput formControlName="name" placeholder="Customer name" />
</mat-form-field>
<mat-form-field appearance="outline" class="field">
<mat-label>Account Number</mat-label>
<input matInput formControlName="accountNumber" placeholder="Savings / Current / FD / RD" />
</mat-form-field>
<mat-form-field appearance="outline" class="field">
<mat-label>Aadhaar Number</mat-label>
<input matInput formControlName="aadhaarNumber" placeholder="12-digit Aadhaar" maxlength="12" />
</mat-form-field>
<mat-form-field appearance="outline" class="field">
<mat-label>PAN Number</mat-label>
<input
matInput
formControlName="panNumber"
placeholder="e.g. ABCDE1234F"
maxlength="10"
style="text-transform: uppercase;"
/>
</mat-form-field>
<mat-form-field appearance="outline" class="field field--wide">
<mat-label>Address</mat-label>
<input matInput formControlName="address" placeholder="Street, town, city, or postal code" />
</mat-form-field>
</form>
<div class="account-type-filter" [formGroup]="form">
<span class="account-type-filter__label">Account Type</span>
<mat-checkbox formControlName="savings">Savings</mat-checkbox>
<mat-checkbox formControlName="current">Current</mat-checkbox>
<mat-checkbox formControlName="fixedDeposit">Fixed Deposit</mat-checkbox>
<mat-checkbox formControlName="recurringDeposit">Recurring Deposit</mat-checkbox>
<span class="account-type-filter__hint">(leave all unchecked to search every account type)</span>
</div>
<div class="results" *ngIf="searched">
<p *ngIf="!loading && results.length === 0" class="no-results">No matching customer found.</p>
<table mat-table [dataSource]="results" *ngIf="results.length > 0">
<ng-container matColumnDef="displayName">
<th mat-header-cell *matHeaderCellDef>Name</th>
<td mat-cell *matCellDef="let r">{{ r.displayName }}</td>
</ng-container>
<ng-container matColumnDef="account">
<th mat-header-cell *matHeaderCellDef>Account</th>
<td mat-cell *matCellDef="let r">
<span *ngIf="r.accountNo">{{ r.accountNo }} ({{ accountTypeLabel(r.accountType) }})</span>
<span *ngIf="!r.accountNo" class="muted">No account</span>
</td>
</ng-container>
<ng-container matColumnDef="mobileNo">
<th mat-header-cell *matHeaderCellDef>Mobile</th>
<td mat-cell *matCellDef="let r">{{ r.mobileNo || '-' }}</td>
</ng-container>
<ng-container matColumnDef="officeName">
<th mat-header-cell *matHeaderCellDef>Branch</th>
<td mat-cell *matCellDef="let r">{{ r.officeName || '-' }}</td>
</ng-container>
<ng-container matColumnDef="panNumber">
<th mat-header-cell *matHeaderCellDef>PAN</th>
<td mat-cell *matCellDef="let r">{{ r.panNumber || '-' }}</td>
</ng-container>
<ng-container matColumnDef="aadhaarNumber">
<th mat-header-cell *matHeaderCellDef>Aadhaar</th>
<td mat-cell *matCellDef="let r">{{ r.aadhaarNumber || '-' }}</td>
</ng-container>
<ng-container matColumnDef="address">
<th mat-header-cell *matHeaderCellDef>Address</th>
<td mat-cell *matCellDef="let r">{{ r.address || '-' }}</td>
</ng-container>
<ng-container matColumnDef="select">
<th mat-header-cell *matHeaderCellDef></th>
<td mat-cell *matCellDef="let r">
<button mat-flat-button color="primary" [disabled]="!r.accountNo" (click)="onSelect(r)">Select</button>
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
</table>
</div>
</mat-dialog-content>
<mat-dialog-actions align="end">
<button mat-button (click)="onClose()">Close</button>
<button mat-flat-button color="primary" [disabled]="loading" (click)="onSearch()">Search</button>
</mat-dialog-actions>
`,
styles: [
`
.hint-text {
color: #64748b;
font-size: 13px;
margin: 0 0 12px 0;
}
.search-form {
display: flex;
flex-wrap: wrap;
gap: 12px 16px;
}
.field {
flex: 1 1 220px;
}
.field--wide {
flex-basis: 100%;
}
.account-type-filter {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 8px 16px;
margin: 4px 0 16px 0;
}
.account-type-filter__label {
font-size: 13px;
font-weight: 600;
color: #475569;
}
.account-type-filter__hint {
font-size: 12px;
color: #94a3b8;
}
.results {
margin-top: 16px;
overflow-x: auto;
}
table {
width: 100%;
}
th {
font-weight: 600;
color: #475569;
background-color: #f8fafc;
}
td {
color: #334155;
}
.muted {
color: #94a3b8;
}
.no-results {
text-align: center;
color: #64748b;
padding: 16px 0;
}
`
]
})
export class CustomerSearchDialogComponent implements OnInit {
private fb = inject(FormBuilder);
private http = inject(HttpClient);
private dialogRef = inject(MatDialogRef<CustomerSearchDialogComponent>);
private snackBar = inject(MatSnackBar);
form!: FormGroup;
loading = false;
searched = false;
results: CustomerSearchResult[] = [];
displayedColumns = [
'displayName',
'account',
'mobileNo',
'officeName',
'panNumber',
'aadhaarNumber',
'address',
'select'
];
ngOnInit(): void {
this.form = this.fb.group({
name: [''],
accountNumber: [''],
aadhaarNumber: [''],
panNumber: [''],
address: [''],
savings: [false],
current: [false],
fixedDeposit: [false],
recurringDeposit: [false]
});
}
accountTypeLabel(type: string | null): string {
switch (type) {
case 'SAVINGS':
return 'Savings';
case 'CURRENT':
return 'Current';
case 'FIXED_DEPOSIT':
return 'FD';
case 'RECURRING_DEPOSIT':
return 'RD';
default:
return '-';
}
}
onSearch(): void {
const v = this.form.value;
const accountTypes: string[] = [];
if (v.savings) accountTypes.push('SAVINGS');
if (v.current) accountTypes.push('CURRENT');
if (v.fixedDeposit) accountTypes.push('FIXED_DEPOSIT');
if (v.recurringDeposit) accountTypes.push('RECURRING_DEPOSIT');
if (!v.name && !v.accountNumber && !v.aadhaarNumber && !v.panNumber && !v.address && accountTypes.length === 0) {
this.snackBar.open('Enter at least one search field, or check an account type.', 'Close', { duration: 3000 });
return;
}
this.loading = true;
let params = new HttpParams();
if (v.name) params = params.set('name', v.name);
if (v.accountNumber) params = params.set('accountNumber', v.accountNumber);
if (v.aadhaarNumber) params = params.set('aadhaarNumber', v.aadhaarNumber);
if (v.panNumber) params = params.set('panNumber', v.panNumber);
if (v.address) params = params.set('address', v.address);
if (accountTypes.length > 0) params = params.set('accountTypes', accountTypes.join(','));
this.http.get<CustomerSearchResult[]>('/customer-search', { params }).subscribe({
next: (data) => {
this.results = data || [];
this.searched = true;
this.loading = false;
},
error: (err) => {
this.loading = false;
this.snackBar.open('Error: ' + (err.error?.message || err.message), 'Close', { duration: 5000 });
}
});
}
onSelect(result: CustomerSearchResult): void {
this.dialogRef.close(result);
}
onClose(): void {
this.dialogRef.close();
}
}
@@ -19,7 +19,13 @@
<div class="intro-search-wrap">
<mat-form-field appearance="outline" class="intro-search-field">
<mat-label>Search by Name or Client ID</mat-label>
<input matInput [value]="searchText" (input)="onSearch($any($event.target).value)" autocomplete="off" />
<input
matInput
[value]="searchText"
(input)="onSearch($any($event.target).value)"
autocomplete="off"
[disabled]="disabled"
/>
<mat-icon matSuffix>search</mat-icon>
</mat-form-field>
@@ -86,9 +92,11 @@
}
</span>
</div>
<button mat-icon-button type="button" (click)="removeClient()" class="intro-card__remove">
<mat-icon>close</mat-icon>
</button>
@if (!disabled) {
<button mat-icon-button type="button" (click)="removeClient()" class="intro-card__remove">
<mat-icon>close</mat-icon>
</button>
}
</div>
@if (fetchingLinkedData) {
@@ -33,6 +33,7 @@ export class IntroducerSearchComponent implements OnChanges {
@Input() excludedClientIds: number[] = [];
@Input() preselectedIntroducer: { clientId: number; displayName: string; cifNumber?: string } | null = null;
@Input() disabled = false;
@Output() introducerChange = new EventEmitter<{ clientId: number; displayName: string; cifNumber?: string } | null>();
entryMode: 'linked' = 'linked';