diff --git a/package.json b/package.json
index 4e0057794..aad5a8105 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
"ng": "ng",
"build": "node version.js && npm run env -s && ng build --configuration production --output-hashing=none",
"build:prod": "node version.js && node --max-old-space-size=16384 ./node_modules/@angular/cli/bin/ng build --configuration production --output-hashing=none --base-href=/web-app/",
- "start": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --proxy-config proxy.localhost.conf.js",
+ "start": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" ng serve --proxy-config proxy.localhost.conf.js",
"start:share": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --host 0.0.0.0 --proxy-config proxy.localhost.conf.js",
"start:demo": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --proxy-config proxy.conf.js",
"serve:dev": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --source-map --proxy-config proxy.localhost.conf.js",
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 6938ce4bd..899514486 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
@@ -279,7 +279,7 @@
-
+
@@ -288,7 +288,7 @@
-
+
@@ -353,13 +353,7 @@
-
+
@@ -368,7 +362,7 @@
-
+
@@ -539,7 +533,7 @@
-
+ #
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 cf8330511..a6b2aa257 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
@@ -90,7 +90,7 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
// ── Misc ──────────────────────────────────────────────────────────────────
minDate = new Date(2000, 0, 1);
- maxDate = new Date();
+ maxDate: Date = null;
/** Accounting features switched off for this installation — see disabled-features.ts. */
disabledFeatures = DISABLED_ACCOUNTING_FEATURES;
@@ -208,7 +208,7 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
}
ngOnInit() {
- this.maxDate = this.settingsService.businessDate;
+ this.maxDate = null;
this.paginator.pageSize = 10;
this.restoreState();
this.setFilteredOffices();
diff --git a/src/app/accounts/accounts.service.ts b/src/app/accounts/accounts.service.ts
index ad7e49688..ddc9efadc 100644
--- a/src/app/accounts/accounts.service.ts
+++ b/src/app/accounts/accounts.service.ts
@@ -74,6 +74,17 @@ export class AccountsService {
return this.http.get('/fixeddepositaccounts', { params: httpParams });
}
+ /**
+ * FD Dashboard's data source: every ACTIVE FD, id/account/client/product identity, maturity date
+ * and deposit/maturity amounts only. Deliberately a separate, narrow endpoint rather than
+ * getFixedDepositAccounts() above -- that one's backend query joins in six more tables (audit
+ * who-did-what-when, currency, tax group) an unbounded dashboard fetch does not need, over columns
+ * that had no index until this feature added one (see backend migration 0571).
+ */
+ getFixedDepositMaturityDashboard(): Observable {
+ return this.http.get('/fixeddepositaccounts/maturity-dashboard');
+ }
+
getRecurringDepositAccounts(params: AccountListParams = {}): Observable {
let httpParams = new HttpParams()
.set('paged', 'true')
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 4136ae258..b95fd0ad1 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -63,6 +63,7 @@ import { CfcfrmsModule } from './cfcfrms/cfcfrms.module';
import { BankCalendarModule } from './bank-calendar/bank-calendar.module';
import { DeafModule } from './deaf/deaf.module';
import { SavingsDailyInterestModule } from './savings-daily-interest/savings-daily-interest.module';
+import { FdDashboardModule } from './fd-dashboard/fd-dashboard.module';
import { DicgcModule } from './dicgc/dicgc.module';
import { FiuModule } from './fiu/fiu.module';
import { GlReportsModule } from './gl-reports/gl-reports.module';
@@ -176,6 +177,7 @@ export function HttpLoaderFactory(http: HttpClient) {
BankCalendarModule,
DeafModule,
SavingsDailyInterestModule,
+ FdDashboardModule,
DicgcModule,
FiuModule,
GlReportsModule,
diff --git a/src/app/board-resolution/bor-report.component.html b/src/app/board-resolution/bor-report.component.html
index ec7b8bf32..1fce84acf 100644
--- a/src/app/board-resolution/bor-report.component.html
+++ b/src/app/board-resolution/bor-report.component.html
@@ -17,7 +17,12 @@
-
@if (canOperate) {
-
+ @if (interestPending.length > 0) {
+
+ warning
+
+ Savings interest posting report is not approved for {{ interestPending.join(', ') }}. Approve it in Reports → Interest Posting Reports before
+ closing the day.
+
+
+ }
} @else if (loaded && canOperate) {
diff --git a/src/app/cashier/branch-day/branch-day.component.scss b/src/app/cashier/branch-day/branch-day.component.scss
index c97aebcc9..449dfced1 100644
--- a/src/app/cashier/branch-day/branch-day.component.scss
+++ b/src/app/cashier/branch-day/branch-day.component.scss
@@ -372,3 +372,30 @@
color: #d97706;
}
}
+
+// Shown under the open day while a savings interest posting report due today is unapproved.
+.bd-interest-alert {
+ display: flex;
+ align-items: flex-start;
+ gap: 8px;
+ margin: 8px 0 12px;
+ padding: 10px 14px;
+ border: 1px solid #f59e0b;
+ border-radius: 8px;
+ background: #fef3c7;
+ color: #92400e;
+ font-size: 13px;
+
+ mat-icon {
+ flex-shrink: 0;
+ font-size: 20px;
+ width: 20px;
+ height: 20px;
+ }
+
+ a {
+ color: inherit;
+ font-weight: 600;
+ text-decoration: underline;
+ }
+}
diff --git a/src/app/cashier/branch-day/branch-day.component.ts b/src/app/cashier/branch-day/branch-day.component.ts
index da476f658..088380db1 100644
--- a/src/app/cashier/branch-day/branch-day.component.ts
+++ b/src/app/cashier/branch-day/branch-day.component.ts
@@ -189,6 +189,23 @@ export class BranchDayComponent implements OnInit {
return this.totalOf(this.closeCounts);
}
+ /**
+ * Savings products whose interest posting report is due today and not yet approved. The close is
+ * refused by the backend while any is pending; this only says so before the user tries.
+ */
+ interestPending: string[] = [];
+
+ private checkInterestReports(): void {
+ if (!this.openDay?.businessDate) {
+ this.interestPending = [];
+ return;
+ }
+ this.service
+ .interestDayCloseCheck(this.openDay.businessDate, this.openDay.officeId)
+ .pipe(catchError(() => of(null)))
+ .subscribe((res) => (this.interestPending = res?.pendingProducts ?? []));
+ }
+
load(): void {
this.loading = true;
this.errorMsg = '';
@@ -210,6 +227,7 @@ export class BranchDayComponent implements OnInit {
this.canOperate = !!res?.canOperate;
this.openDate = this.today;
this.checkFirstOpenCashMigration();
+ this.checkInterestReports();
});
this.service
diff --git a/src/app/cashier/cash-clearing-transfer-summary/cash-clearing-transfer-summary.component.ts b/src/app/cashier/cash-clearing-transfer-summary/cash-clearing-transfer-summary.component.ts
index 65fbf5d25..4ddc24e33 100644
--- a/src/app/cashier/cash-clearing-transfer-summary/cash-clearing-transfer-summary.component.ts
+++ b/src/app/cashier/cash-clearing-transfer-summary/cash-clearing-transfer-summary.component.ts
@@ -11,6 +11,7 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { AuthenticationService } from '../../core/authentication/authentication.service';
import { ExportSheetSpec, exportWorkbook } from '../cashier-export';
+import { businessToday } from 'app/core/utils/business-today';
interface SummaryRow {
code: string;
@@ -1316,7 +1317,7 @@ export class CashClearingTransferSummaryComponent {
private dateTag = '2607';
constructor() {
- const d = new Date();
+ const d = businessToday();
this.asOnDate = `${String(d.getDate()).padStart(2, '0')}-${String(d.getMonth() + 1).padStart(2, '0')}-${d.getFullYear()}`;
this.dateTag = `${String(d.getFullYear()).slice(-2)}${String(d.getMonth() + 1).padStart(2, '0')}`;
diff --git a/src/app/cashier/cash-exchange-entry/cash-exchange-entry.component.ts b/src/app/cashier/cash-exchange-entry/cash-exchange-entry.component.ts
index 383cb57d6..bede34b4b 100644
--- a/src/app/cashier/cash-exchange-entry/cash-exchange-entry.component.ts
+++ b/src/app/cashier/cash-exchange-entry/cash-exchange-entry.component.ts
@@ -12,6 +12,7 @@ import { FormsModule } from '@angular/forms';
import { MatIconModule } from '@angular/material/icon';
import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
interface Denom {
id: number;
@@ -63,7 +64,7 @@ export class CashExchangeEntryComponent implements OnInit {
}
ngOnInit(): void {
- const d = new Date();
+ const d = businessToday();
this.exchangeDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
this.service.getActiveDenominations().subscribe({
next: (list) => {
diff --git a/src/app/cashier/cash-settlement/cash-settlement.component.ts b/src/app/cashier/cash-settlement/cash-settlement.component.ts
index 45d5c0f93..122527d6f 100644
--- a/src/app/cashier/cash-settlement/cash-settlement.component.ts
+++ b/src/app/cashier/cash-settlement/cash-settlement.component.ts
@@ -18,6 +18,7 @@ import { MatInputModule } from '@angular/material/input';
import { forkJoin, of } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
type PageState = 'loading' | 'no-cashier' | 'needs-reconciliation' | 'already-settled' | 'form';
@@ -90,7 +91,7 @@ export class CashSettlementComponent implements OnInit {
saving = false;
ngOnInit(): void {
- const d = new Date();
+ const d = businessToday();
this.settlementDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
this.service
.getTellers()
diff --git a/src/app/cashier/cash-transfer/cash-transfer.component.ts b/src/app/cashier/cash-transfer/cash-transfer.component.ts
index fa5de03f9..d818ad5e2 100644
--- a/src/app/cashier/cash-transfer/cash-transfer.component.ts
+++ b/src/app/cashier/cash-transfer/cash-transfer.component.ts
@@ -17,6 +17,7 @@ import { MatInputModule } from '@angular/material/input';
import { of } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
interface Denom {
id: number;
@@ -82,7 +83,7 @@ export class CashTransferComponent implements OnInit {
loadingVault = false;
ngOnInit(): void {
- const d = new Date();
+ const d = businessToday();
this.transferDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
this.service.getActiveDenominations().subscribe({
next: (list) => {
diff --git a/src/app/cashier/cashier-position/cashier-position.component.ts b/src/app/cashier/cashier-position/cashier-position.component.ts
index 1ffa957b1..dc0025bdd 100644
--- a/src/app/cashier/cashier-position/cashier-position.component.ts
+++ b/src/app/cashier/cashier-position/cashier-position.component.ts
@@ -17,6 +17,7 @@ import { forkJoin, of } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { CashierService } from '../cashier.service';
import { AuthenticationService } from '../../core/authentication/authentication.service';
+import { businessToday } from 'app/core/utils/business-today';
interface DenomRow {
denominationId: number;
@@ -71,7 +72,7 @@ export class CashierPositionComponent implements OnInit {
isCashierMode = false;
ngOnInit(): void {
- const d = new Date();
+ const d = businessToday();
this.asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
this.isCashierMode = this.authService.isCashierUser();
diff --git a/src/app/cashier/cashier.service.ts b/src/app/cashier/cashier.service.ts
index 3078701f8..f3700e20c 100644
--- a/src/app/cashier/cashier.service.ts
+++ b/src/app/cashier/cashier.service.ts
@@ -205,6 +205,23 @@ export class CashierService {
return this.http.get('/branchday', { params });
}
+ /**
+ * The savings products whose interest posting report is due for the date and not yet approved —
+ * the backend refuses to close any branch's day while one is pending.
+ */
+ interestDayCloseCheck(
+ date?: string,
+ officeId?: number
+ ): Observable<{ businessDate: string; canClose: boolean; pendingProducts: string[] }> {
+ let params = new HttpParams();
+ if (date) params = params.set('date', date);
+ if (officeId) params = params.set('officeId', String(officeId));
+ return this.http.get<{ businessDate: string; canClose: boolean; pendingProducts: string[] }>(
+ '/savingsinterestpostingreports/day-close-check',
+ { params }
+ );
+ }
+
/** Days opened and never closed — today's own open day excluded. */
branchDayMissed(officeId?: number): Observable {
let params = new HttpParams();
diff --git a/src/app/cashier/closing-cash-report/closing-cash-report.component.ts b/src/app/cashier/closing-cash-report/closing-cash-report.component.ts
index 929a2af27..cc31a58f6 100644
--- a/src/app/cashier/closing-cash-report/closing-cash-report.component.ts
+++ b/src/app/cashier/closing-cash-report/closing-cash-report.component.ts
@@ -12,6 +12,7 @@ import { FormsModule } from '@angular/forms';
import { MatIconModule } from '@angular/material/icon';
import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
/** Day-wise denomination-wise closing cash collected from deposits. */
@Component({
@@ -204,7 +205,7 @@ export class ClosingCashReportComponent implements OnInit {
}
ngOnInit(): void {
- const d = new Date();
+ const d = businessToday();
this.date = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
this.load();
this.service.getTellers().subscribe({ next: (t: any[]) => (this.tellers = t || []), error: () => {} });
diff --git a/src/app/cashier/day-book/day-book.component.ts b/src/app/cashier/day-book/day-book.component.ts
index 8ce3c0436..05fb8e475 100644
--- a/src/app/cashier/day-book/day-book.component.ts
+++ b/src/app/cashier/day-book/day-book.component.ts
@@ -13,6 +13,7 @@ import { MatIconModule } from '@angular/material/icon';
import { Router } from '@angular/router';
import { catchError, of } from 'rxjs';
import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
/**
* Which part of the day's work a row came from. Set by the server, one per source register.
@@ -95,7 +96,7 @@ export class DayBookComponent implements OnInit {
/** Local date as yyyy-MM-dd — toISOString() would shift the day in any timezone behind UTC. */
private today(): string {
- const d = new Date();
+ const d = businessToday();
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
}
diff --git a/src/app/cashier/inter-cashier-transfer/inter-cashier-transfer.component.ts b/src/app/cashier/inter-cashier-transfer/inter-cashier-transfer.component.ts
index 047384c84..e2b204491 100644
--- a/src/app/cashier/inter-cashier-transfer/inter-cashier-transfer.component.ts
+++ b/src/app/cashier/inter-cashier-transfer/inter-cashier-transfer.component.ts
@@ -17,6 +17,7 @@ import { MatInputModule } from '@angular/material/input';
import { of } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
interface Denom {
id: number;
@@ -79,7 +80,7 @@ export class InterCashierTransferComponent implements OnInit {
}
ngOnInit(): void {
- const d = new Date();
+ const d = businessToday();
this.transferDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
this.service.getActiveDenominations().subscribe({
next: (list) => {
diff --git a/src/app/cashier/my-work/my-work.component.ts b/src/app/cashier/my-work/my-work.component.ts
index 4dbee818f..8c0cf4bd4 100644
--- a/src/app/cashier/my-work/my-work.component.ts
+++ b/src/app/cashier/my-work/my-work.component.ts
@@ -14,6 +14,7 @@ import { MatDialog, MatDialogModule } from '@angular/material/dialog';
import { catchError, finalize, of } from 'rxjs';
import { CashierService } from '../cashier.service';
import { VoucherDetailDialogComponent } from './voucher-detail-dialog.component';
+import { businessToday } from 'app/core/utils/business-today';
/** What the signed-in user's part in a voucher was. */
export type MyRole = 'RAISED' | 'VERIFIED' | 'RAISED_AND_VERIFIED';
@@ -357,7 +358,7 @@ export class MyWorkComponent implements OnInit {
}
private todayIso(): string {
- const d = new Date();
+ const d = businessToday();
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
}
}
diff --git a/src/app/cashier/reconciliation/reconciliation.component.ts b/src/app/cashier/reconciliation/reconciliation.component.ts
index 40e4eeae2..a41c15412 100644
--- a/src/app/cashier/reconciliation/reconciliation.component.ts
+++ b/src/app/cashier/reconciliation/reconciliation.component.ts
@@ -18,6 +18,7 @@ import { MatTabsModule } from '@angular/material/tabs';
import { forkJoin, of } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
interface DenomRow {
denominationId: number;
@@ -85,7 +86,7 @@ export class ReconciliationComponent implements OnInit {
loadingHistory = false;
ngOnInit(): void {
- const d = new Date();
+ const d = businessToday();
this.reconDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
this.service
.getTellers()
diff --git a/src/app/cashier/transaction-entry/transaction-entry.component.ts b/src/app/cashier/transaction-entry/transaction-entry.component.ts
index aa4c8ca6f..aca25b5d5 100644
--- a/src/app/cashier/transaction-entry/transaction-entry.component.ts
+++ b/src/app/cashier/transaction-entry/transaction-entry.component.ts
@@ -33,6 +33,7 @@ import {
import { SponsorDDService } from '../../sponsor-dd/sponsor-dd.service';
import { OrganizationService } from '../../organization/organization.service';
import { CashierIssueDdDialogComponent } from './cashier-issue-dd-dialog.component';
+import { businessToday, businessTodayIso } from 'app/core/utils/business-today';
interface TxnRow {
typ: string;
@@ -621,7 +622,7 @@ export class AccountStatementDialogComponent implements OnInit {
@ViewChild('statementContent') statementContent!: ElementRef;
- today = new Date().toISOString().slice(0, 10);
+ today = businessTodayIso();
fromDate = '';
toDate = this.today;
@@ -1870,7 +1871,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
saving = false;
ngOnInit(): void {
- const d = new Date();
+ const d = businessToday();
this.today = `${String(d.getDate()).padStart(2, '0')}/${String(d.getMonth() + 1).padStart(2, '0')}/${d.getFullYear()}`;
this.addRow();
this.loadDenominations();
@@ -2103,7 +2104,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
}
private loadOpeningPosition(): void {
- const d = new Date();
+ const d = businessToday();
const asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
this.cashierService
.getCashierPositionForMe(asOfDate)
@@ -2837,7 +2838,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
fundingAccountId: number,
fundingClientId: number | null
): void {
- const d = new Date();
+ const d = businessToday();
const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
const isCurrent = row.acTyp === 'CA' || row.acTyp === 'CB';
const isGl = row.acTyp === 'GL';
@@ -2969,7 +2970,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
return;
}
- const d = new Date();
+ const d = businessToday();
const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
const isCurrent = row.acTyp === 'CA' || row.acTyp === 'CB';
@@ -3068,7 +3069,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
return;
}
- const d = new Date();
+ const d = businessToday();
const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
const payload = {
@@ -3391,7 +3392,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
return;
}
- const today = new Date();
+ const today = businessToday();
const requestedDate = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
// Full snapshot of the CR (settlement) row exactly as the clerk filled it in — saved verbatim
@@ -3512,7 +3513,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
return;
}
- const today = new Date();
+ const today = businessToday();
const requestedDate = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
// Full snapshot of the CR (settlement) row exactly as the clerk filled it in — saved verbatim
@@ -4173,7 +4174,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
): void {
const accountUrl = `${cfg.detail}/${accountId}${cfg.detailParams ?? '?associations=all'}`;
const todayStr = (() => {
- const d = new Date();
+ const d = businessToday();
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
})();
@@ -4549,7 +4550,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
}
get todayIso(): string {
- const d = new Date();
+ const d = businessToday();
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
}
@@ -5071,7 +5072,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
this.sameDayChequeClearing = 0;
return;
}
- const today = new Date();
+ const today = businessToday();
const sameDay = (d: any) => {
if (!d) return false;
const t = Array.isArray(d) && d.length >= 3 ? new Date(d[0], d[1] - 1, d[2]) : new Date(d);
@@ -5959,7 +5960,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
return;
}
- const today = new Date();
+ const today = businessToday();
const txnDate = `${String(today.getDate()).padStart(2, '0')}/${String(today.getMonth() + 1).padStart(2, '0')}/${today.getFullYear()}`;
const payload: any = {
@@ -6041,7 +6042,12 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
this.editRequest = req;
}
- const acTyp = 'SD';
+ // Same bug, same fix as the token-driven withdrawal-slip lookup above (see its comment): the
+ // request carries its own real account_type (SAVINGS, CURRENT, FIXED_DEPOSIT or
+ // RECURRING_DEPOSIT), and hardcoding 'SD' here searched every non-savings account on the
+ // wrong endpoint, so reviewing a Current-account withdrawal always failed with "Account not
+ // found".
+ const acTyp = TransactionEntryComponent.SEARCH_ACCOUNT_TYPE_TO_AC_TYP[req.account_type || ''] || 'SD';
const row = this.rows[0];
row.acNo = req.account_no ?? '';
row.acTyp = acTyp;
@@ -6149,7 +6155,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
/** Build the withdrawal-request payload from the current row + loaded account. */
private buildWithdrawalPayload(row: TxnRow, amount: number): any {
- const today = new Date();
+ const today = businessToday();
const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
const selectedPt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
@@ -6254,7 +6260,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
/** Build the deposit-request payload from the current row + loaded account. */
private buildDepositPayload(row: TxnRow, amount: number): any {
- const today = new Date();
+ const today = businessToday();
const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
const selectedPt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
// Send denominations only for cash payments — stale counts on a cheque
@@ -6365,7 +6371,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
return;
}
- const today = new Date();
+ const today = businessToday();
const txnDate = `${String(today.getDate()).padStart(2, '0')}/${String(today.getMonth() + 1).padStart(2, '0')}/${today.getFullYear()}`;
const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
diff --git a/src/app/cashier/vault-position/vault-position.component.ts b/src/app/cashier/vault-position/vault-position.component.ts
index d91cbdb2d..064d8b58d 100644
--- a/src/app/cashier/vault-position/vault-position.component.ts
+++ b/src/app/cashier/vault-position/vault-position.component.ts
@@ -16,6 +16,7 @@ import { MatInputModule } from '@angular/material/input';
import { of } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
interface DenomRow {
denominationId: number;
@@ -67,7 +68,7 @@ export class VaultPositionComponent implements OnInit {
errorMsg = '';
ngOnInit(): void {
- const d = new Date();
+ const d = businessToday();
this.asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
this.service
diff --git a/src/app/cashier/voucher-report/voucher-report.component.ts b/src/app/cashier/voucher-report/voucher-report.component.ts
index 8444b2813..d6c148d91 100644
--- a/src/app/cashier/voucher-report/voucher-report.component.ts
+++ b/src/app/cashier/voucher-report/voucher-report.component.ts
@@ -13,6 +13,7 @@ import { ActivatedRoute } from '@angular/router';
import { MatIconModule } from '@angular/material/icon';
import { catchError, of } from 'rxjs';
import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
/**
* Which side of the register a screen shows.
@@ -227,7 +228,7 @@ export class VoucherReportComponent implements OnInit {
}
private todayIso(): string {
- const now = new Date();
+ const now = businessToday();
return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`;
}
diff --git a/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts b/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts
index ed53470c4..db39bae63 100644
--- a/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts
+++ b/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts
@@ -643,8 +643,9 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
this.createClientForm.get('degreeQualificationId')?.setValue('');
}
});
- // Fetch all constitution options from code ID 17
- this.clientService.getCodeValuesById(17).subscribe((options) => {
+ // Constitution options by code NAME, never by id: code ids differ per tenant (on abc_bank id 17 is the empty
+ // ClientClassification code and Constitution is id 24), so a hardcoded id left the dropdown empty.
+ this.clientService.getCodeValuesByName('Constitution').subscribe((options) => {
if (options?.length) {
this.constitutionOptions = options;
// Sort master by value length descending so longer/more-specific keys match first
diff --git a/src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.html b/src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.html
index f139711f3..65d2d97da 100644
--- a/src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.html
+++ b/src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.html
@@ -1321,6 +1321,11 @@
kycForm.get('kycDocumentNumber')?.hasError('pattern') && kycForm.get('kycDocumentNumber')?.touched
) {
Only letters, numbers, hyphens and slashes allowed
+ } @else if (
+ kycForm.get('kycDocumentNumber')?.hasError('aadhaarLast4Mismatch') &&
+ kycForm.get('kycDocumentNumber')?.touched
+ ) {
+ Last 4 digits do not match the Aadhaar number entered above
}
diff --git a/src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.ts b/src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.ts
index 00d2afccd..cfca4fb8c 100644
--- a/src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.ts
+++ b/src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.ts
@@ -8,7 +8,14 @@
import { Component, Input, OnInit, OnChanges, OnDestroy, SimpleChanges, inject } from '@angular/core';
import { forkJoin, catchError, of } from 'rxjs';
-import { UntypedFormBuilder, UntypedFormGroup, Validators, FormsModule } from '@angular/forms';
+import {
+ UntypedFormBuilder,
+ UntypedFormGroup,
+ Validators,
+ FormsModule,
+ AbstractControl,
+ ValidationErrors
+} from '@angular/forms';
import {
MatDialog,
MAT_DIALOG_DATA,
@@ -567,6 +574,28 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
/** Existing signature document ID (for re-upload/delete) */
existingSignatureDocId: string = '';
+ /**
+ * Cross-field check for the OVD "Document Number" field (kycDocumentNumber): when Aadhaar Card
+ * is the selected KYC document, its value must identify the same Aadhaar as the aadhaarNumber
+ * field captured earlier in this step - the last 4 digits are what's compared, since
+ * aadhaarNumber may hold either the raw 12-digit number or a masked value (masking only ever
+ * obscures the first 8 digits - see aadhaarMasked in the kycData getter below - so the last 4
+ * characters are always the real digits either way). Not applicable to any other document type,
+ * where kycDocumentNumber is unrelated to Aadhaar entirely.
+ */
+ private aadhaarLast4MatchValidator = (control: AbstractControl): ValidationErrors | null => {
+ if (this.selectedKycDoc?.code !== 'AADHAAR') {
+ return null;
+ }
+ const docNumber = (control.value || '').toString().trim();
+ const aadhaarValue = (control.parent?.get('aadhaarNumber')?.value || '').toString().trim();
+ if (docNumber.length < 4 || aadhaarValue.length < 4) {
+ // Required/pattern validators already flag an empty or too-short value on their own.
+ return null;
+ }
+ return docNumber.slice(-4) === aadhaarValue.slice(-4) ? null : { aadhaarLast4Mismatch: true };
+ };
+
/** KYC Form */
kycForm: UntypedFormGroup = this.formBuilder.group({
hasPan: [true],
@@ -616,7 +645,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
[
Validators.required,
Validators.pattern(/^[A-Za-z0-9\-\/\s]+$/),
- Validators.maxLength(30)
+ Validators.maxLength(30),
+ this.aadhaarLast4MatchValidator
]
],
kycDocIssueDate: [''],
@@ -739,6 +769,14 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
this.kycForm.get('ecgcSalFlag')?.disable();
this.kycForm.get('dormantFlag')?.disable();
}
+
+ // aadhaarLast4MatchValidator (on kycDocumentNumber) reads this control's value directly rather
+ // than through its own valueChanges, so a re-check has to be triggered explicitly whenever the
+ // Aadhaar field itself changes - otherwise fixing aadhaarNumber after kycDocumentNumber was
+ // already entered would leave a stale mismatch error in place.
+ this.kycForm.get('aadhaarNumber')?.valueChanges.subscribe(() => {
+ this.kycForm.get('kycDocumentNumber')?.updateValueAndValidity({ onlySelf: true });
+ });
}
/** Seed the document-type picker from defaults (entity RBI docs vs. individual OVDs,
@@ -1009,6 +1047,9 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
// Reset uploads + merged preview when document type changes
this.kycDocFiles = { front: null, back: null };
this.kycDocMergedPreview = null;
+ // aadhaarLast4MatchValidator only applies while Aadhaar Card is selected - re-check so switching
+ // to/away from it immediately picks up (or clears) the mismatch error.
+ this.kycForm.get('kycDocumentNumber')?.updateValueAndValidity({ onlySelf: true });
}
isKycDocSelected(proof: ProofType): boolean {
@@ -1189,6 +1230,9 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
// Sync chip-picker selection with the prefilled document name
if (data.kycDocumentName) {
this.selectedKycDoc = this.findKycDocProofByName(data.kycDocumentName);
+ // patchValue above ran kycDocumentNumber's validators before selectedKycDoc was known,
+ // so aadhaarLast4MatchValidator needs a fresh check now that it is.
+ this.kycForm.get('kycDocumentNumber')?.updateValueAndValidity({ onlySelf: true });
}
// Set verification statuses from existing data
if (data.panVerified) {
diff --git a/src/app/clients/clients-routing.module.ts b/src/app/clients/clients-routing.module.ts
index 22ee81703..cb7b21e06 100644
--- a/src/app/clients/clients-routing.module.ts
+++ b/src/app/clients/clients-routing.module.ts
@@ -61,6 +61,7 @@ import { KycTabComponent } from './clients-view/kyc-tab/kyc-tab.component';
import { CkycTabComponent } from './clients-view/ckyc-tab/ckyc-tab.component';
import { Form60TabComponent } from './clients-view/form60-tab/form60-tab.component';
import { Form121TabComponent } from './clients-view/form121-tab/form121-tab.component';
+import { tdsConfigResolver } from '../letter-mgmt/certificates/form-15gh/tds-config.service';
import { EntityClassificationTabComponent } from './clients-view/entity-classification-tab/entity-classification-tab.component';
import { AuthorizedSignatoriesTabComponent } from './clients-view/authorized-signatories-tab/authorized-signatories-tab.component';
import { familyAllowedGuard, nomineeAllowedGuard } from './utils/family-nominee.guard';
@@ -198,6 +199,7 @@ const routes: Routes = [
{
path: 'form121',
component: Form121TabComponent,
+ resolve: { tdsConfig: tdsConfigResolver },
data: { title: 'Form 121 / TDS', breadcrumb: 'Form 121 / TDS', routeParamBreadcrumb: false }
},
{
diff --git a/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.html b/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.html
index 4f71a5b6d..4beac80ce 100644
--- a/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.html
+++ b/src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.html
@@ -202,9 +202,14 @@
{{ existing.CLIENT_SIGNATURE.name }}
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 602d2dd3e..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
@@ -623,6 +623,35 @@
}
}
+/* Opens the uploaded artefact full size in a new tab. Sits directly under the thumbnail, and is
+ the only way to inspect a PDF - which cannot render as an inline . */
+.ckyc-existing__view {
+ align-self: flex-start;
+ color: #1d6fd0;
+ border-color: #bcd8f5;
+ background: #fff;
+ font-size: 13px;
+ font-weight: 600;
+
+ &:hover {
+ background: #eef6ff;
+ }
+}
+
+/* Shown when a document row exists but its file could not be fetched from the content store,
+ so "Already available" is not silently misleading. */
+.ckyc-existing__warn {
+ display: inline-block;
+ margin-left: 8px;
+ padding: 1px 8px;
+ border-radius: 10px;
+ background: #fdecec;
+ border: 1px solid #f3c2c2;
+ color: #a12b2b;
+ font-size: 11px;
+ font-weight: 600;
+}
+
.ckyc-existing {
display: flex;
flex-direction: column;
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 0acbbf2d8..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
@@ -36,11 +36,41 @@ interface ExistingArtefact {
* already writes/reads for address proof; now shared by the photo/identity proof too. */
description?: string;
fileCount?: number;
+ /** 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;
}
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
+ * is not rejected server-side:
+ * - 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.
+ * 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 = [
+ 'png',
+ 'jpeg',
+ 'jpg'
+];
+const DOCUMENT_EXTENSIONS = [
+ ...IMAGE_EXTENSIONS,
+ 'pdf'
+];
+
+/** Cards that render an inline , so a PDF would not display in them. */
+const IMAGE_ONLY_KINDS: CkycDocKind[] = [
+ 'CLIENT_IMAGE',
+ 'CLIENT_SIGNATURE'
+];
+
@Component({
selector: 'mifosx-ckyc-tab',
templateUrl: './ckyc-tab.component.html',
@@ -150,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();
@@ -157,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;
@@ -280,19 +355,29 @@ export class CkycTabComponent implements OnInit, OnDestroy {
present: true,
source: 'Client registration',
name: signatureDoc.fileName || 'Client signature',
- documentId: signatureDoc.id
+ documentId: signatureDoc.id,
+ mimeType: signatureDoc.type
};
- // Fetch blob for preview
+ // 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
- .getClientSignatureImage(this.clientId, signatureDoc.id)
+ .downloadClientDocument(this.clientId, String(signatureDoc.id), true)
.pipe(takeUntil(this.destroy$))
.subscribe({
next: (blob: any) => {
- if (blob) {
+ 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: () => undefined
+ error: () => {
+ this.existing.CLIENT_SIGNATURE.previewUnavailable = true;
+ }
});
}
@@ -364,6 +449,7 @@ export class CkycTabComponent implements OnInit, OnDestroy {
const list = Array.isArray(docs) ? docs : [];
if (!list.length) return;
this.existing[kind].fileCount = list.length;
+ this.existing[kind].previewUnavailable = false;
const byNewest = (a: any, b: any) => b.id - a.id;
const label = (d: any) => (d?.name || d?.fileName || '').toString();
@@ -372,6 +458,9 @@ export class CkycTabComponent implements OnInit, OnDestroy {
[...list].filter((d: any) => /front/i.test(label(d))).sort(byNewest)[0] ||
[...list].filter((d: any) => d.id !== back?.id).sort(byNewest)[0];
+ // 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');
});
@@ -388,12 +477,19 @@ export class CkycTabComponent implements OnInit, OnDestroy {
.pipe(takeUntil(this.destroy$))
.subscribe({
next: (blob: any) => {
- if (!blob) return;
+ 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;
},
- error: () => undefined
+ // 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[kind].previewUnavailable = true;
+ }
});
}
@@ -452,6 +548,18 @@ export class CkycTabComponent implements OnInit, OnDestroy {
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;
@@ -470,6 +578,66 @@ export class CkycTabComponent implements OnInit, OnDestroy {
});
}
+ /** Extensions a given card can both store and render. */
+ private allowedExtensions(kind: CkycDocKind): string[] {
+ return IMAGE_ONLY_KINDS.includes(kind) ? IMAGE_EXTENSIONS : DOCUMENT_EXTENSIONS;
+ }
+
+ /**
+ * Rejects a file the backend would refuse (or the card could not render) before it is uploaded,
+ * so the user gets a clear message instead of a raw server error. Returns null when the file is
+ * acceptable.
+ */
+ 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)) {
+ return `Unsupported file type ".${extension}". Allowed: ${allowed.map((e) => e.toUpperCase()).join(', ')}.`;
+ }
+ if (file.size > MAX_UPLOAD_BYTES) {
+ const mb = (file.size / (1024 * 1024)).toFixed(1);
+ return `File is ${mb} MB. The maximum allowed size is 5 MB.`;
+ }
+ if (file.size === 0) {
+ return 'The selected file is empty.';
+ }
+ return null;
+ }
+
+ /**
+ * 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');
+ }
+ }
+
/** 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 } {
@@ -533,6 +701,10 @@ export class CkycTabComponent implements OnInit, OnDestroy {
request$.pipe(takeUntil(this.destroy$)).subscribe({
next: () => {
this.uploading[documentType] = false;
+ // 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);
},
@@ -653,13 +825,22 @@ export class CkycTabComponent implements OnInit, OnDestroy {
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;
+ if (photo) {
+ this.existing.CLIENT_IMAGE.previewUrl = photo;
+ } else {
+ this.existing.CLIENT_IMAGE.previewUnavailable = true;
+ }
});
break;
case 'CLIENT_SIGNATURE':
@@ -672,11 +853,21 @@ export class CkycTabComponent implements OnInit, OnDestroy {
?.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
- .getClientSignatureImage(this.clientId, doc.id)
+ .downloadClientDocument(this.clientId, String(doc.id), true)
.pipe(takeUntil(this.destroy$))
- .subscribe((blob: any) => {
- if (blob) this.existing.CLIENT_SIGNATURE.previewUrl = URL.createObjectURL(blob);
+ .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;
@@ -690,10 +881,6 @@ export class CkycTabComponent implements OnInit, OnDestroy {
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);
- if (e.previewUrlBack?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrlBack);
- });
+ this.revokePreviewUrls();
}
}
diff --git a/src/app/clients/clients-view/form121-tab/form121-tab.component.html b/src/app/clients/clients-view/form121-tab/form121-tab.component.html
index 1b75a798d..1a351078d 100644
--- a/src/app/clients/clients-view/form121-tab/form121-tab.component.html
+++ b/src/app/clients/clients-view/form121-tab/form121-tab.component.html
@@ -55,7 +55,10 @@
info_outline
- @if (!dateOfBirth) {
+ @if (configMissing) {
+ TDS rates for FY {{ fy }} are not configured, so the tax cannot be computed. Set them up under Organization
+ › TDS Configuration.
+ } @else if (!dateOfBirth) {
Date of birth is not on record, so the senior-citizen threshold cannot be determined. Add it on the Personal
Data tab.
} @else {
@@ -113,8 +116,8 @@
warning_amber
- A Form 121 declaration is on record for this year, but withholding is still switched on for one or more
- deposits. Turn it off on those accounts, or tax will keep being deducted.
+ A declaration is on record for this year, but one or more deposits still carry a tax group. Those accounts
+ deduct on their own and ignore the declaration — remove the tax group from them.
+ Accepted on
- Not captured — the declaration is treated as covering the whole year. A mid-year acceptance would change
- the figures below.
+ {{ d.acceptedOn | date: 'd MMM y' }} — no TDS on interest credited from this day to 31 March. Interest
+ credited before it is taxed as usual.
- No scan is on file for this document. Upload one below.
-
+
No scan is on file for this document. Upload one below.
}
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 84743bb5b..611abcf88 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
@@ -182,7 +182,10 @@ export class KycTabComponent implements OnInit, OnDestroy {
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'];
+ readonly docScanSlots: ('front' | 'back')[] = [
+ 'front',
+ 'back'
+ ];
docScanOf(slot: 'front' | 'back') {
return this.docScans[slot];
@@ -474,7 +477,8 @@ export class KycTabComponent implements OnInit, OnDestroy {
adverseMediaMatch: !!v.adverseMediaMatch,
// Blank stays null rather than becoming zero: an income nobody asked for is unknown, and a zero would read as a
// customer who declared no income at all.
- declaredAnnualIncome: v.declaredAnnualIncome === '' || v.declaredAnnualIncome == null ? null : v.declaredAnnualIncome,
+ declaredAnnualIncome:
+ v.declaredAnnualIncome === '' || v.declaredAnnualIncome == null ? null : v.declaredAnnualIncome,
declaredAnnualTurnover:
v.declaredAnnualTurnover === '' || v.declaredAnnualTurnover == null ? null : v.declaredAnnualTurnover
};
@@ -519,7 +523,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
dateFormat: 'dd MMMM yyyy',
...this.buildDocumentFields(),
...this.buildRiskProfileFields(),
- ...this.buildExceptionFields()
+ ...this.buildExceptionFields()
};
if (!this.kycId) {
@@ -766,7 +770,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
riskCategory: this.kycForm.value.riskCategory || 1,
...declarationFields,
...this.buildRiskProfileFields(),
- ...this.buildExceptionFields()
+ ...this.buildExceptionFields()
};
this.clientsService
@@ -927,7 +931,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
riskCategory: this.kycForm.value.riskCategory || 1,
...receiptFields,
...this.buildRiskProfileFields(),
- ...this.buildExceptionFields()
+ ...this.buildExceptionFields()
};
this.clientsService
@@ -1455,7 +1459,10 @@ I further confirm that:
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]) {
+ for (const old of [
+ this.docScans.front,
+ this.docScans.back
+ ]) {
if (old?.previewUrl) {
URL.revokeObjectURL(old.previewUrl);
}
@@ -1497,7 +1504,10 @@ I further confirm that:
}
this.docScans = sides;
- for (const key of ['front', 'back'] as const) {
+ for (const key of [
+ 'front',
+ 'back'
+ ] as const) {
if (sides[key]) {
this.loadScanPreview(sides[key]!);
}
@@ -1558,7 +1568,9 @@ I further confirm that:
error: (err: any) => {
this.docScanUploading = null;
this.docScanError =
- err?.error?.defaultUserMessage || err?.error?.developerMessage || `Could not replace the ${label.toLowerCase()} side.`;
+ err?.error?.defaultUserMessage ||
+ err?.error?.developerMessage ||
+ `Could not replace the ${label.toLowerCase()} side.`;
}
});
}
@@ -1741,7 +1753,10 @@ I further confirm that:
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]) {
+ for (const side of [
+ this.docScans.front,
+ this.docScans.back
+ ]) {
if (side?.previewUrl) {
URL.revokeObjectURL(side.previewUrl);
}
diff --git a/src/app/clients/clients.service.ts b/src/app/clients/clients.service.ts
index 7220fbe47..cd08181ce 100644
--- a/src/app/clients/clients.service.ts
+++ b/src/app/clients/clients.service.ts
@@ -569,8 +569,19 @@ export class ClientsService {
return this.http.get(`/clients/${clientId}/documents`);
}
- downloadClientDocument(parentEntityId: string, documentId: string) {
- return this.http.get(`/clients/${parentEntityId}/documents/${documentId}/attachment`, { responseType: 'blob' });
+ /**
+ * Fetches a client document's stored file.
+ *
+ * `silent` opts the request out of ErrorHandlerInterceptor's alert. Pass it when the caller
+ * renders its own failure state - notably thumbnail fetches, where a `m_document` row whose file
+ * is no longer in the content store returns 500 and would otherwise pop a modal the user can do
+ * nothing about. The interceptor still rethrows, so the caller's error callback continues to run.
+ */
+ downloadClientDocument(parentEntityId: string, documentId: string, silent = false) {
+ return this.http.get(`/clients/${parentEntityId}/documents/${documentId}/attachment`, {
+ responseType: 'blob',
+ ...(silent ? { context: new HttpContext().set(SILENT_HTTP_ERROR, true) } : {})
+ });
}
uploadClientDocument(clientId: string, documentData: any) {
@@ -992,12 +1003,28 @@ export class ClientsService {
return this.http.post(`/clients/${clientId}/entityclassification/${category}`, data);
}
- getClientCkyc(clientId: string): Observable {
- return this.http.get(`/clients/${clientId}/ckyc`);
+ /**
+ * Uploads a single CKYC artefact against the client, using the platform's generic document
+ * endpoint (DocumentApiResource, POST /v1/{entityType}/{entityId}/documents). There is no
+ * CKYC-specific document API on the backend - the earlier `/clients/{id}/ckyc/documents` path
+ * was never implemented and returned 404.
+ *
+ * The multipart body must carry `file`, `name` and `description`; the caller builds those so the
+ * stored document stays identifiable by CKYC artefact type. See ckyc-tab.component.ts.
+ */
+ uploadCkycDocument(clientId: string, formData: FormData): Observable {
+ return this.http.post(`/clients/${clientId}/documents`, formData);
}
- uploadCkycDocument(clientId: string, formData: FormData): Observable {
- return this.http.post(`/clients/${clientId}/ckyc/documents`, formData);
+ /**
+ * Replaces the content of an existing client document in place (DocumentApiResource PUT
+ * /v1/{entityType}/{entityId}/documents/{documentId}), keeping the same document id.
+ *
+ * Used by the CKYC screen's "Upload new version" so a re-upload updates the existing artefact
+ * rather than adding another row. Takes the same multipart body as the create call.
+ */
+ replaceClientDocument(clientId: string, documentId: string, formData: FormData): Observable {
+ return this.http.put(`/clients/${clientId}/documents/${documentId}`, formData);
}
/**
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
index 6e646f72a..bf720407f 100644
--- 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
@@ -109,13 +109,7 @@
}
-
+
}
diff --git a/src/app/core/http/cache.interceptor.ts b/src/app/core/http/cache.interceptor.ts
index b20947383..d20aca013 100644
--- a/src/app/core/http/cache.interceptor.ts
+++ b/src/app/core/http/cache.interceptor.ts
@@ -25,6 +25,36 @@ import { environment } from '../../../environments/environment';
export class CacheInterceptor implements HttpInterceptor {
private forceUpdate = false;
+ /**
+ * Endpoints that compute a live figure from the current ledger/configuration and must never be
+ * served from cache. Caching them meant a report kept showing a stale response after its
+ * underlying GL mapping changed — the request was answered from cachedData and the backend was
+ * never hit again. Matched as a substring of the request URL.
+ */
+ private static readonly NEVER_CACHE = [
+ '/rbireservereturn',
+ '/rbireserveconfig',
+ '/tdsconfig',
+ '/tds/deposit-interest',
+ // Declarations and challans are entered on the very screens that read them back.
+ '/tds/declarations',
+ '/tds/challans',
+ '/tds/deducted',
+ '/savingsinterestpostingreports',
+ // Cash in vaults and drawers changes with every transaction; a cached teller list or position
+ // kept showing a branch's old tellers and figures at day close.
+ '/tellers',
+ '/cashreports',
+ '/cashreconciliation',
+ '/cashsettlement',
+ '/cashtransfer',
+ '/branchday'
+ ];
+
+ private isCacheable(url: string): boolean {
+ return !CacheInterceptor.NEVER_CACHE.some((fragment) => url.includes(fragment));
+ }
+
// eslint-disable-next-line @angular-eslint/prefer-inject
constructor(private httpCacheService: HttpCacheService) {}
@@ -42,7 +72,7 @@ export class CacheInterceptor implements HttpInterceptor {
}
intercept(request: HttpRequest, next: HttpHandler): Observable> {
- if (request.method !== 'GET') {
+ if (request.method !== 'GET' || !this.isCacheable(request.urlWithParams)) {
return next.handle(request);
}
diff --git a/src/app/core/shell/shell.component.html b/src/app/core/shell/shell.component.html
index 3351e3022..27da072b6 100644
--- a/src/app/core/shell/shell.component.html
+++ b/src/app/core/shell/shell.component.html
@@ -65,6 +65,14 @@
ESC Show Header
}
+
+ @else if (currentUrl.includes('/fd-dashboard')) {
+
+ }
@else if (currentUrl.includes('/clerk/')) {
+
{{ 'labels.inputs.Apply Penal Interest (less)' | translate }}
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-maturity-terms-step/fixed-deposit-account-maturity-terms-step.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-maturity-terms-step/fixed-deposit-account-maturity-terms-step.component.ts
index bce8468a1..d4552f9d1 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-maturity-terms-step/fixed-deposit-account-maturity-terms-step.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-maturity-terms-step/fixed-deposit-account-maturity-terms-step.component.ts
@@ -11,6 +11,7 @@ import { Component, Input, OnChanges, SimpleChanges, inject } from '@angular/cor
import { UntypedFormGroup, UntypedFormBuilder, UntypedFormControl, Validators } from '@angular/forms';
import { MatCheckbox } from '@angular/material/checkbox';
import { MatIcon } from '@angular/material/icon';
+import { MatIconButton } from '@angular/material/button';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
/**
@@ -25,7 +26,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
imports: [
...STANDALONE_SHARED_IMPORTS,
MatCheckbox,
- MatIcon
+ MatIcon,
+ MatIconButton
]
})
export class FixedDepositAccountMaturityTermsStepComponent implements OnChanges {
@@ -53,9 +55,12 @@ export class FixedDepositAccountMaturityTermsStepComponent implements OnChanges
preClosurePenalInterestOnTypeId: ['']
});
this.closureSettingsForm.get('maturityInstructionId').valueChanges.subscribe((value: number) => {
- // 200 = Transfer to Savings -- Withdraw Deposit (100) needs no target account, and both
- // Reinvest options (300/400) open a brand-new FD instead, so they ignore this field too.
- if (value === 200) {
+ // 200 = Transfer to Savings -- the whole matured balance goes here. 400 = Reinvest Principal
+ // Only -- the principal rolls into a new FD, but the leftover interest still needs the same
+ // kind of target so it isn't left stranded on the closed account (a real gap the account used
+ // to silently hit before this field also asked for it here). Reinvest Principal + Interest
+ // (300) rolls the whole balance into the same account, so it never needs a target at all.
+ if (value === 200 || value === 400) {
this.closureSettingsForm.addControl(
'transferToSavingsId',
new UntypedFormControl(this.linkedSavingsAccountId ?? '', Validators.required)
@@ -91,15 +96,48 @@ export class FixedDepositAccountMaturityTermsStepComponent implements OnChanges
});
}
}
+ // Editing an existing account: its own already-saved Maturity Instructions choice lives on
+ // `fixedDepositsAccountTemplate` (the real account+template GET, FixedDepositAccountData's
+ // `onAccountClosure`) -- NOT on `fixedDepositsAccountProductTemplate`, which is only the blank
+ // per-product default template refetched from the Product dropdown's own productId (via
+ // getFixedDepositsAccountTemplate(clientId, productId)) and carries no account-specific data at
+ // all. This was never read from the right place before, so Edit always opened onto a blank
+ // picker even for an account that really does have an instruction saved. `.dirty` guards it the
+ // same way the penal-interest fields above do, so a maker's own in-progress edit here is never
+ // silently overwritten if this input fires again mid-edit.
+ if (this.fixedDepositsAccountTemplate && !this.closureSettingsForm.get('maturityInstructionId').dirty) {
+ this.closureSettingsForm
+ .get('maturityInstructionId')
+ ?.setValue(this.fixedDepositsAccountTemplate.onAccountClosure?.id ?? '');
+ const transferControl = this.closureSettingsForm.get('transferToSavingsId');
+ if (transferControl) {
+ transferControl.setValue(
+ this.fixedDepositsAccountTemplate.transferToSavingsId ?? this.linkedSavingsAccountId ?? ''
+ );
+ }
+ }
}
- /** The linked-savings account for the transfer-to-savings maturity instruction, once picked. */
+ /** The linked-savings account for the transfer-to-savings / reinvest-principal-only-interest
+ * maturity instruction, once picked. */
get selectedTransferAccount(): any {
const id = this.closureSettingsForm.value.transferToSavingsId;
if (!id) return null;
return this.savingsAccountsData.find((account: any) => account.id === id) ?? null;
}
+ get transferAccountCardTitle(): string {
+ return this.closureSettingsForm.value.maturityInstructionId === 400
+ ? 'Interest payout account'
+ : 'Transfer to savings account';
+ }
+
+ get transferAccountCardSubtitle(): string {
+ return this.closureSettingsForm.value.maturityInstructionId === 400
+ ? 'The principal renews into a new FD; interest earned is paid out to this account.'
+ : 'Maturity proceeds will be credited to this account.';
+ }
+
clearTransferAccount(): void {
this.closureSettingsForm.get('transferToSavingsId')?.setValue('');
}
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.html
index 659f79528..94cd1ea54 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.html
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.html
@@ -8,11 +8,24 @@
-
-
-
{{ 'labels.heading.Payment' | translate }}
-
Process this Fixed Deposit now -- works whether it's Active or Matured.
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.scss b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.scss
index 48967437c..c6c8920ad 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.scss
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.scss
@@ -6,291 +6,466 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-$navy: #0d1b2a;
-$slate: #475569;
-$muted: #64748b;
-$border: #e2e8f0;
-$soft: #f8fafc;
-$blue: #1e40af;
-$blue-soft: #eff6ff;
-$green: #166534;
-$green-soft: #f0fdf4;
+/**
+ * Payment / Renewal Dialog Styles
+ * CBSNexora Core Banking System
+ */
.pmt {
display: flex;
flex-direction: column;
- min-height: 320px;
- max-height: 85vh;
+ height: 100%;
+ max-height: 92vh;
+ box-sizing: border-box;
+ font-family:
+ 'DM Sans',
+ system-ui,
+ -apple-system,
+ sans-serif;
+ color: #0f172a;
+ border-radius: 16px;
overflow: hidden;
- margin: -24px;
+ box-shadow: 0 24px 48px -12px rgb(15 23 42 / 25%);
}
.pmt__header {
- display: flex;
- align-items: flex-start;
- gap: 14px;
- padding: 22px 28px 18px;
- background: linear-gradient(135deg, #1e3a8a 0%, #1e40af 55%, #4338ca 100%);
- color: #fff;
- flex: 0 0 auto;
-}
-
-.pmt__header-ico {
- width: 40px;
- height: 40px;
- min-width: 40px;
- border-radius: 10px;
- background: rgb(255 255 255 / 15%);
display: flex;
align-items: center;
- justify-content: center;
- font-size: 18px;
+ justify-content: space-between;
+ gap: 16px;
+ padding: 26px 30px;
+ background: linear-gradient(135deg, #1e3a8a 0%, #1d4ed8 55%, #2563eb 100%);
+ color: #fff;
+ flex-shrink: 0;
+ position: relative;
+ overflow: hidden;
+
+ &::after {
+ content: '';
+ position: absolute;
+ inset: 0;
+ background: radial-gradient(circle at 88% -20%, rgb(255 255 255 / 22%), transparent 55%);
+ pointer-events: none;
+ }
+
+ &-left {
+ display: flex;
+ align-items: center;
+ gap: 16px;
+ position: relative;
+ z-index: 1;
+ }
+
+ &-ico {
+ width: 48px;
+ height: 48px;
+ border-radius: 14px;
+ background: rgb(255 255 255 / 16%);
+ border: 1px solid rgb(255 255 255 / 25%);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 20px;
+ color: #fff;
+ flex-shrink: 0;
+ }
+
+ &-text {
+ display: flex;
+ flex-direction: column;
+ }
+
+ &-close {
+ position: relative;
+ z-index: 1;
+ background: rgb(255 255 255 / 14%);
+ border: none;
+ color: #fff;
+ width: 34px;
+ height: 34px;
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ cursor: pointer;
+ transition: all 0.2s ease;
+ flex-shrink: 0;
+
+ &:hover:not(:disabled) {
+ background: rgb(255 255 255 / 28%);
+ transform: rotate(90deg);
+ }
+
+ &:disabled {
+ opacity: 0.5;
+ cursor: not-allowed;
+ }
+ }
}
.pmt__title {
margin: 0;
- font-size: 19px;
- font-weight: 700;
+ font-size: 20px;
+ font-weight: 800;
+ color: #fff;
+ line-height: 1.25;
+ letter-spacing: -0.01em;
}
.pmt__subtitle {
- margin: 4px 0 0;
- font-size: 12.5px;
- color: rgb(255 255 255 / 82%);
+ margin: 5px 0 0;
+ font-size: 13px;
+ color: rgb(255 255 255 / 88%);
line-height: 1.4;
}
.pmt__content {
- padding: 22px 28px 8px !important;
+ padding: 26px 30px !important;
overflow-y: auto;
flex: 1 1 auto;
+ background: #fbfcfe;
+
+ mat-form-field {
+ width: 100%;
+ }
}
.pmt__loading {
display: flex;
justify-content: center;
align-items: center;
- min-height: 260px;
+ min-height: 240px;
}
.pmt__stat {
display: flex;
flex-direction: column;
- gap: 2px;
- background: $blue-soft;
- border: 1px solid #dbeafe;
- border-radius: 10px;
- padding: 12px 16px;
+ gap: 4px;
+ background: linear-gradient(135deg, #eff6ff 0%, #e0e9ff 100%);
+ border: 1px solid #bfdbfe;
+ border-radius: 14px;
+ padding: 18px 22px;
margin-bottom: 18px;
+
+ &-label {
+ font-size: 11.5px;
+ font-weight: 700;
+ text-transform: uppercase;
+ letter-spacing: 0.07em;
+ color: #1d4ed8;
+ }
+
+ &-value {
+ font-family: 'JetBrains Mono', 'DM Sans', monospace;
+ font-size: 28px;
+ font-weight: 800;
+ color: #0f172a;
+ letter-spacing: -0.01em;
+ }
}
-.pmt__stat-label {
- font-size: 11px;
- font-weight: 700;
- text-transform: uppercase;
- letter-spacing: 0.05em;
- color: $blue;
-}
+.pmt__preview {
+ display: flex;
+ flex-direction: column;
+ background: #fff;
+ border: 1px solid #e2e8f0;
+ border-radius: 14px;
+ padding: 4px 18px;
+ margin: 0 0 18px;
-.pmt__stat-value {
- font-size: 22px;
- font-weight: 800;
- color: $navy;
- font-variant-numeric: tabular-nums;
-}
+ &-row {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 12px;
+ padding: 11px 0;
+ border-bottom: 1px solid #f1f5f9;
-.pmt__date {
- width: 100%;
+ &:last-child {
+ border-bottom: none;
+ }
+
+ &--highlight {
+ .pmt__preview-value {
+ color: #0d9488;
+ font-weight: 800;
+ }
+ }
+
+ &--total {
+ margin: 0 -18px;
+ padding: 14px 18px;
+ background: linear-gradient(135deg, #eff6ff 0%, #e0e9ff 100%);
+ border-bottom: none;
+ border-radius: 0 0 12px 12px;
+
+ .pmt__preview-label {
+ color: #1d4ed8;
+ font-weight: 700;
+ }
+
+ .pmt__preview-value {
+ color: #0f172a;
+ font-size: 18px;
+ font-weight: 800;
+ }
+ }
+ }
+
+ &-label {
+ font-size: 12.5px;
+ color: #64748b;
+ font-weight: 600;
+ }
+
+ &-value {
+ font-family: 'JetBrains Mono', 'DM Sans', monospace;
+ font-size: 14px;
+ font-weight: 700;
+ color: #0f172a;
+ }
}
.pmt__section-label {
- font-size: 11.5px;
+ font-size: 12px;
font-weight: 700;
text-transform: uppercase;
- letter-spacing: 0.05em;
- color: $slate;
- margin: 4px 0 10px;
+ letter-spacing: 0.06em;
+ color: #475569;
+ margin: 10px 0 12px;
}
+/* Action Options Grid - 2 Equal Columns, comfortably wide now that the dialog itself is wider */
.pmt__options {
display: grid;
- grid-template-columns: repeat(auto-fit, minmax(190px, 1fr));
- gap: 10px;
- margin-bottom: 6px;
+ grid-template-columns: repeat(2, 1fr);
+ gap: 14px;
+ margin-bottom: 18px;
+
+ @media (width <= 560px) {
+ grid-template-columns: 1fr;
+ }
}
.pmt__option {
display: flex;
align-items: flex-start;
- gap: 10px;
+ gap: 14px;
text-align: left;
background: #fff;
- border: 1.5px solid $border;
- border-radius: 10px;
- padding: 12px 14px;
+ border: 1.5px solid #e2e8f0;
+ border-radius: 14px;
+ padding: 16px;
cursor: pointer;
font: inherit;
- transition:
- border-color 0.15s,
- background 0.15s,
- box-shadow 0.15s;
-}
+ transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+ position: relative;
-.pmt__option:hover {
- border-color: #93c5fd;
- background: $blue-soft;
-}
+ &:hover {
+ border-color: #93c5fd;
+ background: #f8fafc;
+ box-shadow: 0 6px 16px rgb(15 23 42 / 6%);
+ transform: translateY(-1px);
+ }
-.pmt__option--active {
- border-color: $blue;
- background: $blue-soft;
- box-shadow: 0 0 0 1px $blue;
-}
+ &--active {
+ border-color: #2563eb;
+ background: #eff6ff;
+ box-shadow: 0 0 0 1.5px #2563eb;
-.pmt__option-ico {
- width: 30px;
- height: 30px;
- min-width: 30px;
- border-radius: 8px;
- background: $soft;
- color: $blue;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 13px;
-}
+ .pmt__option-ico {
+ background: #2563eb;
+ color: #fff;
+ border-color: #2563eb;
+ }
+ }
-.pmt__option--active .pmt__option-ico {
- background: $blue;
- color: #fff;
-}
+ &-ico {
+ width: 38px;
+ height: 38px;
+ min-width: 38px;
+ border-radius: 10px;
+ background: #f1f5f9;
+ border: 1px solid #e2e8f0;
+ color: #2563eb;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 15px;
+ flex-shrink: 0;
+ transition: all 0.2s ease;
+ }
-.pmt__option-text {
- display: flex;
- flex-direction: column;
- gap: 2px;
-}
+ // Distinct accent per option while unselected, purely presentational -- helps the four cards read
+ // apart at a glance. Selecting a card always fills its icon blue (see &--active above), matching the
+ // blue selection border/check regardless of which option it is, rather than mixing selection-blue
+ // with the option's own accent.
+ &:not(.pmt__option--active):nth-child(2) .pmt__option-ico {
+ color: #7c3aed;
+ }
-.pmt__option-title {
- font-size: 13px;
- font-weight: 700;
- color: $navy;
-}
+ &:not(.pmt__option--active):nth-child(3) .pmt__option-ico {
+ color: #0d9488;
+ }
-.pmt__option-desc {
- font-size: 11px;
- color: $muted;
- line-height: 1.35;
-}
+ &:not(.pmt__option--active):nth-child(4) .pmt__option-ico {
+ color: #d97706;
+ }
-.pmt__option:focus-visible {
- outline: 2px solid $blue;
- outline-offset: 2px;
-}
+ &-text {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ flex: 1;
+ }
-.pmt__option-check {
- margin-left: auto;
- color: $blue;
- font-size: 13px;
+ &-title {
+ font-size: 14px;
+ font-weight: 700;
+ color: #0f172a;
+ line-height: 1.3;
+ }
+
+ &-desc {
+ font-size: 12px;
+ color: #64748b;
+ line-height: 1.4;
+ }
+
+ &-check {
+ color: #2563eb;
+ font-size: 17px;
+ position: absolute;
+ top: 14px;
+ right: 14px;
+ }
}
.pmt__option-error {
color: #b91c1c;
font-size: 12px;
- margin: 4px 0 14px;
-}
-
-.pmt__error {
- display: flex;
- align-items: flex-start;
- gap: 4px;
- background: #fef2f2;
- border: 1px solid #fecaca;
- border-radius: 8px;
- color: #b91c1c;
- font-size: 12.5px;
- line-height: 1.45;
- padding: 10px 14px;
- margin: 4px 0 8px;
-}
-
-.pmt__hint {
- display: flex;
- align-items: flex-start;
- gap: 4px;
- background: $soft;
- border: 1px solid $border;
- border-radius: 8px;
- color: $slate;
- font-size: 12px;
- line-height: 1.45;
- padding: 9px 13px;
- margin: 0 0 10px;
-}
-
-.pmt__hint--warn {
- background: #fffbeb;
- border-color: #fde68a;
- color: #92400e;
+ font-weight: 600;
+ margin: -10px 0 14px;
}
.pmt__split {
display: flex;
align-items: center;
- gap: 12px;
- background: $soft;
+ gap: 16px;
+ background: #f8fafc;
border: 1px dashed #cbd5e1;
- border-radius: 10px;
- padding: 14px 16px 0;
- margin: 4px 0 8px;
+ border-radius: 14px;
+ padding: 18px;
+ margin: 10px 0 18px;
flex-wrap: wrap;
+
+ &-input {
+ flex: 1 1 220px;
+ }
+
+ &-arrow {
+ color: #94a3b8;
+ font-size: 17px;
+ }
+
+ &-remainder {
+ display: flex;
+ flex-direction: column;
+ gap: 3px;
+ background: #f0fdf4;
+ border: 1px solid #bbf7d0;
+ border-radius: 10px;
+ padding: 12px 16px;
+ flex: 1 1 220px;
+
+ &-label {
+ font-size: 11px;
+ font-weight: 700;
+ text-transform: uppercase;
+ letter-spacing: 0.04em;
+ color: #166534;
+ }
+
+ &-value {
+ font-family: 'JetBrains Mono', 'DM Sans', monospace;
+ font-size: 19px;
+ font-weight: 800;
+ color: #166534;
+ }
+ }
}
-.pmt__split-input {
- flex: 1 1 180px;
- min-width: 160px;
-}
-
-.pmt__split-arrow {
- color: $muted;
- font-size: 14px;
- margin-bottom: 20px;
-}
-
-.pmt__split-remainder {
+.pmt__hint {
display: flex;
- flex-direction: column;
- gap: 2px;
- background: $green-soft;
- border: 1px solid #bbf7d0;
- border-radius: 8px;
- padding: 8px 14px;
- margin-bottom: 14px;
- flex: 1 1 180px;
- min-width: 160px;
+ align-items: flex-start;
+ gap: 10px;
+ background: #f0f9ff;
+ border: 1px solid #bae6fd;
+ border-left: 4px solid #0284c7;
+ border-radius: 10px;
+ color: #0369a1;
+ font-size: 13px;
+ line-height: 1.5;
+ padding: 12px 16px;
+ margin: 0 0 18px;
+
+ &--warn {
+ background: #fffbeb;
+ border-color: #fde68a;
+ border-left-color: #d97706;
+ color: #b45309;
+ }
}
-.pmt__split-remainder-label {
- font-size: 10.5px;
- font-weight: 700;
- text-transform: uppercase;
- letter-spacing: 0.04em;
- color: $green;
-}
-
-.pmt__split-remainder-value {
- font-size: 16px;
- font-weight: 800;
- color: $green;
- font-variant-numeric: tabular-nums;
-}
-
-.pmt__content mat-form-field {
- width: 100%;
+.pmt__error {
+ display: flex;
+ align-items: flex-start;
+ gap: 10px;
+ background: #fef2f2;
+ border: 1px solid #fecaca;
+ border-left: 4px solid #ef4444;
+ border-radius: 10px;
+ color: #b91c1c;
+ font-size: 13px;
+ padding: 12px 16px;
+ margin: 10px 0;
}
.pmt__actions {
- padding: 14px 28px 20px !important;
- border-top: 1px solid $border;
- flex: 0 0 auto;
+ padding: 18px 30px !important;
+ border-top: 1px solid #e2e8f0;
+ background: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ gap: 14px;
+ flex-shrink: 0;
+
+ .pmt__btn-cancel {
+ border-radius: 10px;
+ font-weight: 600;
+ color: #475569;
+ }
+
+ .pmt__btn-submit {
+ border-radius: 10px;
+ font-weight: 700;
+ padding: 0 26px;
+ height: 42px;
+ background: linear-gradient(135deg, #1d4ed8 0%, #2563eb 100%);
+ color: #fff;
+ box-shadow: 0 8px 20px rgb(37 99 235 / 30%);
+ transition: all 0.2s ease;
+
+ &:hover:not(:disabled) {
+ box-shadow: 0 10px 24px rgb(37 99 235 / 40%);
+ transform: translateY(-1px);
+ }
+
+ &:disabled {
+ background: #cbd5e1;
+ box-shadow: none;
+ color: #64748b;
+ }
+ }
}
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.ts
index cd433f83c..521656fa8 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.ts
@@ -24,15 +24,26 @@ import { UntypedFormBuilder, UntypedFormGroup, UntypedFormControl, ValidatorFn,
/** Custom Services */
import { FixedDepositsService } from '../../../fixed-deposits.service';
import { SettingsService } from 'app/settings/settings.service';
+import { AlertService } from 'app/core/alert/alert.service';
import { Dates } from 'app/core/utils/dates';
import { FormatNumberPipe } from '../../../../../pipes/format-number.pipe';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { FdMaturityRow } from 'app/fd-dashboard/fd-dashboard.compute';
/**
* "Payment" dialog -- an always-available alternative to Premature Close (Active-only, no reinvest) and
* Close (Matured-only, no partial option). Works on an FD in either state and offers a fourth choice,
* Partial Reinvest, alongside the ones the backend's `DepositAccountOnClosureType` already had: the
* entered amount renews on this same account, the rest transfers to a savings account picked here.
+ *
+ * Doubles as the FD Dashboard's Renew action when opened with `data.dashboardRenewal` set: same form,
+ * same full set of closure types (nothing removed -- Transfer to Savings and Partial Reinvest work from
+ * the Dashboard too, not just the two Reinvest options). The only two differences in that mode: the
+ * Closed On Date is computed from the FD's grace window instead of picked freely (backdated to the
+ * original maturity date within grace, today once it's passed -- the picker is hidden, not just
+ * defaulted, so it can't accidentally be moved off that date), and submit() first calls
+ * `creditGapInterestIfPastGrace` when past grace, crediting the gap-period interest (at the linked
+ * account's rate) onto the FD before the normal `payment` command runs and reads its balance.
*/
@Component({
selector: 'mifosx-payment-dialog',
@@ -76,11 +87,18 @@ export class PaymentDialogComponent implements OnInit {
};
dialogRef = inject>(MatDialogRef);
- data: { accountId: number | string; accountBalance?: number; maturityDate?: any } = inject(MAT_DIALOG_DATA);
+ data: {
+ accountId: number | string;
+ accountBalance?: number;
+ maturityDate?: any;
+ /** Present only when opened from the FD Dashboard's Renew action. */
+ dashboardRenewal?: { row: FdMaturityRow };
+ } = inject(MAT_DIALOG_DATA);
private formBuilder = inject(UntypedFormBuilder);
private fixedDepositsService = inject(FixedDepositsService);
private settingsService = inject(SettingsService);
private dateUtils = inject(Dates);
+ private alertService = inject(AlertService);
paymentForm: UntypedFormGroup;
/** Loaded once, on open, from the same closure template the existing Close action already uses. */
@@ -93,6 +111,16 @@ export class PaymentDialogComponent implements OnInit {
submitError: string = null;
maxDate: Date;
+ /** Whether gap-interest still needs crediting before this submits -- only ever true once, right
+ * after open; cleared as soon as `submit()` has credited it, so a retried submit doesn't double-post. */
+ private gapInterestPending = false;
+
+ /** Read-only numbers (current balance, linked account's rate, gap days, gap-interest amount,
+ * projected new balance) fetched once on open in dashboard-renewal mode, shown above the Action
+ * cards so staff see exactly what a late renewal is about to credit before confirming anything. */
+ renewalPreview: any = null;
+ renewalPreviewLoading = false;
+
ngOnInit(): void {
this.maxDate = this.settingsService.businessDate;
this.paymentForm = this.formBuilder.group({
@@ -106,6 +134,34 @@ export class PaymentDialogComponent implements OnInit {
],
note: ['']
});
+
+ // Fetched every time this dialog opens, not just from the FD Dashboard -- Payment is now only ever
+ // offered once an FD has Matured (see FixedDepositsButtonsConfiguration), so a plain Payment on it
+ // is exactly the same "late renewal" scenario the Dashboard's Renew action handles, and needs the
+ // exact same date-locking/gap-interest treatment, or an FD closed this way instead of from the
+ // Dashboard would silently skip crediting interest it genuinely earned.
+ this.renewalPreviewLoading = true;
+ this.fixedDepositsService.getFdRenewalPreview(this.data.accountId).subscribe({
+ next: (preview: any) => {
+ this.renewalPreview = preview;
+ this.renewalPreviewLoading = false;
+ if (preview?.isMatured) {
+ // Computed from the grace window, never picked -- the date field stays in the form (the
+ // generic submit path and reinvestCap/processingOnOrAfterMaturity both key off it) but its
+ // picker is hidden once matured (see the template), so it can't be moved off this value.
+ this.paymentForm
+ .get('closedOnDate')
+ .setValue(preview.withinGrace ? new Date(preview.maturityDate) : this.maxDate);
+ this.gapInterestPending = !preview.withinGrace;
+ }
+ },
+ // Non-fatal -- Confirm still works from here (backend re-derives the same numbers on submit),
+ // only the numeric preview and its date-locking are unavailable, not the action itself.
+ error: () => {
+ this.renewalPreviewLoading = false;
+ }
+ });
+
this.paymentForm.get('onAccountClosureId').valueChanges.subscribe((id: number) => this.onClosureTypeChange(id));
// The cap depends on whether the chosen date is on or after maturity, so a date change can make an
// already-entered amount valid or invalid. Without this the amount keeps its verdict from the old date.
@@ -136,6 +192,31 @@ export class PaymentDialogComponent implements OnInit {
});
}
+ get isDashboardRenewalMode(): boolean {
+ return !!this.data.dashboardRenewal;
+ }
+
+ get dashboardRenewalRow(): FdMaturityRow | null {
+ return this.data.dashboardRenewal?.row ?? null;
+ }
+
+ /** True once the loaded preview confirms this FD has actually Matured -- which, since Payment is
+ * only ever offered on a Matured account, is every real open of this dialog now, from either entry
+ * point. Drives the date-locking and gap-interest preview/crediting identically either way. */
+ get isMaturedRenewal(): boolean {
+ return !!this.renewalPreview?.isMatured;
+ }
+
+ /** What clicking Confirm is actually about to do -- shown above the (hidden-picker) date once
+ * matured, since the date itself is no longer visible to explain it. */
+ get maturedRenewalTimingText(): string {
+ if (!this.renewalPreview) return '';
+ return this.renewalPreview.withinGrace
+ ? `Backdated to its original maturity date (${this.renewalPreview.maturityDate}), at the currently active interest rate.`
+ : `This FD's grace period has passed -- gap-period interest (for the days since maturity) will be ` +
+ `credited at the linked account's rate first, then this renews from today.`;
+ }
+
/**
* The amount being split, and the bound the entered partial amount is checked against.
*
@@ -259,6 +340,31 @@ export class PaymentDialogComponent implements OnInit {
}
submit(): void {
+ if (this.gapInterestPending) {
+ this.submitting = true;
+ this.submitError = null;
+ this.fixedDepositsService.creditGapInterestIfPastGrace(this.data.accountId).subscribe({
+ next: () => {
+ this.gapInterestPending = false;
+ this.submitGenericPayment();
+ },
+ error: (error: any) => {
+ this.submitting = false;
+ this.submitError =
+ error?.error?.defaultUserMessage ??
+ error?.error?.errors?.[0]?.defaultUserMessage ??
+ 'Could not credit gap-period interest. Please review the details and try again.';
+ }
+ });
+ return;
+ }
+ this.submitGenericPayment();
+ }
+
+ /** The same `command=payment` submission every non-Dashboard call to this dialog already used --
+ * Dashboard-renewal mode reaches it too, once any gap-interest pre-step above has cleared, so every
+ * closure type behaves identically regardless of where the dialog was opened from. */
+ private submitGenericPayment(): void {
const formValue = { ...this.paymentForm.value };
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
@@ -271,7 +377,16 @@ export class PaymentDialogComponent implements OnInit {
this.fixedDepositsService
.executeFixedDepositsAccountCommand(this.data.accountId as string, 'payment', data)
.subscribe({
- next: () => {
+ next: (response: any) => {
+ // Parked in the Checker Inbox rather than executed -- see the same handling in
+ // PrematureCloseDialogComponent for why an HTTP 200 here can still mean "not applied yet".
+ if (response?.rollbackTransaction) {
+ this.alertService.alert({
+ type: 'Success',
+ message:
+ 'This payment has been submitted for approval. The deposit is unchanged until a checker approves it.'
+ });
+ }
this.dialogRef.close({ confirm: true });
},
// Keep the dialog open with the entered values and say what went wrong, rather than leaving a
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/premature-close-dialog/premature-close-dialog.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/premature-close-dialog/premature-close-dialog.component.html
new file mode 100644
index 000000000..cc6736b60
--- /dev/null
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/premature-close-dialog/premature-close-dialog.component.html
@@ -0,0 +1,282 @@
+
+
+
+ * The premature amount is date-dependent (unlike Payment's one-shot template load): every change to
+ * Closed On Date re-calls `calculatePrematureAmount`, same as the full-page form this replaces did.
+ */
+@Component({
+ selector: 'mifosx-premature-close-dialog',
+ templateUrl: './premature-close-dialog.component.html',
+ styleUrls: ['./premature-close-dialog.component.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ CdkScrollable,
+ MatDialogContent,
+ MatDialogActions,
+ MatDialogClose,
+ CdkTextareaAutosize,
+ FaIconComponent,
+ FormatNumberPipe,
+ GlAccountSelectorComponent
+ ]
+})
+export class PrematureCloseDialogComponent implements OnInit {
+ /** The `onAccountClosureId` codes Premature Close can offer -- same codes Payment/Close use. */
+ private static readonly WITHDRAW_DEPOSIT_ID = 100;
+ private static readonly TRANSFER_TO_SAVINGS_ID = 200;
+ private static readonly TRANSFER_TO_GL_ID = 600;
+
+ private static readonly ACTION_ICONS: Record = {
+ [PrematureCloseDialogComponent.WITHDRAW_DEPOSIT_ID]: 'money-bill-wave',
+ [PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID]: 'wallet',
+ [PrematureCloseDialogComponent.TRANSFER_TO_GL_ID]: 'book'
+ };
+
+ private static readonly ACTION_DESCRIPTIONS: Record = {
+ [PrematureCloseDialogComponent.WITHDRAW_DEPOSIT_ID]: 'Pay out the full balance in cash',
+ [PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID]: 'Move the full balance to another savings account',
+ [PrematureCloseDialogComponent.TRANSFER_TO_GL_ID]: 'Post the full balance to a GL account'
+ };
+
+ /**
+ * Mirrors the backend's PrematureClosureReasonType values exactly -- see that enum for why these
+ * four (everything but Normal) always waive the penalty by RBI policy rather than at the maker's
+ * discretion. `gatedBy` is the product-facility flag (from `data`) that must be true for the option
+ * to even be offered; `null` means always offered. Deceased Settlement / Nominee-Legal Heir Closure
+ * are gated because they are the product's own opt-in facilities (see SavingsProduct
+ * deceasedSettlement/noPenaltyNomineeHeirClosure) -- a product that never enabled one shouldn't let
+ * a maker pick it to bypass a penalty that product's terms don't actually exempt.
+ */
+ private static readonly NORMAL_REASON_ID = 100;
+ private static readonly ALL_CLOSURE_REASONS: {
+ id: number;
+ label: string;
+ autoWaived: boolean;
+ gatedBy: 'deceasedSettlement' | 'noPenaltyNomineeHeirClosure' | null;
+ }[] = [
+ { id: 100, label: 'Normal Premature Closure', autoWaived: false, gatedBy: null },
+ { id: 200, label: 'Premature Extension / Renewal', autoWaived: true, gatedBy: null },
+ { id: 300, label: 'Conversion to Another Term Deposit', autoWaived: true, gatedBy: null },
+ { id: 400, label: 'Deceased Settlement', autoWaived: true, gatedBy: 'deceasedSettlement' },
+ { id: 500, label: 'Nominee / Legal Heir Closure', autoWaived: true, gatedBy: 'noPenaltyNomineeHeirClosure' }
+ ];
+
+ dialogRef = inject>(MatDialogRef);
+ data: {
+ accountId: number | string;
+ accountNo?: string;
+ depositAmount?: number;
+ nominalAnnualInterestRate?: number;
+ preClosurePenalApplicable?: boolean;
+ preClosurePenalInterest?: number;
+ preClosurePenalInterestOnType?: { value: string };
+ deceasedSettlement?: boolean;
+ noPenaltyNomineeHeirClosure?: boolean;
+ activatedOnDate?: any;
+ maturityDate?: any;
+ currentBalance?: number;
+ } = inject(MAT_DIALOG_DATA);
+ private formBuilder = inject(UntypedFormBuilder);
+ private fixedDepositsService = inject(FixedDepositsService);
+ private settingsService = inject(SettingsService);
+ private accountingService = inject(AccountingService);
+ private alertService = inject(AlertService);
+ private dateUtils = inject(Dates);
+
+ prematureCloseForm: UntypedFormGroup;
+ onAccountClosureOptions: any[] = [];
+ savingsAccountsData: any[] = [];
+ /** Postable GL accounts, loaded once -- only read when the GL action is chosen. */
+ glAccountsData: GLAccount[] = [];
+ maturityAmount: number = null;
+ /** The rate actually resolved for THIS preview by the backend (actual-period vs contracted,
+ * penalty-deducted or not) -- distinct from data.nominalAnnualInterestRate, which is always the
+ * account's unmodified contracted rate. Read fresh on every recalculation. */
+ effectiveInterestRate: number = null;
+ loadingAmount = true;
+ loadFailed = false;
+ submitting = false;
+ submitError: string = null;
+ minDate = new Date(2000, 0, 1);
+ maxDate: Date;
+
+ ngOnInit(): void {
+ this.maxDate = this.settingsService.businessDate;
+ this.prematureCloseForm = this.formBuilder.group({
+ closedOnDate: [
+ this.maxDate,
+ Validators.required
+ ],
+ // Both always present (not added conditionally like onAccountClosureId below) so submit()
+ // always carries a value, even for a product with no penalty configured at all -- the backend
+ // ignores them there anyway, since there is nothing to waive.
+ prematureClosureReasonId: [PrematureCloseDialogComponent.NORMAL_REASON_ID],
+ waivePreClosurePenalty: [false]
+ });
+
+ this.prematureCloseForm
+ .get('closedOnDate')
+ .valueChanges.subscribe((date: Date) => this.calculatePrematureAmount(date));
+ // Waiving/un-waiving recalculates the preview the same way changing the date does -- the maker
+ // should see the actual amount they're about to confirm, not the penalty-applied one, the moment
+ // they tick the box.
+ this.prematureCloseForm
+ .get('waivePreClosurePenalty')
+ .valueChanges.subscribe(() => this.calculatePrematureAmount(this.prematureCloseForm.get('closedOnDate').value));
+ // Picking an RBI-mandated waiver reason forces the checkbox on (see onClosureReasonChange) and,
+ // like it, recalculates the preview so the amount shown always matches the reason selected.
+ this.prematureCloseForm
+ .get('prematureClosureReasonId')
+ .valueChanges.subscribe((id: number) => this.onClosureReasonChange(id));
+ // Same date the form already starts with -- without this the amount/options never load unless the
+ // maker happens to touch the date picker, which the full-page form this replaces required too.
+ this.calculatePrematureAmount(this.maxDate);
+ }
+
+ /** The reason list this account's product actually allows -- see ALL_CLOSURE_REASONS' `gatedBy`. */
+ get closureReasonOptions(): { id: number; label: string; autoWaived: boolean }[] {
+ return PrematureCloseDialogComponent.ALL_CLOSURE_REASONS.filter(
+ (reason) => !reason.gatedBy || this.data[reason.gatedBy]
+ );
+ }
+
+ /** True when the selected reason waives the penalty by policy, not maker choice -- the checkbox is
+ * hidden in favour of a plain statement of that fact when this is true (see the template). */
+ get isAutoWaivedReason(): boolean {
+ return !!this.selectedReason?.autoWaived;
+ }
+
+ get selectedReasonLabel(): string {
+ return this.selectedReason?.label ?? '';
+ }
+
+ private get selectedReason(): { id: number; label: string; autoWaived: boolean } | undefined {
+ const id = this.prematureCloseForm?.get('prematureClosureReasonId')?.value;
+ return PrematureCloseDialogComponent.ALL_CLOSURE_REASONS.find((reason) => reason.id === id);
+ }
+
+ private onClosureReasonChange(reasonId: number): void {
+ const reason = PrematureCloseDialogComponent.ALL_CLOSURE_REASONS.find((r) => r.id === reasonId);
+ if (reason?.autoWaived) {
+ // emitEvent: false -- the explicit calculatePrematureAmount call below already covers this
+ // change; without it, this setValue would also fire waivePreClosurePenalty's own subscription
+ // and the amount would be calculated twice for one reason change.
+ this.prematureCloseForm.get('waivePreClosurePenalty').setValue(true, { emitEvent: false });
+ }
+ this.calculatePrematureAmount(this.prematureCloseForm.get('closedOnDate').value);
+ }
+
+ private calculatePrematureAmount(date: Date): void {
+ this.loadingAmount = true;
+ this.loadFailed = false;
+ const locale = this.settingsService.language.code;
+ const dateFormat = this.settingsService.dateFormat;
+ const data = {
+ closedOnDate: this.dateUtils.formatDate(date, dateFormat),
+ dateFormat,
+ locale,
+ prematureClosureReasonId: this.prematureCloseForm.get('prematureClosureReasonId')?.value,
+ waivePreClosurePenalty: !!this.prematureCloseForm.get('waivePreClosurePenalty')?.value
+ };
+ this.fixedDepositsService
+ .executeFixedDepositsAccountCommand(this.data.accountId as string, 'calculatePrematureAmount', data)
+ .subscribe({
+ next: (response: any) => {
+ this.savingsAccountsData = response.savingsAccounts ?? [];
+ this.onAccountClosureOptions = response.onAccountClosureOptions ?? [];
+ this.maturityAmount = response.maturityAmount;
+ this.effectiveInterestRate = response.nominalAnnualInterestRate ?? null;
+ this.loadingAmount = false;
+ if (!this.prematureCloseForm.contains('onAccountClosureId')) {
+ this.prematureCloseForm.addControl('onAccountClosureId', new UntypedFormControl('', Validators.required));
+ this.prematureCloseForm.addControl('note', new UntypedFormControl(''));
+ this.prematureCloseForm
+ .get('onAccountClosureId')
+ .valueChanges.subscribe((id: number) => this.onClosureTypeChange(id));
+ }
+ },
+ // Without this the spinner would run forever on a failed load, leaving Cancel as the only way out.
+ error: () => {
+ this.loadingAmount = false;
+ this.loadFailed = true;
+ }
+ });
+ }
+
+ /** Adds/removes the destination control to match what the chosen type needs. */
+ private onClosureTypeChange(id: number): void {
+ const toSavings = id === PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID;
+ const toGl = id === PrematureCloseDialogComponent.TRANSFER_TO_GL_ID;
+
+ if (toSavings && !this.prematureCloseForm.contains('toSavingsAccountId')) {
+ this.prematureCloseForm.addControl('toSavingsAccountId', new UntypedFormControl('', Validators.required));
+ } else if (!toSavings) {
+ this.prematureCloseForm.removeControl('toSavingsAccountId');
+ }
+
+ if (toGl) {
+ if (!this.prematureCloseForm.contains('toGlAccountId')) {
+ this.prematureCloseForm.addControl('toGlAccountId', new UntypedFormControl('', Validators.required));
+ }
+ this.loadGlAccounts();
+ } else {
+ this.prematureCloseForm.removeControl('toGlAccountId');
+ }
+
+ // Both destinations carry the description through -- to the account transfer, or to the narration on
+ // the journal entry that credits the GL account.
+ if ((toSavings || toGl) && !this.prematureCloseForm.contains('transferDescription')) {
+ this.prematureCloseForm.addControl('transferDescription', new UntypedFormControl(''));
+ } else if (!toSavings && !toGl) {
+ this.prematureCloseForm.removeControl('transferDescription');
+ }
+ }
+
+ /** Fetched on first use rather than with the dialog, since most closures never pick the GL action. */
+ private loadGlAccounts(): void {
+ if (this.glAccountsData.length) {
+ return;
+ }
+ this.accountingService.getGlAccounts().subscribe((accounts: GLAccount[]) => {
+ this.glAccountsData = accounts ?? [];
+ });
+ }
+
+ /** The GL selector takes a control instance, not a control name. */
+ get toGlAccountControl(): UntypedFormControl {
+ return this.prematureCloseForm.get('toGlAccountId') as UntypedFormControl;
+ }
+
+ /** The gap between the deposit and the computed maturity amount -- the actual interest this premature
+ * closure earns, at whatever rate (contracted, or the lower pre-closure-penalty one below) applied. */
+ get interestEarned(): number | null {
+ if (this.maturityAmount === null || this.maturityAmount === undefined || !this.data.depositAmount) {
+ return null;
+ }
+ return Number(this.maturityAmount) - Number(this.data.depositAmount);
+ }
+
+ get activatedOnDateDisplay(): string {
+ return this.formatFullDate(this.data.activatedOnDate);
+ }
+
+ get maturityDateDisplay(): string {
+ return this.formatFullDate(this.data.maturityDate);
+ }
+
+ /**
+ * The date every "as of" figure in this dialog is measured against -- the maker's own chosen Premature
+ * Close Date, falling back to Fineract's configured Business Date. Deliberately NOT the real-world
+ * clock (`new Date()`): Fineract's business date can lag behind the calendar (a bank's own admin
+ * advances it), and the backend's interest calculation is measured from THIS date, not today's actual
+ * date. Using the real clock here previously showed a "days elapsed" figure that disagreed with the
+ * interest the backend actually computed for the same closure -- both must read off the same clock.
+ */
+ private get referenceDate(): Date {
+ const picked = this.prematureCloseForm?.get('closedOnDate')?.value;
+ return picked instanceof Date ? picked : this.maxDate;
+ }
+
+ /** Days from the current term's start to the chosen closure date -- 0 if the date is missing or the
+ * closure date is somehow before it, rather than a negative. */
+ get daysElapsed(): number | null {
+ const start = this.data.activatedOnDate ? this.dateUtils.parseDate(this.data.activatedOnDate) : null;
+ if (!start) {
+ return null;
+ }
+ return Math.max(0, this.dateUtils.calculateDiff(start, this.referenceDate));
+ }
+
+ /** Days from the chosen closure date to the scheduled maturity date -- 0 once matured/overdue rather
+ * than negative, since this dialog is for a still-Active account closing early, not a matured one. */
+ get daysRemainingToMaturity(): number | null {
+ const maturity = this.data.maturityDate ? this.dateUtils.parseDate(this.data.maturityDate) : null;
+ if (!maturity) {
+ return null;
+ }
+ return Math.max(0, this.dateUtils.calculateDiff(this.referenceDate, maturity));
+ }
+
+ /** Elapsed tenure as Years/Months/Days, the way a real passbook states it, rather than a raw day
+ * count that is hard to read for a multi-year FD. */
+ get tenureElapsedDisplay(): string {
+ const start = this.data.activatedOnDate ? this.dateUtils.parseDate(this.data.activatedOnDate) : null;
+ if (!start) {
+ return '—';
+ }
+ const { years, months, days } = PrematureCloseDialogComponent.yearsMonthsDaysBetween(start, this.referenceDate);
+ const parts: string[] = [];
+ if (years > 0) {
+ parts.push(`${years} yr${years === 1 ? '' : 's'}`);
+ }
+ if (months > 0) {
+ parts.push(`${months} mo${months === 1 ? '' : 's'}`);
+ }
+ if (days > 0 || parts.length === 0) {
+ parts.push(`${days} day${days === 1 ? '' : 's'}`);
+ }
+ return parts.join(', ');
+ }
+
+ private formatFullDate(value: any): string {
+ if (!value) {
+ return '—';
+ }
+ const parsed = this.dateUtils.parseDate(value);
+ // "28 September 2026" -- day/month-name/year, so this reads unambiguously regardless of the
+ // account's own configured short date format elsewhere in the app.
+ return this.dateUtils.formatDate(parsed, 'd MMMM y');
+ }
+
+ private static yearsMonthsDaysBetween(start: Date, end: Date): { years: number; months: number; days: number } {
+ let years = end.getFullYear() - start.getFullYear();
+ let months = end.getMonth() - start.getMonth();
+ let days = end.getDate() - start.getDate();
+ if (days < 0) {
+ months -= 1;
+ const daysInPreviousMonth = new Date(end.getFullYear(), end.getMonth(), 0).getDate();
+ days += daysInPreviousMonth;
+ }
+ if (months < 0) {
+ years -= 1;
+ months += 12;
+ }
+ return { years: Math.max(0, years), months: Math.max(0, months), days: Math.max(0, days) };
+ }
+
+ /** True when the chosen action needs a destination account but the customer has none to pick. */
+ get noDestinationAccounts(): boolean {
+ return (
+ !this.loadingAmount &&
+ this.prematureCloseForm?.contains('toSavingsAccountId') &&
+ this.savingsAccountsData.length === 0
+ );
+ }
+
+ iconFor(id: number): string {
+ return PrematureCloseDialogComponent.ACTION_ICONS[id] ?? 'circle';
+ }
+
+ descriptionFor(id: number): string {
+ return PrematureCloseDialogComponent.ACTION_DESCRIPTIONS[id] ?? '';
+ }
+
+ selectClosureType(id: number): void {
+ this.prematureCloseForm.get('onAccountClosureId').setValue(id);
+ this.prematureCloseForm.get('onAccountClosureId').markAsTouched();
+ }
+
+ submit(): void {
+ const formValue = { ...this.prematureCloseForm.value };
+ const locale = this.settingsService.language.code;
+ const dateFormat = this.settingsService.dateFormat;
+ if (formValue.closedOnDate instanceof Date) {
+ formValue.closedOnDate = this.dateUtils.formatDate(formValue.closedOnDate, dateFormat);
+ }
+ const data = { ...formValue, dateFormat, locale };
+ this.submitting = true;
+ this.submitError = null;
+ this.fixedDepositsService
+ .executeFixedDepositsAccountCommand(this.data.accountId as string, 'prematureClose', data)
+ .subscribe({
+ next: (response: any) => {
+ // A command on a maker-checker permission is parked in the Checker Inbox, not executed:
+ // the platform rolls its transaction back and still answers HTTP 200 with
+ // rollbackTransaction: true. Without saying so, the dialog closes and the account reloads
+ // unchanged -- which reads as "nothing happened" rather than "waiting for approval".
+ if (response?.rollbackTransaction) {
+ this.alertService.alert({
+ type: 'Success',
+ message:
+ 'Premature closure has been submitted for approval. The deposit is unchanged until a checker approves it.'
+ });
+ }
+ this.dialogRef.close({ confirm: true });
+ },
+ // Keep the dialog open with the entered values and say what went wrong, rather than leaving a
+ // permanently disabled Confirm behind whatever modal the global interceptor threw up.
+ error: (error: any) => {
+ this.submitting = false;
+ this.submitError =
+ error?.error?.defaultUserMessage ??
+ error?.error?.errors?.[0]?.defaultUserMessage ??
+ 'This account could not be prematurely closed. Please review the details and try again.';
+ }
+ });
+ }
+}
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts
index fefdb323d..088e31ec2 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts
@@ -17,6 +17,7 @@ import { CalculateInterestDialogComponent } from './custom-dialogs/calculate-int
import { PostInterestDialogComponent } from './custom-dialogs/post-interest-dialog/post-interest-dialog.component';
import { ToggleWithholdTaxDialogComponent } from './custom-dialogs/toggle-withhold-tax-dialog/toggle-withhold-tax-dialog.component';
import { PaymentDialogComponent } from './custom-dialogs/payment-dialog/payment-dialog.component';
+import { PrematureCloseDialogComponent } from './custom-dialogs/premature-close-dialog/premature-close-dialog.component';
import { DepositCertificateDialogComponent } from 'app/shared/deposit-certificate-dialog/deposit-certificate-dialog.component';
/** Custom Button Config. */
@@ -29,6 +30,7 @@ import { AccountsService } from 'app/accounts/accounts.service';
import { Currency } from 'app/shared/models/general.model';
import { SettingsService } from 'app/settings/settings.service';
import { Dates } from 'app/core/utils/dates';
+import { AlertService } from 'app/core/alert/alert.service';
import { AuthenticationService } from '../../../core/authentication/authentication.service';
import { MatTooltip } from '@angular/material/tooltip';
import { NgClass, CurrencyPipe } from '@angular/common';
@@ -73,6 +75,7 @@ import { DormancyAlertPanelComponent } from 'app/shared/dormancy-alert-panel/dor
export class FixedDepositAccountViewComponent implements OnInit {
private route = inject(ActivatedRoute);
private router = inject(Router);
+ private alertService = inject(AlertService);
private fixedDepositsService = inject(FixedDepositsService);
private savingsService = inject(SavingsService);
private accountsService = inject(AccountsService);
@@ -238,7 +241,6 @@ export class FixedDepositAccountViewComponent implements OnInit {
case 'Undo Activation':
case 'Add Charge':
case 'Withdrawn by Client':
- case 'Premature Close':
case 'Deposit':
case 'Withdrawal':
this.router.navigate([`actions/${name}`], { relativeTo: this.route });
@@ -267,16 +269,21 @@ export class FixedDepositAccountViewComponent implements OnInit {
case 'Payment':
this.openPaymentDialog();
break;
+ case 'Premature Close':
+ this.openPrematureCloseDialog();
+ break;
}
}
/**
- * Opens the Payment action -- unlike Premature Close/Close, works whether the account is Active or
- * Matured, and is the only place a Partial Reinvest can be done.
+ * Opens the Payment action -- only offered once the FD has actually Matured (see
+ * FixedDepositsButtonsConfiguration), and the only place a Partial Reinvest can be done. Also the
+ * exact same dialog the FD Dashboard's Renew action opens (see fd-dashboard.component.ts's
+ * openRenewDialog), just without dashboardRenewal data, so its date picker stays visible.
*/
private openPaymentDialog(): void {
const paymentDialogRef = this.dialog.open(PaymentDialogComponent, {
- width: '640px',
+ width: '720px',
maxWidth: '95vw',
data: {
accountId: this.fixedDepositsAccountData.id,
@@ -293,6 +300,60 @@ export class FixedDepositAccountViewComponent implements OnInit {
});
}
+ /**
+ * The start date of the term currently running -- the last entry in renewalHistory, which is ordered
+ * oldest-first (see RenewalHistoryTabComponent). Falls back to the account's own activation date for
+ * an FD that has never been renewed (or whose renewalHistory hasn't loaded), which is the same date
+ * in that case anyway.
+ */
+ private get currentTermStartDate(): any {
+ const history = this.fixedDepositsAccountData?.renewalHistory;
+ const latestTerm = Array.isArray(history) && history.length > 0 ? history[history.length - 1] : null;
+ return latestTerm?.activatedondate ?? this.fixedDepositsAccountData?.timeline?.activatedOnDate;
+ }
+
+ /**
+ * Opens the Premature Close action -- Active-only, no reinvest option, since the deposit hasn't
+ * matured yet.
+ */
+ private openPrematureCloseDialog(): void {
+ const prematureCloseDialogRef = this.dialog.open(PrematureCloseDialogComponent, {
+ width: '720px',
+ maxWidth: '95vw',
+ data: {
+ accountId: this.fixedDepositsAccountData.id,
+ accountNo: this.fixedDepositsAccountData.fdAccountNumber || this.fixedDepositsAccountData.accountNo,
+ // calculatePrematureAmount only ever returns the final maturityAmount, not how it was reached --
+ // these come from the account's own data (already loaded for this page) so the dialog can show
+ // the breakdown (deposit, contracted rate, penalty, interest earned) behind that one number.
+ depositAmount: this.fixedDepositsAccountData.depositAmount,
+ nominalAnnualInterestRate: this.fixedDepositsAccountData.nominalAnnualInterestRate,
+ preClosurePenalApplicable: this.fixedDepositsAccountData.preClosurePenalApplicable,
+ preClosurePenalInterest: this.fixedDepositsAccountData.preClosurePenalInterest,
+ preClosurePenalInterestOnType: this.fixedDepositsAccountData.preClosurePenalInterestOnType,
+ // Gate which RBI-mandated waiver reasons the dialog offers -- these two are the product's own
+ // facility toggles (Deceased Settlement / No Penalty Nominee-Heir Closure), off by default, so
+ // a product that never enabled them shouldn't offer a reason implying it did.
+ deceasedSettlement: this.fixedDepositsAccountData.deceasedSettlement,
+ noPenaltyNomineeHeirClosure: this.fixedDepositsAccountData.noPenaltyNomineeHeirClosure,
+ // Tenure context (current term's start date, maturity date, current balance) so the dialog can
+ // show how far into THIS term the account is and how much is actually sitting in it today, not
+ // just the penalty-adjusted amount calculatePrematureAmount returns. Deliberately the current
+ // term's own start (see currentTermStartDate), not the account's original activation -- a
+ // renewed FD's interest/tenure runs from the renewal, and showing the original activation date
+ // here would make an account renewed days ago look like it has been running for months.
+ activatedOnDate: this.currentTermStartDate,
+ maturityDate: this.fixedDepositsAccountData.maturityDate,
+ currentBalance: this.fixedDepositsAccountData.summary?.accountBalance
+ }
+ });
+ prematureCloseDialogRef.afterClosed().subscribe((response: any) => {
+ if (response?.confirm) {
+ this.reload();
+ }
+ });
+ }
+
/**
* Deletes Fixed Deposits Account.
*/
@@ -360,7 +421,16 @@ export class FixedDepositAccountViewComponent implements OnInit {
if (response.confirm) {
this.fixedDepositsService
.executeFixedDepositsAccountCommand(this.fixedDepositsAccountData.id, 'postInterest', {})
- .subscribe(() => {
+ .subscribe((commandResponse: any) => {
+ // Parked in the Checker Inbox rather than executed (HTTP 200 with
+ // rollbackTransaction: true), so the reload below shows no new interest posting.
+ if (commandResponse?.rollbackTransaction) {
+ this.alertService.alert({
+ type: 'Success',
+ message:
+ 'Interest posting has been sent for checker approval. No interest is posted until a checker approves it.'
+ });
+ }
this.reload();
});
}
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts
index 3146a730c..9ce40ede6 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts
@@ -57,11 +57,12 @@ export class FixedDepositsButtonsConfiguration {
];
break;
case 'Matured':
+ // 'Close' (the generic Fineract apply-maturity-instructions action) is deliberately left out
+ // here -- what happens to a matured FD is now handled either automatically by the nightly job
+ // (an account opened with an explicit instruction) or manually via the FD Dashboard's Renew
+ // action (an account left without one, backdated within grace / gap-interest after). Closing
+ // from here would go around both of those paths.
this.buttonsArray = [
- {
- name: 'Close',
- icon: 'fa fa-arrow-right'
- },
{
name: 'Calculate Interest',
icon: 'fa fa-table'
@@ -109,7 +110,18 @@ export class FixedDepositsButtonsConfiguration {
setOptions(status: string) {
switch (status) {
case 'Active':
+ this.optionArray = [
+ {
+ name: 'Post Interest'
+ },
+ {
+ name: 'Add Charge'
+ }
+ ];
+ break;
case 'Matured':
+ // Payment only makes sense once the deposit has actually matured -- an Active FD that needs
+ // closing early already has Premature Close for that.
this.optionArray = [
{
name: 'Post Interest'
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/renewal-history-tab/renewal-history-tab.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/renewal-history-tab/renewal-history-tab.component.html
index 3648e2ee1..885983e11 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/renewal-history-tab/renewal-history-tab.component.html
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/renewal-history-tab/renewal-history-tab.component.html
@@ -41,8 +41,8 @@
) {
diff --git a/src/app/dormancy-report/dormancy-report.component.ts b/src/app/dormancy-report/dormancy-report.component.ts
index 39c794881..09b5325fd 100644
--- a/src/app/dormancy-report/dormancy-report.component.ts
+++ b/src/app/dormancy-report/dormancy-report.component.ts
@@ -147,8 +147,24 @@ export class DormancyReportComponent implements OnInit {
remitSaving = false;
remitError = '';
+ /**
+ * Only savings accounts can be put into a DEAF remittance: remittances are recorded against a savings account, so
+ * the selection (keyed by account id) holds savings ids alone and a current account with the same id cannot be
+ * mistaken for one.
+ */
+ isRemittable(row: DormancyRow): boolean {
+ return row.accountType !== 'CURRENT' && row.remittance !== 'REMITTED';
+ }
+
+ isSelected(row: DormancyRow): boolean {
+ return row.accountType !== 'CURRENT' && this.selected.has(row.accountId);
+ }
+
toggleSelect(row: DormancyRow, event: Event): void {
event.stopPropagation();
+ if (!this.isRemittable(row)) {
+ return;
+ }
if (this.selected.has(row.accountId)) {
this.selected.delete(row.accountId);
} else {
@@ -158,7 +174,7 @@ export class DormancyReportComponent implements OnInit {
/** Ticks every unremitted row on display, or clears them if all are already ticked. */
toggleSelectAll(): void {
- const selectable = this.visibleRows.filter((r) => r.remittance !== 'REMITTED');
+ const selectable = this.visibleRows.filter((r) => this.isRemittable(r));
if (selectable.every((r) => this.selected.has(r.accountId))) {
selectable.forEach((r) => this.selected.delete(r.accountId));
} else {
@@ -177,12 +193,12 @@ export class DormancyReportComponent implements OnInit {
}
get allSelected(): boolean {
- const selectable = this.visibleRows.filter((r) => r.remittance !== 'REMITTED');
+ const selectable = this.visibleRows.filter((r) => this.isRemittable(r));
return selectable.length > 0 && selectable.every((r) => this.selected.has(r.accountId));
}
get selectedTotal(): number {
- return this.rows.filter((r) => this.selected.has(r.accountId)).reduce((s, r) => s + r.balance, 0);
+ return this.rows.filter((r) => this.isSelected(r)).reduce((s, r) => s + r.balance, 0);
}
openRemit(): void {
@@ -316,6 +332,7 @@ export class DormancyReportComponent implements OnInit {
const next = lastTxn ? nextStage(lastTxn, stage) : { date: '', label: '' };
return {
+ accountType: a?.accountType || 'SAVINGS',
accountId: a?.accountId,
accountNo: a?.accountNo || '—',
clientId: a?.clientId,
diff --git a/src/app/dormancy-report/dormancy-report.compute.ts b/src/app/dormancy-report/dormancy-report.compute.ts
index bd491edb2..5867c8bd8 100644
--- a/src/app/dormancy-report/dormancy-report.compute.ts
+++ b/src/app/dormancy-report/dormancy-report.compute.ts
@@ -80,6 +80,8 @@ export const DORMANCY_STAGES: Record = {
export type DeafRemittanceState = 'PENDING' | 'REMITTED';
export interface DormancyRow {
+ /** SAVINGS or CURRENT. Ids are only unique within one kind, so rows are keyed by both. */
+ accountType: string;
accountId: number;
accountNo: string;
clientId: number;
diff --git a/src/app/fd-dashboard/fd-dashboard-routing.module.ts b/src/app/fd-dashboard/fd-dashboard-routing.module.ts
new file mode 100644
index 000000000..fd20e2e5e
--- /dev/null
+++ b/src/app/fd-dashboard/fd-dashboard-routing.module.ts
@@ -0,0 +1,29 @@
+/**
+ * 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 { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { Route } from '../core/route/route.service';
+import { FdDashboardComponent } from './fd-dashboard.component';
+
+const routes: Routes = [
+ Route.withShell([
+ {
+ path: 'fd-dashboard',
+ component: FdDashboardComponent,
+ data: { title: 'FD Dashboard', breadcrumb: 'FD Dashboard' }
+ }
+ ])
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule]
+})
+export class FdDashboardRoutingModule {}
diff --git a/src/app/fd-dashboard/fd-dashboard.component.html b/src/app/fd-dashboard/fd-dashboard.component.html
new file mode 100644
index 000000000..1c35e6d72
--- /dev/null
+++ b/src/app/fd-dashboard/fd-dashboard.component.html
@@ -0,0 +1,240 @@
+
+
+
+
+
+
+
+
+
+
+
+
FD Dashboard & Maturity Ladder
+ Core Banking
+
+
+ Active Fixed Deposits positioned against maturity dates. Press ESC to toggle header & footer.
+
+
+
+
+
+
+
+
+
+ @if (errorMessage) {
+
+
+ {{ errorMessage }}
+
+ }
+
+
+
+ @for (key of stageKeys; track key) {
+
+ }
+
+
+
+
+
+
+
+ @if (search) {
+
+ }
+
+
+ @if (stageFilter || search) {
+
+ }
+
+
+
+
+
+ {{ visibleRows.length }} of {{ summary.total }} active FDs
+
+
+
+
+ @if (loading) {
+
+
+
Loading FD maturity list...
+
+ } @else if (visibleRows.length === 0) {
+
+
+
+ @if (!stageFilter && summary.total > 0) {
+ No FDs are matured or maturing within {{ policy.upcomingDays }} days. Click "On Track" to see all active FDs.
+ } @else {
+ No FDs match these filters.
+ }
+
+ @if (crrSlr.status === 'ok') {
+ Within Limits
+ } @else if (crrSlr.status === 'short') {
+ Shortfall
+ } @else {
+ Not computed
+ }
+
diff --git a/src/app/home/dashboard/dashboard.component.scss b/src/app/home/dashboard/dashboard.component.scss
index c0d81a80e..1cde1703d 100644
--- a/src/app/home/dashboard/dashboard.component.scss
+++ b/src/app/home/dashboard/dashboard.component.scss
@@ -444,6 +444,17 @@ $purple: #7c3aed;
font-weight: 600;
}
+/* A figure that could not be computed. Deliberately not green: a tile that cannot read the ledger
+ has not found the bank compliant, and a success tag on an unknown position is a false all-clear. */
+.tag-muted {
+ background: #f3f4f6;
+ color: #4b5563;
+ padding: 2px 6px;
+ border-radius: 10px;
+ font-size: 10px;
+ font-weight: 600;
+}
+
/* ─── Compact Detail Cards ─── */
.dash-card.compact {
padding: 12px 16px;
diff --git a/src/app/home/dashboard/dashboard.component.ts b/src/app/home/dashboard/dashboard.component.ts
index 877f5b3f7..c0605e700 100644
--- a/src/app/home/dashboard/dashboard.component.ts
+++ b/src/app/home/dashboard/dashboard.component.ts
@@ -19,6 +19,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
import { AsyncPipe, DatePipe } from '@angular/common';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { RbiCircularsService } from '../../rbi-circulars/rbi-circulars.service';
/**
* Dashboard component.
*/
@@ -40,9 +41,29 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
export class DashboardComponent implements OnInit {
private router = inject(Router);
private dialog = inject(MatDialog);
+ private rbi = inject(RbiCircularsService);
today = new Date();
+ /**
+ * The CRR/SLR tile, read from the return.
+ *
+ * The amounts and the rates were both fixed text on the template until now, so the tile reported
+ * ₹2,077 Cr at 3% whatever the ledger held and whatever rate Admin was on. A dashboard figure is
+ * read as the bank's position, and one that cannot move is worse than none: nothing on the tile
+ * says it is a placeholder.
+ *
+ * Dashes until the return answers. 'status' drives the compliance tag, which is only claimed
+ * where the return states it.
+ */
+ crrSlr: {
+ crrRate: number | null;
+ slrRate: number | null;
+ crrRequired: string;
+ slrRequired: string;
+ status: 'ok' | 'short' | 'unknown';
+ } = { crrRate: null, slrRate: null, crrRequired: '—', slrRequired: '—', status: 'unknown' };
+
/** Array of all user activities */
userActivity: string[];
/** Array of most recent user activities */
@@ -67,6 +88,45 @@ export class DashboardComponent implements OnInit {
this.recentActivities = this.getRecentActivities();
this.frequentActivities = this.getFrequentActivities();
this.setFilteredActivities();
+ this.loadCrrSlr();
+ }
+
+ /** Fills the CRR/SLR tile from the return, leaving it dashed where the return cannot compute. */
+ private loadCrrSlr(): void {
+ const crore = (v: number | null | undefined): string =>
+ v === null || v === undefined ? '—' : `₹${Math.round(v / 1e7).toLocaleString('en-IN')} Cr`;
+
+ // The statutory Form 1, which is the return this bank files — twice a month, at the 15th and at
+ // the month end. The working report's 45-day lag lands mid-fortnight, on a date the bank never
+ // reported, so a tile built on it shows a position that appears on no filing.
+ this.rbi.getForm1Statutory().subscribe({
+ next: (data: any) => {
+ const latest = (data?.columns?.length ?? 0) - 1;
+ if (latest < 0) {
+ return;
+ }
+ this.crrSlr.crrRate = data?.crrPercentage ?? null;
+ this.crrSlr.slrRate = data?.slrPercentage ?? null;
+ this.crrSlr.crrRequired = crore(data?.partB?.required?.[latest]);
+ this.crrSlr.slrRequired = crore(data?.partC?.required?.[latest]);
+
+ // Compliant only where BOTH ratios are met: the tile carries one tag for the pair, and a
+ // bank short on SLR is not within limits because its cash reserve happens to be ample.
+ const crrHeld = data?.partB?.maintained?.[latest];
+ const crrNeed = data?.partB?.required?.[latest];
+ const slrHeld = data?.partC?.maintained?.[latest];
+ const slrNeed = data?.partC?.required?.[latest];
+ if ([
+ crrHeld,
+ crrNeed,
+ slrHeld,
+ slrNeed
+ ].every((v) => v !== null && v !== undefined)) {
+ this.crrSlr.status = crrHeld >= crrNeed && slrHeld >= slrNeed ? 'ok' : 'short';
+ }
+ },
+ error: () => undefined
+ });
}
/**
diff --git a/src/app/interest-posting-report/interest-posting-report.component.html b/src/app/interest-posting-report/interest-posting-report.component.html
new file mode 100644
index 000000000..b830e7b92
--- /dev/null
+++ b/src/app/interest-posting-report/interest-posting-report.component.html
@@ -0,0 +1,322 @@
+
+
+
+
+
+
Interest Posting Reports
+
+ Each branch gets its own report for each savings product, generated automatically at 12:00 PM on the posting
+ date and open to generating or regenerating at any time. The branch approves it, and its approved interest is
+ posted when the branch closes the day — it cannot close until then. The head office closes last.
+
+
+
+
+
+
+
+
+
+ @if (isHeadOffice) {
+
+
+
+
+ @if (tab === 'others') {
+
+
+
+ Each branch generates and approves its own reports. The head office can act here only for a branch that has
+ not opened the day, and only once every other open branch has closed. Anything it approves is marked (HO).
+
+
+ }
+ }
+
+ @if (showPreview) {
+
+
+
+
Interest preview — earned up to {{ previewAsOf }}
+
+ What each account would be paid if interest were posted today. View only — nothing is saved, approved or
+ posted.
+
+
+
+ Total so far
+ ₹{{ previewTotal | number: '1.2-2' }}
+ {{ previewRows.length }} account(s)
+
diff --git a/src/app/interest-posting-report/interest-posting-report.component.scss b/src/app/interest-posting-report/interest-posting-report.component.scss
new file mode 100644
index 000000000..a4d744927
--- /dev/null
+++ b/src/app/interest-posting-report/interest-posting-report.component.scss
@@ -0,0 +1,327 @@
+/**
+ * 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 {
+ --i-navy: #1a237e;
+ --i-blue: #1d4ed8;
+ --i-blue-l: #eff6ff;
+ --i-green: #15803d;
+ --i-green-l: #dcfce7;
+ --i-amber: #b45309;
+ --i-amber-l: #fef3c7;
+ --i-red: #c0392b;
+ --i-red-l: #fdecea;
+ --i-g100: #f1f5f9;
+ --i-g200: #e2e8f0;
+ --i-g500: #64748b;
+ --i-g900: #0f172a;
+
+ display: block;
+ font-family: 'DM Sans', system-ui, sans-serif;
+ color: var(--i-g900);
+}
+
+.ipr {
+ max-width: 1280px;
+ margin: 0 auto;
+ padding: 16px;
+}
+
+.ipr-head {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ align-items: flex-end;
+ gap: 12px;
+ margin-bottom: 14px;
+}
+
+.ipr-head-t {
+ margin: 0;
+ font-size: 22px;
+ color: var(--i-navy);
+}
+
+.ipr-head-s {
+ max-width: 720px;
+ margin-top: 4px;
+ font-size: 13px;
+ color: var(--i-g500);
+}
+
+.ipr-head-a {
+ display: flex;
+ align-items: flex-end;
+ gap: 8px;
+}
+
+.ipr-date {
+ display: flex;
+ flex-direction: column;
+ font-size: 11px;
+ color: var(--i-g500);
+
+ input,
+ select {
+ padding: 6px 8px;
+ border: 1px solid var(--i-g200);
+ border-radius: 6px;
+ font: inherit;
+ font-size: 13px;
+ }
+}
+
+.ipr-btn {
+ display: inline-flex;
+ align-items: center;
+ gap: 6px;
+ padding: 7px 12px;
+ border: 1px solid var(--i-g200);
+ border-radius: 6px;
+ background: #fff;
+ font: inherit;
+ font-size: 13px;
+ cursor: pointer;
+
+ &:disabled {
+ opacity: 0.55;
+ cursor: default;
+ }
+}
+
+.ipr-btn--primary {
+ border-color: var(--i-blue);
+ background: var(--i-blue);
+ color: #fff;
+}
+
+.ipr-btn--slim {
+ padding: 4px 10px;
+ font-size: 12px;
+}
+
+.ipr-alert {
+ display: flex;
+ gap: 8px;
+ margin-bottom: 10px;
+ padding: 10px 14px;
+ border-radius: 8px;
+ font-size: 13px;
+}
+
+.ipr-alert--error {
+ background: var(--i-red-l);
+ color: var(--i-red);
+}
+
+.ipr-alert--ok {
+ background: var(--i-green-l);
+ color: var(--i-green);
+}
+
+.ipr-alert--warn {
+ background: var(--i-amber-l);
+ color: var(--i-amber);
+}
+
+.ipr-card {
+ margin-bottom: 14px;
+ border: 1px solid var(--i-g200);
+ border-radius: 10px;
+ background: #fff;
+ overflow-x: auto;
+}
+
+.ipr-table {
+ width: 100%;
+ border-collapse: collapse;
+ font-size: 13px;
+
+ th,
+ td {
+ padding: 9px 12px;
+ border-bottom: 1px solid var(--i-g100);
+ text-align: left;
+ vertical-align: top;
+ }
+
+ th {
+ background: var(--i-g100);
+ font-size: 11px;
+ text-transform: uppercase;
+ letter-spacing: 0.03em;
+ color: var(--i-g500);
+ }
+
+ tbody tr {
+ cursor: pointer;
+ }
+
+ tbody tr.is-selected {
+ background: var(--i-blue-l);
+ }
+
+ .num {
+ text-align: right;
+ white-space: nowrap;
+ }
+
+ .actions {
+ display: flex;
+ gap: 6px;
+ justify-content: flex-end;
+ cursor: default;
+ }
+
+ tfoot td {
+ background: var(--i-g100);
+ }
+}
+
+.muted {
+ color: var(--i-g500);
+ font-size: 12px;
+}
+
+.ipr-empty {
+ padding: 24px !important;
+ text-align: center !important;
+ color: var(--i-g500);
+}
+
+.ipr-badge {
+ display: inline-block;
+ padding: 2px 8px;
+ border-radius: 10px;
+ font-size: 11px;
+ font-weight: 600;
+}
+
+.ipr-badge--pending {
+ background: var(--i-amber-l);
+ color: var(--i-amber);
+}
+
+.ipr-badge--approved {
+ background: var(--i-blue-l);
+ color: var(--i-blue);
+}
+
+.ipr-badge--posted {
+ background: var(--i-green-l);
+ color: var(--i-green);
+}
+
+.ipr-badge--muted {
+ background: var(--i-g100);
+ color: var(--i-g500);
+}
+
+.ipr-fail {
+ margin-top: 4px;
+ font-size: 11px;
+ color: var(--i-red);
+}
+
+.ipr-detail-head {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ gap: 12px;
+ padding: 14px 16px;
+
+ h3 {
+ margin: 0 0 4px;
+ font-size: 16px;
+ color: var(--i-navy);
+ }
+}
+
+.ipr-total {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-end;
+
+ strong {
+ font-size: 22px;
+ color: var(--i-navy);
+ }
+}
+
+.ipr-due-body {
+ display: flex;
+ flex-direction: column;
+ gap: 6px;
+ flex: 1;
+}
+
+.ipr-due-row {
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ gap: 8px;
+}
+
+// Approved by the head office on behalf of a branch that did not open that day.
+.ipr-behalf {
+ margin-left: 4px;
+ font-size: 11px;
+ font-weight: 600;
+ color: var(--i-amber);
+}
+
+// Preview: refresh / export / close, above the totals.
+.ipr-preview-actions {
+ display: flex;
+ gap: 6px;
+ justify-content: flex-end;
+ padding: 0 16px 10px;
+}
+
+.ipr-tabs {
+ display: flex;
+ gap: 4px;
+ margin-bottom: 12px;
+ border-bottom: 1px solid var(--i-g200);
+}
+
+.ipr-tab {
+ display: inline-flex;
+ align-items: center;
+ gap: 6px;
+ padding: 8px 14px;
+ margin-bottom: -1px;
+ font-size: 13px;
+ font-weight: 600;
+ color: var(--i-g500);
+ cursor: pointer;
+ background: transparent;
+ border: 1px solid transparent;
+ border-radius: 6px 6px 0 0;
+
+ &.is-active {
+ color: var(--i-navy);
+ background: #fff;
+ border-color: var(--i-g200);
+ border-bottom-color: #fff;
+ }
+}
+
+.ipr-alert--info {
+ background: var(--i-blue-l);
+ color: var(--i-blue);
+}
+
+.ipr-blocked {
+ display: inline-block;
+ max-width: 320px;
+ font-size: 11px;
+ line-height: 1.35;
+ color: var(--i-g500);
+ white-space: normal;
+}
diff --git a/src/app/interest-posting-report/interest-posting-report.component.ts b/src/app/interest-posting-report/interest-posting-report.component.ts
new file mode 100644
index 000000000..c4fd3f1ad
--- /dev/null
+++ b/src/app/interest-posting-report/interest-posting-report.component.ts
@@ -0,0 +1,398 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component, OnInit, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { SettingsService } from 'app/settings/settings.service';
+import { exportWorkbook } from '../cashier/cashier-export';
+import {
+ InterestPostingDue,
+ InterestPostingReport,
+ InterestPostingReportDetail,
+ InterestPostingReportService,
+ InterestPreviewRow,
+ ReportScope
+} from './interest-posting-report.service';
+
+/**
+ * Savings interest posting reports.
+ *
+ * On a product's posting date the system generates, at noon, the list of what each savings account
+ * will be paid. It is reviewed and approved here; the approved amounts are posted when the last
+ * branch closes the day, and until then no branch can close. Regenerating replaces the report and
+ * needs approving again.
+ */
+@Component({
+ selector: 'mifosx-interest-posting-report',
+ templateUrl: './interest-posting-report.component.html',
+ styleUrls: ['./interest-posting-report.component.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ FormsModule,
+ FaIconComponent
+ ]
+})
+export class InterestPostingReportComponent implements OnInit {
+ private reportService = inject(InterestPostingReportService);
+ private settingsService = inject(SettingsService);
+
+ postingDate = '';
+ loading = false;
+ busy = false;
+ errorMessage = '';
+ notice = '';
+
+ reports: InterestPostingReport[] = [];
+ selected: InterestPostingReportDetail | null = null;
+ /** Products with interest due and no report yet — the noon job ran before they had anything due, or failed. */
+ due: InterestPostingDue[] = [];
+
+ /** 'own' — the user's own branch; 'others' — every other branch, a head-office-only tab. */
+ tab: ReportScope = 'own';
+ isHeadOffice = false;
+ myBranch = '';
+
+ ngOnInit(): void {
+ this.postingDate = this.businessDateIso();
+ this.reportService.context().subscribe({
+ next: (ctx) => {
+ this.isHeadOffice = !!ctx?.headOffice;
+ this.myBranch = ctx?.officeName ?? '';
+ },
+ error: () => (this.isHeadOffice = false)
+ });
+ this.load();
+ }
+
+ switchTab(tab: ReportScope): void {
+ if (this.tab === tab) {
+ return;
+ }
+ this.tab = tab;
+ this.selected = null;
+ this.notice = '';
+ this.load();
+ }
+
+ /** Acting for another branch is the head office's exception, so it is spelt out before it happens. */
+ private confirmOnBehalf(officeName: string, action: string): boolean {
+ if (this.tab !== 'others') {
+ return true;
+ }
+ return confirm(
+ `${officeName} has not opened today. You are about to ${action} its interest posting report on its behalf, ` +
+ 'from the head office. Continue?'
+ );
+ }
+
+ load(): void {
+ this.loading = true;
+ this.errorMessage = '';
+ this.reportService.list(this.postingDate || undefined, undefined, undefined, this.tab).subscribe({
+ next: (reports) => {
+ this.reports = reports ?? [];
+ this.loading = false;
+ const stillThere = this.selected && this.reports.find((r) => r.id === this.selected?.id);
+ if (stillThere) {
+ this.open(stillThere);
+ } else {
+ this.selected = null;
+ }
+ },
+ error: (err) => {
+ this.loading = false;
+ this.errorMessage = this.messageOf(err, 'Could not load the interest posting reports.');
+ }
+ });
+ this.reportService.dueWithoutReport(this.postingDate || undefined, this.tab).subscribe({
+ next: (due) => (this.due = due ?? []),
+ error: () => (this.due = [])
+ });
+ }
+
+ generate(item: InterestPostingDue): void {
+ if (!this.confirmOnBehalf(item.officeName, 'generate')) {
+ return;
+ }
+ this.busy = true;
+ this.notice = '';
+ this.errorMessage = '';
+ this.reportService.regenerate(item.productId, item.officeId, item.postingDate).subscribe({
+ next: (res) => {
+ this.busy = false;
+ this.notice = `Report generated for ${item.productName} — ${item.officeName}. Review and approve it.`;
+ this.load();
+ this.reportService.detail(res.reportId).subscribe((detail) => (this.selected = detail));
+ },
+ error: (err) => {
+ this.busy = false;
+ this.errorMessage = this.messageOf(err, 'Could not generate the report.');
+ }
+ });
+ }
+
+ open(report: InterestPostingReport): void {
+ this.errorMessage = '';
+ this.reportService.detail(report.id).subscribe({
+ next: (detail) => (this.selected = detail),
+ error: (err) => (this.errorMessage = this.messageOf(err, 'Could not load the report.'))
+ });
+ }
+
+ regenerate(report: InterestPostingReport): void {
+ if (
+ !confirm(
+ `Regenerate the interest posting report for ${report.productName} — ${report.officeName}? It will need approving again.`
+ ) ||
+ !this.confirmOnBehalf(report.officeName, 'regenerate')
+ ) {
+ return;
+ }
+ this.busy = true;
+ this.notice = '';
+ this.errorMessage = '';
+ this.reportService.regenerate(report.productId, report.officeId, report.postingDate).subscribe({
+ next: (res) => {
+ this.busy = false;
+ this.notice = `Report regenerated for ${report.productName}. Review and approve it.`;
+ this.selected = null;
+ this.load();
+ this.reportService.detail(res.reportId).subscribe((detail) => (this.selected = detail));
+ },
+ error: (err) => {
+ this.busy = false;
+ this.errorMessage = this.messageOf(err, 'Could not regenerate the report.');
+ }
+ });
+ }
+
+ approve(report: InterestPostingReport): void {
+ if (
+ !confirm(
+ `Approve interest of ₹${report.totalInterest} across ${report.accountCount} account(s) for ${report.productName}? ` +
+ 'It will be posted when the branch closes the day.'
+ ) ||
+ !this.confirmOnBehalf(report.officeName, 'approve')
+ ) {
+ return;
+ }
+ this.busy = true;
+ this.notice = '';
+ this.errorMessage = '';
+ this.reportService.approve(report.id).subscribe({
+ next: () => {
+ this.busy = false;
+ this.notice = `Approved. Interest for ${report.productName} — ${report.officeName} will be posted when the branch closes the day.`;
+ this.load();
+ },
+ error: (err) => {
+ this.busy = false;
+ this.errorMessage = this.messageOf(err, 'Could not approve the report.');
+ }
+ });
+ }
+
+ canRegenerate(report: InterestPostingReport): boolean {
+ return report.canAct && (report.status === 'GENERATED' || report.status === 'APPROVED');
+ }
+
+ canApprove(report: InterestPostingReport): boolean {
+ return report.canAct && report.status === 'GENERATED';
+ }
+
+ statusClass(status: string): string {
+ return (
+ {
+ GENERATED: 'ipr-badge--pending',
+ APPROVED: 'ipr-badge--approved',
+ POSTED: 'ipr-badge--posted',
+ SUPERSEDED: 'ipr-badge--muted'
+ }[status] ?? 'ipr-badge--muted'
+ );
+ }
+
+ /** Pending reports that block this user's own day close; another branch's pending reports block only that branch. */
+ get pendingCount(): number {
+ return this.tab === 'own' ? this.reports.filter((r) => r.status === 'GENERATED').length : 0;
+ }
+
+ // ── Preview: what each account has earned so far, as if posted today. View only. ──
+
+ showPreview = false;
+ previewLoading = false;
+ previewRows: InterestPreviewRow[] = [];
+ previewAsOf = '';
+
+ openPreview(): void {
+ this.showPreview = true;
+ this.previewLoading = true;
+ this.errorMessage = '';
+ this.reportService.preview().subscribe({
+ next: (rows) => {
+ this.previewRows = rows ?? [];
+ this.previewAsOf = this.previewRows[0]?.asOf ?? this.businessDateIso();
+ this.previewLoading = false;
+ },
+ error: (err) => {
+ this.previewLoading = false;
+ this.previewRows = [];
+ this.errorMessage = this.messageOf(err, 'Could not load the interest preview.');
+ }
+ });
+ }
+
+ closePreview(): void {
+ this.showPreview = false;
+ }
+
+ get previewTotal(): number {
+ return this.previewRows.reduce((sum, r) => sum + Number(r.interest || 0), 0);
+ }
+
+ /** Totals by branch and product, for the summary above the account list and the export. */
+ get previewGroups(): {
+ officeName: string;
+ productName: string;
+ postingDate: string;
+ accounts: number;
+ interest: number;
+ }[] {
+ const map = new Map<
+ string,
+ { officeName: string; productName: string; postingDate: string; accounts: number; interest: number }
+ >();
+ this.previewRows.forEach((r) => {
+ const key = `${r.officeName}|${r.productName}`;
+ const g = map.get(key) ?? {
+ officeName: r.officeName,
+ productName: r.productName,
+ postingDate: r.postingDate,
+ accounts: 0,
+ interest: 0
+ };
+ g.accounts += 1;
+ g.interest += Number(r.interest || 0);
+ map.set(key, g);
+ });
+ return [...map.values()];
+ }
+
+ exportPreview(): void {
+ const stamp = `Interest earned to ${this.previewAsOf} — preview, not posted`;
+ exportWorkbook(
+ [
+ {
+ sheetName: 'By account',
+ title: 'Savings Interest Preview',
+ subtitle: stamp,
+ headers: [
+ 'Branch',
+ 'Product',
+ 'Account No',
+ 'Customer',
+ 'Balance',
+ 'Rate %',
+ 'Cycle Start',
+ 'Posting Date',
+ 'Interest So Far'
+ ],
+ widths: [
+ 18,
+ 22,
+ 20,
+ 26,
+ 16,
+ 8,
+ 12,
+ 12,
+ 16
+ ],
+ rows: [
+ ...this.previewRows.map((r) => [
+ r.officeName,
+ r.productName,
+ r.accountNo,
+ r.clientName,
+ Number(r.balance || 0),
+ Number(r.rate || 0),
+ r.cycleStart,
+ r.postingDate,
+ Number(r.interest || 0)
+ ]),
+ [
+ 'TOTAL',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ this.previewTotal
+ ]
+ ]
+ },
+ {
+ sheetName: 'By branch & product',
+ title: 'Savings Interest Preview — Totals',
+ subtitle: stamp,
+ headers: [
+ 'Branch',
+ 'Product',
+ 'Posting Date',
+ 'Accounts',
+ 'Interest So Far'
+ ],
+ widths: [
+ 18,
+ 22,
+ 12,
+ 10,
+ 16
+ ],
+ rows: [
+ ...this.previewGroups.map((g) => [
+ g.officeName,
+ g.productName,
+ g.postingDate,
+ g.accounts,
+ g.interest
+ ]),
+ [
+ 'TOTAL',
+ '',
+ '',
+ this.previewRows.length,
+ this.previewTotal
+ ]
+ ]
+ }
+ ],
+ `savings-interest-preview-${this.previewAsOf}`
+ );
+ }
+
+ private businessDateIso(): string {
+ const businessDate = this.settingsService.businessDate as any;
+ const parsed = businessDate ? new Date(businessDate) : new Date();
+ if (isNaN(parsed.getTime())) {
+ return new Date().toISOString().slice(0, 10);
+ }
+ const month = String(parsed.getMonth() + 1).padStart(2, '0');
+ const day = String(parsed.getDate()).padStart(2, '0');
+ return `${parsed.getFullYear()}-${month}-${day}`;
+ }
+
+ private messageOf(err: any, fallback: string): string {
+ return (
+ err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.defaultUserMessage ?? err?.error?.message ?? fallback
+ );
+ }
+}
diff --git a/src/app/interest-posting-report/interest-posting-report.service.ts b/src/app/interest-posting-report/interest-posting-report.service.ts
new file mode 100644
index 000000000..7d2466e49
--- /dev/null
+++ b/src/app/interest-posting-report/interest-posting-report.service.ts
@@ -0,0 +1,180 @@
+/**
+ * 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 { Injectable, inject } from '@angular/core';
+import { HttpClient, HttpParams } from '@angular/common/http';
+import { Observable } from 'rxjs';
+
+export type InterestPostingReportStatus = 'GENERATED' | 'APPROVED' | 'POSTED' | 'SUPERSEDED';
+
+/** Which branches a list covers: the user's own, or (head office only) every other branch. */
+export type ReportScope = 'own' | 'others';
+
+export interface InterestPostingReport {
+ id: number;
+ productId: number;
+ productName: string;
+ officeId: number;
+ officeName: string;
+ postingDate: string;
+ status: InterestPostingReportStatus;
+ totalInterest: number;
+ accountCount: number;
+ generationMode: 'AUTO' | 'MANUAL';
+ generatedAt: string;
+ generatedBy: string | null;
+ approvedAt: string | null;
+ approvedBy: string | null;
+ approvedOnBehalf: boolean;
+ postedAt: string | null;
+ failureReason: string | null;
+ /** Whether the signed-in user may regenerate or approve it: their own branch, or the head office for a branch that did not open. */
+ canAct: boolean;
+ /** Why not, where canAct is false. */
+ blockedReason: string | null;
+}
+
+export interface InterestPostingReportLine {
+ savingsAccountId: number;
+ accountNo: string;
+ clientName: string;
+ interestAmount: number;
+ balanceBefore: number;
+ balanceAfter: number;
+ savingsTransactionId: number | null;
+}
+
+export interface InterestPostingReportDetail extends InterestPostingReport {
+ payableGlCode: string | null;
+ payableGlName: string | null;
+ paidGlCode: string | null;
+ paidGlName: string | null;
+ expenseGlCode: string | null;
+ expenseGlName: string | null;
+ lines: InterestPostingReportLine[];
+}
+
+export interface InterestPostingDue {
+ productId: number;
+ productName: string;
+ officeId: number;
+ officeName: string;
+ postingDate: string;
+ canAct: boolean;
+ blockedReason: string | null;
+}
+
+export interface InterestPostingSummaryRow {
+ id: number;
+ postingDate: string;
+ officeId: number;
+ officeName: string;
+ productId: number;
+ productName: string;
+ accountCount: number;
+ totalInterest: number;
+ status: InterestPostingReportStatus;
+ approvedBy: string | null;
+ approvedOnBehalf: boolean;
+ approvedAt: string | null;
+ postedAt: string | null;
+}
+
+export interface InterestPreviewRow {
+ officeId: number;
+ officeName: string;
+ productId: number;
+ productName: string;
+ savingsAccountId: number;
+ accountNo: string;
+ clientName: string;
+ balance: number;
+ rate: number;
+ cycleStart: string;
+ postingDate: string;
+ asOf: string;
+ interest: number;
+}
+
+/**
+ * The savings interest posting reports, one per branch and product: generated at noon on a posting
+ * date, approved by the branch, posted when the branch closes the day.
+ */
+@Injectable({ providedIn: 'root' })
+export class InterestPostingReportService {
+ private http = inject(HttpClient);
+ private readonly base = '/savingsinterestpostingreports';
+
+ /** scope 'own' is the user's own branch; 'others' (head office only) every other branch. */
+ list(
+ postingDate?: string,
+ status?: string,
+ officeId?: number,
+ scope?: ReportScope
+ ): Observable {
+ let params = new HttpParams();
+ if (scope) params = params.set('scope', scope);
+ if (postingDate) params = params.set('postingDate', postingDate);
+ if (status) params = params.set('status', status);
+ if (officeId) params = params.set('officeId', String(officeId));
+ return this.http.get(this.base, { params });
+ }
+
+ /** Branch and product pairs with interest due by the date and no report yet, that this user may generate. */
+ dueWithoutReport(postingDate?: string, scope?: ReportScope): Observable {
+ let params = new HttpParams();
+ if (scope) params = params.set('scope', scope);
+ if (postingDate) params = params.set('postingDate', postingDate);
+ return this.http.get(`${this.base}/due-without-report`, { params });
+ }
+
+ /** The signed-in user's branch, and whether it is the head office. */
+ context(): Observable<{ officeId: number; officeName: string; headOffice: boolean }> {
+ return this.http.get<{ officeId: number; officeName: string; headOffice: boolean }>(`${this.base}/context`);
+ }
+
+ detail(reportId: number): Observable {
+ return this.http.get(`${this.base}/${reportId}`);
+ }
+
+ regenerate(
+ productId: number,
+ officeId: number,
+ postingDate: string
+ ): Observable<{ reportId: number; status: string }> {
+ return this.http.post<{ reportId: number; status: string }>(
+ this.base,
+ { productId, officeId, postingDate },
+ { params: new HttpParams().set('command', 'regenerate') }
+ );
+ }
+
+ approve(reportId: number): Observable<{ reportId: number; status: string }> {
+ return this.http.post<{ reportId: number; status: string }>(
+ `${this.base}/${reportId}`,
+ {},
+ { params: new HttpParams().set('command', 'approve') }
+ );
+ }
+
+ /** Interest each account has earned so far this cycle, as if posted today. View only. */
+ preview(officeId?: number): Observable {
+ let params = new HttpParams();
+ if (officeId) params = params.set('officeId', String(officeId));
+ return this.http.get(`${this.base}/preview`, { params });
+ }
+
+ /** The head office's branch-wise view over a date range. */
+ summary(fromDate?: string, toDate?: string, productId?: number): Observable {
+ let params = new HttpParams();
+ if (fromDate) params = params.set('fromDate', fromDate);
+ if (toDate) params = params.set('toDate', toDate);
+ if (productId) params = params.set('productId', String(productId));
+ return this.http.get(`${this.base}/summary`, { params });
+ }
+}
diff --git a/src/app/interest-posting-summary/interest-posting-summary.component.html b/src/app/interest-posting-summary/interest-posting-summary.component.html
new file mode 100644
index 000000000..8ecca4e98
--- /dev/null
+++ b/src/app/interest-posting-summary/interest-posting-summary.component.html
@@ -0,0 +1,172 @@
+
+
+
+
+
+
Interest Posting Summary
+
+ Savings interest across every branch: for each posting date, branch and product, how many customers were paid
+ and how much. Each branch approves and posts its own; this is the head office's view.
+
+
+
+
+
+
+
+
+
+
+
+ @if (errorMessage) {
+
+
+
{{ errorMessage }}
+
+ }
+ @if (pendingCount > 0) {
+
+
+
{{ pendingCount }} branch report(s) in this period are not posted yet.
- OD Account Closed with Zero Balance in Day Closing
+ End OD Once Fully Repaid (One-time OD only)
- Automatically closes OD accounts when balance reaches zero during day-end closing.
+ At day-end, withdraws the OD sanction when the debit balance is cleared to zero. Only the OD ends, not
+ the account. Leave off for a regular OD: a customer who uses it and repays the same day would lose it.
- Average Balance Calculation in Period
-
- 6M
- 1Y
- 3Y
-
-
-
-
- Valid for Period
-
- 3M
- 1Y
- 3Y
-
-
-
- OD Limit %
+ Maximum OD Limit (₹)
+ Highest per account
+ Enter the maximum OD limit
- Interest on OD %
-
+ Minimum OD Limit (₹)
+
+ Lowest per account
+ @if (CurrentProductSettingsForm.get('odMinLimit')?.hasError('exceedsMax')) {
+ Cannot exceed the maximum OD limit
+ } @else {
+ Cannot be negative
+ }
+
+
+ OD Security Type
+
+ @for (option of odSecurityTypeOptions; track option.value) {
+ {{ option.label }}
+ }
+
+
Off: a withdrawal that would cross the limit is refused.
+ } @else {
+
+
+ Maximum Excess (% of limit)
+
+ Beyond this, refused
+ Enter above 0% and up to 25%
+
+
+
+ Penal Charge on Excess (% p.a.)
+
+ Only on the excess amount
+ Enter above 0% and up to 50%
+
+
+ @if (excessExample) {
+
{{ excessExample }}
+ }
+ }
+
+
+
+ Each account is sanctioned its own limit within this range, valid for the period above. The OD interest
+ rate is set on the Terms tab.
+
}
diff --git a/src/app/products/current-products/current-product-stepper/current-product-settings-step/current-product-settings-step.component.ts b/src/app/products/current-products/current-product-stepper/current-product-settings-step/current-product-settings-step.component.ts
index de2e04d2d..f68d32c94 100644
--- a/src/app/products/current-products/current-product-stepper/current-product-settings-step/current-product-settings-step.component.ts
+++ b/src/app/products/current-products/current-product-stepper/current-product-settings-step/current-product-settings-step.component.ts
@@ -7,7 +7,7 @@
*/
import { Component, OnInit, Input, inject } from '@angular/core';
-import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
+import { AbstractControl, UntypedFormGroup, UntypedFormBuilder, ValidationErrors, Validators } from '@angular/forms';
import { MatCheckbox } from '@angular/material/checkbox';
import { MatRadioGroup, MatRadioButton } from '@angular/material/radio';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -40,6 +40,21 @@ export class CurrentProductSettingsStepComponent implements OnInit {
{ id: 'YEARS', value: 'value.years' }
];
+ /** How long an OD sanction on this product runs before it must be renewed. */
+ odValidityOptions = [
+ { value: '3M', label: '3 Months' },
+ { value: '6M', label: '6 Months' },
+ { value: '1Y', label: '1 Year' },
+ { value: '2Y', label: '2 Years' },
+ { value: '3Y', label: '3 Years' }
+ ];
+
+ odSecurityTypeOptions = [
+ { value: 'CLEAN', label: 'Clean', hint: 'No security needed' },
+ { value: 'SECURED', label: 'Secured', hint: 'Against FD lien, property, etc.' },
+ { value: 'BOTH', label: 'Both', hint: 'Decided at each sanction' }
+ ];
+
constructor() {
this.createCurrentProductSettingsForm();
this.setConditionalControls();
@@ -72,14 +87,15 @@ export class CurrentProductSettingsStepComponent implements OnInit {
daysToEscheat: isEditing
? this.CurrentProductsTemplate.daysToEscheat || DORMANCY_DEFAULTS.daysToEscheat
: DORMANCY_DEFAULTS.daysToEscheat,
- // Overdraft fields
+ // Overdraft scheme (the OD interest rate lives on the Terms tab)
allowOverdraft: isEditing ? (this.CurrentProductsTemplate.allowOverdraft ?? false) : false,
overdraftLimit: isEditing ? this.CurrentProductsTemplate.overdraftLimit : '',
- nominalAnnualInterestRateOverdraft: isEditing
- ? this.CurrentProductsTemplate.nominalAnnualInterestRateOverdraft
- : '',
- avgBalanceCalcPeriod: isEditing ? this.CurrentProductsTemplate.avgBalanceCalcPeriod || '1Y' : '1Y',
- validForPeriod: isEditing ? this.CurrentProductsTemplate.validForPeriod || '1Y' : '1Y',
+ odMinLimit: isEditing ? this.CurrentProductsTemplate.odMinLimit : '',
+ odSecurityType: isEditing ? this.CurrentProductsTemplate.odSecurityType || 'CLEAN' : 'CLEAN',
+ validForPeriod: this.validityOrDefault(isEditing ? this.CurrentProductsTemplate.validForPeriod : null),
+ odExcessAllowed: isEditing ? !!this.CurrentProductsTemplate.odExcessAllowed : false,
+ odExcessLimitPercent: isEditing ? this.CurrentProductsTemplate.odExcessLimitPercent : '',
+ odPenalRate: isEditing ? this.CurrentProductsTemplate.odPenalRate : '',
odAccountClosedZeroBalanceInDayClosing: isEditing
? (this.CurrentProductsTemplate.odAccountClosedZeroBalanceInDayClosing ?? false)
: false
@@ -123,23 +139,119 @@ export class CurrentProductSettingsStepComponent implements OnInit {
daysToInactive: [DORMANCY_DEFAULTS.daysToInactive],
daysToDormancy: [DORMANCY_DEFAULTS.daysToDormancy],
daysToEscheat: [DORMANCY_DEFAULTS.daysToEscheat],
- // Overdraft (OD) Facility
+ // Overdraft (OD) Facility: the scheme an account's OD sanction is held to
allowOverdraft: [false],
- overdraftLimit: [
- '',
- [Validators.min(0)]
- ],
- nominalAnnualInterestRateOverdraft: [
- '',
- [Validators.min(0)]
- ],
- avgBalanceCalcPeriod: ['1Y'],
+ overdraftLimit: [''],
+ odMinLimit: [''],
+ odSecurityType: ['CLEAN'],
validForPeriod: ['1Y'],
+ // Excess drawing past the sanctioned limit: off means it is refused
+ odExcessAllowed: [false],
+ odExcessLimitPercent: [''],
+ odPenalRate: [''],
odAccountClosedZeroBalanceInDayClosing: [false]
});
}
+ get selectedSecurityTypeHint(): string {
+ const selected = this.CurrentProductSettingsForm.get('odSecurityType')?.value;
+ return this.odSecurityTypeOptions.find((option) => option.value === selected)?.hint ?? '';
+ }
+
+ /** A worked example on the maximum limit, so the percentages read as rupees. */
+ get excessExample(): string {
+ const value = this.CurrentProductSettingsForm.value;
+ const limit = Number(value.overdraftLimit);
+ const percent = Number(value.odExcessLimitPercent);
+ const penal = Number(value.odPenalRate);
+ if (!limit || !percent) return '';
+ const excess = (limit * percent) / 100;
+ const inr = (n: number) => '₹' + n.toLocaleString('en-IN', { maximumFractionDigits: 2 });
+ let text = `On a ${inr(limit)} limit, up to ${inr(excess)} more may be drawn.`;
+ if (penal) {
+ text += ` If ${inr(excess)} stays over the limit for a day, the penal charge is ${inr((excess * penal) / 100 / 365)}.`;
+ }
+ return text;
+ }
+
+ private validityOrDefault(value: string | null): string {
+ return this.odValidityOptions.some((option) => option.value === value) ? value : '1Y';
+ }
+
+ /** The minimum sanction may not exceed the maximum. */
+ private odMinWithinMax = (control: AbstractControl): ValidationErrors | null => {
+ const max = Number(this.CurrentProductSettingsForm?.get('overdraftLimit')?.value);
+ const min = Number(control.value);
+ if (control.value === '' || control.value === null || !max) return null;
+ return min > max ? { exceedsMax: true } : null;
+ };
+
+ private applyOverdraftValidators(allowed: boolean) {
+ const max = this.CurrentProductSettingsForm.get('overdraftLimit');
+ const min = this.CurrentProductSettingsForm.get('odMinLimit');
+ const security = this.CurrentProductSettingsForm.get('odSecurityType');
+ const validity = this.CurrentProductSettingsForm.get('validForPeriod');
+ if (allowed) {
+ max.setValidators([
+ Validators.required,
+ Validators.min(1)
+ ]);
+ min.setValidators([
+ Validators.min(0),
+ this.odMinWithinMax
+ ]);
+ security.setValidators([Validators.required]);
+ validity.setValidators([Validators.required]);
+ } else {
+ [
+ max,
+ min,
+ security,
+ validity
+ ].forEach((control) => control.clearValidators());
+ }
+ [
+ max,
+ min,
+ security,
+ validity
+ ].forEach((control) => control.updateValueAndValidity({ emitEvent: false }));
+ this.applyExcessValidators();
+ }
+
+ /** The excess cap and penal rate are required only while both OD and excess drawing are on. */
+ private applyExcessValidators() {
+ const form = this.CurrentProductSettingsForm;
+ const required = !!form.get('allowOverdraft').value && !!form.get('odExcessAllowed').value;
+ const percent = form.get('odExcessLimitPercent');
+ const penal = form.get('odPenalRate');
+ percent.setValidators(
+ required ? [
+ Validators.required,
+ Validators.min(0.01),
+ Validators.max(25)
+ ] : []
+ );
+ penal.setValidators(
+ required ? [
+ Validators.required,
+ Validators.min(0.01),
+ Validators.max(50)
+ ] : []
+ );
+ percent.updateValueAndValidity({ emitEvent: false });
+ penal.updateValueAndValidity({ emitEvent: false });
+ }
+
setConditionalControls() {
+ this.CurrentProductSettingsForm.get('allowOverdraft').valueChanges.subscribe((allowed: boolean) =>
+ this.applyOverdraftValidators(!!allowed)
+ );
+ this.CurrentProductSettingsForm.get('odExcessAllowed').valueChanges.subscribe(() => this.applyExcessValidators());
+ this.CurrentProductSettingsForm.get('overdraftLimit').valueChanges.subscribe(() =>
+ this.CurrentProductSettingsForm.get('odMinLimit').updateValueAndValidity({ emitEvent: false })
+ );
+
this.CurrentProductSettingsForm.get('enableLockinPeriod').valueChanges.subscribe((enabled: boolean) => {
const freq = this.CurrentProductSettingsForm.get('lockinPeriodFrequency');
const type = this.CurrentProductSettingsForm.get('lockinPeriodFrequencyType');
@@ -168,10 +280,15 @@ export class CurrentProductSettingsStepComponent implements OnInit {
if (!formValue.allowOverdraft) {
delete formValue.overdraftLimit;
- delete formValue.nominalAnnualInterestRateOverdraft;
- delete formValue.avgBalanceCalcPeriod;
+ delete formValue.odMinLimit;
+ delete formValue.odSecurityType;
delete formValue.validForPeriod;
delete formValue.odAccountClosedZeroBalanceInDayClosing;
+ delete formValue.odExcessAllowed;
+ }
+ if (!formValue.allowOverdraft || !formValue.odExcessAllowed) {
+ delete formValue.odExcessLimitPercent;
+ delete formValue.odPenalRate;
}
return formValue;
diff --git a/src/app/products/current-products/current-product-stepper/current-product-terms-step/current-product-terms-step.component.html b/src/app/products/current-products/current-product-stepper/current-product-terms-step/current-product-terms-step.component.html
index f2350d95a..a7d6adee9 100644
--- a/src/app/products/current-products/current-product-stepper/current-product-terms-step/current-product-terms-step.component.html
+++ b/src/app/products/current-products/current-product-stepper/current-product-terms-step/current-product-terms-step.component.html
@@ -13,20 +13,78 @@
Interest On OD
- Frequency Fix Day
- {{ currentProduct.frequencyFixDay }}
-
- }
- @if (currentProduct.lastInterestDate) {
-
- Last Interest Date
- {{ currentProduct.lastInterestDate | dateFormat }}
+ Days in Year
+ {{ currentProduct.interestCalculationDaysInYearType.id }} Days
diff --git a/src/app/products/current-products/view-current-product/current-product-general-tab/current-product-general-tab.component.ts b/src/app/products/current-products/view-current-product/current-product-general-tab/current-product-general-tab.component.ts
index 40c634e85..3b9f19df2 100644
--- a/src/app/products/current-products/view-current-product/current-product-general-tab/current-product-general-tab.component.ts
+++ b/src/app/products/current-products/view-current-product/current-product-general-tab/current-product-general-tab.component.ts
@@ -22,7 +22,6 @@ import {
MatRowDef,
MatRow
} from '@angular/material/table';
-import { ViewSavingsAccountingDetailsComponent } from '../../../../shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component';
import { DateFormatPipe } from '../../../../pipes/date-format.pipe';
import { FormatNumberPipe } from '../../../../pipes/format-number.pipe';
import { YesnoPipe } from '../../../../pipes/yesno.pipe';
@@ -47,7 +46,6 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
MatHeaderRow,
MatRowDef,
MatRow,
- ViewSavingsAccountingDetailsComponent,
DateFormatPipe,
FormatNumberPipe,
YesnoPipe
@@ -102,4 +100,20 @@ export class CurrentProductGeneralTabComponent {
isCashOrAccrualAccounting(): boolean {
return this.accounting.isCashOrAccrualAccounting(this.currentProduct.accountingRule);
}
+
+ /** The GLs a current product maps, by the names the Accounting tab gives them. */
+ get currentAccountingRows(): Array<{ label: string; account: any }> {
+ const m = this.currentProduct?.accountingMappings || {};
+ const rows = [
+ { label: 'Current Control (Liability)', account: m.savingsControlAccount },
+ { label: 'Overdraft Portfolio Control (Asset)', account: m.overdraftPortfolioControl },
+ { label: 'Income From Fees', account: m.incomeFromFeeAccount },
+ { label: 'Income From Penalties', account: m.incomeFromPenaltyAccount },
+ { label: 'Income From Interest', account: m.incomeFromInterest }
+ ];
+ if (this.currentProduct?.isDormancyTrackingActive) {
+ rows.push({ label: 'Escheat Liability', account: m.escheatLiabilityAccount });
+ }
+ return rows;
+ }
}
diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts
index 921f9773e..e1004052a 100644
--- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts
+++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts
@@ -24,6 +24,10 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
type AccountingSectionKey = 'assets' | 'liabilities' | 'expenses' | 'income';
+const SAVINGS_INTEREST_PAYABLE_ACCOUNT_NAME = 'Savings Interest Payable';
+const FIXED_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME = 'Fixed Deposit Interest Paid';
+const SAVINGS_INTEREST_PAID_ACCOUNT_NAME = 'Savings Interest Paid';
+
type AccountingRowConfig = {
key: string;
label: string;
@@ -128,6 +132,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
feesReceivableAccountId: [''],
penaltiesReceivableAccountId: [''],
interestPayableAccountId: [''],
+ savingsInterestPaidAccountId: [''],
escheatLiabilityId: [''],
assetsOtherGlMappings: this.formBuilder.array([]),
liabilitiesOtherGlMappings: this.formBuilder.array([]),
@@ -158,6 +163,20 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
return '';
}
+ private extractNamedGlMapping(
+ otherGlMappings: any[],
+ accountName: string,
+ controlName: string,
+ options: GLAccount[]
+ ): any[] {
+ const match = (otherGlMappings || []).find((mapping) => mapping?.accountName === accountName);
+ if (match) {
+ const glAccountId = match.glAccountId || options.find((option) => option.glCode === match.glCode)?.id || '';
+ this.fixedDepositProductAccountingForm.get(controlName)?.patchValue(glAccountId);
+ }
+ return (otherGlMappings || []).filter((mapping) => mapping?.accountName !== accountName);
+ }
+
private patchAccountingValues(mappings: any) {
this.fixedDepositProductAccountingForm.patchValue({
savingsReferenceAccountId: this.extractAccountId(
@@ -200,7 +219,18 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
glMappings?.liabilities || [],
this.liabilityAccountOptions
);
- this.setOtherGlMappings('expensesOtherGlMappings', glMappings?.expenses || [], this.expenseAccountOptions);
+ const fromExpenses = this.extractNamedGlMapping(
+ this.extractNamedGlMapping(
+ glMappings?.expenses || [],
+ FIXED_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME,
+ 'savingsInterestPaidAccountId',
+ this.expenseAccountOptions
+ ),
+ SAVINGS_INTEREST_PAID_ACCOUNT_NAME,
+ 'savingsInterestPaidAccountId',
+ this.expenseAccountOptions
+ );
+ this.setOtherGlMappings('expensesOtherGlMappings', fromExpenses, this.expenseAccountOptions);
this.setOtherGlMappings('incomeOtherGlMappings', glMappings?.income || [], this.incomeAccountOptions);
}
}
@@ -266,10 +296,26 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
}))
.filter((item: { accountName: string; glCode: string }) => !!item.accountName || !!item.glCode);
+ const namedAsOtherGlMapping = (controlName: string, accountName: string, options: GLAccount[]) => {
+ const glAccountId = this.fixedDepositProductAccountingForm.get(controlName)?.value;
+ if (!glAccountId) {
+ return [];
+ }
+ const glCode = options.find((o) => o.id === glAccountId)?.glCode || '';
+ return glCode ? [{ accountName, glCode }] : [];
+ };
+
const otherGlMappings = {
assets: map('assetsOtherGlMappings', this.assetAccountOptions),
liabilities: map('liabilitiesOtherGlMappings', this.liabilityAccountOptions),
- expenses: map('expensesOtherGlMappings', this.expenseAccountOptions),
+ expenses: [
+ ...namedAsOtherGlMapping(
+ 'savingsInterestPaidAccountId',
+ FIXED_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME,
+ this.expenseAccountOptions
+ ),
+ ...map('expensesOtherGlMappings', this.expenseAccountOptions)
+ ],
income: map('incomeOtherGlMappings', this.incomeAccountOptions)
};
return Object.values(otherGlMappings).some((v) => v.length) ? otherGlMappings : null;
@@ -308,6 +354,11 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
setRequired('incomeFromPenaltyAccountId', cashOrAccrual);
setRequired('feesReceivableAccountId', accrualOnly);
setRequired('penaltiesReceivableAccountId', accrualOnly);
+ // Required only on accrual, where there is no posting without it. On cash it stays optional but
+ // is offered, because interest posting routes through it when the product names one (see
+ // AccountingProcessorHelper.createInterestPostingJournalEntriesForSavings): the payable carries
+ // interest declared but not yet credited, and a product that names none collapses straight to
+ // Savings Control instead.
setRequired('interestPayableAccountId', accrualOnly);
setRequired('escheatLiabilityId', cashOrAccrual && this.isDormancyTrackingEnabled());
@@ -326,8 +377,8 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
rows: [
{
key: 'savingsReferenceAccountId',
- label: 'Savings Reference Account',
- inputLabel: 'Savings reference account',
+ label: 'Fixed Deposit Reference Account',
+ inputLabel: 'Fixed deposit reference account',
controlName: 'savingsReferenceAccountId',
options: this.assetAccountOptions,
required: true
@@ -360,8 +411,8 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
rows: [
{
key: 'savingsControlAccountId',
- label: 'Savings Control Account',
- inputLabel: 'Savings control account',
+ label: 'Fixed Deposit Control Account',
+ inputLabel: 'Fixed deposit control account',
controlName: 'savingsControlAccountId',
options: this.liabilityAccountOptions,
required: true
@@ -375,12 +426,16 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
required: true
},
{
+ // Offered on cash accounting too, not only accrual: interest posting routes through
+ // this account whichever basis the product uses, so that interest declared but not yet
+ // credited to the member reads as the bank's own liability rather than appearing only
+ // when it is paid. Optional on cash - a product naming none posts straight to Savings
+ // Control as before.
key: 'interestPayableAccountId',
label: 'Interest Payable Account',
inputLabel: 'Interest payable account',
controlName: 'interestPayableAccountId',
- options: this.liabilityAccountOptions,
- accrualOnly: true
+ options: this.liabilityAccountOptions
},
{
key: 'escheatLiabilityId',
@@ -402,11 +457,18 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
rows: [
{
key: 'interestOnSavingsAccountId',
- label: 'Interest On Savings Account',
- inputLabel: 'Interest on savings account',
+ label: 'Interest On Fixed Deposits',
+ inputLabel: 'Interest on fixed deposits',
controlName: 'interestOnSavingsAccountId',
options: this.expenseAccountOptions,
required: true
+ },
+ {
+ key: 'savingsInterestPaidAccountId',
+ label: 'Fixed Deposit Interest Paid',
+ inputLabel: 'Fixed deposit interest paid',
+ controlName: 'savingsInterestPaidAccountId',
+ options: this.expenseAccountOptions
}
],
otherMappingsControlName: 'expensesOtherGlMappings',
@@ -447,6 +509,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
liabilitiesOtherGlMappings,
expensesOtherGlMappings,
incomeOtherGlMappings,
+ savingsInterestPaidAccountId,
...accounting
} = this.fixedDepositProductAccountingForm.value;
const otherGlMappings = this.getOtherGlMappings();
diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-preview-step/fixed-deposit-product-preview-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-preview-step/fixed-deposit-product-preview-step.component.html
index e92b052fd..8a6431b90 100644
--- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-preview-step/fixed-deposit-product-preview-step.component.html
+++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-preview-step/fixed-deposit-product-preview-step.component.html
@@ -481,6 +481,7 @@
}
diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.html
index 239c749bd..504d06752 100644
--- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.html
+++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.html
@@ -34,6 +34,35 @@
+
+
+
+
+ Renewal
+
+
+
+ ℹ️
+
+ Leave blank for an FD on this product to keep renewing instantly, the same night it matures, as before. Set a
+ number of days and a matured "auto renew" FD instead waits on the FD Dashboard for that many days for staff to
+ renew it manually -- backdated to the original maturity date within that window, or from the day it is
+ actually renewed (with gap-period interest at the linked Savings account's rate) once the window has passed.
+
+
+
+
+ Renewal Grace Period
+
+ Days
+ @if (fixedDepositProductTermsForm.get('renewalGracePeriodDays').hasError('min')) {
+ Renewal Grace Period must be zero or greater
+ }
+
+
+
+
+
diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.ts b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.ts
index 11061126a..d1abb4ad6 100644
--- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.ts
+++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.ts
@@ -85,12 +85,21 @@ export class FixedDepositProductTermsStepComponent implements OnInit, OnChanges
: (this.interestCalculationTypeOptionData?.[0]?.id ?? null);
this.fixedDepositProductTermsForm.patchValue({
- minDepositTerm: this.fixedDepositProductsTemplate.minDepositTerm ?? 1,
- minDepositTermTypeId: this.fixedDepositProductsTemplate.minDepositTermType?.id ?? defaultPeriodTypeId,
+ // Hidden, unedited-by-anyone fields. On EDIT, left as the product's own saved value with no
+ // forced fallback (like their max-/in-multiples-of- siblings already correctly are), or a
+ // checker's "Proposed changes" review showed these as changed on every unrelated edit, never
+ // anything a maker touched. On CREATE there is no saved value yet, and the backend requires
+ // minDepositTerm -- default it (and its unit) here same as before, since the field is hidden
+ // and no one gets a chance to fill it in themselves.
+ minDepositTerm: isEditing ? (this.fixedDepositProductsTemplate.minDepositTerm ?? '') : 1,
+ minDepositTermTypeId: isEditing
+ ? (this.fixedDepositProductsTemplate.minDepositTermType?.id ?? '')
+ : defaultPeriodTypeId,
maxDepositTerm: this.fixedDepositProductsTemplate.maxDepositTerm ?? '',
maxDepositTermTypeId: this.fixedDepositProductsTemplate.maxDepositTermType?.id ?? '',
inMultiplesOfDepositTerm: this.fixedDepositProductsTemplate.inMultiplesOfDepositTerm ?? '',
inMultiplesOfDepositTermTypeId: this.fixedDepositProductsTemplate.inMultiplesOfDepositTermType?.id ?? '',
+ renewalGracePeriodDays: this.fixedDepositProductsTemplate.renewalGracePeriodDays ?? '',
minDepositAmount: this.fixedDepositProductsTemplate.minDepositAmount,
maxDepositAmount: this.fixedDepositProductsTemplate.maxDepositAmount,
nominalAnnualInterestRate: this.fixedDepositProductsTemplate.nominalAnnualInterestRate ?? 0,
@@ -171,6 +180,13 @@ export class FixedDepositProductTermsStepComponent implements OnInit, OnChanges
maxDepositTermTypeId: [''],
inMultiplesOfDepositTerm: [''],
inMultiplesOfDepositTermTypeId: [''],
+ // Days after maturity a depositor can still walk in and have their FD renewed backdated to the
+ // original maturity date, at the currently active rate -- blank/0 keeps today's instant,
+ // same-night auto-renewal (see FD Dashboard for the manual renewal this enables).
+ renewalGracePeriodDays: [
+ '',
+ Validators.min(0)
+ ],
minDepositAmount: [
'',
Validators.min(0)
diff --git a/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html b/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html
index cb3324ea9..458eece5b 100644
--- a/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html
+++ b/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html
@@ -607,6 +607,7 @@
}
diff --git a/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-accounting-step/recurring-deposit-product-accounting-step.component.ts b/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-accounting-step/recurring-deposit-product-accounting-step.component.ts
index 3ceaa248a..6d3332921 100644
--- a/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-accounting-step/recurring-deposit-product-accounting-step.component.ts
+++ b/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-accounting-step/recurring-deposit-product-accounting-step.component.ts
@@ -24,6 +24,10 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
type AccountingSectionKey = 'assets' | 'liabilities' | 'expenses' | 'income';
+const SAVINGS_INTEREST_PAYABLE_ACCOUNT_NAME = 'Savings Interest Payable';
+const RECURRING_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME = 'Recurring Deposit Interest Paid';
+const SAVINGS_INTEREST_PAID_ACCOUNT_NAME = 'Savings Interest Paid';
+
type AccountingRowConfig = {
key: string;
label: string;
@@ -122,6 +126,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
feesReceivableAccountId: [''],
penaltiesReceivableAccountId: [''],
interestPayableAccountId: [''],
+ savingsInterestPaidAccountId: [''],
escheatLiabilityId: [''],
assetsOtherGlMappings: this.formBuilder.array([]),
liabilitiesOtherGlMappings: this.formBuilder.array([]),
@@ -136,6 +141,20 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
});
}
+ private extractNamedGlMapping(
+ otherGlMappings: any[],
+ accountName: string,
+ controlName: string,
+ options: GLAccount[]
+ ): any[] {
+ const match = (otherGlMappings || []).find((mapping) => mapping?.accountName === accountName);
+ if (match) {
+ const glAccountId = match.glAccountId || options.find((option) => option.glCode === match.glCode)?.id || '';
+ this.recurringDepositProductAccountingForm.get(controlName)?.patchValue(glAccountId);
+ }
+ return (otherGlMappings || []).filter((mapping) => mapping?.accountName !== accountName);
+ }
+
private patchAccountingValues(mappings: any) {
this.recurringDepositProductAccountingForm.patchValue({
savingsReferenceAccountId: mappings.savingsReferenceAccount?.id || '',
@@ -158,7 +177,18 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
glMappings?.liabilities || [],
this.liabilityAccountOptions
);
- this.setOtherGlMappings('expensesOtherGlMappings', glMappings?.expenses || [], this.expenseAccountOptions);
+ const fromExpenses = this.extractNamedGlMapping(
+ this.extractNamedGlMapping(
+ glMappings?.expenses || [],
+ RECURRING_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME,
+ 'savingsInterestPaidAccountId',
+ this.expenseAccountOptions
+ ),
+ SAVINGS_INTEREST_PAID_ACCOUNT_NAME,
+ 'savingsInterestPaidAccountId',
+ this.expenseAccountOptions
+ );
+ this.setOtherGlMappings('expensesOtherGlMappings', fromExpenses, this.expenseAccountOptions);
this.setOtherGlMappings('incomeOtherGlMappings', glMappings?.income || [], this.incomeAccountOptions);
}
}
@@ -224,10 +254,26 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
}))
.filter((item: { accountName: string; glCode: string }) => !!item.accountName || !!item.glCode);
+ const namedAsOtherGlMapping = (controlName: string, accountName: string, options: GLAccount[]) => {
+ const glAccountId = this.recurringDepositProductAccountingForm.get(controlName)?.value;
+ if (!glAccountId) {
+ return [];
+ }
+ const glCode = options.find((o) => o.id === glAccountId)?.glCode || '';
+ return glCode ? [{ accountName, glCode }] : [];
+ };
+
const otherGlMappings = {
assets: map('assetsOtherGlMappings', this.assetAccountOptions),
liabilities: map('liabilitiesOtherGlMappings', this.liabilityAccountOptions),
- expenses: map('expensesOtherGlMappings', this.expenseAccountOptions),
+ expenses: [
+ ...namedAsOtherGlMapping(
+ 'savingsInterestPaidAccountId',
+ RECURRING_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME,
+ this.expenseAccountOptions
+ ),
+ ...map('expensesOtherGlMappings', this.expenseAccountOptions)
+ ],
income: map('incomeOtherGlMappings', this.incomeAccountOptions)
};
return Object.values(otherGlMappings).some((v) => v.length) ? otherGlMappings : null;
@@ -360,11 +406,18 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
rows: [
{
key: 'interestOnSavingsAccountId',
- label: 'Interest On Savings Account',
- inputLabel: 'Interest on savings account',
+ label: 'Interest On Recurring Deposits',
+ inputLabel: 'Interest on recurring deposits',
controlName: 'interestOnSavingsAccountId',
options: this.expenseAccountOptions,
required: true
+ },
+ {
+ key: 'savingsInterestPaidAccountId',
+ label: 'Recurring Deposit Interest Paid',
+ inputLabel: 'Recurring deposit interest paid',
+ controlName: 'savingsInterestPaidAccountId',
+ options: this.expenseAccountOptions
}
],
otherMappingsControlName: 'expensesOtherGlMappings',
@@ -405,6 +458,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
liabilitiesOtherGlMappings,
expensesOtherGlMappings,
incomeOtherGlMappings,
+ savingsInterestPaidAccountId,
...accounting
} = this.recurringDepositProductAccountingForm.value;
const otherGlMappings = this.getOtherGlMappings();
diff --git a/src/app/products/saving-products/create-saving-product/create-saving-product.component.html b/src/app/products/saving-products/create-saving-product/create-saving-product.component.html
index 867619fa8..f60a295f3 100644
--- a/src/app/products/saving-products/create-saving-product/create-saving-product.component.html
+++ b/src/app/products/saving-products/create-saving-product/create-saving-product.component.html
@@ -144,7 +144,7 @@
}
@if (savingProductFormValid && selectedTabIndex === totalTabs - 1) {
-