-
-
-
+ }
diff --git a/src/app/letter-mgmt/certificates/form-15gh/form-15gh.component.ts b/src/app/letter-mgmt/certificates/form-15gh/form-15gh.component.ts
index 839a9fb6f..9ab9b9b5d 100644
--- a/src/app/letter-mgmt/certificates/form-15gh/form-15gh.component.ts
+++ b/src/app/letter-mgmt/certificates/form-15gh/form-15gh.component.ts
@@ -21,9 +21,31 @@ import {
} from '../certificate-preview-dialog/certificate-preview-dialog.component';
import { downloadForm15ghPdf } from '../certificate-pdf';
import { DscSignService } from '../../dsc-sign-dialog/dsc-sign.service';
+import { RealForm15ghViewComponent } from './real-form15gh-view/real-form15gh-view.component';
-export type Form15Kind = '15G' | '15H';
+import {
+ Declaration,
+ DeclarationForm,
+ EligibilityResult,
+ FY_TAX_CONFIG,
+ Form15Kind,
+ TdsMode,
+ TdsSchedule,
+ ageInFy,
+ buildSchedule,
+ checkEligibility,
+ declarationFormFor,
+ formKindFor,
+ isSeniorInFy,
+ normaliseFy,
+ projectQuarterlyCredits,
+ tdsModeFor
+} from './tds-15gh.compute';
+
+export type { Form15Kind };
export type Form15Status = 'FILED' | 'PENDING';
+/** Which deduction trigger the payee falls under. Age-based, still. */
+export type ThresholdBand = 'GENERAL' | 'SENIOR';
export interface Form15ghRecord {
customerId: string;
@@ -32,18 +54,46 @@ export interface Form15ghRecord {
customerAddress: string;
dob: string;
branch: string;
- /** Aggregate interest the bank will pay this FY. */
+ /** Aggregate interest the bank will pay this FY across the customer's time deposits. */
estimatedInterest: number;
- /** Customer's total estimated income for the FY. */
+ /** Customer's total estimated income for the FY, as declared by them. */
estimatedIncome: number;
/** Sum of FD / RD principals tied to the declaration. */
depositPrincipal: number;
fy: string;
status: Form15Status;
filedOn?: string;
- /** "Yes / No" for: has any income tax been assessed for the customer
- under the IT Act in the past six years? */
+ /**
+ * "Yes / No" for: has any income tax been assessed for the customer under the
+ * IT Act in the past six years?
+ */
assessed: boolean;
+ /**
+ * The deposit product's interest-posting frequency. Tax falls due when interest
+ * is credited, so this — and not any customer preference — decides whether it
+ * settles quarterly or at year end.
+ */
+ interestPostingPeriodType: string;
+}
+
+/** A register row with everything the engine derived for it, computed once. */
+export interface Form15ghRow {
+ record: Form15ghRecord;
+ /** The form actually in force for the record's year — '121' from FY 2026-27. */
+ form: DeclarationForm;
+ /**
+ * The 15G/15H label. Only a form distinction up to FY 2025-26; from FY 2026-27
+ * the forms merged and this reflects the threshold band alone.
+ */
+ kind: Form15Kind;
+ band: ThresholdBand;
+ age: number;
+ mode: TdsMode;
+ /** Schedule as things stand, declaration included where one is on record. */
+ schedule: TdsSchedule;
+ /** Tax the declaration kept out of the customer's pocket this year. */
+ tdsSaved: number;
+ eligibility: EligibilityResult;
}
@Component({
@@ -55,7 +105,8 @@ export interface Form15ghRecord {
CommonModule,
FormsModule,
FaIconComponent,
- MatTooltip
+ MatTooltip,
+ RealForm15ghViewComponent
]
})
export class Form15ghComponent implements OnInit {
@@ -63,40 +114,89 @@ export class Form15ghComponent implements OnInit {
private snack = inject(MatSnackBar);
private dscSign = inject(DscSignService);
+ /** Mode toggle: 'demo' uses mock seed data; 'real' pulls live Fineract data. */
+ viewMode: 'demo' | 'real' = 'demo';
+
// ── Filters ──
search = '';
- /** Which form. Empty = both. */
- kindFilter: '' | Form15Kind = '';
+ /** Which deduction trigger. Empty = both bands. */
+ bandFilter: '' | ThresholdBand = '';
statusFilter: '' | Form15Status = '';
+ /** Show only declarations the branch cannot lawfully accept. */
+ ineligibleOnly = false;
- records: Form15ghRecord[] = [];
+ /** Which row's quarter-wise breakdown is open. */
+ expandedId: string | null = null;
+
+ rows: Form15ghRow[] = [];
ngOnInit(): void {
- this.records = seedForm15gh();
+ // Derived once. The template reads these many times per change-detection
+ // pass, and re-running the schedules on every read is what made the other
+ // register screens stall.
+ this.rows = seedForm15gh().map((record) => this.buildRow(record));
}
- /** Compute age in years from DoB. */
- age(dob: string): number {
- if (!dob) return 0;
- const today = new Date();
- const birth = new Date(dob);
- let age = today.getFullYear() - birth.getFullYear();
- const m = today.getMonth() - birth.getMonth();
- if (m < 0 || (m === 0 && today.getDate() < birth.getDate())) age--;
- return age;
+ private buildRow(record: Form15ghRecord): Form15ghRow {
+ const ctx = {
+ fy: record.fy,
+ dateOfBirth: record.dob,
+ pan: record.customerPan,
+ resident: true
+ };
+
+ const declaration: Declaration | null =
+ record.status === 'FILED'
+ ? {
+ kind: formKindFor(record.dob, record.fy),
+ // The register holds the filing date; a declaration operates from
+ // the day the branch accepted it.
+ acceptedOn: record.filedOn ?? `${record.fy.replace(/\D/g, '').slice(0, 4)}-04-01`,
+ fy: record.fy
+ }
+ : null;
+
+ const mode = tdsModeFor({ interestPostingPeriodType: record.interestPostingPeriodType });
+ // The register carries a projected annual figure rather than real postings,
+ // so spread it across the year to drive the schedule.
+ const credits = projectQuarterlyCredits(record.estimatedInterest, record.fy);
+
+ const schedule = buildSchedule(mode, credits, { ...ctx, declaration });
+ const withoutDeclaration = buildSchedule(mode, credits, { ...ctx, declaration: null });
+
+ return {
+ record,
+ form: declarationFormFor(record.fy, record.dob),
+ kind: formKindFor(record.dob, record.fy),
+ band: isSeniorInFy(record.dob, record.fy) ? 'SENIOR' : 'GENERAL',
+ age: ageInFy(record.dob, record.fy),
+ mode,
+ schedule,
+ tdsSaved: declaration ? Math.max(0, withoutDeclaration.totalTds - schedule.totalTds) : 0,
+ eligibility: checkEligibility(ctx, {
+ estimatedInterest: record.estimatedInterest,
+ estimatedIncome: record.estimatedIncome,
+ incomeOnRecord: true
+ })
+ };
}
- /** 15H once 60+, 15G otherwise. */
- formKind(r: Form15ghRecord): Form15Kind {
- return this.age(r.dob) >= 60 ? '15H' : '15G';
- }
-
- get filteredRecords(): Form15ghRecord[] {
+ get filteredRows(): Form15ghRow[] {
const q = this.search.trim().toLowerCase();
- return this.records.filter((r) => {
- if (this.kindFilter && this.formKind(r) !== this.kindFilter) return false;
- if (this.statusFilter && r.status !== this.statusFilter) return false;
- if (!q) return true;
+ return this.rows.filter((row) => {
+ if (this.bandFilter && row.band !== this.bandFilter) {
+ return false;
+ }
+ if (this.statusFilter && row.record.status !== this.statusFilter) {
+ return false;
+ }
+ if (this.ineligibleOnly && row.eligibility.eligible) {
+ return false;
+ }
+ if (!q) {
+ return true;
+ }
+ const r = row.record;
return (
r.customerName.toLowerCase().includes(q) ||
r.customerId.toLowerCase().includes(q) ||
@@ -105,32 +205,67 @@ export class Form15ghComponent implements OnInit {
});
}
- count15G(): number {
- return this.records.filter((r) => this.formKind(r) === '15G').length;
+ countGeneralBand(): number {
+ return this.rows.filter((r) => r.band === 'GENERAL').length;
}
- count15H(): number {
- return this.records.filter((r) => this.formKind(r) === '15H').length;
+ countSeniorBand(): number {
+ return this.rows.filter((r) => r.band === 'SENIOR').length;
+ }
+
+ /**
+ * The declaration in force across the register, and the provision charging the
+ * tax. Both changed on 01 April 2026, so they are read from the config rather
+ * than written into the template.
+ */
+ get statute(): { form: string; section: string; statement: string; frequency: string } {
+ const fy = normaliseFy(this.rows[0]?.record.fy ?? '2026-27');
+ const cfg = FY_TAX_CONFIG[fy];
+ return {
+ form: cfg.declarationForm === '121' ? 'Form 121' : 'Form 15G / 15H',
+ section: cfg.interestTdsSection,
+ statement: cfg.tdsStatementForm,
+ frequency: cfg.declarationStatementFrequency === 'MONTHLY' ? 'monthly' : 'quarterly'
+ };
}
countFiled(): number {
- return this.records.filter((r) => r.status === 'FILED').length;
+ return this.rows.filter((r) => r.record.status === 'FILED').length;
+ }
+
+ /** Declarations on record that the branch could not lawfully have accepted. */
+ countIneligible(): number {
+ return this.rows.filter((r) => !r.eligibility.eligible).length;
}
totalInterest(): number {
- return this.filteredRecords.reduce((s, r) => s + r.estimatedInterest, 0);
+ return this.filteredRows.reduce((s, r) => s + r.record.estimatedInterest, 0);
+ }
+
+ /** Tax the declarations kept out of customers' pockets, across the filter. */
+ totalTdsSaved(): number {
+ return this.filteredRows.reduce((s, r) => s + r.tdsSaved, 0);
}
clearFilters(): void {
this.search = '';
- this.kindFilter = '';
+ this.bandFilter = '';
this.statusFilter = '';
+ this.ineligibleOnly = false;
}
- viewCertificate(r: Form15ghRecord): void {
+ toggleExpanded(row: Form15ghRow): void {
+ this.expandedId = this.expandedId === row.record.customerId ? null : row.record.customerId;
+ }
+
+ isExpanded(row: Form15ghRow): boolean {
+ return this.expandedId === row.record.customerId;
+ }
+
+ viewCertificate(row: Form15ghRow): void {
const data: CertificatePreviewDialogData = {
kind: 'form15gh',
- form15gh: { record: r, kind: this.formKind(r), age: this.age(r.dob) }
+ form15gh: { record: row.record, kind: row.kind, age: row.age }
};
this.dialog.open(CertificatePreviewDialogComponent, {
width: '880px',
@@ -142,20 +277,34 @@ export class Form15ghComponent implements OnInit {
});
}
- downloadCertificate(r: Form15ghRecord): void {
- const kind = this.formKind(r);
+ downloadCertificate(row: Form15ghRow): void {
+ const r = row.record;
+ // A declaration the branch cannot accept must not go out as a signed PDF.
+ if (!row.eligibility.eligible) {
+ this.snack.open(`Cannot issue: ${row.eligibility.reasons[0]}`, 'Dismiss', { duration: 6000 });
+ return;
+ }
this.dscSign.promptThenDownload(
{
- title: `Form 121 (${kind}) Declaration`,
+ title: `${row.form === '121' ? 'Form 121' : `Form ${row.form}`} Declaration`,
reference: `${r.customerId} · ${r.customerName} · ${r.fy}`,
filename: `Form121-${r.customerId}-${r.fy.replace(/\s+/g, '')}.pdf`
},
- (dsc) => downloadForm15ghPdf(r, kind, dsc)
+ (dsc) => downloadForm15ghPdf(r, row.kind, dsc)
);
}
+
+ toggleViewMode(): void {
+ this.viewMode = this.viewMode === 'demo' ? 'real' : 'demo';
+ }
}
-// ───────────────────── Mock seed (top-level export) ─────────────────────
+// ───────────────────────── Mock seed (top-level export) ─────────────────────
+/**
+ * Two of these customers are deliberately ineligible — their estimated income
+ * leaves a tax liability, so a Form 121 declaration cannot be accepted from them.
+ * That gives the register's eligibility warnings something to show.
+ */
export function seedForm15gh(): Form15ghRecord[] {
return [
{
@@ -165,86 +314,109 @@ export function seedForm15gh(): Form15ghRecord[] {
customerAddress: 'Flat 902, Skyline Apt, Andheri (E), Mumbai 400069',
dob: '1985-02-14',
branch: 'Mumbai — Andheri (E)',
- estimatedInterest: 38500,
- estimatedIncome: 850000,
- depositPrincipal: 500000,
- fy: 'FY 2025-26',
- status: 'FILED',
- filedOn: '2025-04-10',
- assessed: true
+ estimatedInterest: 38_500,
+ // Over the basic exemption limit — not eligible for 15G.
+ estimatedIncome: 850_000,
+ depositPrincipal: 500_000,
+ fy: 'FY 2026-27',
+ status: 'PENDING',
+ assessed: true,
+ interestPostingPeriodType: 'savingsPostingInterestPeriodType.quarterly'
},
{
customerId: 'CUST556677',
customerName: 'Karthik Rao',
- customerPan: 'PQRSR2233Z',
+ customerPan: 'PQRPR2233Z',
customerAddress: '24, MG Road, Bengaluru 560001',
dob: '1972-09-04',
branch: 'Bengaluru — MG Road',
- estimatedInterest: 52800,
- estimatedIncome: 320000,
- depositPrincipal: 700000,
- fy: 'FY 2025-26',
+ estimatedInterest: 52_800,
+ estimatedIncome: 320_000,
+ depositPrincipal: 700_000,
+ fy: 'FY 2026-27',
status: 'PENDING',
- assessed: false
+ assessed: false,
+ interestPostingPeriodType: 'savingsPostingInterestPeriodType.quarterly'
},
{
customerId: 'CUST667788',
customerName: 'Lakshmi Naidu',
- customerPan: 'XYZAN7788Q',
+ customerPan: 'XYZPN7788Q',
customerAddress: 'Plot 14, Road No. 3, Banjara Hills, Hyderabad 500034',
dob: '1958-06-22',
branch: 'Hyderabad — Banjara Hills',
- estimatedInterest: 88200,
- estimatedIncome: 410000,
- depositPrincipal: 1200000,
- fy: 'FY 2025-26',
+ estimatedInterest: 88_200,
+ estimatedIncome: 410_000,
+ depositPrincipal: 1_200_000,
+ fy: 'FY 2026-27',
status: 'FILED',
- filedOn: '2025-04-15',
- assessed: true
+ filedOn: '2026-04-15',
+ assessed: true,
+ interestPostingPeriodType: 'savingsPostingInterestPeriodType.quarterly'
},
{
customerId: 'CUST334455',
customerName: 'Anita Verma',
- customerPan: 'EFGHV5678A',
+ customerPan: 'EFGPV5678A',
customerAddress: 'B-12, Connaught Pl, New Delhi 110001',
dob: '1962-11-30',
branch: 'New Delhi — Connaught Place',
- estimatedInterest: 64500,
- estimatedIncome: 280000,
- depositPrincipal: 900000,
- fy: 'FY 2025-26',
+ estimatedInterest: 64_500,
+ estimatedIncome: 280_000,
+ depositPrincipal: 900_000,
+ fy: 'FY 2026-27',
status: 'FILED',
- filedOn: '2025-04-05',
- assessed: false
+ filedOn: '2026-04-05',
+ assessed: false,
+ interestPostingPeriodType: 'savingsPostingInterestPeriodType.annual'
},
{
customerId: 'CUST990011',
customerName: 'Arjun Banerjee',
- customerPan: 'TUVWB4455F',
+ customerPan: 'TUVPB4455F',
customerAddress: '42, Park Street, Kolkata 700016',
dob: '1991-07-19',
branch: 'Kolkata — Park Street',
- estimatedInterest: 14200,
- estimatedIncome: 620000,
- depositPrincipal: 200000,
- fy: 'FY 2025-26',
+ estimatedInterest: 14_200,
+ // Over the basic exemption limit — not eligible for 15G.
+ estimatedIncome: 620_000,
+ depositPrincipal: 200_000,
+ fy: 'FY 2026-27',
status: 'PENDING',
- assessed: true
+ assessed: true,
+ interestPostingPeriodType: 'savingsPostingInterestPeriodType.monthly'
},
{
customerId: 'CUST330044',
customerName: 'Madhavi Singh',
- customerPan: 'TUVWS3344K',
+ customerPan: 'TUVPS3344K',
customerAddress: 'D-5, Greater Kailash, New Delhi 110048',
dob: '1955-03-08',
branch: 'New Delhi — Connaught Place',
- estimatedInterest: 145000,
- estimatedIncome: 320000,
- depositPrincipal: 2000000,
- fy: 'FY 2025-26',
+ // A 15H declarant faces no ceiling on interest — only a nil liability.
+ estimatedInterest: 145_000,
+ estimatedIncome: 320_000,
+ depositPrincipal: 2_000_000,
+ fy: 'FY 2026-27',
status: 'FILED',
- filedOn: '2025-04-02',
- assessed: false
+ filedOn: '2026-04-02',
+ assessed: false,
+ interestPostingPeriodType: 'savingsPostingInterestPeriodType.quarterly'
+ },
+ {
+ customerId: 'CUST778899',
+ customerName: 'Vikram Malhotra',
+ customerPan: '',
+ customerAddress: 'Flat 405, Green Glen Layout, Outer Ring Road, Bengaluru 560103',
+ dob: '1980-05-15',
+ branch: 'Bengaluru — MG Road',
+ estimatedInterest: 60_000,
+ estimatedIncome: 350_000,
+ depositPrincipal: 800_000,
+ fy: 'FY 2026-27',
+ status: 'PENDING',
+ assessed: true,
+ interestPostingPeriodType: 'savingsPostingInterestPeriodType.quarterly'
}
];
}
diff --git a/src/app/reports/reports-routing.module.ts b/src/app/reports/reports-routing.module.ts
index 602c49d5f..7565d21ec 100644
--- a/src/app/reports/reports-routing.module.ts
+++ b/src/app/reports/reports-routing.module.ts
@@ -59,6 +59,18 @@ const routes: Routes = [
loadComponent: () =>
import('../risk-review/risk-review-report.component').then((m) => m.RiskReviewReportComponent)
},
+ {
+ path: 'tds-interest',
+ data: { title: 'Deposit Interest & TDS', breadcrumb: 'Deposit Interest & TDS' },
+ loadComponent: () =>
+ import('../tds-reports/tds-interest-report.component').then((m) => m.TdsInterestReportComponent)
+ },
+ {
+ path: 'tds-remittance',
+ data: { title: 'TDS Remitted to Government', breadcrumb: 'TDS Remitted to Government' },
+ loadComponent: () =>
+ import('../tds-reports/tds-remittance-report.component').then((m) => m.TdsRemittanceReportComponent)
+ },
{
path: ':filter',
data: { routeParamBreadcrumb: 'filter' },