+
+
+
+
+
+
+
+
+
+ @if (!loading && debitSide && creditSide) {
+
+ {{ tallied ? 'Balanced' : 'Out of balance by ' + fmt(difference) }}
+
+ }
+
+
+
+
+ @if (error) {
+ {{ error }}
+ }
+
+ @if (loading) {
+ Loading balance sheet…
+ }
+
+ @if (!loading && debitSide && creditSide) {
+
+
+
+
+
+
+ }
+CONSOLIDATED BALANCE SHEET (SUB GROUP WISE)
+AS ON : {{ displayDate(asOnDateLoaded) }}
+FOR BRANCHES : {{ officeLabel }}
+
+
+
+
+
+
+
+
+
+
+ LIABILITIES ( CREDIT )
+
+ ACCOUNT NAME
+ BALANCE
+ TOTAL
+
+ @for (group of creditSide.groups; track group.classification) {
+ @for (root of group.nodes; track root.id) {
+ No liability, equity or income balances as on this date.
+ }
+
+
+
+ {{ fmt(creditSide.total) }}
+
+ ASSETS ( DEBIT )
+
+ ACCOUNT NAME
+ BALANCE
+ TOTAL
+
+ @for (group of debitSide.groups; track group.classification) {
+ @for (root of group.nodes; track root.id) {
+ No asset or expense balances as on this date.
+ }
+
+
+
+ {{ fmt(debitSide.total) }}
+
+
+
+ } @else {
+
+ {{ root.name }}
+ {{ fmt(root.balance) }}
+ {{ fmt(root.balance) }}
+
+
+
+ }
+{{ root.name }}
+
+ @for (child of root.children; track child.id) {
+
+ No accounts under this group
+
+
+
+ }
+
+
+
+ {{ fmt(root.balance) }}
+
+
+ {{ node.name }}
+ {{ fmt(node.balance) }}
+
+
+ } @else {
+
+ {{ node.name }}
+
+
+
+ @for (child of node.children; track child.id) {
+
+
+ {{ fmt(node.balance) }}
+
+
+ }
+
- account_balance
-
-
-
-
-
-
-
-
Cash GL Account
- ({{ glStatus.glCode }}) {{ glStatus.glAccountName }}
- @if (glHasBalance) {
+ @if (todayAlreadyOpen) {
+
+
+ lock
+
-
-
-
+
- Business Day Already Open
+
+ {{ todayOpenInfo.businessDate }} — opened by {{ todayOpenInfo.openedByName }}, opening cash ₹{{
+ todayOpenInfo.openingCash | number: '1.2-2'
+ }}
+
- Already holds
- ₹{{ glTarget.toLocaleString('en-IN') }}
- — count the drawer to exactly this amount.
+ This branch has already opened today's business day — counting the drawer again here would only be rejected
+ on submit. Deposits, withdrawals and closing today's day happen from Day Register instead.
- } @else {
-
- No opening balance posted yet — whatever you count below becomes this account's opening balance.
-
- }
-
-
- @for (d of allDenoms; track d.id) {
- Denomination
- Count
- Amount
+
-
- }
-
- {{ d.label }} {{ d.kind }}
-
-
-
-
-
-
- ₹{{ subtotalFor(d).toLocaleString('en-IN') }}
-
-
- Counted Total
- ₹{{ countedTotal.toLocaleString('en-IN') }}
- @if (glHasBalance) {
-
- GL Target
- ₹{{ glTarget.toLocaleString('en-IN') }}
+ } @else {
+
+
+
+
-
- Why does the count differ from the GL balance?
-
-
+
- }
- @if (errorMsg) {
-
+ account_balance
+
- @if (needsDifferenceReason) {
-
+
- }
- Cash GL Account
+ ({{ glStatus.glCode }}) {{ glStatus.glAccountName }}
+ @if (glHasBalance) {
+
+ Already holds
+ ₹{{ glTarget.toLocaleString('en-IN') }}
+ — count the drawer to exactly this amount.
+
+ } @else {
+
+ No opening balance posted yet — whatever you count below becomes this account's opening balance.
+
+ }
- @if (countedTotal <= 0) {
- edit_note
- Count each denomination above
- } @else if (isReconciled) {
- check_circle
- {{ glHasBalance ? 'Matches the GL balance' : 'Will define the GL opening balance' }}
- } @else {
- error
- Off by ₹{{
- (countedTotal - glTarget < 0 ? glTarget - countedTotal : countedTotal - glTarget).toLocaleString('en-IN')
- }}
- }
-
+
+ @for (d of allDenoms; track d.id) {
+ Denomination
+ Count
+ Amount
+
+
+ }
+ {{ d.label }} {{ d.kind }}
+
+
+
+
+
+
+ ₹{{ subtotalFor(d).toLocaleString('en-IN') }}
+ {{ errorMsg }}
- }
-
- @if (successMsg) {
-
- check_circle
- ('/aml/ctr-reports');
}
+ /**
+ * The reportable lines behind the generated CTRs, each resolved to the account, customer, branch
+ * and date a FIU-IND filing names. Omit `reportId` for every generated month.
+ */
+ getCtrReportLines(reportId?: number): Observable {
+ const params = reportId ? new HttpParams().set('reportId', String(reportId)) : undefined;
+ return this.http.get('/aml/ctr-reports/lines', { params });
+ }
+
/** month format: yyyy-MM */
generateCtrReport(month: string): Observable {
return this.http.post('/aml/ctr-reports/generate', { month });
diff --git a/src/app/cashier/branch-day/branch-day.component.html b/src/app/cashier/branch-day/branch-day.component.html
index e5db06861..65d27eb6e 100644
--- a/src/app/cashier/branch-day/branch-day.component.html
+++ b/src/app/cashier/branch-day/branch-day.component.html
@@ -49,6 +49,18 @@
}
+ @if (firstOpenNeedsCashMigration && !missedOnly) {
+
- {{ successMsg }}
- = {};
@@ -118,6 +126,8 @@ export class MigrateCashDenominationComponent implements OnInit {
this.result = null;
this.successMsg = '';
this.errorMsg = '';
+ this.todayAlreadyOpen = false;
+ this.todayOpenInfo = null;
if (!this.officeId) return;
this.glLoading = true;
@@ -131,6 +141,15 @@ export class MigrateCashDenominationComponent implements OnInit {
this.glError = res.message || 'No cash GL account is configured for this tenant yet.';
}
});
+
+ this.service
+ .branchDayRegister(this.officeId)
+ .pipe(catchError(() => of(null)))
+ .subscribe((res: any) => {
+ const openDay = res?.openDay;
+ this.todayAlreadyOpen = !!openDay && openDay.businessDate === res?.today;
+ this.todayOpenInfo = this.todayAlreadyOpen ? openDay : null;
+ });
}
countFor(d: Denom): number {
@@ -149,6 +168,12 @@ export class MigrateCashDenominationComponent implements OnInit {
this.counts[d.id] = Math.max(0, (this.counts[d.id] || 0) + delta);
}
+ /** Widens the count box as the typed count grows more digits, so a large count (hundreds,
+ * thousands) is never clipped or hard to read inside a field sized for one or two digits. */
+ countInputWidthCh(d: Denom): number {
+ return Math.max(3, String(this.countFor(d)).length + 2);
+ }
+
get countedTotal(): number {
return this.allDenoms.reduce((s, d) => s + this.subtotalFor(d), 0);
}
diff --git a/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.html b/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.html
index 728b7cf77..ac06c467a 100644
--- a/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.html
+++ b/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.html
@@ -162,7 +162,18 @@
diff --git a/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.scss b/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.scss
index 14cf2ca5a..578f9a0ee 100644
--- a/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.scss
+++ b/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.scss
@@ -219,6 +219,33 @@
word-break: break-word;
}
+ /* Cash at Vault / Cash at Teller — locked, see MigrateOpeningBalancesComponent.isDenominationManaged. */
+ &__lock {
+ display: inline-flex;
+ align-items: center;
+ gap: 4px;
+ margin-left: 8px;
+ padding: 1px 8px 1px 6px;
+ border-radius: 999px;
+ background: #fff7ed;
+ color: #9a3412;
+ font-size: 11px;
+ font-weight: 600;
+ white-space: nowrap;
+ vertical-align: middle;
+
+ mat-icon {
+ font-size: 13px;
+ width: 13px;
+ height: 13px;
+ }
+
+ a {
+ color: inherit;
+ text-decoration: underline;
+ }
+ }
+
&__amt {
text-align: right;
}
diff --git a/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.ts b/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.ts
index b1636d9df..0a4bcf291 100644
--- a/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.ts
+++ b/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.ts
@@ -17,6 +17,7 @@ import {
} from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { MatIconModule } from '@angular/material/icon';
+import { MatTooltipModule } from '@angular/material/tooltip';
/** Custom Services */
import { AccountingService } from '../accounting.service';
@@ -43,7 +44,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
...STANDALONE_SHARED_IMPORTS,
GlAccountDisplayComponent,
CurrencyPipe,
- MatIconModule
+ MatIconModule,
+ MatTooltipModule
]
})
export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
@@ -74,6 +76,13 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
debitsSum = 0;
/** Sum total of credits. */
creditsSum = 0;
+ /** GL account ids mapped to Financial Activity 101 (Cash at Vault) / 102 (Cash at Teller) — the
+ * account(s) Migrate Cash Denomination owns. Their opening balance is shown here for visibility
+ * but locked against editing: redefining it as a bare number here, instead of through a counted
+ * denomination breakdown, would let the GL figure drift away from what is physically in the till.
+ * The backend enforces the same rule independently (see defineOpeningBalance's
+ * validateNoDenominationManagedCashAccounts) — this is a convenience, not the source of truth. */
+ denominationManagedGlAccountIds: number[] = [];
/* Reference of search form */
@ViewChild('searchFormRef') searchFormRef: ElementRef;
@@ -95,6 +104,22 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
this.officeData = data.offices;
this.currencyData = data.currencies.selectedCurrencyOptions;
});
+ // Office-independent: which GL account(s) this tenant has mapped to Cash at Vault / Cash at
+ // Teller, so their row can be locked the moment the office's accounts are drawn.
+ this.accountingService.getFinancialActivityAccounts().subscribe((mappings: any[]) => {
+ this.denominationManagedGlAccountIds = (mappings || [])
+ .filter((mapping) => mapping.financialActivityData?.id === 101 || mapping.financialActivityData?.id === 102)
+ .map((mapping) => mapping.glAccountData?.id)
+ .filter((id) => id != null);
+ // Retrieve may already have run before this (fast) request came back — lock any row it
+ // missed rather than leaving it editable for the rest of this visit.
+ this.glAccountEntries?.controls.forEach((control) => {
+ const glAccountId = control.get('glAccountId')?.value;
+ if (this.isDenominationManaged(glAccountId) && control.enabled) {
+ control.disable();
+ }
+ });
+ });
}
/**
@@ -136,14 +161,31 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
* @returns {FormGroup} GL Account entry form.
*/
createGLAccountEntryForm(glAccount: any): UntypedFormGroup {
- return this.formBuilder.group(
+ // A never-touched account arrives as a placeholder row (amount/entryType both null); one that
+ // already carries an opening balance arrives with its real, committed figure — show that
+ // instead of leaving the field looking blank.
+ const existingDebit = glAccount.entryType?.value === 'DEBIT' ? glAccount.amount : null;
+ const existingCredit = glAccount.entryType?.value === 'CREDIT' ? glAccount.amount : null;
+ const group = this.formBuilder.group(
{
glAccountId: [glAccount.glAccountId],
- debit: [null],
- credit: [null]
+ debit: [existingDebit],
+ credit: [existingCredit]
},
{ validator: onlyOneOfTheFieldsIsRequiredValidator }
);
+ if (this.isDenominationManaged(glAccount.glAccountId)) {
+ // Disabling excludes this row from the form's own .value, so it is never resubmitted here —
+ // the account keeps whatever Migrate Cash Denomination last set it to.
+ group.disable();
+ }
+ return group;
+ }
+
+ /** Whether this GL account is Cash at Vault / Cash at Teller — locked here, see
+ * denominationManagedGlAccountIds. */
+ isDenominationManaged(glAccountId: number): boolean {
+ return this.denominationManagedGlAccountIds.includes(glAccountId);
}
/**
@@ -176,17 +218,30 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
this.openingBalancesData = openingBalancesData;
- entry.valueChanges.subscribe(() => {
- this.debitsSum = 0;
- this.creditsSum = 0;
- entry.controls.forEach((value) => {
- this.debitsSum += value.value.debit;
- this.creditsSum += value.value.credit;
- });
- });
+ entry.valueChanges.subscribe(() => this.recomputeSums());
+ // Runs once immediately too: valueChanges only fires on a later edit, and the locked cash
+ // row's own prefilled figure (set once, above, never through a further value change) would
+ // otherwise never be reflected in the banner at all.
+ this.recomputeSums();
});
}
+ /** Total Debit / Total Credit shown in the balance banner. A locked (denomination-managed) row is
+ * excluded here exactly as it is excluded from the form's own .value used at submit time — this
+ * screen only needs to balance the accounts it is itself about to (re)define, not the one
+ * Migrate Cash Denomination already settled and this form can never touch. */
+ private recomputeSums(): void {
+ this.debitsSum = 0;
+ this.creditsSum = 0;
+ this.glAccountEntries.controls.forEach((control) => {
+ if (control.disabled) {
+ return;
+ }
+ this.debitsSum += control.value.debit || 0;
+ this.creditsSum += control.value.credit || 0;
+ });
+ }
+
/**
* Submits the opening balances form and defines opening balances,
* if successful redirects to view created transaction.
diff --git a/src/app/accounting/search-journal-entry/search-journal-entry.component.html b/src/app/accounting/search-journal-entry/search-journal-entry.component.html
index f8dacebff..6938ce4bd 100644
--- a/src/app/accounting/search-journal-entry/search-journal-entry.component.html
+++ b/src/app/accounting/search-journal-entry/search-journal-entry.component.html
@@ -53,10 +53,13 @@
@@ -715,7 +718,10 @@
>
- @if (totalEntries === 0) {
+
+ @if (((dataSource?.entries$ | async) || []).length === 0) {
diff --git a/src/app/accounting/search-journal-entry/search-journal-entry.component.ts b/src/app/accounting/search-journal-entry/search-journal-entry.component.ts
index 39c8e1694..cf8330511 100644
--- a/src/app/accounting/search-journal-entry/search-journal-entry.component.ts
+++ b/src/app/accounting/search-journal-entry/search-journal-entry.component.ts
@@ -14,6 +14,7 @@ import { ActivatedRoute, RouterLink } from '@angular/router';
import { merge } from 'rxjs';
import { tap, startWith, map, distinctUntilChanged, debounceTime } from 'rxjs/operators';
import { AccountingService } from '../accounting.service';
+import { DISABLED_ACCOUNTING_FEATURES } from '../disabled-features';
import { SettingsService } from 'app/settings/settings.service';
import { JournalEntriesDataSource } from './journal-entry.datasource';
import { Dates } from 'app/core/utils/dates';
@@ -90,6 +91,8 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
// ── Misc ──────────────────────────────────────────────────────────────────
minDate = new Date(2000, 0, 1);
maxDate = new Date();
+ /** Accounting features switched off for this installation — see disabled-features.ts. */
+ disabledFeatures = DISABLED_ACCOUNTING_FEATURES;
// ── Filter controls ───────────────────────────────────────────────────────
officeName = new UntypedFormControl();
diff --git a/src/app/aml/aml.service.ts b/src/app/aml/aml.service.ts
index 59385a350..76bbc1905 100644
--- a/src/app/aml/aml.service.ts
+++ b/src/app/aml/aml.service.ts
@@ -122,6 +122,15 @@ export class AmlService {
return this.http.get
-
+
+
+
+
+ Why does the count differ from the GL balance?
+
+
+
+
+ }
+
+ @if (errorMsg) {
+
diff --git a/src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.scss b/src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.scss
index 6dcf31aa0..c68d75abd 100644
--- a/src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.scss
+++ b/src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.scss
@@ -115,6 +115,10 @@
color: #64748b;
line-height: 1.4;
}
+
+ button {
+ margin-top: 10px;
+ }
}
.mcd-grid {
@@ -171,7 +175,11 @@
}
&__input {
- width: 48px;
+ /* Width is set inline per row (see countInputWidthCh()), growing with the digit count typed —
+ min-width here only covers the fallback before Angular has bound anything. */
+ min-width: 48px;
+ max-width: 96px;
+ transition: width 0.1s ease-out;
text-align: center;
font-variant-numeric: tabular-nums;
border: 1px solid #e2e8f0;
diff --git a/src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.ts b/src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.ts
index a66fb5651..2509a0fce 100644
--- a/src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.ts
+++ b/src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.ts
@@ -66,6 +66,14 @@ export class MigrateCashDenominationComponent implements OnInit {
glStatus: any = null;
glError = '';
+ /** Set once per office change: whether TODAY's business day is already open for this office. This
+ * screen is a one-time "day 1" tool (see the class doc) - once a day has actually been opened,
+ * reopening the same one is exactly what BranchDayRegisterApiResource#migrateCashDenomination
+ * itself refuses (its own openDayInternal call rejects a day that is already open), so this is
+ * checked here too, before the user counts an entire drawer only to have the submit rejected. */
+ todayAlreadyOpen = false;
+ todayOpenInfo: any = null;
+
notes: Denom[] = [];
coins: Denom[] = [];
counts: Record
+
- }
- @if (!successMsg) {
-
+ Counted Total
+ ₹{{ countedTotal.toLocaleString('en-IN') }}
+
+ @if (glHasBalance) {
+
+ GL Target
+ ₹{{ glTarget.toLocaleString('en-IN') }}
+ }
+
+ @if (countedTotal <= 0) {
+ edit_note
+ Count each denomination above
+ } @else if (isReconciled) {
+ check_circle
+ {{ glHasBalance ? 'Matches the GL balance' : 'Will define the GL opening balance' }}
+ } @else {
+ error
+ Off by ₹{{
+ (countedTotal - glTarget < 0 ? glTarget - countedTotal : countedTotal - glTarget).toLocaleString(
+ 'en-IN'
+ )
+ }}
+ }
-
-
+ @if (needsDifferenceReason) {
+ {{ errorMsg }}
+ }
+
+ @if (successMsg) {
+
+ check_circle
+
+ }
+
+ @if (!successMsg) {
+
+ {{ successMsg }}
+
+
+
+
+
+
+
+ }
}
}
{{ openingBalancesData.glAccounts[i].glAccountCode }}
- {{ openingBalancesData.glAccounts[i].glAccountName }}
+
+ {{ openingBalancesData.glAccounts[i].glAccountName }}
+ @if (isDenominationManaged(openingBalancesData.glAccounts[i].glAccountId)) {
+
+ lock
+ Migrate Cash Denomination
+
+ }
+
No entries found
@@ -724,7 +730,11 @@
}
-
+ lock
+
+ This branch has never opened a business day, and its Cash at Vault GL account has no opening balance yet. Count
+ the vault and open the first business day together from
+ Migrate Cash Denomination — Open Day here is
+ locked until that is done, so today's cash tracking never starts out of step with the ledger.
+
+
+ }
+
@if (missed.length > 0) {
@@ -703,10 +715,10 @@
· {{ timeOnly(d.closedAt) }}
}
- {{ d.closingCash != null ? '₹' + (d.closingCash | number: '1.2-2') : '—' }}
- {{ d.bookCash != null ? '₹' + (d.bookCash | number: '1.2-2') : '—' }}
+ {{ hasValue(d.closingCash) ? '₹' + (d.closingCash | number: '1.2-2') : '—' }}
+ {{ hasValue(d.bookCash) ? '₹' + (d.bookCash | number: '1.2-2') : '—' }}
- @if (d.cashDifference == null) {
+ @if (!hasValue(d.cashDifference)) {
—
} @else if (d.cashDifference === 0) {
Tallied
diff --git a/src/app/cashier/branch-day/branch-day.component.scss b/src/app/cashier/branch-day/branch-day.component.scss
index fa49ed69d..c97aebcc9 100644
--- a/src/app/cashier/branch-day/branch-day.component.scss
+++ b/src/app/cashier/branch-day/branch-day.component.scss
@@ -30,6 +30,36 @@
}
}
+/* Blocks Open Day until the branch's first-ever open has gone through Migrate Cash Denomination —
+ see BranchDayComponent.checkFirstOpenCashMigration(). Same shape as .ve-note, in the error palette
+ the rest of this screen already uses for a missed close (.bd-missed). */
+.bd-locked {
+ display: flex;
+ align-items: flex-start;
+ gap: 8px;
+ padding: 10px 14px;
+ margin-bottom: 14px;
+ background: #fef2f2;
+ border: 1px solid #fecaca;
+ border-radius: 8px;
+ color: #b91c1c;
+ font-size: 12px;
+ line-height: 1.5;
+
+ mat-icon {
+ flex: none;
+ font-size: 18px;
+ width: 18px;
+ height: 18px;
+ }
+
+ a {
+ color: inherit;
+ font-weight: 600;
+ text-decoration: underline;
+ }
+}
+
.bd-success {
padding: 10px 14px;
margin-bottom: 14px;
diff --git a/src/app/cashier/branch-day/branch-day.component.ts b/src/app/cashier/branch-day/branch-day.component.ts
index 579a3364a..da476f658 100644
--- a/src/app/cashier/branch-day/branch-day.component.ts
+++ b/src/app/cashier/branch-day/branch-day.component.ts
@@ -10,7 +10,7 @@ import { Component, OnInit, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { MatIconModule } from '@angular/material/icon';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, RouterLink } from '@angular/router';
import { catchError, forkJoin, map, of, switchMap } from 'rxjs';
import { CashierService } from '../cashier.service';
@@ -61,7 +61,8 @@ interface BranchDay {
imports: [
CommonModule,
FormsModule,
- MatIconModule
+ MatIconModule,
+ RouterLink
]
})
export class BranchDayComponent implements OnInit {
@@ -85,6 +86,12 @@ export class BranchDayComponent implements OnInit {
loaded = false;
errorMsg = '';
successMsg = '';
+ /** True only for a branch that has never opened a business day and whose Cash at Vault / Cash at
+ * Teller GL account has never had anything posted to it — Open Day here would let day-to-day cash
+ * tracking begin while the ledger silently stays wherever it already was. The backend enforces
+ * this independently too (see BranchDayRegisterApiResource#requireCashMigrationBeforeFirstEverOpen);
+ * this flag only steers the user to the right screen before they hit that rejection. */
+ firstOpenNeedsCashMigration = false;
// Open-day form
showOpenForm = false;
@@ -202,6 +209,7 @@ export class BranchDayComponent implements OnInit {
this.today = res?.today ?? '';
this.canOperate = !!res?.canOperate;
this.openDate = this.today;
+ this.checkFirstOpenCashMigration();
});
this.service
@@ -212,9 +220,42 @@ export class BranchDayComponent implements OnInit {
});
}
+ /**
+ * Only relevant the moment this branch has never opened a business day before — every later
+ * open/close on this screen is untouched, so there is nothing to re-check once history exists.
+ */
+ private checkFirstOpenCashMigration(): void {
+ if (this.days.length > 0 || this.openDay) {
+ this.firstOpenNeedsCashMigration = false;
+ return;
+ }
+ this.service.cashGlStatus().subscribe({
+ next: (status: any) => {
+ // configured === false means this tenant has no Cash at Vault / Cash at Teller account
+ // mapped at all — nothing for this check to reconcile against, so it does not block.
+ this.firstOpenNeedsCashMigration = status?.configured !== false && !status?.hasBalance;
+ },
+ error: () => {
+ this.firstOpenNeedsCashMigration = false;
+ }
+ });
+ }
+
/** True when the branch has no open day at all, so today can be opened. */
get canOpenToday(): boolean {
- return this.canOperate && !this.openDay;
+ return this.canOperate && !this.openDay && !this.firstOpenNeedsCashMigration;
+ }
+
+ /**
+ * A still-open day's closing/book figures are dropped from the API response entirely (the
+ * backend's Gson instance omits a null map value rather than sending it as JSON null), so the
+ * field arrives as undefined, not null. Checking only `!== null` against that — which a stricter
+ * pass of this file made the mistake of doing — leaves undefined on the "has a value" branch,
+ * which then renders `'₹' + null` (the number pipe's own null output, string-concatenated) as the
+ * literal text "₹null". This checks for either, the way an open day actually shows up.
+ */
+ hasValue(value: number | null | undefined): boolean {
+ return value !== null && value !== undefined;
}
startOpen(): void {
diff --git a/src/app/cashier/closing-cash-report/closing-cash-report.component.html b/src/app/cashier/closing-cash-report/closing-cash-report.component.html
index b6faf9d5c..c964fd540 100644
--- a/src/app/cashier/closing-cash-report/closing-cash-report.component.html
+++ b/src/app/cashier/closing-cash-report/closing-cash-report.component.html
@@ -303,8 +303,8 @@
Voucher No
Date
- A/C No
- A/C Name
+ Debit
+ Credit
Payment Type
Teller
DR (₹)
@@ -326,8 +326,25 @@
{{ r.acNo }}
- {{ r.acName }}
+
+
+
+
+ @if (r.creditParty) {
+
@if (r.paymentType) {
{{ r.paymentType }}
diff --git a/src/app/cashier/transaction-entry/cashier-issue-dd-dialog.component.ts b/src/app/cashier/transaction-entry/cashier-issue-dd-dialog.component.ts
index 50e51c402..89206900c 100644
--- a/src/app/cashier/transaction-entry/cashier-issue-dd-dialog.component.ts
+++ b/src/app/cashier/transaction-entry/cashier-issue-dd-dialog.component.ts
@@ -71,8 +71,11 @@ export interface CashierIssueDdDialogData {
post_add
- Fill DD Details & Send for Approval
+ {{
+ row.ddDetails ? 'edit_note' : 'post_add'
+ }}
+
+ {{
+ row.ddDetails ? 'DD ' + row.ddDetails.ddNumber + ' · Edit Details' : 'Fill DD Details'
+ }}
@@ -1529,7 +1535,7 @@
(row.dbCr = 'Cr')
"
>
- @for (a of acTypOptions; track a) {
+ @for (a of acTypOptionsFor(row); track a) {
}
@@ -1756,7 +1762,7 @@
"
>
post_add
- Fill DD Details & Send for Approval
+ Fill DD Details
diff --git a/src/app/cashier/transaction-entry/transaction-entry.component.ts b/src/app/cashier/transaction-entry/transaction-entry.component.ts
index 5a49e956d..2ea622557 100644
--- a/src/app/cashier/transaction-entry/transaction-entry.component.ts
+++ b/src/app/cashier/transaction-entry/transaction-entry.component.ts
@@ -57,6 +57,27 @@ interface TxnRow {
* account — governs the share redemption (see submitShareRedemptionTransfer()). */
resolutionNumber?: string;
meetingDate?: string;
+ /**
+ * Beneficiary and leaflet captured in the DD dialog, held on the row until Save.
+ *
+ * The dialog used to submit the request itself, which left the worksheet's own Save button doing
+ * nothing for a DD row — the clerk filled the dialog, the request was already gone, and pressing
+ * Save afterwards had no effect. Filling in details and committing them are two different
+ * actions, so the dialog now only records what was entered and Save is what sends it.
+ */
+ ddDetails?: {
+ leafletId: number;
+ ddNumber: string;
+ beneficiaryName: string;
+ payableAtBranch: string;
+ payableAtCity: string;
+ /** Present only for a walk-in cash draft. */
+ purchaser?: { name: string; address: string; aadhaar: string };
+ /** Note-and-coin breakdown, cash drafts only. */
+ denominations?: { [key: string]: number };
+ fundingAccountId?: number;
+ fundingClientId?: number;
+ };
}
interface Denomination {
@@ -1617,6 +1638,13 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
private lastLoadedAcNo = '';
private acNoInput$ = new Subject<{ row: TxnRow; index: number; value: string }>();
cashVaultGlId: number | null = null;
+ /** The Cash Vault GL account's own code and name — the denomination breakdown for a manual GL
+ * entry has to be filed against THIS account, not whichever account the teller typed in, since
+ * that account is never the one physical notes actually moved through (see submitGlJournalEntry).
+ * Both resolved dynamically off whatever this tenant's own financial-activity mapping names as
+ * its cash/vault account (see loadCashVaultGl) — never a literal account name or code. */
+ cashVaultGlCode: string | null = null;
+ cashVaultGlName: string | null = null;
// Joint holder expanded details (keyed by index)
expandedHolder: number | null = null;
@@ -1671,6 +1699,33 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
'GL',
'LA'
];
+
+ /**
+ * Account types a clerk may fund a demand draft from.
+ *
+ * A clerk raises a draft against a member's own balance, so the only sensible sources are the
+ * accounts a member actually holds money in. GL was offered here too, and picking it quietly
+ * switched the row onto the cash path — the one that asks for a walk-in purchaser's name and a
+ * note-and-coin count, neither of which a clerk debiting an account has. The option is removed
+ * rather than validated afterwards, so the wrong path cannot be reached at all.
+ */
+ private static readonly DD_CLERK_ACTYPS = [
+ 'SD',
+ 'CA'
+ ];
+
+ /**
+ * The account types this particular row may use.
+ *
+ * Every other row keeps the full list; only a clerk's DD row is narrowed, because that is the
+ * only row where the account type silently decides which funding flow runs.
+ */
+ acTypOptionsFor(row: TxnRow): string[] {
+ if (this.isClerk && row.typ === 'DD') {
+ return TransactionEntryComponent.DD_CLERK_ACTYPS;
+ }
+ return this.acTypOptions;
+ }
dbCrOptions = [
'Dr',
'Cr'
@@ -2230,12 +2285,13 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
// panel never appears and the row would post as an ordinary entry with the charges silently
// dropped.
//
- // A clerk funds a draft through an account or an instrument instead, and their TXN TP. list no
- // longer offers cash, so defaulting to it would open the field on a value it cannot show.
- // isDdCashGlRow() still holds for them through AC.TP = GL.
+ // A clerk funds a draft by debiting a member's own account, so their row opens on savings and
+ // is debited, and GL is not on their AC.TP list at all (see acTypOptionsFor). Opening them on
+ // GL put the row on the cash path, which asks for a walk-in purchaser and a note-and-coin
+ // count that a clerk debiting an account does not have.
case 'DD':
- row.dbCr = 'Cr';
- row.acTyp = 'GL';
+ row.dbCr = this.isClerk ? 'Dr' : 'Cr';
+ row.acTyp = this.isClerk ? 'SD' : 'GL';
row.paymentTypeId = this.isClerk ? this.findTransferPaymentTypeId() : this.findCashPaymentTypeId();
row.chequeNo = '';
row.cheqDate = '';
@@ -2416,13 +2472,34 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
}
});
+ // Recorded on the row, not sent. Save is what commits the worksheet, and a DD row that
+ // submitted itself here left that button with nothing to do — so the clerk had no way to
+ // review the entered details, and no way to abandon them either.
dialogRef.afterClosed().subscribe((result) => {
if (!result) return;
- if (accountDebit) {
- this.submitAccountDebitDd(row, leaflet, result, fundingAccountId!, fundingClientId!);
- } else {
- this.submitWalkinCashDd(row, leaflet, result);
- }
+ row.ddDetails = {
+ leafletId: leaflet.id,
+ ddNumber: leaflet.ddNumber,
+ beneficiaryName: result.beneficiaryName,
+ payableAtBranch: result.payableAtBranch,
+ payableAtCity: result.payableAtCity,
+ purchaser: accountDebit
+ ? undefined
+ : {
+ name: result.walkinPurchaserName,
+ address: result.walkinPurchaserAddress,
+ aadhaar: result.walkinPurchaserAadhaar
+ },
+ fundingAccountId: accountDebit ? fundingAccountId! : undefined,
+ fundingClientId: accountDebit ? fundingClientId! : undefined
+ };
+ this.showAlert('success', 'DD Details Captured', [
+ `DD No. ${leaflet.ddNumber} · in favour of ${result.beneficiaryName}.`,
+ accountDebit
+ ? `₹${this.ddTotalPayableFor(row)} will be debited from ${row.acNo} once a checker approves.`
+ : `₹${this.ddTotalPayableFor(row)} to be collected at the counter.`,
+ 'Press Save to send this draft for approval.'
+ ]);
});
},
error: (err) => {
@@ -2480,6 +2557,9 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
row.amount = null;
row.ddCharges = null;
row.description = '';
+ // Cleared with the row: leaving the captured details behind would let a second Save raise
+ // the same draft again against a leaflet that has already been used.
+ row.ddDetails = undefined;
},
error: (err) => {
this.saving = false;
@@ -2488,6 +2568,53 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
});
}
+ /**
+ * Sends the drafts on the worksheet for approval.
+ *
+ * Each row carries the beneficiary details the dialog captured; a row that was never filled in is
+ * refused by name rather than skipped, because a clerk who pressed Save expecting one draft and
+ * got none has no way of telling which row was missing.
+ */
+ private saveDdRows(ddRows: TxnRow[]): void {
+ const unfilled = ddRows.filter((r) => !r.ddDetails);
+ if (unfilled.length > 0) {
+ this.showAlert('error', 'DD Details Not Entered', [
+ unfilled.length === 1
+ ? 'One DD row has no beneficiary details yet.'
+ : `${unfilled.length} DD rows have no beneficiary details yet.`,
+ 'Use "Fill DD Details & Send for Approval" on each DD row first, then press Save.'
+ ]);
+ return;
+ }
+
+ for (const row of ddRows) {
+ const details = row.ddDetails!;
+ const leaflet = { id: details.leafletId, ddNumber: details.ddNumber };
+ if (this.isDdAccountDebitRow(row)) {
+ this.submitAccountDebitDd(
+ row,
+ leaflet,
+ {
+ beneficiaryName: details.beneficiaryName,
+ payableAtBranch: details.payableAtBranch,
+ payableAtCity: details.payableAtCity
+ },
+ details.fundingAccountId!,
+ details.fundingClientId!
+ );
+ } else {
+ this.submitWalkinCashDd(row, leaflet, {
+ beneficiaryName: details.beneficiaryName,
+ payableAtBranch: details.payableAtBranch,
+ payableAtCity: details.payableAtCity,
+ walkinPurchaserName: details.purchaser?.name,
+ walkinPurchaserAddress: details.purchaser?.address,
+ walkinPurchaserAadhaar: details.purchaser?.aadhaar
+ });
+ }
+ }
+ }
+
private submitWalkinCashDd(row: TxnRow, leaflet: any, purchaserData: any): void {
// Read through countFor, which knows the map is keyed by kind:value. Indexing by d.id looked
// right but matched nothing, so every cash DD went in with no breakdown at all and its money
@@ -2557,6 +2684,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
row.amount = null;
row.ddCharges = null;
row.description = '';
+ // See the account-debit path: a second Save must not re-raise a draft already issued.
+ row.ddDetails = undefined;
this.clearDenominations();
},
error: (err) => {
@@ -3121,6 +3250,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
byName(/vault/i) ?? byName(/cash/i) ?? items.find((a: any) => a.glAccountData?.type?.value === 'ASSET');
if (found?.glAccountData?.id) {
this.cashVaultGlId = found.glAccountData.id;
+ this.cashVaultGlCode = found.glAccountData.glCode ?? null;
+ this.cashVaultGlName = found.glAccountData.name ?? found.financialActivityData?.name ?? null;
}
});
}
@@ -3189,7 +3320,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
// Step 1: search on the correct endpoint for this account type
this.http
.get(
- `${cfg.list}?${cfg.listQueryParam}=${encodeURIComponent(acNo)}${cfg.supportsPagination ? `&offset=0&limit=${cfg.maxLimit}` : ''}`
+ `${cfg.list}?${cfg.listQueryParam}=${encodeURIComponent(acNo)}${cfg.supportsPagination ? `&offset=0&limit=${cfg.maxLimit}` : ''}${cfg.extraListQueryParams ? `&${cfg.extraListQueryParams}` : ''}`
)
.pipe(catchError(() => of(null)))
.subscribe((res: any) => {
@@ -3278,6 +3409,10 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
matchField: string;
detailParams: string;
supportsPagination: boolean;
+ /** Extra fixed query params (e.g. "usage=1") appended to every list-search request for this
+ * account type — used to keep Header GL accounts out of the results a clerk/cashier can pick
+ * for a transaction; a Header can never receive a posting, so it should never be offered. */
+ extraListQueryParams?: string;
} {
const t = acTyp?.toUpperCase();
if (t === 'LA') {
@@ -3331,7 +3466,10 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
listQueryParam: 'searchParam',
matchField: 'glCode',
detailParams: '?fetchRunningBalance=true',
- supportsPagination: false
+ supportsPagination: false,
+ // Detail-only: a Header account is a pure grouping node and can never receive a
+ // transaction, so it must never be a selectable match here in the first place.
+ extraListQueryParams: 'usage=1'
};
}
if (t === 'CA' || t === 'CB') {
@@ -4361,6 +4499,15 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
}
onSave(): void {
+ // Demand drafts commit here like everything else on the worksheet. Checked first because a DD
+ // row shares its shape with the ordinary entries below — without this it would fall through and
+ // post as a plain transaction, with the draft never raised and the charges silently dropped.
+ const ddRows = this.rows.filter((r) => this.isDdRow(r));
+ if (ddRows.length > 0) {
+ this.saveDdRows(ddRows);
+ return;
+ }
+
// Clerk bank transfer — N DR savings/CA + N CR savings/CA, immediate execution. 'Fund Transfer'
// is the same flow under a second TYPE label — onTypChange() already defaults it identically to
// 'Enter Bank Transfer', so submission has to recognise both or a share redemption or bank
@@ -5641,11 +5788,15 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
count: this.countFor(d),
subtotal: this.subtotalFor(d)
}));
+ // Filed against the Cash Vault GL, not the account the teller selected on screen: that
+ // selected account (e.g. Sundry Creditors) is the other leg of the journal entry, and
+ // never the one whose physical notes actually changed hands. Tagging the breakdown to it
+ // instead of the vault is why this cash never reached the cashier/vault position.
this.http
.post('/cashier/gl-denomination', {
txnId: res.transactionId ?? res.resourceId,
- accountNo: this.accountDetails?.glCode ?? row.acNo,
- accountName: this.accountDetails?.name ?? '',
+ accountNo: this.cashVaultGlCode ?? row.acNo,
+ accountName: this.cashVaultGlName ?? 'Cash at Vault',
txnType: isDeposit ? 'DEPOSIT' : 'WITHDRAWAL',
txnDate: txnDateIso,
paymentTypeName: selectedPt?.name ?? 'Cash',
diff --git a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
index dc8109323..dbe9d8b20 100644
--- a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
+++ b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
@@ -969,6 +969,11 @@
createClientForm.get('alternateMobileNo')?.touched
) {
Enter valid 10-digit number (starts with 6-9)
+ } @else if (
+ createClientForm.get('alternateMobileNo')?.hasError('sameAsMobile') &&
+ createClientForm.get('alternateMobileNo')?.touched
+ ) {
+ Alternate number can't be the same as Mobile No
}
@@ -979,7 +984,11 @@
color="primary"
type="button"
class="verify-btn"
- [disabled]="readOnly || createClientForm.get('alternateMobileNo')?.value?.length !== 10"
+ [disabled]="
+ readOnly ||
+ createClientForm.get('alternateMobileNo')?.value?.length !== 10 ||
+ createClientForm.get('alternateMobileNo')?.hasError('sameAsMobile')
+ "
(click)="verifyAlternateDIP()"
>
+ Expiry date (optional)
+ event_busy
+
+
— Front" / "— Back"). Where the name says nothing, upload order stands in, front
+ * first, rather than leaving a scan the officer cannot see.
+ */
+ private fetchScansFor(identifierIds: string[]): void {
+ forkJoin(
+ identifierIds.map((id) =>
+ this.clientsService.getClientIdentificationDocuments(id).pipe(
+ // Tagged with the row it came from, because the download call needs the parent id and
+ // the sides can be spread across more than one.
+ map((docs: any) => ((docs as any[]) || []).map((d) => ({ ...d, identifierId: id }))),
+ catchError(() => of([] as any[]))
+ )
+ )
+ ).subscribe((perIdentifier: any[][]) => {
+ this.docScansLoading = false;
+ // This runs again after every replace, so the previews being thrown away are revoked
+ // rather than left holding their blobs.
+ for (const old of [
+ this.docScans.front,
+ this.docScans.back
+ ]) {
+ if (old?.previewUrl) {
+ URL.revokeObjectURL(old.previewUrl);
+ }
+ }
+
+ // Oldest first by document id, so the newest upload for a side is the last one written and
+ // therefore the one that stands. Identifier order cannot do this job: a replacement is filed
+ // against the first row while the original sits on the second, so reading the rows in order
+ // let a document uploaded months ago overwrite the scan collected a moment ago - the officer
+ // pressed Replace, saw "replaced", and the old image came straight back.
+ const docs = perIdentifier.flat().sort((a, b) => Number(a.id) - Number(b.id));
+ const sides: typeof this.docScans = { front: null, back: null };
+ const unlabelled: any[] = [];
+
+ const entryOf = (d: any): DocScanSide => ({
+ documentId: String(d.id),
+ identifierId: String(d.identifierId),
+ fileName: d.fileName || d.name,
+ previewUrl: null
+ });
+
+ for (const d of docs) {
+ const text = `${d.name || ''} ${d.fileName || ''}`.toLowerCase();
+ // Later uploads win, so a replaced side shows the new scan rather than the original.
+ if (text.includes('back')) {
+ sides.back = entryOf(d);
+ } else if (text.includes('front')) {
+ sides.front = entryOf(d);
+ } else {
+ unlabelled.push(d);
+ }
+ }
+ for (const d of unlabelled) {
+ if (!sides.front) {
+ sides.front = entryOf(d);
+ } else if (!sides.back) {
+ sides.back = entryOf(d);
+ }
+ }
+
+ this.docScans = sides;
+ for (const key of [
+ 'front',
+ 'back'
+ ] as const) {
+ if (sides[key]) {
+ this.loadScanPreview(sides[key]!);
+ }
+ }
+ });
+ }
+
+ private loadScanPreview(side: DocScanSide): void {
+ this.clientsService
+ .downloadClientIdentificationDocument(side.identifierId, side.documentId)
+ .pipe(catchError(() => of(null)))
+ .subscribe((blob: Blob | null) => {
+ if (!blob || !blob.type?.startsWith('image/')) {
+ return;
+ }
+ // Revoked in ngOnDestroy; a preview left behind holds the blob in memory for the life of
+ // the tab.
+ side.previewUrl = URL.createObjectURL(blob);
+ });
+ }
+
+ /**
+ * Replaces one side with a freshly collected scan.
+ *
+ * The new file is uploaded under the same side name, which is what the readers here and on the
+ * client screen key on, so the latest upload becomes the scan on show. The old file is left in
+ * place deliberately: a KYC document that has been re-collected is a record of what was held
+ * before and when it changed, and destroying it would leave the audit trail with a gap.
+ */
+ onDocScanSelected(event: Event, slot: 'front' | 'back'): void {
+ const input = event.target as HTMLInputElement;
+ const file = input.files?.[0];
+ // Cleared so choosing the same filename twice still fires a change event.
+ input.value = '';
+ if (!file || !this.docIdentifierId) {
+ return;
+ }
+
+ this.docScanError = null;
+ this.docScanSuccess = null;
+ this.docScanUploading = slot;
+
+ const label = slot === 'front' ? 'Front' : 'Back';
+ const docName = this.kycForm.get('kycDocumentName')?.value || this.kycData?.kycDocumentName || 'KYC document';
+
+ const formData = new FormData();
+ formData.append('file', file);
+ formData.append('name', `${docName} — ${label}`);
+ formData.append('description', `Re-collected on ${new Date().toLocaleDateString('en-IN')}`);
+
+ this.clientsService.uploadClientIdentifierDocument(this.docIdentifierId, formData).subscribe({
+ next: () => {
+ this.docScanUploading = null;
+ this.docScanSuccess = `${label} side replaced.`;
+ // Re-read every row, not just the one written to: the other side still lives on its own.
+ this.fetchScansFor(this.docIdentifierIds);
+ },
+ error: (err: any) => {
+ this.docScanUploading = null;
+ this.docScanError =
+ err?.error?.defaultUserMessage ||
+ err?.error?.developerMessage ||
+ `Could not replace the ${label.toLowerCase()} side.`;
+ }
+ });
+ }
+
+ /**
+ * A verified record only accepts an amendment with a reason on it, so the dialog has to ask for
+ * one. 300 is VERIFIED; the code form is checked too, since either can arrive on the payload.
+ */
+ private get isKycVerified(): boolean {
+ return this.kycData?.kycStatus === 300 || this.kycData?.kycStatusCode === 'clientKycStatus.verified';
+ }
+
+ /**
+ * Re-collects the officially valid document from its own row.
+ *
+ * PAN and Aadhaar are each handled on their row; this one sent the officer into edit mode on the
+ * whole KYC form to do the same job. The dialog asks for the number, the dates and each side of
+ * the scan together, which is what re-collecting a document actually is.
+ */
+ updateKycDocument(): void {
+ if (!this.kycId) {
+ this.docScanError = 'KYC record not found. Save KYC details first.';
+ return;
+ }
+
+ this.dialog
+ .open(KycDocumentUpdateDialogComponent, {
+ width: '640px',
+ maxWidth: '95vw',
+ disableClose: true,
+ data: {
+ documentName: this.kycData?.kycDocumentName || 'KYC document',
+ documentNumber: this.kycData?.kycDocumentNumber || '',
+ issueDate: this.parseApiDate(this.kycData?.kycDocIssueDate),
+ expiryDate: this.parseApiDate(this.kycData?.kycDocExpiryDate),
+ reason: this.showKycDocumentAlert ? this.kycDocumentAlertMessage : '',
+ currentFront: this.docScans.front?.previewUrl || null,
+ currentBack: this.docScans.back?.previewUrl || null,
+ requiresRemarks: this.isKycVerified
+ } as KycDocumentUpdateData
+ })
+ .afterClosed()
+ .subscribe((result: KycDocumentUpdateResult | undefined) => {
+ if (result) {
+ this.persistKycDocument(result);
+ }
+ });
+ }
+
+ /**
+ * Saves the corrected details, then uploads whichever sides were re-scanned.
+ *
+ * The details go first: they are the record, and a scan attached to a document whose number was
+ * never corrected would file the new image under the old identity.
+ */
+ private persistKycDocument(result: KycDocumentUpdateResult): void {
+ this.saving = true;
+ this.docScanError = null;
+ this.docScanSuccess = null;
+
+ const dateFormat = 'dd MMMM yyyy';
+ const payload: any = {
+ locale: 'en',
+ dateFormat,
+ kycDocumentName: this.kycData?.kycDocumentName || null,
+ kycDocumentNumber: result.documentNumber || null,
+ kycDocIssueDate: result.issueDate ? this.dateUtils.formatDate(result.issueDate, dateFormat) : null,
+ kycDocExpiryDate: result.expiryDate ? this.dateUtils.formatDate(result.expiryDate, dateFormat) : null
+ };
+ // The server refuses an amendment to a verified record without one, and records it as the
+ // reason the document changed.
+ if (result.remarks) {
+ payload.remarks = result.remarks;
+ }
+
+ this.clientsService.updateClientKyc(this.clientId, this.kycId!, payload).subscribe({
+ next: () => {
+ this.saving = false;
+ this.docScanSuccess = 'Document updated.';
+ this.loadKycData();
+ this.uploadReplacedSides(result);
+ },
+ error: (err: any) => {
+ this.saving = false;
+ this.docScanError =
+ err?.error?.defaultUserMessage || err?.error?.developerMessage || 'Could not update the document.';
+ }
+ });
+ }
+
+ /** Sends each re-scanned side through the same upload path the panel below uses. */
+ private uploadReplacedSides(result: KycDocumentUpdateResult): void {
+ if (!this.docIdentifierId) {
+ return;
+ }
+ const sides: { slot: 'front' | 'back'; file: File }[] = [];
+ if (result.front) {
+ sides.push({ slot: 'front', file: result.front });
+ }
+ if (result.back) {
+ sides.push({ slot: 'back', file: result.back });
+ }
+ if (!sides.length) {
+ return;
+ }
+
+ const docName = this.kycData?.kycDocumentName || 'KYC document';
+ forkJoin(
+ sides.map(({ slot, file }) => {
+ const formData = new FormData();
+ formData.append('file', file);
+ formData.append('name', `${docName} — ${slot === 'front' ? 'Front' : 'Back'}`);
+ formData.append('description', `Re-collected on ${new Date().toLocaleDateString('en-IN')}`);
+ return this.clientsService
+ .uploadClientIdentifierDocument(this.docIdentifierId!, formData)
+ .pipe(catchError(() => of(null)));
+ })
+ ).subscribe(() => {
+ this.docScanSuccess = 'Document and scan updated.';
+ this.fetchScansFor(this.docIdentifierIds);
+ });
+ }
+
/** Handle file selection for signed declaration upload */
onDeclarationFileSelected(event: Event): void {
const input = event.target as HTMLInputElement;
@@ -1365,5 +1713,14 @@ I further confirm that:
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
+ // Object URLs are held by the browser until revoked, so the scan blobs would outlive the tab.
+ for (const side of [
+ this.docScans.front,
+ this.docScans.back
+ ]) {
+ if (side?.previewUrl) {
+ URL.revokeObjectURL(side.previewUrl);
+ }
+ }
}
}
diff --git a/src/app/clients/create-client/create-client.component.ts b/src/app/clients/create-client/create-client.component.ts
index 6218ea5ac..ccd05c057 100644
--- a/src/app/clients/create-client/create-client.component.ts
+++ b/src/app/clients/create-client/create-client.component.ts
@@ -840,6 +840,15 @@ export class CreateClientComponent {
this.saveAddressProof(clientId);
}
+ /** "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" — same convention the CKYC tab and
+ * client-india-address-step's own "load existing" parsing both read back. */
+ private buildProofDescription(issueDate: string | null | undefined, expiryDate: string | null | undefined): string {
+ const parts: string[] = [];
+ if (issueDate) parts.push(`Issue date: ${issueDate}`);
+ if (expiryDate) parts.push(`Expiry date: ${expiryDate}`);
+ return parts.join(', ');
+ }
+
/**
* Save the address-proof picked on the permanent tab as a client identifier
* + upload each selected file as a document attached to that identifier.
@@ -855,9 +864,9 @@ export class CreateClientComponent {
const proofName = payload.proof?.name || 'Address Proof';
const identifierData: any = {
documentTypeId: payload.proofId,
- status: 'Active',
+ status: 'ACTIVE',
documentKey: payload.documentKey || `${proofName} - ${clientId}`,
- description: payload.issueDate ? `Issue date: ${payload.issueDate}` : ''
+ description: this.buildProofDescription(payload.issueDate, payload.expiryDate)
};
this.clientsService.addClientIdentifier(clientId, identifierData).subscribe({
@@ -904,7 +913,7 @@ export class CreateClientComponent {
}
const identifierData: any = {
documentTypeId,
- status: 'Active',
+ status: 'ACTIVE',
documentKey: payload.documentKey || `${proofName} - ${clientId}`,
description: 'KYC document'
};
diff --git a/src/app/clients/edit-client/contact-otp-block/contact-otp-block.component.ts b/src/app/clients/edit-client/contact-otp-block/contact-otp-block.component.ts
index 7d01f68d9..99cbd5959 100644
--- a/src/app/clients/edit-client/contact-otp-block/contact-otp-block.component.ts
+++ b/src/app/clients/edit-client/contact-otp-block/contact-otp-block.component.ts
@@ -164,6 +164,13 @@ export class ContactOtpBlockComponent implements OnChanges, OnDestroy {
request$.subscribe({
next: (res: any) => {
this.sending = false;
+ // The backend reports failure to actually dispatch the OTP (gateway error, flagged
+ // number, SMTP failure...) as a 200 response with success:false and a real reason in
+ // `message` — never a thrown error. Surface that reason instead of treating it as sent.
+ if (res?.success === false) {
+ this.errorMessage = res?.message || 'Could not send OTP.';
+ return;
+ }
this.otpId = res?.otpId ?? res?.resourceId ?? null;
this.otpSent = true;
this.clearAllDigits();
diff --git a/src/app/clients/edit-client/edit-client.component.ts b/src/app/clients/edit-client/edit-client.component.ts
index 0f300376a..b2a07e089 100644
--- a/src/app/clients/edit-client/edit-client.component.ts
+++ b/src/app/clients/edit-client/edit-client.component.ts
@@ -1035,6 +1035,15 @@ export class EditClientComponent {
this.saveAddressProof(clientId);
}
+ /** "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" — same convention the CKYC tab and
+ * client-india-address-step's own "load existing" parsing both read back. */
+ private buildProofDescription(issueDate: string | null | undefined, expiryDate: string | null | undefined): string {
+ const parts: string[] = [];
+ if (issueDate) parts.push(`Issue date: ${issueDate}`);
+ if (expiryDate) parts.push(`Expiry date: ${expiryDate}`);
+ return parts.join(', ');
+ }
+
/**
* Save the address-proof picked on the permanent tab as a client identifier
* + upload each selected file as a document attached to that identifier.
@@ -1050,9 +1059,9 @@ export class EditClientComponent {
const proofName = payload.proof?.name || 'Address Proof';
const identifierData: any = {
documentTypeId: payload.proofId,
- status: 'Active',
+ status: 'ACTIVE',
documentKey: payload.documentKey || `${proofName} - ${clientId}`,
- description: payload.issueDate ? `Issue date: ${payload.issueDate}` : ''
+ description: this.buildProofDescription(payload.issueDate, payload.expiryDate)
};
this.clientsService.addClientIdentifier(clientId, identifierData).subscribe({
@@ -1105,7 +1114,7 @@ export class EditClientComponent {
const existingId = this.clientKycStep?.existingKycIdentifierId;
if (existingId) {
this.resolveDocumentTypeId(payload.proofId, proofName).subscribe((documentTypeId: number | null) => {
- const update: any = { documentKey: payload.documentKey || `${proofName} - ${clientId}`, status: 'Active' };
+ const update: any = { documentKey: payload.documentKey || `${proofName} - ${clientId}`, status: 'ACTIVE' };
if (documentTypeId != null) {
update.documentTypeId = documentTypeId;
}
@@ -1128,7 +1137,7 @@ export class EditClientComponent {
}
const identifierData: any = {
documentTypeId,
- status: 'Active',
+ status: 'ACTIVE',
documentKey: payload.documentKey || `${proofName} - ${clientId}`,
description: 'KYC document'
};
diff --git a/src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.html b/src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.html
new file mode 100644
index 000000000..bf720407f
--- /dev/null
+++ b/src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.html
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+ @if (data.reason) {
+
+
+
+
+
+
diff --git a/src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.scss b/src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.scss
new file mode 100644
index 000000000..1837b342c
--- /dev/null
+++ b/src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.scss
@@ -0,0 +1,172 @@
+/**
+ * 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/.
+ */
+
+.kdu-title {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+
+ mat-icon {
+ color: #64748b;
+ }
+}
+
+.kdu-body {
+ padding-top: 4px;
+}
+
+.kdu-reason {
+ display: flex;
+ align-items: flex-start;
+ gap: 8px;
+ margin-bottom: 16px;
+ padding: 10px 12px;
+ border: 1px solid #fde68a;
+ border-radius: 6px;
+ background: #fffbeb;
+ color: #92400e;
+ font-size: 13px;
+ line-height: 1.5;
+
+ mat-icon {
+ flex: 0 0 auto;
+ font-size: 18px;
+ width: 18px;
+ height: 18px;
+ color: #d97706;
+ }
+}
+
+.kdu-form {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 12px;
+}
+
+.kdu-field {
+ flex: 1 1 180px;
+}
+
+.kdu-field--wide {
+ flex: 1 1 100%;
+}
+
+.kdu-scans {
+ margin-top: 8px;
+ padding: 12px;
+ border: 1px solid #e2e8f0;
+ border-radius: 8px;
+ background: #f8fafc;
+}
+
+.kdu-scans__head {
+ font-size: 12px;
+ font-weight: 700;
+ letter-spacing: 0.03em;
+ text-transform: uppercase;
+ color: #475569;
+}
+
+.kdu-scans__hint {
+ margin: 4px 0 12px;
+ font-size: 12px;
+ color: #64748b;
+}
+
+.kdu-sides {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 16px;
+}
+
+.kdu-side {
+ display: flex;
+ flex-direction: column;
+ gap: 6px;
+ width: 210px;
+}
+
+.kdu-side__label {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+ font-size: 12px;
+ font-weight: 700;
+ color: #334155;
+}
+
+/* Marks the side the officer has just re-scanned, so it is obvious what will change on save. */
+.kdu-side__new {
+ padding: 1px 7px;
+ border-radius: 999px;
+ background: #dcfce7;
+ color: #15803d;
+ font-size: 10.5px;
+ font-weight: 700;
+}
+
+.kdu-side__frame {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 132px;
+ padding: 6px;
+ border: 1px solid #e2e8f0;
+ border-radius: 6px;
+ background: #fff;
+ overflow: hidden;
+
+ img {
+ max-width: 100%;
+ max-height: 100%;
+ object-fit: contain;
+ border-radius: 3px;
+ }
+
+ &--new {
+ border-color: #86efac;
+ box-shadow: 0 0 0 1px #86efac;
+ }
+}
+
+.kdu-side__none {
+ font-size: 12px;
+ color: #94a3b8;
+}
+
+.kdu-side__file {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ gap: 4px;
+ padding: 0 6px;
+ font-size: 11px;
+ color: #475569;
+ text-align: center;
+ word-break: break-word;
+
+ mat-icon {
+ color: #64748b;
+ }
+}
+
+.kdu-side__actions {
+ display: flex;
+ align-items: center;
+ gap: 4px;
+}
+
+.kdu-side__btn {
+ flex: 1;
+ font-size: 12px;
+}
+
+.kdu-actions {
+ padding: 8px 24px 20px;
+ gap: 8px;
+}
diff --git a/src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.ts b/src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.ts
new file mode 100644
index 000000000..a0add1167
--- /dev/null
+++ b/src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.ts
@@ -0,0 +1,215 @@
+/**
+ * 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/.
+ */
+
+/** Angular Imports */
+import { Component, OnDestroy, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { UntypedFormBuilder, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/** What the caller hands in: the document as it stands, and the scans already on file. */
+export interface KycDocumentUpdateData {
+ documentName: string;
+ documentNumber: string;
+ issueDate: Date | string | null;
+ expiryDate: Date | string | null;
+ /** Why the document is being asked for, shown at the top so the officer sees the reason. */
+ reason: string;
+ /** Previews of what is currently held, so the officer can see what they are replacing. */
+ currentFront: string | null;
+ currentBack: string | null;
+ /**
+ * True when the KYC record is already verified. Changing data on one of those needs a reason on
+ * the record, which the server enforces - so the dialog asks for it rather than letting the
+ * officer fill the whole form in and be refused on submit.
+ */
+ requiresRemarks: boolean;
+}
+
+/** What the caller gets back: the corrected details, plus whichever sides were re-scanned. */
+export interface KycDocumentUpdateResult {
+ documentNumber: string;
+ issueDate: Date | null;
+ expiryDate: Date | null;
+ front: File | null;
+ back: File | null;
+ /** Why the document was re-collected. Blank unless the record was already verified. */
+ remarks: string;
+}
+
+/**
+ * Re-collects an officially valid document without leaving the KYC record.
+ *
+ * PAN and Aadhaar are each dealt with on their own row of the verification table. The OVD was the
+ * exception: its Update button put the whole KYC form into edit mode, so re-collecting one expiring
+ * document meant scrolling a form of unrelated fields and finding the same document again. The work
+ * is the same either way - a new number, new dates, a fresh scan of each side - so it is asked for
+ * in one place.
+ */
+@Component({
+ selector: 'mifosx-kyc-document-update-dialog',
+ templateUrl: './kyc-document-update-dialog.component.html',
+ styleUrls: ['./kyc-document-update-dialog.component.scss'],
+ standalone: true,
+ // The shared set carries the date adapter the two datepickers below need; the sibling dialogs
+ // pull it in the same way.
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ CommonModule,
+ ReactiveFormsModule,
+ MatDialogModule,
+ MatButtonModule,
+ MatDatepickerModule,
+ MatFormFieldModule,
+ MatIconModule,
+ MatInputModule,
+ MatProgressSpinnerModule,
+ MatTooltipModule
+ ]
+})
+export class KycDocumentUpdateDialogComponent implements OnDestroy {
+ private formBuilder = inject(UntypedFormBuilder);
+ private dialogRef = inject>(MatDialogRef);
+ data = inject(MAT_DIALOG_DATA);
+
+ form: UntypedFormGroup;
+
+ /** Newly chosen files, with a local preview so the officer sees what they picked. */
+ picked: { front: File | null; back: File | null } = { front: null, back: null };
+ pickedPreview: { front: string | null; back: string | null } = { front: null, back: null };
+
+ readonly slots: ('front' | 'back')[] = [
+ 'front',
+ 'back'
+ ];
+
+ constructor() {
+ this.form = this.formBuilder.group({
+ documentNumber: [
+ this.data.documentNumber || '',
+ [Validators.required]
+ ],
+ issueDate: [this.toDate(this.data.issueDate)],
+ // Left free rather than required: a passport expires, a PAN card does not.
+ expiryDate: [this.toDate(this.data.expiryDate)],
+ // Required only where the server requires it, so completing a record that was never verified
+ // does not demand a justification for filling in blanks.
+ remarks: [
+ '',
+ this.data.requiresRemarks ? [Validators.required] : []
+ ]
+ });
+ }
+
+ private toDate(value: Date | string | null): Date | null {
+ if (!value) {
+ return null;
+ }
+ const d = value instanceof Date ? value : new Date(value);
+ return isNaN(d.getTime()) ? null : d;
+ }
+
+ previewOf(slot: 'front' | 'back'): string | null {
+ return this.pickedPreview[slot] || (slot === 'front' ? this.data.currentFront : this.data.currentBack);
+ }
+
+ /** True once this side has been re-scanned in this dialog, so the label can say so. */
+ isReplaced(slot: 'front' | 'back'): boolean {
+ return !!this.picked[slot];
+ }
+
+ pickedName(slot: 'front' | 'back'): string {
+ return this.picked[slot]?.name || '';
+ }
+
+ onFilePicked(event: Event, slot: 'front' | 'back'): void {
+ const input = event.target as HTMLInputElement;
+ const file = input.files?.[0] || null;
+ // Cleared so re-picking the same filename still fires a change event.
+ input.value = '';
+ if (!file) {
+ return;
+ }
+ if (this.pickedPreview[slot]) {
+ URL.revokeObjectURL(this.pickedPreview[slot]!);
+ }
+ this.picked[slot] = file;
+ this.pickedPreview[slot] = file.type.startsWith('image/') ? URL.createObjectURL(file) : null;
+ }
+
+ clearPick(slot: 'front' | 'back'): void {
+ if (this.pickedPreview[slot]) {
+ URL.revokeObjectURL(this.pickedPreview[slot]!);
+ }
+ this.picked[slot] = null;
+ this.pickedPreview[slot] = null;
+ }
+
+ /**
+ * Something has to change for the update to mean anything - either a corrected detail or a fresh
+ * scan. Submitting an untouched form would reopen a verified KYC record for no reason.
+ */
+ get hasChanges(): boolean {
+ if (this.picked.front || this.picked.back) {
+ return true;
+ }
+ const v = this.form.value;
+ const sameNumber = (v.documentNumber || '').trim() === (this.data.documentNumber || '').trim();
+ const sameIssue = this.sameDay(v.issueDate, this.toDate(this.data.issueDate));
+ const sameExpiry = this.sameDay(v.expiryDate, this.toDate(this.data.expiryDate));
+ return !(sameNumber && sameIssue && sameExpiry);
+ }
+
+ private sameDay(a: Date | null, b: Date | null): boolean {
+ if (!a && !b) {
+ return true;
+ }
+ if (!a || !b) {
+ return false;
+ }
+ return a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate();
+ }
+
+ submit(): void {
+ if (this.form.invalid || !this.hasChanges) {
+ this.form.markAllAsTouched();
+ return;
+ }
+ const v = this.form.value;
+ const result: KycDocumentUpdateResult = {
+ documentNumber: (v.documentNumber || '').trim(),
+ issueDate: v.issueDate || null,
+ expiryDate: v.expiryDate || null,
+ front: this.picked.front,
+ back: this.picked.back,
+ remarks: (v.remarks || '').trim()
+ };
+ this.dialogRef.close(result);
+ }
+
+ cancel(): void {
+ this.dialogRef.close();
+ }
+
+ ngOnDestroy(): void {
+ // Only the previews this dialog created; the caller owns the ones it passed in.
+ for (const slot of this.slots) {
+ if (this.pickedPreview[slot]) {
+ URL.revokeObjectURL(this.pickedPreview[slot]!);
+ }
+ }
+ }
+}
diff --git a/src/app/core/shell/sidenav/sidenav.component.html b/src/app/core/shell/sidenav/sidenav.component.html
index 95778bb7c..a8ae77c84 100644
--- a/src/app/core/shell/sidenav/sidenav.component.html
+++ b/src/app/core/shell/sidenav/sidenav.component.html
@@ -299,32 +299,38 @@
{{ 'labels.menus.Notifications' | translate }}
-
-
-
- {{ 'labels.menus.Frequent Postings' | translate }}
-
-
-
-
- {{ 'labels.menus.Create Journal Entry' | translate }}
-
+
+ @if (!disabledFeatures.frequentPostings) {
+
+
+
+ {{ 'labels.menus.Frequent Postings' | translate }}
+
+ }
+ @if (!disabledFeatures.createJournalEntries) {
+
+
+
+ {{ 'labels.menus.Create Journal Entry' | translate }}
+
+ }
{{ r.txnTime }}
}
- {{ r.debitParty || r.acName }}
+ @if (r.debitAccount || r.acNo) {
+ {{ r.debitAccount || r.acNo }}
+ }
+ {{ r.creditParty }}
+ @if (r.creditAccount) {
+ {{ r.creditAccount }}
+ }
+ } @else {
+ —
+ }
+
+
-
+
`,
diff --git a/src/app/cashier/transaction-entry/transaction-entry.component.html b/src/app/cashier/transaction-entry/transaction-entry.component.html
index 98ae9647e..de55bc0f0 100644
--- a/src/app/cashier/transaction-entry/transaction-entry.component.html
+++ b/src/app/cashier/transaction-entry/transaction-entry.component.html
@@ -178,7 +178,7 @@
(row.dbCr = 'Cr')
"
>
- @for (a of acTypOptions; track a) {
+ @for (a of acTypOptionsFor(row); track a) {
}
@@ -432,8 +432,14 @@
: 'Auto-selects next available leaflet and opens walk-in purchaser form'
"
>
-
- Auto-Selected Leaflet
+ DD Number Being Issued
{{ data.leaflet.ddNumber }}
{{ data.sponsorBankName || 'Sponsor Bank' }} · {{ data.branchName }}
@@ -233,9 +236,7 @@ export interface CashierIssueDdDialogData {
@@ -238,14 +254,18 @@
@if (existingAddressProofDocuments.length > 0 && !addrFiles.front && readOnly) {
-
-
- photo_library
- Replace the scanned front / back of this document
- chevron_right
-
+
+
}
diff --git a/src/app/clients/clients-view/kyc-tab/kyc-tab.component.scss b/src/app/clients/clients-view/kyc-tab/kyc-tab.component.scss
index 101a3e073..0f4520920 100644
--- a/src/app/clients/clients-view/kyc-tab/kyc-tab.component.scss
+++ b/src/app/clients/clients-view/kyc-tab/kyc-tab.component.scss
@@ -1681,3 +1681,129 @@
.kyc-doc-scans-link__go {
margin-left: auto;
}
+
+/* The scan itself, beside the number and dates it belongs to. */
+.kyc-doc-scans {
+ margin-top: 10px;
+ padding: 12px;
+ border: 1px solid #e2e8f0;
+ border-radius: 8px;
+ background: #fff;
+}
+
+.kyc-doc-scans__head {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ margin-bottom: 10px;
+ font-size: 12px;
+ font-weight: 700;
+ letter-spacing: 0.03em;
+ text-transform: uppercase;
+ color: #475569;
+
+ mat-icon {
+ font-size: 18px;
+ width: 18px;
+ height: 18px;
+ color: #64748b;
+ }
+}
+
+.kyc-doc-scans__empty {
+ margin-bottom: 10px;
+ font-size: 12.5px;
+ color: #64748b;
+}
+
+.kyc-doc-scans__sides {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 14px;
+}
+
+.kyc-doc-side {
+ display: flex;
+ flex-direction: column;
+ gap: 6px;
+ width: 190px;
+}
+
+.kyc-doc-side__label {
+ font-size: 11.5px;
+ font-weight: 700;
+ color: #334155;
+}
+
+/* Fixed height so front and back line up whatever the scan's aspect ratio is. */
+.kyc-doc-side__frame {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 118px;
+ padding: 6px;
+ border: 1px solid #e2e8f0;
+ border-radius: 6px;
+ background: #f8fafc;
+ overflow: hidden;
+
+ img {
+ max-width: 100%;
+ max-height: 100%;
+ object-fit: contain;
+ border-radius: 3px;
+ }
+}
+
+.kyc-doc-side__none {
+ font-size: 12px;
+ color: #94a3b8;
+}
+
+.kyc-doc-side__file {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ gap: 4px;
+ padding: 0 6px;
+ font-size: 11px;
+ color: #475569;
+ text-align: center;
+ word-break: break-word;
+
+ mat-icon {
+ color: #64748b;
+ }
+}
+
+.kyc-doc-side__btn {
+ font-size: 12px;
+
+ mat-progress-spinner {
+ display: inline-block;
+ margin-right: 6px;
+ vertical-align: middle;
+ }
+}
+
+.kyc-doc-scans__msg {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+ margin-top: 10px;
+ font-size: 12.5px;
+
+ mat-icon {
+ font-size: 17px;
+ width: 17px;
+ height: 17px;
+ }
+
+ &--err {
+ color: #b91c1c;
+ }
+
+ &--ok {
+ color: #15803d;
+ }
+}
diff --git a/src/app/clients/clients-view/kyc-tab/kyc-tab.component.ts b/src/app/clients/clients-view/kyc-tab/kyc-tab.component.ts
index 365e9c0a7..32587d1e9 100644
--- a/src/app/clients/clients-view/kyc-tab/kyc-tab.component.ts
+++ b/src/app/clients/clients-view/kyc-tab/kyc-tab.component.ts
@@ -11,7 +11,7 @@ import { Component, OnInit, OnDestroy, inject } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { UntypedFormBuilder, UntypedFormGroup, Validators, FormsModule } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
-import { catchError, of, Subject, takeUntil } from 'rxjs';
+import { catchError, forkJoin, map, of, Subject, takeUntil } from 'rxjs';
/** Custom Services */
import { ClientsService } from '../../clients.service';
@@ -30,6 +30,11 @@ import {
AadhaarReceiptDialogComponent,
AadhaarReceiptResult
} from '../../shared/aadhaar-receipt-dialog/aadhaar-receipt-dialog.component';
+import {
+ KycDocumentUpdateDialogComponent,
+ KycDocumentUpdateData,
+ KycDocumentUpdateResult
+} from '../../shared/kyc-document-update-dialog/kyc-document-update-dialog.component';
import { Dates } from 'app/core/utils/dates';
import { jsPDF } from 'jspdf';
import { MatIcon } from '@angular/material/icon';
@@ -38,6 +43,15 @@ import { MatProgressSpinner } from '@angular/material/progress-spinner';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+/** One side of the scanned KYC document, with the preview once it has been fetched. */
+interface DocScanSide {
+ documentId: string;
+ /** The identifier row this scan hangs off; the two sides can sit on different rows. */
+ identifierId: string;
+ fileName: string;
+ previewUrl: string | null;
+}
+
/**
* KYC Tab Component.
* Displays and manages KYC (Know Your Customer) details for an existing client.
@@ -149,9 +163,42 @@ export class KycTabComponent implements OnInit, OnDestroy {
exceptionReason: [[]]
});
+ // ── Officially valid document scans ────────────────────────────────────────
+
+ /**
+ * The scans of the document named above, by side.
+ *
+ * The screen used to show the document's number and dates but not the image behind them, and
+ * sent the officer to the client edit screen to change it. Re-collecting an expiring document is
+ * the one thing this panel exists for, so the scan is shown and replaced here.
+ */
+ docScans: { front: DocScanSide | null; back: DocScanSide | null } = { front: null, back: null };
+
+ /** The two sides, in display order, so the template loops rather than repeating itself. */
+ readonly docScanSlots: ('front' | 'back')[] = [
+ 'front',
+ 'back'
+ ];
+
+ docScanOf(slot: 'front' | 'back') {
+ return this.docScans[slot];
+ }
+
+ /** Identifier row replacements are filed against. Null when the document has no identifier. */
+ private docIdentifierId: string | null = null;
+ /** Every identifier row carrying this document, since the sides can be split across them. */
+ private docIdentifierIds: string[] = [];
+ docScansLoading = false;
+ /** Which side is mid-upload, so only that button shows a spinner. */
+ docScanUploading: 'front' | 'back' | null = null;
+ docScanError: string | null = null;
+ docScanSuccess: string | null = null;
+
ngOnInit(): void {
this.route.parent.params.subscribe((params: any) => {
this.clientId = params['clientId'];
+ // Scans are matched against the document number on the KYC record, so they are loaded once
+ // that record has arrived rather than alongside it.
this.loadKycData();
this.loadClientDateOfBirth();
});
@@ -190,6 +237,8 @@ export class KycTabComponent implements OnInit, OnDestroy {
isException: data.isException || false,
exceptionReason: data.exceptionReason ? data.exceptionReason.split(', ') : []
});
+ // Now that the document number is known, the scans filed under it can be found.
+ this.loadDocumentScans();
}
});
}
@@ -1307,6 +1356,305 @@ I further confirm that:
doc.save(`Self_Declaration_${cifNumber}_${clientName.replace(/\s/g, '_')}.pdf`);
}
+ // ── Document scans ─────────────────────────────────────────────────────────
+
+ /**
+ * Finds the identifier the KYC document was filed under and loads its scans.
+ *
+ * The KYC record keeps the document's name and number but not the identifier id, so the two are
+ * matched on the number — that is what makes them the same document, and it survives the client
+ * holding several identifiers of the same type.
+ */
+ private loadDocumentScans(): void {
+ if (!this.clientId) {
+ return;
+ }
+ this.docScansLoading = true;
+ this.clientsService
+ .getClientIdentifiers(this.clientId)
+ .pipe(catchError(() => of([] as any[])))
+ .subscribe((identifiers: any[]) => {
+ const wantedKey = (this.kycData?.kycDocumentNumber || '').toString().trim();
+ const wantedName = (this.kycData?.kycDocumentName || '').toString().trim().toLowerCase();
+ const norm = (s: any) => (s || '').toString().trim().toLowerCase();
+
+ // Every identifier carrying this document number, not just the first. The onboarding step
+ // files each side against its own identifier row, so this client's Aadhaar front sits on
+ // one row and the back on another under the same number - taking only the first match
+ // showed the front and reported the back as missing.
+ let matches = (identifiers || []).filter((i) => wantedKey && norm(i.documentKey) === norm(wantedKey));
+ if (!matches.length) {
+ matches = (identifiers || []).filter((i) => wantedName && norm(i.documentType?.name) === wantedName);
+ }
+
+ if (!matches.length) {
+ this.docScansLoading = false;
+ this.docIdentifierId = null;
+ this.docIdentifierIds = [];
+ this.docScans = { front: null, back: null };
+ return;
+ }
+ // Replacements are filed against the first row, so the sides stay together from here on.
+ this.docIdentifierId = String(matches[0].id);
+ this.docIdentifierIds = matches.map((m: any) => String(m.id));
+ this.fetchScansFor(this.docIdentifierIds);
+ });
+ }
+
+ /**
+ * Sides are read off the document name, which is how they were written at upload
+ * ("
- @if (addrMergedPreview) {
- ![Saved address proof]()
+ @if (existingAddrFrontSlotPreview) {
+ ![Saved address proof]()
} @else {
description
}
+ } @else {
+
}
@@ -1188,15 +1193,81 @@
+
}
- @if (!existing.CLIENT_SIGNATURE.present || existing.CLIENT_SIGNATURE.expanded) {
- Not uploaded yet. Accepted formats: PNG, JPEG, JPG
+{{ 'labels.inputs.Accepted formats' | translate }}: PNG, JPEG, JPG
-
-
-
-
-
-
+ @if (uploading['CLIENT_SIGNATURE']) {
+ = {
- ID_PROOF: { name: 'ckycIdProof', description: 'CKYC ID proof' },
- ADDRESS_PROOF: { name: 'ckycAddressProof', description: 'CKYC address proof' },
- PHOTO_PROOF: { name: 'ckycPhotoProof', description: 'CKYC photo proof' },
- CLIENT_IMAGE: { name: 'ckycClientImage', description: 'CKYC client photograph' },
- CLIENT_SIGNATURE: { name: 'clientSignature', description: 'Client signature' }
-};
-
-const CKYC_DOCUMENT_TYPES = Object.keys(CKYC_DOCUMENT_META) as CkycDocumentType[];
+type ProofKind = 'ADDRESS_PROOF' | 'PHOTO_PROOF';
+type CkycDocKind = ProofKind | 'CLIENT_IMAGE' | 'CLIENT_SIGNATURE';
/**
* Client-side upload guards, kept deliberately in step with the backend so a file that passes here
@@ -62,8 +51,8 @@ const CKYC_DOCUMENT_TYPES = Object.keys(CKYC_DOCUMENT_META) as CkycDocumentType[
* - 5 MB matches `spring.servlet.multipart.max-file-size`
* - the extension list is the intersection of the backend `fineract.content.regex-whitelist`
* with what these cards can actually render.
- * `accept=` on the input is only a file-picker hint and is trivially bypassed, so the real check
- * lives in onFileSelect().
+ * The dialog's `accept=` is only a file-picker hint and is trivially bypassed, so the real check
+ * runs here, on the file the dialog hands back, before anything is sent.
*/
const MAX_UPLOAD_BYTES = 5 * 1024 * 1024;
const IMAGE_EXTENSIONS = [
@@ -76,8 +65,8 @@ const DOCUMENT_EXTENSIONS = [
'pdf'
];
-/** Types whose card renders an inline ![]()
preview, so a PDF would not display. */
-const IMAGE_ONLY_TYPES: CkycDocumentType[] = [
+/** Cards that render an inline ![]()
, so a PDF would not display in them. */
+const IMAGE_ONLY_KINDS: CkycDocKind[] = [
'CLIENT_IMAGE',
'CLIENT_SIGNATURE'
];
@@ -98,6 +87,8 @@ export class CkycTabComponent implements OnInit, OnDestroy {
private route = inject(ActivatedRoute);
private clientsService = inject(ClientsService);
private alertService = inject(AlertService);
+ private dialog = inject(MatDialog);
+ private dates = inject(Dates);
private destroy$ = new Subject();
@@ -131,37 +122,55 @@ export class CkycTabComponent implements OnInit, OnDestroy {
return this.panVerified && this.aadhaarVerified;
}
- /** CKYC artefacts already uploaded for this client, keyed by artefact type. */
- existing: Record = {
- ID_PROOF: { present: false },
+ /** Pre-existing artefacts detected from client data */
+ existing: Record = {
ADDRESS_PROOF: { present: false },
PHOTO_PROOF: { present: false },
CLIENT_IMAGE: { present: false },
CLIENT_SIGNATURE: { present: false }
};
+ /** Document-type options for the proof pickers, fetched once from /kyc/proof-types */
+ addressProofOptions: ProofType[] = [];
+ idProofOptions: ProofType[] = [];
+
+ /** Document type currently selected in each proof card's picker */
+ selectedProofType: Record = {
+ ADDRESS_PROOF: null,
+ PHOTO_PROOF: null
+ };
+
+ /** Front/back files staged for the two proof cards; other cards keep a single file each */
+ docFiles: Record = {
+ ADDRESS_PROOF: { front: null, back: null },
+ PHOTO_PROOF: { front: null, back: null }
+ };
+
+ /** Document number + issue/expiry dates staged from the upload dialog, same fields client
+ * creation collects for a KYC/address proof — persisted onto the identifier's documentKey
+ * and description ("Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd"). */
+ private documentDetails: Record<
+ ProofKind,
+ { documentKey: string; issueDate: string | null; expiryDate: string | null }
+ > = {
+ ADDRESS_PROOF: { documentKey: '', issueDate: null, expiryDate: null },
+ PHOTO_PROOF: { documentKey: '', issueDate: null, expiryDate: null }
+ };
+
/** File references */
- idProofFile: File | null = null;
- addressProofFile: File | null = null;
- photoProofFile: File | null = null;
clientImageFile: File | null = null;
clientSignatureFile: File | null = null;
/** Per-document upload state */
uploading: { [key: string]: boolean } = {
- ID_PROOF: false,
ADDRESS_PROOF: false,
PHOTO_PROOF: false,
CLIENT_IMAGE: false,
CLIENT_SIGNATURE: false
};
- /** Per-document upload response */
- uploadResponses: { [key: string]: any } = {};
-
/** Per-document error messages */
uploadErrors: { [key: string]: string | null } = {
- ID_PROOF: null,
ADDRESS_PROOF: null,
PHOTO_PROOF: null,
CLIENT_IMAGE: null,
@@ -171,6 +180,11 @@ export class CkycTabComponent implements OnInit, OnDestroy {
ngOnInit(): void {
this.route.parent.params.subscribe((params: any) => {
this.clientId = params['clientId'];
+ // Angular reuses this component when only the clientId in the route changes, and
+ // loadExistingArtefacts() only ever *assigns* what it finds - it has no "not found" branch.
+ // Without clearing first, a client with no photo (or no signature, or no proof) keeps showing
+ // the previous client's card.
+ this.resetArtefactState();
this.loadClientInfo();
this.loadAccounts();
this.loadCkycData();
@@ -178,6 +192,46 @@ export class CkycTabComponent implements OnInit, OnDestroy {
});
}
+ /**
+ * Returns every per-client card to its empty state, so nothing from the client just viewed can
+ * survive into the next one. Covers all four cards plus the details staged for an upload - a file
+ * or document number left over from another client must never be submitted against this one.
+ */
+ private resetArtefactState(): void {
+ this.revokePreviewUrls();
+ this.existing = {
+ ADDRESS_PROOF: { present: false },
+ PHOTO_PROOF: { present: false },
+ CLIENT_IMAGE: { present: false },
+ CLIENT_SIGNATURE: { present: false }
+ };
+ this.selectedProofType = { ADDRESS_PROOF: null, PHOTO_PROOF: null };
+ this.docFiles = {
+ ADDRESS_PROOF: { front: null, back: null },
+ PHOTO_PROOF: { front: null, back: null }
+ };
+ this.documentDetails = {
+ ADDRESS_PROOF: { documentKey: '', issueDate: null, expiryDate: null },
+ PHOTO_PROOF: { documentKey: '', issueDate: null, expiryDate: null }
+ };
+ this.clientImageFile = null;
+ this.clientSignatureFile = null;
+ this.uploadErrors = {
+ ADDRESS_PROOF: null,
+ PHOTO_PROOF: null,
+ CLIENT_IMAGE: null,
+ CLIENT_SIGNATURE: null
+ };
+ }
+
+ /** Frees the blob URLs held by the current cards before their references are dropped. */
+ private revokePreviewUrls(): void {
+ Object.values(this.existing).forEach((e) => {
+ if (e.previewUrl?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrl);
+ if (e.previewUrlBack?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrlBack);
+ });
+ }
+
private loadClientInfo(): void {
this.route.parent.data.subscribe((data: any) => {
const cv = data?.clientViewData;
@@ -263,123 +317,270 @@ export class CkycTabComponent implements OnInit, OnDestroy {
}
/**
- * Loads every CKYC artefact from the client's documents (`m_document`), which is the single
- * source of truth for this screen: each card matches the `name` its own upload writes, so what
- * the checker sees is exactly what CKYC stored.
- *
- * Deliberately does NOT read the profile image or client identifiers any more. Those belong to
- * client registration and the Identities section; reading them here showed artefacts this screen
- * had never uploaded, and hid the ones it had. Those other screens are untouched.
- *
- * A client can accumulate several rows for one artefact (older uploads pre-date replacement, and
- * the signature is also written by client registration), so the newest row - highest `id` - wins.
+ * Fetch photo (profile image), signature (client document),
+ * ID proof and address proof (client identifiers) so already-uploaded
+ * artefacts are shown here instead of forcing re-upload.
*/
private loadExistingArtefacts(): void {
this.checkingExisting = true;
+ forkJoin({
+ photo: this.clientsService.getClientProfileImage(this.clientId).pipe(catchError(() => of(null))),
+ documents: this.clientsService.getClientDocuments(this.clientId).pipe(catchError(() => of([]))),
+ identifiers: this.clientsService.getClientIdentifiers(this.clientId).pipe(catchError(() => of([]))),
+ proofTypes: this.clientsService.getKycProofTypes().pipe(catchError(() => of({ idProofs: [], addressProofs: [] })))
+ })
+ .pipe(takeUntil(this.destroy$))
+ .subscribe(({ photo, documents, identifiers, proofTypes }) => {
+ this.checkingExisting = false;
+
+ // 1. Photo / image of client — from m_client.image_id
+ if (photo && typeof photo === 'string' && photo.length > 0) {
+ this.existing.CLIENT_IMAGE = {
+ present: true,
+ source: 'Client registration',
+ previewUrl: photo,
+ name: 'Profile photo'
+ };
+ }
+
+ // 2. Signature — client document with name='clientSignature'. Multiple rows can exist
+ // for clients who re-cropped/replaced their signature before uploads became single-slot,
+ // so pick the highest id (latest) rather than the first unordered match.
+ const signatureDoc = (documents as any[])
+ ?.filter((d: any) => d?.name === 'clientSignature')
+ ?.sort((a: any, b: any) => b.id - a.id)?.[0];
+ if (signatureDoc) {
+ this.existing.CLIENT_SIGNATURE = {
+ present: true,
+ source: 'Client registration',
+ name: signatureDoc.fileName || 'Client signature',
+ documentId: signatureDoc.id,
+ mimeType: signatureDoc.type
+ };
+ // Same endpoint getClientSignatureImage() uses, but opted out of the global error alert:
+ // a m_document row whose file is no longer in the content store returns 500, and the card
+ // below reports that itself. Without `silent` the interceptor pops an "Internal Server
+ // Error" modal on every page load, for a failure the user cannot act on.
+ this.clientsService
+ .downloadClientDocument(this.clientId, String(signatureDoc.id), true)
+ .pipe(takeUntil(this.destroy$))
+ .subscribe({
+ next: (blob: any) => {
+ if (blob && blob.size > 0) {
+ this.existing.CLIENT_SIGNATURE.previewUrl = URL.createObjectURL(blob);
+ } else {
+ // A 200 with an empty body still means there is nothing to show. Without this the
+ // card would claim "Already available" with no thumbnail and no explanation.
+ this.existing.CLIENT_SIGNATURE.previewUnavailable = true;
+ }
+ },
+ error: () => {
+ this.existing.CLIENT_SIGNATURE.previewUnavailable = true;
+ }
+ });
+ }
+
+ // 3 & 4. ID proof + Address proof — client identifiers classified via proof-types
+ this.idProofOptions = (proofTypes?.idProofs || []).map((p: any) => normalizeProofType(p));
+ this.addressProofOptions = (proofTypes?.addressProofs || []).map((p: any) => normalizeProofType(p));
+ const idProofIds = new Set((proofTypes?.idProofs || []).map((p: any) => String(p.id)));
+ const addressProofIds = new Set((proofTypes?.addressProofs || []).map((p: any) => String(p.id)));
+
+ const idList = Array.isArray(identifiers) ? identifiers : (identifiers as any)?.pageItems || [];
+
+ for (const identity of idList) {
+ const docTypeId = String(identity?.documentType?.id ?? '');
+ const isActive =
+ !identity?.status ||
+ identity?.status?.code === 'clientIdentifierStatusType.active' ||
+ identity?.status === 'clientIdentifierStatusType.active' ||
+ identity?.status === 'Active';
+ if (!isActive) continue;
+
+ const proofName = identity?.documentType?.name || 'Identifier';
+ // Address proof documentKey is auto-generated as " - "
+ // in identities-tab; hide it when it's just that synthetic key.
+ const rawKey = identity?.documentKey || '';
+ const isSyntheticKey = rawKey.startsWith(`${proofName} - `);
+ const common = {
+ present: true,
+ source: 'Identities section',
+ name: proofName,
+ documentKey: isSyntheticKey ? '' : rawKey,
+ documentId: identity?.id,
+ documentTypeId: docTypeId,
+ description: identity?.description || '',
+ fileCount: (identity?.documents || []).length
+ };
+
+ if (idProofIds.has(docTypeId) && !this.existing.PHOTO_PROOF.present) {
+ this.existing.PHOTO_PROOF = common;
+ this.selectedProofType.PHOTO_PROOF = this.idProofOptions.find((p) => String(p.id) === docTypeId) || null;
+ this.loadIdentifierDocPreview('PHOTO_PROOF', identity.id);
+ } else if (addressProofIds.has(docTypeId) && !this.existing.ADDRESS_PROOF.present) {
+ this.existing.ADDRESS_PROOF = common;
+ this.selectedProofType.ADDRESS_PROOF =
+ this.addressProofOptions.find((p) => String(p.id) === docTypeId) || null;
+ this.loadIdentifierDocPreview('ADDRESS_PROOF', identity.id);
+ }
+ }
+ });
+ }
+
+ /**
+ * The scanned ID/address-proof card only showed its file name and key — never the scan
+ * itself, unlike the photo and signature cards right beside it. Mirrors those two: fetch
+ * the identifier's own attached document(s) (m_client_identifier -> m_document, the same
+ * chain the Identities tab and the create-client stepper read) and download the latest for
+ * an inline preview. Two-sided proof types (Aadhaar, Passport, Voter ID, Driving Licence)
+ * store front/back as two separate documents named " — Front"/"— Back" (the same
+ * convention the create-client stepper writes), so both are matched and previewed here;
+ * a legacy single upload with no such marker just shows as the one preview.
+ */
+ private loadIdentifierDocPreview(kind: ProofKind, identifierId: string): void {
this.clientsService
- .getClientDocuments(this.clientId)
+ .getClientIdentificationDocuments(identifierId)
.pipe(
takeUntil(this.destroy$),
catchError(() => of([]))
)
- .subscribe((documents: any) => {
- this.checkingExisting = false;
+ .subscribe((docs: any) => {
+ const list = Array.isArray(docs) ? docs : [];
+ if (!list.length) return;
+ this.existing[kind].fileCount = list.length;
+ this.existing[kind].previewUnavailable = false;
- const list: any[] = Array.isArray(documents) ? documents : (documents?.pageItems ?? []);
+ const byNewest = (a: any, b: any) => b.id - a.id;
+ const label = (d: any) => (d?.name || d?.fileName || '').toString();
+ const back = [...list].filter((d: any) => /back/i.test(label(d))).sort(byNewest)[0];
+ const front =
+ [...list].filter((d: any) => /front/i.test(label(d))).sort(byNewest)[0] ||
+ [...list].filter((d: any) => d.id !== back?.id).sort(byNewest)[0];
- for (const type of CKYC_DOCUMENT_TYPES) {
- const expectedName = CKYC_DOCUMENT_META[type].name;
-
- const doc = list
- .filter((d: any) => d?.name === expectedName)
- .sort((a: any, b: any) => (b?.id ?? 0) - (a?.id ?? 0))[0];
-
- if (!doc) {
- // No upload yet for this artefact - leave the card in its empty state.
- this.existing[type] = { present: false };
- continue;
- }
-
- this.existing[type] = {
- present: true,
- source: 'CKYC upload',
- name: doc.fileName || expectedName,
- documentId: doc.id,
- mimeType: doc.type
- };
-
- this.loadPreview(type, doc.id);
- }
+ // A proof can be scanned to PDF, which no ![]()
can render - remember what was stored so the
+ // card offers "View document" instead of a broken thumbnail.
+ if (front) this.existing[kind].mimeType = front.type;
+ if (front) this.downloadIdentifierDocPreview(identifierId, front.id, kind, 'front');
+ if (back && back.id !== front?.id) this.downloadIdentifierDocPreview(identifierId, back.id, kind, 'back');
});
}
- /**
- * Fetches the stored file so the card can show a thumbnail. A failure here is reported on the
- * card rather than swallowed: the usual cause is a `m_document` row whose file is no longer in
- * the content store, and silently showing "Already available" with no image hides that.
- */
- private loadPreview(type: CkycDocumentType, documentId: string | number): void {
+ private downloadIdentifierDocPreview(
+ identifierId: string,
+ documentId: string,
+ kind: ProofKind,
+ slot: 'front' | 'back'
+ ): void {
this.clientsService
- // silent: a missing stored file returns 500, and the card below already reports that. Without
- // this the global error interceptor pops an "Internal Server Error" modal on every page load
- // and after every upload, for a failure the user cannot act on.
- .downloadClientDocument(this.clientId, String(documentId), true)
+ .downloadClientIdentificationDocument(identifierId, documentId)
.pipe(takeUntil(this.destroy$))
.subscribe({
next: (blob: any) => {
- if (blob && blob.size > 0) {
- this.existing[type].previewUrl = URL.createObjectURL(blob);
- } else {
- // A 200 with an empty body still means there is nothing to show. Without this the card
- // would sit there claiming "Already available" with no thumbnail and no explanation.
- this.existing[type].previewUnavailable = true;
+ if (!blob || blob.size === 0) {
+ this.existing[kind].previewUnavailable = true;
+ return;
}
+ const url = URL.createObjectURL(blob);
+ if (slot === 'front') this.existing[kind].previewUrl = url;
+ else this.existing[kind].previewUrlBack = url;
},
+ // The row exists but its file is gone from the content store. Saying so on the card beats
+ // showing "Already available" next to a blank space.
error: () => {
- this.existing[type].previewUnavailable = true;
+ this.existing[kind].previewUnavailable = true;
}
});
}
- /**
- * True when the stored file can be shown as an inline thumbnail. A PDF cannot, so its card falls
- * back to the "View document" button alone rather than rendering a broken image.
- */
- isImage(documentType: CkycDocumentType): boolean {
- const entry = this.existing[documentType];
- if (entry?.mimeType) {
- return entry.mimeType.startsWith('image/');
- }
- // Older rows can have no stored MIME type - fall back to the file extension.
- const extension = (entry?.name?.split('.').pop() || '').toLowerCase();
- return IMAGE_EXTENSIONS.includes(extension);
- }
-
- /**
- * Opens the uploaded document full size in a new tab. Uses the blob already fetched for the
- * thumbnail, so it works for PDFs too and costs no extra request.
- */
- openDocument(documentType: CkycDocumentType): void {
- const url = this.existing[documentType]?.previewUrl;
- if (url) {
- window.open(url, '_blank', 'noopener');
- }
- }
-
- toggleReplace(documentType: string): void {
- const entry = (this.existing as any)[documentType];
- if (entry) entry.expanded = !entry.expanded;
- }
-
onAccountSelect(accountNo: string): void {
this.selectedAccount = this.allAccounts.find((a) => a.accountNo === accountNo) || null;
this.selectedAccountType = this.selectedAccount?.accountType || '';
}
+ getFile(documentType: string): File | null {
+ switch (documentType) {
+ case 'CLIENT_IMAGE':
+ return this.clientImageFile;
+ case 'CLIENT_SIGNATURE':
+ return this.clientSignatureFile;
+ default:
+ return null;
+ }
+ }
+
+ private static readonly CARD_TITLES: Record = {
+ ADDRESS_PROOF: 'Address Proof Document',
+ PHOTO_PROOF: 'Photo Proof Document',
+ CLIENT_IMAGE: 'Image of Client',
+ CLIENT_SIGNATURE: 'Signature of Client'
+ };
+
+ /** Opens the picker/preview popup for one card and, once the user confirms a file there, feeds
+ * the picked type/file(s) into the same upload path the card always used. Picking and preview
+ * now live entirely in the dialog — this screen only stages the result and re-runs upload. */
+ openUploadDialog(kind: CkycDocKind): void {
+ const isProofKind = kind === 'ADDRESS_PROOF' || kind === 'PHOTO_PROOF';
+ const action = this.existing[kind].present ? 'Replace' : 'Upload';
+ const existingDates = isProofKind
+ ? this.parseDescriptionDates(this.existing[kind].description)
+ : { issueDate: null, expiryDate: null };
+
+ const ref = this.dialog.open(CkycUploadDialogComponent, {
+ width: '480px',
+ maxWidth: '95vw',
+ data: {
+ title: `${action} ${CkycTabComponent.CARD_TITLES[kind]}`,
+ isProofKind,
+ accept: isProofKind ? '.png,.jpeg,.jpg,.pdf' : '.png,.jpeg,.jpg',
+ proofOptions:
+ kind === 'PHOTO_PROOF'
+ ? this.idProofOptions
+ : kind === 'ADDRESS_PROOF'
+ ? this.addressProofOptions
+ : undefined,
+ initialProofType: isProofKind ? this.selectedProofType[kind as ProofKind] : undefined,
+ initialDocumentKey: isProofKind ? this.existing[kind].documentKey || '' : undefined,
+ initialIssueDate: existingDates.issueDate,
+ initialExpiryDate: existingDates.expiryDate
+ }
+ });
+
+ ref.afterClosed().subscribe((result: CkycUploadDialogResult | null) => {
+ if (!result) return;
+
+ // The dialog's `accept=` filter is only a hint to the file picker and is trivially bypassed,
+ // so the size/type guard runs here on what actually came back. Catching it now turns a raw
+ // server rejection into a message on the card.
+ const rejection =
+ this.validationError(result.front, kind) ?? (result.back ? this.validationError(result.back, kind) : null);
+ if (rejection) {
+ this.uploadErrors[kind] = rejection;
+ return;
+ }
+ this.uploadErrors[kind] = null;
+
+ if (isProofKind) {
+ const proofKind = kind as ProofKind;
+ this.selectedProofType[proofKind] = result.proofType || null;
+ this.docFiles[proofKind] = { front: result.front, back: result.back || null };
+ this.documentDetails[proofKind] = {
+ documentKey: result.documentKey || '',
+ issueDate: result.issueDate || null,
+ expiryDate: result.expiryDate || null
+ };
+ } else if (kind === 'CLIENT_IMAGE') {
+ this.clientImageFile = result.front;
+ } else {
+ this.clientSignatureFile = result.front;
+ }
+ this.uploadDocument(kind);
+ });
+ }
+
/** Extensions a given card can both store and render. */
- private allowedExtensions(documentType: string): string[] {
- return IMAGE_ONLY_TYPES.includes(documentType as CkycDocumentType) ? IMAGE_EXTENSIONS : DOCUMENT_EXTENSIONS;
+ private allowedExtensions(kind: CkycDocKind): string[] {
+ return IMAGE_ONLY_KINDS.includes(kind) ? IMAGE_EXTENSIONS : DOCUMENT_EXTENSIONS;
}
/**
@@ -387,8 +588,11 @@ export class CkycTabComponent implements OnInit, OnDestroy {
* so the user gets a clear message instead of a raw server error. Returns null when the file is
* acceptable.
*/
- private validationError(file: File, documentType: string): string | null {
- const allowed = this.allowedExtensions(documentType);
+ private validationError(file: File | null | undefined, kind: CkycDocKind): string | null {
+ if (!file) {
+ return null;
+ }
+ const allowed = this.allowedExtensions(kind);
const extension = (file.name.split('.').pop() || '').toLowerCase();
if (!allowed.includes(extension)) {
@@ -404,125 +608,279 @@ export class CkycTabComponent implements OnInit, OnDestroy {
return null;
}
- private setFile(documentType: string, file: File | null): void {
- switch (documentType) {
- case 'ID_PROOF':
- this.idProofFile = file;
- break;
- case 'ADDRESS_PROOF':
- this.addressProofFile = file;
- break;
- case 'PHOTO_PROOF':
- this.photoProofFile = file;
- break;
- case 'CLIENT_IMAGE':
- this.clientImageFile = file;
- break;
- case 'CLIENT_SIGNATURE':
- this.clientSignatureFile = file;
- break;
+ /**
+ * True when the stored file can be shown as an inline thumbnail. A PDF cannot, so its card falls
+ * back to the "View document" button alone rather than rendering a broken image.
+ */
+ isImage(kind: CkycDocKind): boolean {
+ const entry = this.existing[kind];
+ // The profile image arrives as a `data:image/...;base64,` URL, which declares its own type -
+ // it has neither a stored MIME type nor a file extension for the checks below to read.
+ if (entry?.previewUrl?.startsWith('data:')) {
+ return entry.previewUrl.startsWith('data:image/');
+ }
+ if (entry?.mimeType) {
+ return entry.mimeType.startsWith('image/');
+ }
+ // Older rows can have no stored MIME type - fall back to the file extension.
+ const extension = (entry?.name?.split('.').pop() || '').toLowerCase();
+ return IMAGE_EXTENSIONS.includes(extension);
+ }
+
+ /**
+ * Opens the uploaded document full size in a new tab. Uses the blob already fetched for the
+ * thumbnail, so it works for PDFs too and costs no extra request.
+ */
+ openDocument(kind: CkycDocKind): void {
+ const url = this.existing[kind]?.previewUrl;
+ if (url) {
+ window.open(url, '_blank', 'noopener');
}
}
- onFileSelect(event: any, documentType: string): void {
- const file = event.target?.files?.[0];
- if (!file) return;
+ /** Reads back the "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" convention this tab (and
+ * client-india-address-step, for address proof) writes into the identifier's description. */
+ private parseDescriptionDates(description: string | undefined): { issueDate: Date | null; expiryDate: Date | null } {
+ const issueMatch = (description || '').match(/Issue date:\s*([^,|]+)/i);
+ const expiryMatch = (description || '').match(/Expiry date:\s*([^,|]+)/i);
+ return {
+ issueDate: issueMatch ? this.dates.parseDate(issueMatch[1].trim()) : null,
+ expiryDate: expiryMatch ? this.dates.parseDate(expiryMatch[1].trim()) : null
+ };
+ }
- const error = this.validationError(file, documentType);
- if (error) {
- this.setFile(documentType, null);
- this.uploadErrors[documentType] = error;
- event.target.value = '';
+ private buildDescription(issueDate: string | null, expiryDate: string | null): string {
+ const parts: string[] = [];
+ if (issueDate) parts.push(`Issue date: ${issueDate}`);
+ if (expiryDate) parts.push(`Expiry date: ${expiryDate}`);
+ return parts.join(', ');
+ }
+
+ /** Issue/expiry date for display on the card, formatted dd-MM-yyyy — parsed from the same
+ * description text the upload dialog writes. */
+ cardDate(kind: ProofKind, which: 'issue' | 'expiry'): string {
+ const parsed = this.parseDescriptionDates(this.existing[kind].description);
+ const value = which === 'issue' ? parsed.issueDate : parsed.expiryDate;
+ return value ? this.dates.formatDate(value, 'dd-MM-yyyy') : '';
+ }
+
+ /**
+ * Routes each card to whichever real endpoint that artefact is actually stored through — there
+ * is no single "/clients/{id}/ckyc/documents" resource on the backend, so posting every card to
+ * one made-up URL 404'd for all four. A photo goes to the image endpoint, a signature to the
+ * client's own documents, and an ID/address proof to the m_client_identifier it already belongs
+ * to (the same one the Identities tab and create-client stepper post to) — never a fresh,
+ * type-less upload, since which identifier a proof belongs to is exactly what makes it that
+ * proof rather than some other file on the client's record.
+ */
+ uploadDocument(documentType: string): void {
+ if (documentType === 'PHOTO_PROOF' || documentType === 'ADDRESS_PROOF') {
+ this.uploadProofDocument(documentType);
return;
}
- this.setFile(documentType, file);
- this.uploadErrors[documentType] = null;
- }
-
- getFile(documentType: string): File | null {
- switch (documentType) {
- case 'ID_PROOF':
- return this.idProofFile;
- case 'ADDRESS_PROOF':
- return this.addressProofFile;
- case 'PHOTO_PROOF':
- return this.photoProofFile;
- case 'CLIENT_IMAGE':
- return this.clientImageFile;
- case 'CLIENT_SIGNATURE':
- return this.clientSignatureFile;
- default:
- return null;
- }
- }
-
- uploadDocument(documentType: CkycDocumentType): void {
const file = this.getFile(documentType);
if (!file) return;
this.uploading[documentType] = true;
this.uploadErrors[documentType] = null;
+ const key = documentType as keyof typeof this.existing;
- // DocumentApiResource consumes multipart/form-data with body parts `file`, `name` and
- // `description` (file + description mandatory). There is no document-type field in that
- // contract, so the artefact type is carried in `name` - which is also the key
- // loadExistingArtefacts() matches on when reading the document back.
- const meta = CKYC_DOCUMENT_META[documentType];
-
- const formData = new FormData();
- formData.append('file', file);
- formData.append('name', meta.name);
- formData.append('description', meta.description);
-
- // Replace in place when this artefact already has a usable document, so a re-upload updates the
- // existing row (same document id, same content-store location) instead of stacking up another
- // copy. Falls back to create for the first upload of an artefact.
- //
- // Deliberately create instead of replace when the stored file is missing: the backend's update
- // path writes the new content relative to the row's existing `location` and never calls
- // setLocation(), so replacing a row whose file is already gone writes the upload to a fresh
- // folder while the row keeps pointing at the missing one - the artefact would stay broken and
- // the user would get a success message. Creating a new row repairs the card instead.
- const entry = this.existing[documentType];
- const replacing = !!entry?.documentId && !entry?.previewUnavailable;
- const existingId = entry?.documentId;
-
- const request$ = replacing
- ? this.clientsService.replaceClientDocument(this.clientId, String(existingId), formData)
- : this.clientsService.uploadCkycDocument(this.clientId, formData);
+ let request$: Observable;
+ switch (documentType) {
+ case 'CLIENT_IMAGE':
+ request$ = this.clientsService.uploadClientProfileImage(this.clientId, file);
+ break;
+ case 'CLIENT_SIGNATURE':
+ request$ = this.clientsService.uploadClientSignatureImage(this.clientId, file);
+ break;
+ default:
+ return;
+ }
request$.pipe(takeUntil(this.destroy$)).subscribe({
- next: (response: any) => {
+ next: () => {
this.uploading[documentType] = false;
- this.uploadResponses[documentType] = response;
- this.setFile(documentType, null);
- this.alertService.alert({
- type: 'success',
- message:
- response?.message || (replacing ? 'Document replaced successfully.' : 'Document uploaded successfully.')
- });
- // Re-read from m_document so the card reflects what was actually stored, rather than
- // assuming the write succeeded exactly as sent.
- this.loadExistingArtefacts();
+ // The card is gated on `present`; without this a successful upload left it reading
+ // "Not uploaded yet". uploadProofDocument() sets the same flag for the proof cards.
+ this.existing[key].present = true;
+ this.existing[key].source = this.existing[key].source || 'CKYC upload';
+ this.alertService.alert({ type: 'success', message: 'Document uploaded successfully.' });
+ this.refreshPreview(documentType);
},
error: (err: any) => {
this.uploading[documentType] = false;
- this.uploadErrors[documentType] =
- err?.error?.developerMessage ||
- err?.error?.defaultUserMessage ||
- err?.message ||
- 'Failed to upload document.';
+ this.uploadErrors[documentType] = this.extractErrorMessage(err);
}
});
}
+ /**
+ * Proof cards work like the create-client KYC step: pick a document type first (its `sides`
+ * decides whether one image or a front+back pair is required), then upload. Reuses the same
+ * identifier the Identities tab manages — updates its documentTypeId if the picked type
+ * changed, or creates a fresh identifier when none exists yet, so this card never depends on
+ * a separate trip to the Identities tab.
+ */
+ private uploadProofDocument(kind: ProofKind): void {
+ const proof = this.selectedProofType[kind];
+ if (!proof) {
+ this.uploadErrors[kind] = 'Select a document type first.';
+ return;
+ }
+ const files = this.docFiles[kind];
+ if (!files.front || (proof.sides === 2 && !files.back)) {
+ this.uploadErrors[kind] =
+ proof.sides === 2
+ ? 'Both front and back images are required for this document type.'
+ : 'Select a file to upload.';
+ return;
+ }
+
+ this.uploading[kind] = true;
+ this.uploadErrors[kind] = null;
+
+ const existingId = this.existing[kind].documentId;
+ const details = this.documentDetails[kind];
+ const documentKey = details.documentKey || `${proof.name} - ${this.clientId}`;
+ const description = this.buildDescription(details.issueDate, details.expiryDate);
+
+ const identifier$: Observable = !existingId
+ ? this.clientsService.addClientIdentifier(this.clientId, {
+ documentTypeId: proof.id,
+ status: 'ACTIVE',
+ documentKey,
+ description: description || 'KYC document'
+ })
+ : this.clientsService.updateClientIdentifier(this.clientId, existingId, {
+ documentTypeId: proof.id,
+ status: 'ACTIVE',
+ documentKey,
+ description
+ });
+
+ identifier$.pipe(takeUntil(this.destroy$)).subscribe({
+ next: (res: any) => {
+ const identifierId = existingId || res?.resourceId;
+ const uploads: Observable[] = [];
+
+ const front = new FormData();
+ front.append('name', proof.sides === 2 ? `${proof.name} — Front` : proof.name);
+ front.append('file', files.front!);
+ uploads.push(this.clientsService.uploadClientIdentifierDocument(identifierId, front));
+
+ if (proof.sides === 2 && files.back) {
+ const back = new FormData();
+ back.append('name', `${proof.name} — Back`);
+ back.append('file', files.back);
+ uploads.push(this.clientsService.uploadClientIdentifierDocument(identifierId, back));
+ }
+
+ forkJoin(uploads)
+ .pipe(takeUntil(this.destroy$))
+ .subscribe({
+ next: () => {
+ this.uploading[kind] = false;
+ this.existing[kind].present = true;
+ this.existing[kind].documentId = identifierId;
+ this.existing[kind].documentTypeId = String(proof.id);
+ this.existing[kind].documentKey = details.documentKey || '';
+ this.existing[kind].description = description;
+ this.existing[kind].name = proof.name;
+ this.existing[kind].source = this.existing[kind].source || 'Identities section';
+ this.docFiles[kind] = { front: null, back: null };
+ this.alertService.alert({ type: 'success', message: 'Document uploaded successfully.' });
+ this.refreshPreview(kind);
+ },
+ error: (err: any) => {
+ this.uploading[kind] = false;
+ this.uploadErrors[kind] = this.extractErrorMessage(err);
+ }
+ });
+ },
+ error: (err: any) => {
+ this.uploading[kind] = false;
+ this.uploadErrors[kind] = this.extractErrorMessage(err);
+ }
+ });
+ }
+
+ private extractErrorMessage(err: any): string {
+ return (
+ err?.error?.errors?.[0]?.defaultUserMessage ||
+ err?.error?.developerMessage ||
+ err?.error?.defaultUserMessage ||
+ err?.message ||
+ 'Failed to upload document.'
+ );
+ }
+
+ /** Re-fetches whichever artefact was just replaced, so its preview reflects the new file
+ * immediately instead of the one this screen loaded on entry. */
+ private refreshPreview(documentType: string): void {
+ const staleKey = documentType as keyof typeof this.existing;
+ if (this.existing[staleKey].previewUrl?.startsWith('blob:')) {
+ URL.revokeObjectURL(this.existing[staleKey].previewUrl!);
+ }
+ if (this.existing[staleKey].previewUrlBack?.startsWith('blob:')) {
+ URL.revokeObjectURL(this.existing[staleKey].previewUrlBack!);
+ }
+ // The upload that triggered this refresh is what repairs a previously missing file, so the
+ // warning has to be cleared before the re-read - otherwise a fixed card keeps the old badge.
+ this.existing[staleKey].previewUrl = undefined;
+ this.existing[staleKey].previewUrlBack = undefined;
+ this.existing[staleKey].previewUnavailable = false;
+ switch (documentType) {
+ case 'CLIENT_IMAGE':
+ this.clientsService
+ .getClientProfileImage(this.clientId)
+ .pipe(takeUntil(this.destroy$))
+ .subscribe((photo: any) => {
+ if (photo) {
+ this.existing.CLIENT_IMAGE.previewUrl = photo;
+ } else {
+ this.existing.CLIENT_IMAGE.previewUnavailable = true;
+ }
+ });
+ break;
+ case 'CLIENT_SIGNATURE':
+ this.clientsService
+ .getClientDocuments(this.clientId)
+ .pipe(takeUntil(this.destroy$))
+ .subscribe((documents: any) => {
+ const doc = (documents as any[])
+ ?.filter((d: any) => d?.name === 'clientSignature')
+ ?.sort((a: any, b: any) => b.id - a.id)?.[0];
+ if (!doc) return;
+ this.existing.CLIENT_SIGNATURE.documentId = doc.id;
+ this.existing.CLIENT_SIGNATURE.mimeType = doc.type;
+ this.clientsService
+ .downloadClientDocument(this.clientId, String(doc.id), true)
+ .pipe(takeUntil(this.destroy$))
+ .subscribe({
+ next: (blob: any) => {
+ if (blob && blob.size > 0) {
+ this.existing.CLIENT_SIGNATURE.previewUrl = URL.createObjectURL(blob);
+ } else {
+ this.existing.CLIENT_SIGNATURE.previewUnavailable = true;
+ }
+ },
+ error: () => {
+ this.existing.CLIENT_SIGNATURE.previewUnavailable = true;
+ }
+ });
+ });
+ break;
+ case 'PHOTO_PROOF':
+ case 'ADDRESS_PROOF':
+ this.loadIdentifierDocPreview(documentType, this.existing[documentType].documentId!);
+ break;
+ }
+ }
+
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
- // Release object URLs
- Object.values(this.existing).forEach((e) => {
- if (e.previewUrl?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrl);
- });
+ this.revokePreviewUrls();
}
}
diff --git a/src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.html b/src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.html
new file mode 100644
index 000000000..cae9e00ff
--- /dev/null
+++ b/src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.html
@@ -0,0 +1,167 @@
+
+
+
+ @if (data.isProofKind) {
+
+
+
+
+
+
diff --git a/src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.scss b/src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.scss
new file mode 100644
index 000000000..a6833e451
--- /dev/null
+++ b/src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.scss
@@ -0,0 +1,270 @@
+/**
+ * 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/.
+ */
+
+:host {
+ display: block;
+ max-width: 100%;
+}
+
+/* ===================== Header ===================== */
+.cud-header {
+ display: flex;
+ align-items: flex-start;
+ gap: 12px;
+ padding: 20px 24px 16px;
+ border-bottom: 1px solid #eef1f4;
+
+ &__badge {
+ flex-shrink: 0;
+ width: 36px;
+ height: 36px;
+ border-radius: 9px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 15px;
+ color: #fff;
+ background: linear-gradient(135deg, #1a73e8, #4285f4);
+ box-shadow: 0 3px 10px rgb(26 115 232 / 28%);
+ }
+
+ &__text {
+ flex: 1;
+ min-width: 0;
+ }
+}
+
+.cud-title {
+ margin: 0 !important;
+ padding: 0;
+ font-size: 16px;
+ font-weight: 700;
+ color: #1a1d21;
+ line-height: 1.3;
+}
+
+.cud-subtitle {
+ margin: 2px 0 0;
+ font-size: 12px;
+ color: #6b7280;
+}
+
+.cud-close {
+ flex-shrink: 0;
+ width: 32px;
+ height: 32px;
+ margin: -4px -4px 0 0;
+ color: #9aa0a6;
+
+ &:hover {
+ color: #3c4043;
+ }
+}
+
+/* ===================== Body / sections ===================== */
+.cud-body.mat-mdc-dialog-content {
+ padding: 18px 24px !important;
+ max-height: 70vh;
+}
+
+.cud-section {
+ margin-bottom: 14px;
+
+ &--dates {
+ display: flex;
+ gap: 14px;
+
+ .cud-date-field {
+ flex: 1;
+ min-width: 0;
+ }
+ }
+
+ &__label {
+ display: flex;
+ align-items: center;
+ gap: 7px;
+ font-size: 11px;
+ font-weight: 700;
+ color: #475569;
+ text-transform: uppercase;
+ letter-spacing: 0.05em;
+ margin-bottom: 6px;
+
+ fa-icon {
+ color: #1a73e8;
+ font-size: 10.5px;
+ }
+ }
+}
+
+.cud-field {
+ width: 100%;
+}
+
+.cud-hint {
+ font-size: 12px;
+ color: #6b7280;
+ margin: 6px 0 0;
+ line-height: 1.4;
+}
+
+.cud-banner {
+ display: flex;
+ align-items: flex-start;
+ gap: 9px;
+ padding: 10px 14px;
+ margin-bottom: 14px;
+ background: #f0fbf6;
+ border: 1px solid #cfecdd;
+ border-radius: 10px;
+ font-size: 12.5px;
+ color: #085041;
+ line-height: 1.45;
+
+ fa-icon {
+ margin-top: 2px;
+ color: #1d9e75;
+ flex-shrink: 0;
+ }
+}
+
+.cud-divider {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ margin: 16px 0 12px;
+ font-size: 10.5px;
+ font-weight: 700;
+ color: #9aa0a6;
+ text-transform: uppercase;
+ letter-spacing: 0.08em;
+
+ &::before,
+ &::after {
+ content: '';
+ flex: 1;
+ height: 1px;
+ background: #eef1f4;
+ }
+}
+
+/* ===================== Front/back scan grid ===================== */
+.cud-grid {
+ display: grid;
+ grid-template-columns: 1fr;
+ gap: 12px;
+
+ &--two {
+ grid-template-columns: repeat(2, 1fr);
+ }
+}
+
+.cud-slot {
+ display: flex;
+ flex-direction: column;
+ gap: 6px;
+
+ &__label {
+ font-size: 10.5px;
+ font-weight: 700;
+ color: #5f6368;
+ text-transform: uppercase;
+ letter-spacing: 0.05em;
+ }
+}
+
+.cud-dropzone {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ gap: 8px;
+ min-height: 130px;
+ padding: 16px;
+ border: 2px dashed #cbd5e1;
+ border-radius: 12px;
+ cursor: pointer;
+ text-align: center;
+ background: #fafbfc;
+ transition:
+ border-color 0.15s,
+ background 0.15s,
+ box-shadow 0.15s;
+
+ &:hover {
+ border-color: #1a73e8;
+ background: #f5f9ff;
+ box-shadow: 0 2px 10px rgb(26 115 232 / 10%);
+ }
+
+ &--has {
+ border-style: solid;
+ border-color: #1d9e75;
+ background: #f0fbf6;
+ }
+
+ &__icon {
+ font-size: 22px;
+ color: #9aa5b1;
+ }
+
+ &--has &__icon {
+ color: #1d9e75;
+ }
+
+ &__text {
+ font-size: 12px;
+ color: #64748b;
+ margin: 0;
+ font-weight: 500;
+ }
+
+ &__name {
+ font-size: 11.5px;
+ color: #085041;
+ font-weight: 600;
+ margin: 0;
+ word-break: break-all;
+ padding: 0 8px;
+ }
+
+ &__img {
+ max-width: 100%;
+ max-height: 150px;
+ border-radius: 8px;
+ object-fit: contain;
+ box-shadow: 0 2px 8px rgb(0 0 0 / 8%);
+ }
+}
+
+/* ===================== Actions ===================== */
+.cud-actions {
+ padding: 12px 24px !important;
+ margin: 0 !important;
+ border-top: 1px solid #eef1f4;
+
+ fa-icon {
+ font-size: 12px;
+ }
+}
+
+@media (width <= 560px) {
+ :host {
+ width: 100%;
+ }
+
+ .cud-section--dates {
+ flex-direction: column;
+ gap: 14px;
+ }
+
+ .cud-grid--two {
+ grid-template-columns: 1fr;
+ }
+}
diff --git a/src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.ts b/src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.ts
new file mode 100644
index 000000000..3fe969bce
--- /dev/null
+++ b/src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.ts
@@ -0,0 +1,155 @@
+/**
+ * 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, OnDestroy, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import {
+ MatDialogRef,
+ MAT_DIALOG_DATA,
+ MatDialogTitle,
+ MatDialogContent,
+ MatDialogActions,
+ MatDialogClose
+} from '@angular/material/dialog';
+import { MatIconButton } from '@angular/material/button';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { Dates } from 'app/core/utils/dates';
+import { ProofType } from '../../../shared/kyc-proof-types';
+
+export interface CkycUploadDialogData {
+ title: string;
+ isProofKind: boolean;
+ accept: string;
+ proofOptions?: ProofType[];
+ initialProofType?: ProofType | null;
+ initialDocumentKey?: string;
+ initialIssueDate?: Date | null;
+ initialExpiryDate?: Date | null;
+}
+
+export interface CkycUploadDialogResult {
+ proofType?: ProofType | null;
+ front: File;
+ back?: File;
+ /** Document number (Aadhaar/PAN/Passport number, etc.) — same field client creation collects. */
+ documentKey?: string;
+ /** 'yyyy-MM-dd', same as the rest of this app's date fields. */
+ issueDate?: string | null;
+ expiryDate?: string | null;
+}
+
+/**
+ * A focused popup for replacing/uploading one CKYC artefact at a time — opened from each card on
+ * the CKYC tab instead of expanding a form inline underneath it. Collects the same details
+ * client creation does for an identity/address proof (document type, number, issue + expiry
+ * date) and shows a client-side preview of whatever image is picked before it's ever sent to the
+ * server; the actual upload still happens back in CkycTabComponent (this dialog only collects
+ * the type, number, dates and file(s), then hands them back).
+ */
+@Component({
+ selector: 'mifosx-ckyc-upload-dialog',
+ templateUrl: './ckyc-upload-dialog.component.html',
+ styleUrls: ['./ckyc-upload-dialog.component.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ FormsModule,
+ MatDialogTitle,
+ MatDialogContent,
+ MatDialogActions,
+ MatDialogClose,
+ MatIconButton,
+ FaIconComponent
+ ]
+})
+export class CkycUploadDialogComponent implements OnDestroy {
+ private dates = inject(Dates);
+ dialogRef = inject>(MatDialogRef);
+ data = inject(MAT_DIALOG_DATA);
+
+ selectedProofType: ProofType | null = this.data.initialProofType || null;
+ documentKey = this.data.initialDocumentKey || '';
+ issueDate: Date | null = this.data.initialIssueDate || null;
+ expiryDate: Date | null = this.data.initialExpiryDate || null;
+
+ front: File | null = null;
+ back: File | null = null;
+ frontPreview: string | null = null;
+ backPreview: string | null = null;
+
+ get sides(): number {
+ return this.data.isProofKind ? (this.selectedProofType?.sides ?? 1) : 1;
+ }
+
+ get canSubmit(): boolean {
+ if (this.data.isProofKind) {
+ if (!this.selectedProofType) return false;
+ if (!this.documentKey.trim()) return false;
+ }
+ if (!this.front) return false;
+ if (this.sides === 2 && !this.back) return false;
+ return true;
+ }
+
+ compareProofType = (a: ProofType | null, b: ProofType | null): boolean => (a?.id ?? null) === (b?.id ?? null);
+
+ onProofTypeChange(proof: ProofType | null): void {
+ this.selectedProofType = proof;
+ this.clearSlot('front');
+ this.clearSlot('back');
+ }
+
+ onFilePick(slot: 'front' | 'back', event: any): void {
+ const file = event?.target?.files?.[0];
+ if (event?.target) event.target.value = '';
+ if (!file) return;
+
+ this.clearSlot(slot);
+ const preview = file.type?.startsWith('image/') ? URL.createObjectURL(file) : null;
+ if (slot === 'front') {
+ this.front = file;
+ this.frontPreview = preview;
+ } else {
+ this.back = file;
+ this.backPreview = preview;
+ }
+ }
+
+ private clearSlot(slot: 'front' | 'back'): void {
+ if (slot === 'front') {
+ if (this.frontPreview) URL.revokeObjectURL(this.frontPreview);
+ this.front = null;
+ this.frontPreview = null;
+ } else {
+ if (this.backPreview) URL.revokeObjectURL(this.backPreview);
+ this.back = null;
+ this.backPreview = null;
+ }
+ }
+
+ submit(): void {
+ if (!this.canSubmit) return;
+ this.dialogRef.close({
+ proofType: this.selectedProofType,
+ front: this.front!,
+ back: this.sides === 2 ? this.back! : undefined,
+ documentKey: this.data.isProofKind ? this.documentKey.trim() : undefined,
+ issueDate: this.issueDate ? this.dates.getDate(this.issueDate) : null,
+ expiryDate: this.expiryDate ? this.dates.getDate(this.expiryDate) : null
+ });
+ }
+
+ cancel(): void {
+ this.dialogRef.close(null);
+ }
+
+ ngOnDestroy(): void {
+ if (this.frontPreview) URL.revokeObjectURL(this.frontPreview);
+ if (this.backPreview) URL.revokeObjectURL(this.backPreview);
+ }
+}
diff --git a/src/app/clients/clients-view/identities-tab/identities-tab.component.ts b/src/app/clients/clients-view/identities-tab/identities-tab.component.ts
index fc9d25486..daaafe57c 100644
--- a/src/app/clients/clients-view/identities-tab/identities-tab.component.ts
+++ b/src/app/clients/clients-view/identities-tab/identities-tab.component.ts
@@ -229,7 +229,7 @@ export class IdentitiesTabComponent implements OnDestroy {
}
const identifierData = {
documentTypeId,
- status: 'Active',
+ status: 'ACTIVE',
documentKey: kind === 'id' ? section.documentKey : `${proofName} - ${this.clientId}`,
description: kind === 'address' && section.address ? section.address : description
};
diff --git a/src/app/clients/clients-view/kyc-tab/kyc-tab.component.html b/src/app/clients/clients-view/kyc-tab/kyc-tab.component.html
index 57311257a..b4ae05100 100644
--- a/src/app/clients/clients-view/kyc-tab/kyc-tab.component.html
+++ b/src/app/clients/clients-view/kyc-tab/kyc-tab.component.html
@@ -82,12 +82,13 @@
{{ kycDocumentAlertTitle }}
+
@@ -470,7 +471,11 @@
}
-
+
+
+
+ }
+ @if (uploadErrors['CLIENT_SIGNATURE']) {
+
+ error_outline
+ {{ uploadErrors['CLIENT_SIGNATURE'] }}
-
- @if (uploadErrors['CLIENT_SIGNATURE']) {
-
- error_outline
- {{ uploadErrors['CLIENT_SIGNATURE'] }}
-
- }
- @if (uploadResponses['CLIENT_SIGNATURE']) {
-
-
- }
}
diff --git a/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.scss b/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.scss
index 51f57dc01..94b6f1336 100644
--- a/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.scss
+++ b/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.scss
@@ -553,15 +553,21 @@
margin: 0 0 12px;
}
-.ckyc-file-row {
+.ckyc-missing {
+ margin-top: 14px;
display: flex;
+ flex-direction: column;
+ gap: 10px;
align-items: flex-start;
- gap: 8px;
- margin-bottom: 12px;
}
-.ckyc-file-name-field {
- flex: 1;
+.ckyc-uploading {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ margin-top: 10px;
+ font-size: 12px;
+ color: #5f6368;
}
.ckyc-upload-error {
@@ -583,19 +589,6 @@
}
}
-.ckyc-upload-response {
- margin-top: 12px;
- padding: 10px 14px;
- background-color: #e8f5e9;
- border: 1px solid #a5d6a7;
- border-radius: 8px;
- font-size: 12px;
-
- p {
- margin: 4px 0;
- }
-}
-
@media (width <= 900px) {
.ckyc-upload-grid {
grid-template-columns: 1fr;
@@ -610,14 +603,6 @@
.ckyc-upload-grid {
grid-template-columns: 1fr;
}
-
- .ckyc-file-row {
- flex-direction: column;
- }
-
- .ckyc-file-name-field {
- width: 100%;
- }
}
/* ===================== Already-available banners ===================== */
@@ -760,6 +745,34 @@
letter-spacing: 0.3px;
}
+ &__thumbs {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 10px;
+ flex-wrap: wrap;
+ }
+
+ &__dates {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ font-size: 11px;
+ color: #0f6e56;
+ flex-wrap: wrap;
+
+ span {
+ display: inline-flex;
+ align-items: center;
+ gap: 5px;
+ }
+
+ fa-icon {
+ color: #1d9e75;
+ font-size: 11px;
+ }
+ }
+
&__thumb {
width: 100px;
height: 100px;
diff --git a/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.ts b/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.ts
index c5e72c1f0..b90ec1d8c 100644
--- a/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.ts
+++ b/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.ts
@@ -9,52 +9,41 @@
/** Angular Imports */
import { Component, OnInit, OnDestroy, inject } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
-import { Subject, takeUntil, catchError, of } from 'rxjs';
+import { Subject, Observable, takeUntil, catchError, of, forkJoin } from 'rxjs';
/** Custom Services */
import { ClientsService } from '../../clients.service';
import { AlertService } from 'app/core/alert/alert.service';
import { MatIcon } from '@angular/material/icon';
import { MatProgressSpinner } from '@angular/material/progress-spinner';
+import { MatDialog } from '@angular/material/dialog';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { Dates } from 'app/core/utils/dates';
+import { ProofType, normalizeProofType } from '../../shared/kyc-proof-types';
+import { CkycUploadDialogComponent, CkycUploadDialogResult } from './ckyc-upload-dialog/ckyc-upload-dialog.component';
interface ExistingArtefact {
present: boolean;
name?: string;
source?: string;
previewUrl?: string;
+ previewUrlBack?: string;
documentId?: string;
+ documentTypeId?: string;
documentKey?: string;
+ /** "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" — same convention client-india-address-step
+ * already writes/reads for address proof; now shared by the photo/identity proof too. */
+ description?: string;
fileCount?: number;
- expanded?: boolean;
/** Set when the stored file could not be fetched - the row exists but its content is gone. */
previewUnavailable?: boolean;
/** Stored MIME type, so the card knows whether it can render an inline thumbnail. */
mimeType?: string;
}
-/**
- * Multipart `name` / `description` sent for each CKYC artefact type.
- *
- * The platform has no CKYC-specific document API; these are stored through the generic
- * DocumentApiResource, whose contract carries no document-type field. The artefact type therefore
- * travels in `name`, which is the same mechanism the client signature already uses - so
- * `CLIENT_SIGNATURE` deliberately reuses the existing `clientSignature` value that
- * loadExistingArtefacts() (and uploadClientSignatureImage()) match on. Changing that string would
- * orphan every previously uploaded signature.
- */
-export type CkycDocumentType = 'ID_PROOF' | 'ADDRESS_PROOF' | 'PHOTO_PROOF' | 'CLIENT_IMAGE' | 'CLIENT_SIGNATURE';
-
-const CKYC_DOCUMENT_META: Record- {{ 'labels.inputs.Status' | translate }}: {{ uploadResponses['CLIENT_SIGNATURE'].status }} -
-- {{ 'labels.inputs.Request ID' | translate }}: - {{ uploadResponses['CLIENT_SIGNATURE'].requestId }} -
-- {{ 'labels.inputs.Acknowledgement Number' | translate }}: - {{ uploadResponses['CLIENT_SIGNATURE'].acknowledgementNumber }} -
-- {{ 'labels.inputs.Processing Status' | translate }}: - {{ uploadResponses['CLIENT_SIGNATURE'].processingStatus }} -
-
+
+
+
+
+
+
+
+{{ data.title }}
+Fill in the document details, then attach the scan.
+
+
+
+ @for (p of data.proofOptions; track p.id) {
+ {{ p.name }}
+ }
+
+
+
+
+ @if (selectedProofType) {
+ @if (selectedProofType.info) {
+
+ }
+
+ Upload requirements will update automatically based on the type you pick.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Scan
+
+
+
+ }
+ } @else {
+
+ {{ sides === 2 ? 'Front side' : 'Document' }}
+
+
+
+ @if (sides === 2) {
+
+ Back side
+
+
+ }
+
+
+ }
+
+ Document
+
+
+ {{ kycDocumentAlertMessage }}
+
+ photo_library
+ Scanned document
+ @if (docScansLoading) {
+
+
+ @if (!docScansLoading && !docScans.front && !docScans.back) {
+ No scan is on file for this document. Upload one below.
+ }
+
+
+ @for (slot of docScanSlots; track slot) {
+
+
+ @if (docScanError) {
+
+
+ }
+ {{ slot === 'front' ? 'Front' : 'Back' }}
+
+
+ @if (docScanOf(slot)?.previewUrl) {
+ ![]()
+ } @else if (docScanOf(slot)) {
+
+
+
+
+
+
+ description
+ {{ docScanOf(slot)!.fileName }}
+
+ } @else {
+ Not on file
+ }
+
+ error_outline {{ docScanError }}
+
+ }
+ @if (docScanSuccess) {
+
+ check_circle {{ docScanSuccess }}
+
+ }
+
+ description
+ Update {{ data.documentName }}
+
+
+
+ schedule
+ {{ data.reason }}
+
+ }
+
+
+
+
+
+Scanned copy
+ + Leave a side untouched to keep the scan already on file. The previous copy is kept either way. +
+ +
+ @for (slot of slots; track slot) {
+
+
+
+ }
+
+ {{ slot === 'front' ? 'Front' : 'Back' }}
+ @if (isReplaced(slot)) {
+ New
+ }
+
+
+
+ @if (previewOf(slot)) {
+ ![]()
+ } @else if (isReplaced(slot)) {
+
+
+
+
+ insert_drive_file
+ {{ pickedName(slot) }}
+
+ } @else {
+ Not on file
+ }
+
+
+ @if (isReplaced(slot)) {
+
+ }
+
+
+ Financial Intelligence Unit – India (FIU-IND)
- {{ bank.name }} · {{ scopeName }} · Reporting Month {{ bank.reportingMonth }}
- · PMLA 2002 / FINnet 2.0
+ {{ bank.name }} · {{ scopeName }} · Reporting Month
+ {{ reportingMonthLabel }} · PMLA 2002 / FINnet 2.0
@@ -33,12 +33,13 @@
}
-
-
-
-
-
-
+
+ @if (principalOfficerName) {
+
+
+
+ }
@@ -164,7 +165,11 @@
-
+
+
@@ -206,11 +211,27 @@
with the same bundle and are worked on the Customer Cards tab.
-