-
+
+
+
+
@for (o of availableAccounts(role, i); track o.id) {
{{ o.glCode }} · {{ o.name }}
}
diff --git a/src/app/organization/rbi-reserve-config/rbi-reserve-config.component.ts b/src/app/organization/rbi-reserve-config/rbi-reserve-config.component.ts
index 4edfb90f0..a9bed2898 100644
--- a/src/app/organization/rbi-reserve-config/rbi-reserve-config.component.ts
+++ b/src/app/organization/rbi-reserve-config/rbi-reserve-config.component.ts
@@ -7,8 +7,9 @@
*/
import { Component, OnInit, inject } from '@angular/core';
-import { FormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { catchError, forkJoin, of } from 'rxjs';
+import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
import { OrganizationService } from '../organization.service';
@@ -20,6 +21,15 @@ export interface ReserveMapping {
glAccountId: number;
weightPercentage: number;
liabilityClass: string | null;
+ /**
+ * Identity for the row, so the template can track rows by it rather than by position.
+ *
+ * Tracking by index made deletion impossible: removing a row shifts every row after it up one, so
+ * Angular reused the inputs that were bound to the old positions and ngModel wrote their values
+ * straight back into the shortened array. The row reappeared, the draft matched what was stored
+ * again, and Save stayed grey. Never sent to the backend.
+ */
+ rowId: number;
}
/**
@@ -43,7 +53,9 @@ export interface ReserveMapping {
styleUrls: ['./rbi-reserve-config.component.scss'],
imports: [
...STANDALONE_SHARED_IMPORTS,
- FormsModule
+ FormsModule,
+ ReactiveFormsModule,
+ NgxMatSelectSearchModule
]
})
export class RbiReserveConfigComponent implements OnInit {
@@ -80,9 +92,33 @@ export class RbiReserveConfigComponent implements OnInit {
/** Every reserve role the backend returned, before the form filter narrows it. */
private allRoles: any[] = [];
- /** Re-slices what is on screen. No round trip - the full set is already held. */
+ /** Hands each mapping row an identity the template can track it by. See ReserveMapping.rowId. */
+ private nextRowId = 1;
+
+ /**
+ * What is typed into the search box inside an open account dropdown.
+ *
+ * One field for the whole screen rather than one per row: only one dropdown is open at a time, and
+ * it is cleared as each one opens, so a term left behind cannot narrow the next list a user opens
+ * without them seeing why it is short.
+ */
+ accountSearch = '';
+
+ /**
+ * Re-slices what is on screen. No round trip - the full set is already held.
+ *
+ * The rows are rebuilt for whatever the new slice brings in. They used not to be: selection was
+ * filled once, for the heads the first slice happened to contain, so switching the filter showed
+ * the newly admitted heads with no rows at all - a card with a name and an empty body, reading as
+ * a head that had nothing mapped when it was simply never read.
+ */
onFormFilterChange(): void {
this.glRoles = this.rolesForScreen();
+ for (const role of this.glRoles) {
+ if (!this.selection[role.configKey]) {
+ this.reloadSelection(role);
+ }
+ }
this.rebuildGroups();
}
@@ -230,11 +266,7 @@ export class RbiReserveConfigComponent implements OnInit {
for (const role of this.glRoles) {
// Read back what is stored rather than re-derived: a weight or a class the administrator set
// deliberately would otherwise be replaced by a default on the next save.
- this.selection[role.configKey] = (role.accounts || []).map((a: any) => ({
- glAccountId: a.glAccountId,
- weightPercentage: a.weightPercentage === null || a.weightPercentage === undefined ? 100 : +a.weightPercentage,
- liabilityClass: a.liabilityClass ?? (role.classified ? 'TIME' : null)
- }));
+ this.reloadSelection(role);
}
this.rebuildGroups();
}
@@ -288,9 +320,16 @@ export class RbiReserveConfigComponent implements OnInit {
);
}
- /** A role with nothing mapped makes its return refuse to compute — surfaced, not hidden. */
+ /**
+ * A role with nothing mapped makes its return refuse to compute — surfaced, not hidden.
+ *
+ * Read from what is STORED, not from the draft on screen. The returns run off the saved mapping,
+ * so a row cleared but not yet saved changes nothing for them; counting it as unmapped made the
+ * banner announce that returns could not compute while they were still computing perfectly well.
+ * The unsaved edit is already shown by Save turning active.
+ */
isUnmapped(role: any): boolean {
- return !(this.selection[role.configKey] || []).length;
+ return !(role.accounts || []).length;
}
get unmappedCount(): number {
@@ -327,11 +366,29 @@ export class RbiReserveConfigComponent implements OnInit {
// a bank look compliant when it is not.
this.selection[role.configKey] = [
...(this.selection[role.configKey] || []),
- { glAccountId: null as any, weightPercentage: 100, liabilityClass: role.classified ? 'TIME' : null }];
+ {
+ glAccountId: null as any,
+ weightPercentage: 100,
+ liabilityClass: role.classified ? 'TIME' : null,
+ rowId: this.nextRowId++
+ }];
}
+ /**
+ * Drops a row and saves the head straight away.
+ *
+ * The bin used to clear the row on screen and leave it to Save, which read as the mapping having
+ * been removed when nothing had reached the server - the row came back on the next refresh. A bin
+ * is understood to delete, so it deletes: a row with nothing chosen in it never existed on the
+ * server and only has to go from the screen, and anything else is written through at once.
+ */
removeMapping(role: any, index: number): void {
- this.selection[role.configKey] = (this.selection[role.configKey] || []).filter((_, i) => i !== index);
+ const rows = this.selection[role.configKey] || [];
+ const removed = rows[index];
+ this.selection[role.configKey] = rows.filter((_, i) => i !== index);
+ if (removed?.glAccountId) {
+ this.saveRole(role);
+ }
}
/**
@@ -343,7 +400,23 @@ export class RbiReserveConfigComponent implements OnInit {
const rows = this.selection[role.configKey] || [];
const taken = new Set(rows.filter((_, i) => i !== index).map((m) => `${m.glAccountId}/${m.liabilityClass ?? ''}`));
const current = rows[index];
- return this.glAccountOptions.filter((o) => !taken.has(`${o.id}/${current?.liabilityClass ?? ''}`));
+ const free = this.glAccountOptions.filter((o) => !taken.has(`${o.id}/${current?.liabilityClass ?? ''}`));
+
+ // Typed into the search box above the list. Matched on code AND name, because an administrator
+ // looking for a head knows one or the other - the GL code off a trial balance, or the name off
+ // the balance sheet - and should not have to know which this list is sorted by.
+ const term = (this.accountSearch || '').trim().toLowerCase();
+ if (!term) {
+ return free;
+ }
+ // The chosen account stays in the list whatever is typed. Dropping it would leave mat-select
+ // with a value that matches no option, and the row would read as empty.
+ return free.filter(
+ (o) =>
+ o.id === current?.glAccountId ||
+ `${o.glCode}`.toLowerCase().includes(term) ||
+ `${o.name}`.toLowerCase().includes(term)
+ );
}
/** A row that cannot be saved - no account chosen, or a portion outside 0-100. */
@@ -379,6 +452,16 @@ export class RbiReserveConfigComponent implements OnInit {
.filter((e) => Math.abs(e.total - 100) > 0.0001);
}
+ /** Rebuilds one head's rows from what the server last returned, discarding the draft. */
+ private reloadSelection(role: any): void {
+ this.selection[role.configKey] = (role.accounts || []).map((a: any) => ({
+ glAccountId: a.glAccountId,
+ weightPercentage: a.weightPercentage === null || a.weightPercentage === undefined ? 100 : +a.weightPercentage,
+ liabilityClass: a.liabilityClass ?? (role.classified ? 'TIME' : null),
+ rowId: this.nextRowId++
+ }));
+ }
+
saveRole(role: any): void {
this.savingKey = role.configKey;
this.errorMsg = '';
@@ -398,6 +481,11 @@ export class RbiReserveConfigComponent implements OnInit {
catchError((err: any) => {
this.savingKey = null;
this.errorMsg = err?.error?.errors?.[0]?.defaultUserMessage ?? 'Could not save this mapping.';
+ // Put the screen back to what the server holds. A failed save that left the draft showing
+ // would say the change had gone through while the server still had the old mapping - and
+ // the bin deletes immediately, so this is the only thing between a rejected delete and a
+ // row that looks gone but is not.
+ this.reloadSelection(role);
return of(null);
})
)
diff --git a/src/app/pipes/accounts-filter.pipe.ts b/src/app/pipes/accounts-filter.pipe.ts
index 3b7363383..3d7ec3213 100644
--- a/src/app/pipes/accounts-filter.pipe.ts
+++ b/src/app/pipes/accounts-filter.pipe.ts
@@ -62,7 +62,7 @@ export class AccountsFilterPipe implements PipeTransform {
account.status.code === 'savingsAccountStatusType.rejected'
);
});
- } else {
+ } else if (status !== 'all') {
accounts = accounts.filter((account: any) => {
return (
account.status.code !== 'savingsAccountStatusType.withdrawn.by.applicant' &&
diff --git a/src/app/products/dds-account-types/create-dds-account-type/create-dds-account-type.component.html b/src/app/products/dds-account-types/create-dds-account-type/create-dds-account-type.component.html
new file mode 100644
index 000000000..3e0eff78f
--- /dev/null
+++ b/src/app/products/dds-account-types/create-dds-account-type/create-dds-account-type.component.html
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
DDS Product Creation
+
{{ isEdit ? 'Update this Daily Deposit product.' : 'Register a Daily Deposit product.' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ totalCount | number }}
+
Total DDS Products
+
+
+
+
+
+
{{ filteredCount | number }}
+
Showing after filter
+
+
+
+
+
+
+
+ @if (totalCount === 0) {
+
+
+
No account types yet
+
Create one so Daily Deposit accounts can be opened against it.
+
+ Create DDS Product
+
+
+ } @else {
+
+
+
+ Product
+
+
+
+
+
+
+ Description
+ {{ t.accountTypeDescription }}
+
+
+
+ Auto Interest Post
+
+ @if (t.autoInterestPost) {
+ {{ t.autoInterestPostWhen || 'Yes' }}
+ @if (t.autoInterestPostDay) {
+ day {{ t.autoInterestPostDay }}
+ }
+ } @else {
+ No
+ }
+
+
+
+
+ Created
+
+ {{ t.createdDate ? (t.createdDate | dateFormat: 'DD MMM YYYY, hh:mm A') : '—' }}
+
+
+
+
+ Actions
+
+
+ Edit
+
+
+
+
+
+
+ @if (filteredCount === 0 && totalCount > 0) {
+
+ No account types match your filter.
+
+ }
+
+
+
+ }
+
+
= new MatTableDataSource([]);
+ accountTypes: any[] = [];
+ filteredCount = 0;
+
+ @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
+ @ViewChild(MatSort, { static: true }) sort: MatSort;
+
+ get totalCount(): number {
+ return this.accountTypes.length;
+ }
+
+ ngOnInit(): void {
+ this.loadAccountTypes();
+ }
+
+ private loadAccountTypes(): void {
+ this.productsService.getDdsAccountTypes().subscribe((accountTypes: any[]) => {
+ this.accountTypes = accountTypes || [];
+ this.dataSource = new MatTableDataSource(this.accountTypes);
+ this.dataSource.paginator = this.paginator;
+ this.dataSource.sort = this.sort;
+ this.filteredCount = this.accountTypes.length;
+ this.dataSource.connect().subscribe((rows) => (this.filteredCount = rows.length));
+ });
+ }
+
+ applyFilter(filterValue: string): void {
+ this.dataSource.filter = filterValue.trim().toLowerCase();
+ }
+
+ /**
+ * Retires or restores an account type. Never a delete: Parties are opened against an account
+ * type, so removing it would orphan every account already using it. Deactivating takes it out of
+ * the pick lists for new accounts and leaves existing ones untouched.
+ */
+}
diff --git a/src/app/products/loan-interest-rate-register/cibil-adjustment/cibil-adjustment.component.html b/src/app/products/loan-interest-rate-register/cibil-adjustment/cibil-adjustment.component.html
new file mode 100644
index 000000000..25a387ffa
--- /dev/null
+++ b/src/app/products/loan-interest-rate-register/cibil-adjustment/cibil-adjustment.component.html
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
Read-only — {{ register.status }}
+
{{ readOnlyReason() }}
+
+
+
+
+
●
+
CURRENT ACTIVE
+
{{ active.name }}
+
· effective {{ active.effectiveFrom }} → {{ active.effectiveTo || '—' }}
+
You are viewing the Active register
+
View active →
+
+
+
+
+
+
+
+
Credit score slabs
+
+ Only the Adjustment % is editable · changes apply to new sanctions after the register is approved
+
+
+
+
+
+
+
+
+
+
+
= {
+ 'V. Poor': 'tier tier--vpoor',
+ Poor: 'tier tier--poor',
+ Fair: 'tier tier--fair',
+ Good: 'tier tier--good',
+ Excellent: 'tier tier--excellent'
+ };
+ return map[tier] ?? 'tier';
+ }
+
+ /** Classes to colour the adjustment number by sign/magnitude. */
+ adjustInputClass(pct: number): string {
+ const base = 'ca__ghost-input ca__ghost-input--num ca__adj-input';
+ if (pct < 0) {
+ return `${base} ca__adj-input--negative`;
+ }
+ if (pct >= 1) {
+ return `${base} ca__adj-input--high`;
+ }
+ if (pct > 0) {
+ return `${base} ca__adj-input--positive`;
+ }
+ return base;
+ }
+
+ /** Append a new slab continuing from the current highest "score to". */
+ addSlab(): void {
+ if (!this.canEdit) {
+ return;
+ }
+ const lastTo = this.register.cibilSlabs.length ? Math.max(...this.register.cibilSlabs.map((s) => s.to)) : 0;
+ const from = Math.min(lastTo + 1, 900);
+ this.register.cibilSlabs.push({
+ from,
+ to: Math.min(from + 50, 900),
+ tier: 'Fair',
+ type: 'Flat',
+ adjustmentPct: 0
+ });
+ }
+
+ deleteSlab(index: number): void {
+ if (!this.canEdit) {
+ return;
+ }
+ this.register.cibilSlabs.splice(index, 1);
+ }
+
+ /** Edits are kept in the in-memory service (the register reference is shared). */
+ save(): void {
+ this.router.navigate(['/products/loan-interest-rate-register/edit'], { queryParams: { id: this.register.id } });
+ }
+
+ backToRegister(): void {
+ this.save();
+ }
+}
diff --git a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.html b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.html
new file mode 100644
index 000000000..35c9f7843
--- /dev/null
+++ b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.html
@@ -0,0 +1,199 @@
+
+
+
+
+
●
+
CURRENT ACTIVE
+
{{ active.name }}
+
· effective {{ active.effectiveFrom }} → {{ active.effectiveTo || '—' }}
+
You are viewing the Active register
+
View active →
+
+
+
+
+
+
Read-only — {{ register.status }}
+
{{ readOnlyReason() }}
+
+
+
+
+
+
+
+
Rate chart grid
+
+ {{ rows.length }} products × {{ slabs.length }} amount slabs
+ · click any cell to edit
+ · read-only view
+ · {{ unmappedCount() }} without GL — map every product's GL before submitting
+
+
+
+
+
+
+
+
+
+
Add product
+
+
+ PRODUCT NAME
+
+
+ GL ACCOUNT (required)
+
+
Add
+
Cancel
+
+
{{ addProductError }}
+
+
+
Add amount slab
+
+
+ UPPER LIMIT (₹) — leave blank for "above the last slab"
+
+
+ SLAB LABEL
+
+
Add
+
Cancel
+
+
The new slab is added as the last column; fill in its rates for each product.
+
{{ addSlabError }}
+
+
+
+
+
+
CS
+
+
CIBIL / credit score adjustment
+
+ {{ register.cibilSlabs.length }} slabs · +2.00% (very poor) to base (above 700) · applied on top of chart rate
+
+
+
Edit →
+
+
+
+
;
+
+ /** Leaving the page keeps the draft: edits are saved so a reload or a trip to Compare does not lose them. */
+ ngOnDestroy(): void {
+ if (this.canEdit) {
+ this.service.saveDrafts();
+ }
+ }
+
+ saveDraft(): void {
+ this.service.saveDrafts();
+ this.snack.open('Draft saved', 'OK', { duration: 2000 });
+ }
+
+ /** Posting GL accounts for the particular → GL mapping. */
+ glOptions: GlOption[] = [];
+
+ /** "Add product" panel state. A new product needs a name and a GL before it can be added. */
+ addingProduct = false;
+ newProductName = '';
+ newProductGl: number | null = null;
+ addProductError = '';
+
+ /** Index of the row whose GL is being changed inline, or null. */
+ glEditRow: number | null = null;
+
+ ngOnInit(): void {
+ this.service.getGlOptions().subscribe((options) => (this.glOptions = options));
+ const idParam = this.route.snapshot.queryParamMap.get('id');
+ const id = idParam ? Number(idParam) : null;
+ this.service.list().subscribe((all) => {
+ const found = (id ? all.find((r) => r.id === id) : undefined) ?? this.service.getActiveOrFirstDraft();
+ if (!found) {
+ // e.g. a reload on an unsaved local draft: nothing to edit, go back to the list.
+ this.router.navigate(['/products/loan-interest-rate-register']);
+ return;
+ }
+ this.register = found;
+ this.active = this.service.getActive();
+ this.slabs = this.register.slabs;
+ this.rows = this.register.rows;
+ });
+ }
+
+ isActiveRegister(): boolean {
+ return !!this.active && this.active.id === this.register?.id;
+ }
+
+ /** Only a Draft can be edited. Pending Approval / Active / Expired open read-only. */
+ get canEdit(): boolean {
+ return this.register?.status === 'Draft';
+ }
+
+ /** Status label shown on the read-only banner. */
+ readOnlyReason(): string {
+ switch (this.register?.status) {
+ case 'Pending Approval':
+ return 'This version has been submitted and is awaiting checker approval. No further edits allowed.';
+ case 'Active':
+ return 'This is the current Active register. Click "Edit (new version)" on the list page to propose changes as a new Draft.';
+ case 'Expired':
+ return 'This is an inactive historical version. Read-only.';
+ default:
+ return 'Read-only.';
+ }
+ }
+
+ viewActive(): void {
+ if (this.active) {
+ this.router.navigate(['/products/loan-interest-rate-register/edit'], { queryParams: { id: this.active.id } });
+ }
+ }
+
+ /** Formatted display for a cell. */
+ display(cell: RateCell): string {
+ if (cell === null) {
+ return 'N.A.';
+ }
+ if (typeof cell === 'string') {
+ return cell;
+ }
+ return cell.toFixed(2);
+ }
+
+ isFormulaRow(row: RateChartRow): boolean {
+ return !!row.isFormula;
+ }
+
+ isNa(cell: RateCell): boolean {
+ return cell === null;
+ }
+
+ /** Click on a cell → open it as an editable input, pre-filled with the current value. */
+ startEdit(rowIdx: number, colIdx: number, current: RateCell): void {
+ if (!this.canEdit) {
+ return;
+ }
+ this.editing = { row: rowIdx, col: colIdx };
+ if (current === null) {
+ this.editValue = '';
+ } else if (typeof current === 'string') {
+ this.editValue = current;
+ } else {
+ this.editValue = current.toString();
+ }
+ // Let the view render the input, then focus and select its contents.
+ setTimeout(() => {
+ const el = this.cellInput?.nativeElement;
+ if (el) {
+ el.focus();
+ el.select();
+ }
+ }, 0);
+ }
+
+ isEditing(rowIdx: number, colIdx: number): boolean {
+ return !!this.editing && this.editing.row === rowIdx && this.editing.col === colIdx;
+ }
+
+ /**
+ * Save the cell:
+ * - empty / "N.A." / "NA" → the slab is marked unavailable
+ * - value with letters, "%" or "+" → persisted as a formula string ("1% + FD")
+ * - plain number → stored as a number so it formats as a %
+ */
+ saveEdit(rowIdx: number, colIdx: number): void {
+ if (!this.editing) {
+ return;
+ }
+ const raw = this.editValue.trim();
+ let next: RateCell;
+ if (!raw || raw.toLowerCase() === 'n.a.' || raw.toLowerCase() === 'na') {
+ next = null;
+ } else if (/[a-zA-Z+%]/.test(raw)) {
+ next = raw;
+ } else {
+ const num = Number(raw);
+ next = Number.isFinite(num) ? num : this.rows[rowIdx].rates[colIdx];
+ }
+ this.rows[rowIdx].rates[colIdx] = next;
+ this.rows[rowIdx].isFormula = this.rows[rowIdx].rates.some((c) => typeof c === 'string');
+ this.editing = null;
+ }
+
+ cancelEdit(): void {
+ this.editing = null;
+ }
+
+ glLabel(row: RateChartRow): string | null {
+ return this.service.glLabel(row.glAccountId);
+ }
+
+ unmappedCount(): number {
+ return this.rows.filter((r) => r.glAccountId == null).length;
+ }
+
+ /** Submit is blocked until every product has a GL. */
+ get canSubmit(): boolean {
+ return this.unmappedCount() === 0;
+ }
+
+ /** Opens the Add product panel. */
+ addProduct(): void {
+ if (!this.canEdit) {
+ return;
+ }
+ this.addingSlab = false;
+ this.addingProduct = true;
+ this.newProductName = '';
+ this.newProductGl = null;
+ this.addProductError = '';
+ }
+
+ cancelAddProduct(): void {
+ this.addingProduct = false;
+ this.addProductError = '';
+ }
+
+ /** Append the new product row at the bottom of the grid. Name and GL are both mandatory. */
+ confirmAddProduct(): void {
+ const name = this.newProductName.trim();
+ if (!name) {
+ this.addProductError = 'Enter the product name.';
+ return;
+ }
+ if (this.rows.some((r) => r.particulars.trim().toLowerCase() === name.toLowerCase())) {
+ this.addProductError = 'A product with this name already exists.';
+ return;
+ }
+ if (this.newProductGl == null) {
+ this.addProductError = 'Select the GL account for this product.';
+ return;
+ }
+ const next = this.rows.length > 0 ? Math.max(...this.rows.map((r) => r.srNo)) + 1 : 1;
+ this.rows.push({
+ srNo: next,
+ particulars: name,
+ glAccountId: this.newProductGl,
+ rates: Array(this.slabs.length).fill(null),
+ isFormula: false
+ });
+ this.cancelAddProduct();
+ }
+
+ /** Toggle the inline GL selector on an existing row (Draft only). */
+ editGl(rowIdx: number): void {
+ if (this.canEdit) {
+ this.glEditRow = this.glEditRow === rowIdx ? null : rowIdx;
+ }
+ }
+
+ /** "Add slab" panel state. A slab is an amount band; at least a label or an upper limit is needed. */
+ addingSlab = false;
+ newSlabLabel = '';
+ newSlabAmount: number | null = null;
+ addSlabError = '';
+
+ /** Opens the Add slab panel. */
+ addSlab(): void {
+ if (!this.canEdit) {
+ return;
+ }
+ this.addingProduct = false;
+ this.addingSlab = true;
+ this.newSlabLabel = '';
+ this.newSlabAmount = null;
+ this.addSlabError = '';
+ }
+
+ cancelAddSlab(): void {
+ this.addingSlab = false;
+ this.addSlabError = '';
+ }
+
+ /** Label that is filled in for a slab when only the upper limit is given, e.g. "Upto 50,00,000". */
+ suggestedSlabLabel(): string {
+ const amount = this.newSlabAmount;
+ return amount != null && Number.isFinite(amount) && amount > 0 ? `Upto ${amount.toLocaleString('en-IN')}` : '';
+ }
+
+ /** Append the new amount slab as the last column; every existing row grows by one blank cell. */
+ confirmAddSlab(): void {
+ const amount = this.newSlabAmount;
+ const hasAmount = amount != null && String(amount) !== '';
+ if (hasAmount && (!Number.isFinite(amount) || (amount as number) <= 0)) {
+ this.addSlabError = 'The upper limit must be a number greater than 0.';
+ return;
+ }
+ const label = this.newSlabLabel.trim() || this.suggestedSlabLabel();
+ if (!label) {
+ this.addSlabError = 'Enter a label, or an upper limit to build one from.';
+ return;
+ }
+ if (this.slabs.some((s) => s.label.trim().toLowerCase() === label.toLowerCase())) {
+ this.addSlabError = 'A slab with this label already exists.';
+ return;
+ }
+ if (hasAmount && this.slabs.some((s) => s.amountUpto === amount)) {
+ this.addSlabError = 'A slab with this upper limit already exists.';
+ return;
+ }
+ if (!hasAmount && this.slabs.some((s) => s.amountUpto === null)) {
+ this.addSlabError = 'An open-ended slab (no upper limit) already exists.';
+ return;
+ }
+ this.slabs.push({
+ key: `s_${Date.now()}`,
+ label,
+ amountUpto: hasAmount ? (amount as number) : null
+ });
+ this.rows.forEach((r) => r.rates.push(null));
+ this.cancelAddSlab();
+ }
+
+ editCibil(): void {
+ this.router.navigate(['/products/loan-interest-rate-register/cibil'], { queryParams: { id: this.register.id } });
+ }
+
+ backToList(): void {
+ this.router.navigate(['/products/loan-interest-rate-register']);
+ }
+
+ /** Opens the Compare screen; the actual submit happens from there once the maker has reviewed the diff. */
+ submitForApproval(): void {
+ this.router.navigate(['/products/loan-interest-rate-register/preview'], { queryParams: { id: this.register.id } });
+ }
+
+ statusChipClass(): string {
+ switch (this.register?.status) {
+ case 'Active':
+ return 'chip chip--active';
+ case 'Draft':
+ return 'chip chip--draft';
+ case 'Pending Approval':
+ return 'chip chip--pending';
+ default:
+ return 'chip chip--expired';
+ }
+ }
+}
diff --git a/src/app/products/loan-interest-rate-register/gl-picker/gl-picker.component.ts b/src/app/products/loan-interest-rate-register/gl-picker/gl-picker.component.ts
new file mode 100644
index 000000000..c58959fb2
--- /dev/null
+++ b/src/app/products/loan-interest-rate-register/gl-picker/gl-picker.component.ts
@@ -0,0 +1,135 @@
+/**
+ * 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 {
+ AfterViewInit,
+ Component,
+ EventEmitter,
+ Input,
+ OnChanges,
+ OnDestroy,
+ OnInit,
+ Output,
+ SimpleChanges,
+ ViewChild
+} from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ReactiveFormsModule, UntypedFormControl } from '@angular/forms';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatSelect, MatSelectModule } from '@angular/material/select';
+import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
+import { Subject, takeUntil } from 'rxjs';
+import { GlOption } from '../models/rate-register.model';
+
+/**
+ * Compact searchable GL account dropdown. Typing in the search box filters by GL code or name.
+ * Emits the chosen GL id; with allowClear a "GL not mapped" entry emits null.
+ */
+@Component({
+ selector: 'mifosx-gl-picker',
+ imports: [
+ CommonModule,
+ ReactiveFormsModule,
+ MatFormFieldModule,
+ MatSelectModule,
+ NgxMatSelectSearchModule
+ ],
+ template: `
+
+
+
+
+ GL not mapped
+ {{ o.label }}
+
+
+ `,
+ styles: [
+ `
+ .gl-picker {
+ width: 100%;
+ min-width: 260px;
+ font-size: 12px;
+ }
+ `
+ ]
+})
+export class GlPickerComponent implements OnInit, OnChanges, AfterViewInit, OnDestroy {
+ @Input() options: GlOption[] = [];
+ @Input() value: number | null = null;
+ @Input() placeholder = 'Select GL account';
+ @Input() allowClear = false;
+ /** Open the dropdown as soon as it is rendered (used for inline row editing). */
+ @Input() openOnInit = false;
+
+ @Output() valueChange = new EventEmitter();
+ /** Fired when the dropdown panel closes, whether or not a value was picked. */
+ @Output() closed = new EventEmitter();
+
+ @ViewChild(MatSelect) private select?: MatSelect;
+
+ filterCtrl = new UntypedFormControl('');
+ filtered: GlOption[] = [];
+
+ private readonly destroy$ = new Subject();
+
+ ngOnInit(): void {
+ this.filterCtrl.valueChanges.pipe(takeUntil(this.destroy$)).subscribe(() => this.applyFilter());
+ }
+
+ ngOnChanges(changes: SimpleChanges): void {
+ if (changes['options'] || changes['value']) {
+ this.applyFilter();
+ }
+ }
+
+ ngAfterViewInit(): void {
+ if (this.openOnInit) {
+ setTimeout(() => this.select?.open());
+ }
+ }
+
+ ngOnDestroy(): void {
+ this.destroy$.next();
+ this.destroy$.complete();
+ }
+
+ onOpenedChange(opened: boolean): void {
+ if (opened) {
+ this.filterCtrl.setValue('');
+ } else {
+ this.closed.emit();
+ }
+ }
+
+ /** Filter by code or name; the currently selected option always stays in the list so its label shows. */
+ private applyFilter(): void {
+ const q = ((this.filterCtrl.value as string) ?? '').trim().toLowerCase();
+ const all = this.options ?? [];
+ if (!q) {
+ this.filtered = all.slice();
+ return;
+ }
+ const matches = all.filter((o) => o.label.toLowerCase().includes(q));
+ const selected = all.find((o) => o.id === this.value);
+ this.filtered = selected && !matches.includes(selected) ? [
+ selected,
+ ...matches
+ ] : matches;
+ }
+}
diff --git a/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html b/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html
new file mode 100644
index 000000000..cf9e44f33
--- /dev/null
+++ b/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
ACTIVE REGISTER
+
{{ active?.name ?? 'None' }}
+
Effective {{ activeWindow() }}
+
+
+
SLABS
+
10 amount slabs
+
₹10k → > ₹25L
+
+
+
CIBIL ADJUSTMENTS
+
{{ active?.cibilSlabs?.length ?? 0 }} slabs
+
+2.00% (poor) → base (above 700)
+
+
+
+
+
+
+
Loan Interest Rate Register — Version History
+
All versions, newest first · click a version to expand its rate chart
+
+
+
+
+
+
No rate register versions yet
+
+ Create the first version to publish rates for all loan products. It starts with the standard loan types (rates
+ blank) and 5 CIBIL bands — fill in the rates, add any bank-specific products, and submit for approval.
+
+
+
+
+
+
+
+
+
+
+
{{ r.note }}
+
+ Created by {{ r.createdBy }} · Last modified {{ r.lastModified | date: 'dd MMM yyyy' }}
+
+
+
Rate chart ({{ r.rows.length }} products × {{ r.slabs.length }} slabs)
+
+
+
CIBIL / credit-score slabs
+
+
+
+ #
+ Score from
+ Score to
+ Risk tier
+ Type
+ Adjustment
+
+
+
+
+ {{ i + 1 }}
+ {{ slab.from }}
+ {{ slab.to }}
+ {{ slab.tier }}
+ {{ slab.type }}
+ {{ formatPct(slab.adjustmentPct) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Draft
+
{{ draft.name }}
+
+
+
Rate cells changed
+
{{ changedCellCount() }}
+
+
+
CIBIL slabs changed
+
{{ changedCibilCount() }}
+
+
+
+
+
+
+
OLD · WILL BE DEACTIVATED
+
{{ active?.name ?? 'No active register' }}
+
+ Effective {{ active.effectiveFrom }} → {{ active.effectiveTo || '—' }}
+
+
+
→
+
+
NEW · WILL BE ACTIVATED
+
{{ draft.name }}
+
Effective {{ draft.effectiveFrom }} → {{ draft.effectiveTo || '—' }}
+
+
+
+
+
+
+
(
+ SubmitDetailsDialogComponent,
+ {
+ width: '520px',
+ maxWidth: '95vw',
+ data: {
+ name: this.draft.name,
+ effectiveFrom: this.draft.effectiveFrom,
+ effectiveTo: this.draft.effectiveTo ?? '',
+ activeName: this.active && this.active.id !== this.draft.id ? this.active.name : undefined,
+ activeFrom: this.active && this.active.id !== this.draft.id ? this.active.effectiveFrom : undefined
+ }
+ }
+ );
+ ref.afterClosed().subscribe((details) => {
+ if (!details) {
+ return;
+ }
+ this.draft.name = details.name;
+ this.draft.effectiveFrom = details.effectiveFrom;
+ this.draft.effectiveTo = details.effectiveTo || null;
+ this.service.saveDrafts();
+ this.send();
+ });
+ }
+
+ private send(): void {
+ this.submitting = true;
+ this.service.submitForApproval(this.draft.id).subscribe({
+ next: (res) => {
+ this.submitting = false;
+ const msg = res.rollbackTransaction ? 'Submitted — awaiting checker approval' : 'Changes activated';
+ this.snack.open(msg, 'OK', { duration: 3500 });
+ this.router.navigate(['/products/loan-interest-rate-register']);
+ },
+ error: (err) => {
+ // Belt-and-braces guard — the service already catches, but if anything slips through
+ // we still unlock the UI so the user can retry instead of staring at a spinner forever.
+ this.submitting = false;
+ console.error('[PreviewRegister] submit failed', err);
+ const reason =
+ err?.error?.errors?.[0]?.defaultUserMessage ||
+ err?.error?.defaultUserMessage ||
+ err?.error?.message ||
+ 'check backend status and try again';
+ this.snack.open(`Submit failed — ${reason}`, 'Dismiss', { duration: 8000 });
+ }
+ });
+ }
+
+ backToEdit(): void {
+ this.router.navigate(['/products/loan-interest-rate-register/edit'], { queryParams: { id: this.draft.id } });
+ }
+}
diff --git a/src/app/products/loan-interest-rate-register/rate-register-diff.util.ts b/src/app/products/loan-interest-rate-register/rate-register-diff.util.ts
new file mode 100644
index 000000000..6a8ac8920
--- /dev/null
+++ b/src/app/products/loan-interest-rate-register/rate-register-diff.util.ts
@@ -0,0 +1,48 @@
+/**
+ * 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 { CibilSlab, RateCell, RateChartRow } from './models/rate-register.model';
+
+/** Two chart cells are the same when both are N.A., both the same formula, or numerically equal. */
+export function sameCell(a: RateCell, b: RateCell): boolean {
+ if (a === null && b === null) {
+ return true;
+ }
+ if (typeof a === 'number' && typeof b === 'number') {
+ return Math.abs(a - b) < 1e-9;
+ }
+ return a === b;
+}
+
+/** Number of {product, amount-slab} cells whose value differs between the draft and the baseline. */
+export function countChangedCells(draft: RateChartRow[], baseline: RateChartRow[], slabCount: number): number {
+ let n = 0;
+ for (const row of draft) {
+ const base = baseline.find((r) => r.srNo === row.srNo);
+ for (let j = 0; j < slabCount; j++) {
+ if (!sameCell(base?.rates[j] ?? null, row.rates[j] ?? null)) {
+ n++;
+ }
+ }
+ }
+ return n;
+}
+
+/** Number of CIBIL bands that differ (by position) between the draft and the baseline. */
+export function countChangedCibil(draft: CibilSlab[], baseline: CibilSlab[]): number {
+ let n = 0;
+ const max = Math.max(draft.length, baseline.length);
+ for (let i = 0; i < max; i++) {
+ const a = baseline[i];
+ const d = draft[i];
+ if (!a || !d || a.from !== d.from || a.to !== d.to || a.tier !== d.tier || a.adjustmentPct !== d.adjustmentPct) {
+ n++;
+ }
+ }
+ return n;
+}
diff --git a/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.html b/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.html
new file mode 100644
index 000000000..7e421085b
--- /dev/null
+++ b/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.html
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
Rate chart — inline diff
+
Changed cells highlighted · unchanged cells show single value
+
+
+ Show only changed rows
+
+
+
+
+
+
No changes detected
+
The proposed version is identical to the current Active register.
+
+
+
+
+
+
+
CIBIL slabs — inline diff
+
Changed fields shown as OLD → NEW · unchanged fields render once
+
+
+
+
+
+ #
+ Score from
+ Score to
+ Tier
+ Adjustment
+
+
+
+
+ {{ i + 1 }}
+
+
+ {{ baselineCibil[i]?.from ?? '—' }}
+ →
+ {{ slab.from }}
+
+ {{ slab.from }}
+
+
+
+ {{ baselineCibil[i]?.to ?? '—' }}
+ →
+ {{ slab.to }}
+
+ {{ slab.to }}
+
+
+
+ {{ baselineCibil[i]?.tier ?? '—' }}
+ →
+ {{ slab.tier }}
+
+ {{ slab.tier }}
+
+
+
+ {{ formatPct(baselineCibil[i]?.adjustmentPct ?? 0) }}
+ →
+ {{ formatPct(slab.adjustmentPct) }}
+
+ {{ formatPct(slab.adjustmentPct) }}
+
+
+
+
+
();
+ for (const p of payload.products ?? []) {
+ glBySrNo.set(p.srNo, p.glAccountId ?? null);
+ }
+ const madeOn =
+ typeof e.madeOnDate === 'number'
+ ? new Date(e.madeOnDate < 1e12 ? e.madeOnDate * 1000 : e.madeOnDate).toISOString().slice(0, 10)
+ : String(e.madeOnDate ?? '').slice(0, 10);
+ const reg = this.fromBackend(
+ {
+ id: -(RateRegisterService.PENDING_ID_BASE + e.id),
+ name: payload.name,
+ effectiveFromDate: payload.effectiveFromDate ?? madeOn,
+ effectiveToDate: null,
+ currencyCode: payload.currencyCode,
+ isActive: false,
+ fallbackNoCibilSlab: payload.fallbackNoCibilSlab,
+ fallbackBelowMin: payload.fallbackBelowMin,
+ note: payload.note,
+ createdDate: madeOn,
+ slabs: payload.slabs,
+ cibilSlabs: payload.cibilSlabs
+ },
+ glBySrNo
+ );
+ reg.status = 'Pending Approval';
+ reg.createdBy = e.maker ?? 'Maker';
+ reg.lastModified = madeOn;
+ // With no Active register to diff against, the Compare screen falls back to this blank baseline.
+ reg.baselineRows = reg.rows.map((r) => ({
+ srNo: r.srNo,
+ particulars: r.particulars,
+ glAccountId: r.glAccountId ?? null,
+ rates: new Array(r.rates.length).fill(null)
+ }));
+ reg.baselineCibilSlabs = [];
+ out.push(reg);
+ }
+ return out;
+ }
+
+ private readonly slabs: SlabColumn[] = [
+ { key: 's1', label: 'Upto 10,000', amountUpto: 10000 },
+ { key: 's2', label: 'Upto 25,000', amountUpto: 25000 },
+ { key: 's3', label: 'Upto 1,00,000', amountUpto: 100000 },
+ { key: 's4', label: 'Upto 2,00,000', amountUpto: 200000 },
+ { key: 's5', label: 'Upto 5,00,000', amountUpto: 500000 },
+ { key: 's6', label: 'Upto 10,00,000', amountUpto: 1000000 },
+ { key: 's7', label: 'Upto 15,00,000', amountUpto: 1500000 },
+ { key: 's8', label: 'Upto 20,00,000', amountUpto: 2000000 },
+ { key: 's9', label: 'Upto 25,00,000', amountUpto: 2500000 },
+ { key: 's10', label: '> 25,00,000', amountUpto: null }
+ ];
+
+ // Credit-score bands per the bank's approved register:
+ // above 700 = base rate (no change), below that stepped up by 0.5% per band.
+ // No discount band — the register never gives a negative adjustment.
+ private readonly cibilSlabs: CibilSlab[] = [
+ { from: 0, to: 500, tier: 'V. Poor', type: 'Flat', adjustmentPct: 2.0 },
+ { from: 501, to: 600, tier: 'Poor', type: 'Flat', adjustmentPct: 1.5 },
+ { from: 601, to: 650, tier: 'Fair', type: 'Flat', adjustmentPct: 1.0 },
+ { from: 651, to: 700, tier: 'Good', type: 'Flat', adjustmentPct: 0.5 },
+ { from: 701, to: 900, tier: 'Excellent', type: 'Flat', adjustmentPct: 0 }
+ ];
+
+ /**
+ * The standard loan types every bank offers. Same list the backend seeds into
+ * m_loan_rate_register_product; used only if that endpoint cannot be reached when the first
+ * version is created. Any other particular is added by the bank itself.
+ */
+ private readonly defaultParticulars: { srNo: number; name: string }[] = [
+ { srNo: 1, name: 'Housing Loan (Purchase/Construction)' },
+ { srNo: 2, name: 'Home Repair/Renovation' },
+ { srNo: 3, name: 'Personal Loan (Unsecured)' },
+ { srNo: 4, name: 'Personal Loan (Secured/Property)' },
+ { srNo: 5, name: 'Two Wheeler Loan' },
+ { srNo: 6, name: 'Car Loan (New)' },
+ { srNo: 7, name: 'Used Car/Vehicle Loan' },
+ { srNo: 8, name: 'Commercial Vehicle Loan' },
+ { srNo: 9, name: 'Gold Loan' },
+ { srNo: 10, name: 'Business Term Loan' },
+ { srNo: 11, name: 'Machinery & Equipment Loan' },
+ { srNo: 12, name: 'Cash Credit' },
+ { srNo: 13, name: 'Overdraft' },
+ { srNo: 14, name: 'Agriculture Loan' },
+ { srNo: 15, name: 'Loan against FDR' },
+ { srNo: 16, name: 'Loan against RD' }
+ ];
+
+ /**
+ * List all registers (local drafts + server versions). If the backend cannot be reached only the
+ * local drafts are returned: there is no built-in sample data. A successful but empty response is a
+ * genuinely empty register and shows the "Create first version" state.
+ */
+ list(): Observable {
+ if (!this.useHttp) {
+ this.cache = [...this.localDrafts];
+ return of(this.cache);
+ }
+ // Approved versions, the particulars master (each row's GL) and the versions still awaiting a
+ // checker. A failure of the master or the pending lookup must not hide the approved versions.
+ return forkJoin({
+ versions: this.productsService.getLoanBaseInterestRates(),
+ products: this.productsService.getLoanRateRegisterProducts().pipe(catchError(() => of([]))),
+ pending: this.productsService.getPendingLoanRateRegisters().pipe(
+ // The list omits each entry's payload, so fetch the detail of every pending entry.
+ switchMap((entries: any) => {
+ const items: any[] = (Array.isArray(entries) ? entries : (entries?.pageItems ?? [])).filter(
+ (e: any) => (e?.entityName ?? '').toUpperCase() === 'LOANBASEINTERESTRATE'
+ );
+ if (items.length === 0) {
+ return of([] as any[]);
+ }
+ return forkJoin(
+ items.map((e) =>
+ this.productsService.getLoanRateRegisterAuditDetail(e.id).pipe(
+ map((detail: any) => ({ ...detail, ...e })),
+ catchError(() => of(null))
+ )
+ )
+ ).pipe(map((all) => all.filter((x) => x !== null)));
+ }),
+ catchError(() => of([] as any[]))
+ )
+ }).pipe(
+ map(({ versions, products, pending }) => {
+ const glBySrNo = new Map();
+ for (const p of (products as any[]) ?? []) {
+ glBySrNo.set(p.srNo, p.glAccountId ?? null);
+ }
+ const approved = ((versions as any[]) ?? []).map((d) => this.fromBackend(d, glBySrNo));
+ return [
+ ...this.pendingToRegisters(pending),
+ ...approved
+ ];
+ }),
+ catchError((err) => {
+ console.warn('[RateRegisterService] Backend unavailable —', err?.message ?? err);
+ this.useHttp = false;
+ return of([] as RateRegister[]);
+ }),
+ tap((effectiveVersions) => {
+ this.cache = [
+ ...this.localDrafts,
+ ...effectiveVersions
+ ];
+ }),
+ map(() => this.cache)
+ );
+ }
+
+ get(id: number): Observable {
+ const cached = this.cache.find((r) => r.id === id);
+ if (cached) {
+ return of(cached);
+ }
+ // Local draft lookup (negative ids never hit the server).
+ if (id < 0) {
+ return of(this.localDrafts.find((r) => r.id === id));
+ }
+ if (!this.useHttp) {
+ return of(undefined);
+ }
+ return this.productsService.getLoanBaseInterestRateById(id).pipe(
+ map((d: any) => (d ? this.fromBackend(d, new Map()) : undefined)),
+ catchError(() => of(undefined))
+ );
+ }
+
+ /** The one currently in force. Used by the Compare screen as the "left-hand" baseline. */
+ getActive(): RateRegister | undefined {
+ return this.cache.find((r) => r.status === 'Active');
+ }
+
+ /** The one shown by default on list → edit navigation. */
+ getActiveOrFirstDraft(): RateRegister | undefined {
+ return (
+ this.cache.find((r) => r.status === 'Draft') ?? this.cache.find((r) => r.status === 'Active') ?? this.cache[0]
+ );
+ }
+
+ getSlabColumns(): SlabColumn[] {
+ return this.slabs;
+ }
+
+ getCibilSlabs(): CibilSlab[] {
+ return this.cibilSlabs;
+ }
+
+ // ---- maker-checker (real HTTP when backend is up, mock when not) -----------------
+
+ /**
+ * Submit a Draft for approval. HTTP path POSTs to /loanproducts/baseinterestrates — on a
+ * maker-checker-gated response ({@code rollbackTransaction=true}) the Draft stays visible as
+ * "Pending Approval" until the checker acts. On an un-gated response (direct commit) the Draft
+ * is removed and the register list is re-fetched so the new Active appears.
+ */
+ submitForApproval(id: number): Observable<{ rollbackTransaction: boolean; commandId?: number }> {
+ const draft = this.localDrafts.find((x) => x.id === id) ?? this.cache.find((x) => x.id === id);
+ if (!draft) {
+ return of({ rollbackTransaction: false });
+ }
+
+ const payload = this.toBackend(draft);
+ return this.productsService.saveLoanBaseInterestRate(payload).pipe(
+ map((res: any) => {
+ const rollback = res?.rollbackTransaction === true;
+ const commandId = res?.commandId;
+ // Either way the server now owns this version (a pending maker-checker entry, or the new
+ // Active one), so the local draft goes. list() brings the server copy back on its next call.
+ this.localDrafts = this.localDrafts.filter((d) => d.id !== id);
+ this.cache = this.cache.filter((c) => c.id !== id);
+ this.saveDrafts();
+ return { rollbackTransaction: rollback, commandId };
+ })
+ // No catchError: a rejected submit (e.g. a product without GL, backend down) must reach the
+ // caller so it can show the reason instead of pretending the request was sent.
+ );
+ }
+
+ /**
+ * Checker approves a Pending register — it becomes Active and the previously-Active one is
+ * deactivated. In real use the Approvals tab calls Fineract's /makercheckers/{id}?command=approve;
+ * this method remains as a local-only stub for the dev-fallback path.
+ */
+ approve(id: number): Observable {
+ const pending = this.cache.find((x) => x.id === id);
+ if (!pending || pending.status !== 'Pending Approval') {
+ return of(undefined);
+ }
+ const today = new Date().toISOString().slice(0, 10);
+ const previouslyActive = this.cache.find((x) => x.status === 'Active');
+ if (previouslyActive) {
+ previouslyActive.status = 'Expired';
+ previouslyActive.effectiveTo = today;
+ previouslyActive.lastModified = today;
+ }
+ pending.status = 'Active';
+ pending.effectiveFrom = today;
+ pending.lastModified = today;
+ pending.baselineRows = this.cloneRows(pending.rows);
+ pending.baselineCibilSlabs = this.cloneCibilSlabs(pending.cibilSlabs);
+ // Promote the local draft to the server-shaped view by moving it out of localDrafts.
+ this.localDrafts = this.localDrafts.filter((d) => d.id !== id);
+ return of(pending);
+ }
+
+ /**
+ * Scaffold the first-ever Draft. Rows come from the backend's master list of particulars
+ * (/loanproducts/baseinterestrates/products) with every rate blank, so the bank fills in its own
+ * rates. If the backend is unreachable, the same standard loan types come from a built-in list.
+ * Carries a negative id like other local drafts.
+ */
+ createFirstVersion(): Observable {
+ const fromTemplate = (): RateRegister =>
+ this.scaffoldFirstDraft(
+ this.defaultParticulars.map(
+ (p): RateChartRow => ({
+ srNo: p.srNo,
+ particulars: p.name,
+ glAccountId: null,
+ rates: new Array(this.slabs.length).fill(null)
+ })
+ ),
+ 'First version — standard loan types, rates to be filled'
+ );
+
+ if (!this.useHttp) {
+ return of(fromTemplate());
+ }
+ return this.productsService.getLoanRateRegisterProducts().pipe(
+ map((products: any[]) => {
+ const rows: RateChartRow[] = (products ?? []).map(
+ (p): RateChartRow => ({
+ srNo: p.srNo,
+ particulars: p.name,
+ glAccountId: p.glAccountId ?? null,
+ rates: new Array(this.slabs.length).fill(null)
+ })
+ );
+ return rows.length > 0
+ ? this.scaffoldFirstDraft(rows, 'First version — standard loan types, rates to be filled')
+ : fromTemplate();
+ }),
+ catchError(() => of(fromTemplate()))
+ );
+ }
+
+ private scaffoldFirstDraft(rows: RateChartRow[], note: string): RateRegister {
+ const cibilTemplate = this.cibilSlabs;
+ const today = new Date().toISOString().slice(0, 10);
+ const draft: RateRegister = {
+ id: this.nextLocalDraftId(),
+ name: 'Interest Rate of Loans — new version',
+ effectiveFrom: today,
+ effectiveTo: null,
+ currency: 'INR',
+ status: 'Draft',
+ createdBy: 'Current User',
+ lastModified: today,
+ note,
+ slabs: this.slabs,
+ rows,
+ cibilSlabs: this.cloneCibilSlabs(cibilTemplate),
+ // Baseline is blank for a first version, so Compare shows every filled cell as new.
+ baselineRows: rows.map((r) => ({
+ srNo: r.srNo,
+ particulars: r.particulars,
+ rates: new Array(r.rates.length).fill(null)
+ })),
+ baselineCibilSlabs: [],
+ fallbackNoCibilSlab: 2,
+ fallbackBelowMin: 'block'
+ };
+ this.localDrafts.unshift(draft);
+ this.cache.unshift(draft);
+ this.saveDrafts();
+ return draft;
+ }
+
+ /**
+ * Duplicate the current Active (or any register) as a new local Draft so the user can propose
+ * changes without touching the live Active. Local Drafts carry a negative id to never collide
+ * with server-assigned ids.
+ */
+ duplicateAsDraft(sourceId: number): RateRegister | undefined {
+ const source = this.cache.find((r) => r.id === sourceId);
+ if (!source) {
+ return undefined;
+ }
+ const newId = this.nextLocalDraftId();
+ const today = new Date().toISOString().slice(0, 10);
+ const copy: RateRegister = {
+ id: newId,
+ // Left blank on purpose: the maker enters name and dates in the submit popup.
+ name: '',
+ effectiveFrom: '',
+ effectiveTo: null,
+ currency: source.currency,
+ status: 'Draft',
+ createdBy: 'Current User',
+ lastModified: today,
+ note: `Draft derived from ${source.name}`,
+ slabs: source.slabs,
+ rows: this.cloneRows(source.rows),
+ cibilSlabs: this.cloneCibilSlabs(source.cibilSlabs),
+ baselineRows: this.cloneRows(source.rows),
+ baselineCibilSlabs: this.cloneCibilSlabs(source.cibilSlabs),
+ fallbackNoCibilSlab: source.fallbackNoCibilSlab,
+ fallbackBelowMin: source.fallbackBelowMin
+ };
+ this.localDrafts.unshift(copy);
+ this.cache.unshift(copy);
+ this.saveDrafts();
+ return copy;
+ }
+
+ /** Checker rejects the pending register — it goes back to Draft (local-only fallback). */
+ reject(id: number): Observable {
+ const pending = this.cache.find((x) => x.id === id);
+ if (!pending || pending.status !== 'Pending Approval') {
+ return of(undefined);
+ }
+ pending.status = 'Draft';
+ pending.lastModified = new Date().toISOString().slice(0, 10);
+ return of(pending);
+ }
+
+ private nextLocalDraftId(): number {
+ const minId = this.localDrafts.length ? Math.min(...this.localDrafts.map((d) => d.id)) : 0;
+ return (minId <= 0 ? minId : 0) - 1;
+ }
+
+ private cloneRows(src: RateChartRow[]): RateChartRow[] {
+ return src.map((r) => ({
+ srNo: r.srNo,
+ particulars: r.particulars,
+ isFormula: r.isFormula,
+ glAccountId: r.glAccountId ?? null,
+ rates: [...r.rates]
+ }));
+ }
+
+ private cloneCibilSlabs(src: CibilSlab[]): CibilSlab[] {
+ return src.map((s) => ({ ...s }));
+ }
+
+ // ---- backend <-> UI mapping -----------------------------------------------
+ // Backend sends/receives slabs as a flat list of {productSrNo, slabOrder, cell} rows; the UI
+ // works with a matrix: SlabColumn[] + RateChartRow[] (34 × 10). The two mappers below bridge
+ // that gap.
+
+ /** Map a backend {@code LoanRateRegisterData} payload into a UI RateRegister. */
+ private fromBackend(d: any, glBySrNo: Map): RateRegister {
+ // Rebuild the slab columns from unique slabOrders.
+ const slabByOrder = new Map();
+ for (const cell of d.slabs ?? []) {
+ if (!slabByOrder.has(cell.slabOrder)) {
+ slabByOrder.set(cell.slabOrder, {
+ key: `s${cell.slabOrder + 1}`,
+ label: cell.slabLabel,
+ amountUpto: cell.amountUpto ?? null
+ });
+ }
+ }
+ const slabs = [...slabByOrder.entries()]
+ .sort((a, b) => a[0] - b[0])
+ .map(
+ ([
+ ,
+ s
+ ]) => s
+ );
+
+ // Group cells by product to build rows.
+ const rowByProduct = new Map();
+ for (const cell of d.slabs ?? []) {
+ let row = rowByProduct.get(cell.productSrNo);
+ if (!row) {
+ row = {
+ srNo: cell.productSrNo,
+ particulars: cell.productName,
+ glAccountId: glBySrNo.get(cell.productSrNo) ?? null,
+ rates: new Array(slabs.length).fill(null)
+ };
+ rowByProduct.set(cell.productSrNo, row);
+ }
+ let value: RateCell;
+ if (cell.isNa) {
+ value = null;
+ } else if (cell.isFormula && cell.rateFormula) {
+ value = cell.rateFormula;
+ row.isFormula = true;
+ } else {
+ value = cell.rateValue ?? null;
+ }
+ row.rates[cell.slabOrder] = value;
+ }
+ const rows = [...rowByProduct.values()].sort((a, b) => a.srNo - b.srNo);
+
+ const cibilSlabs: CibilSlab[] = (d.cibilSlabs ?? [])
+ .slice()
+ .sort((a: any, b: any) => a.displayOrder - b.displayOrder)
+ .map((c: any) => ({
+ from: c.scoreFrom,
+ to: c.scoreTo,
+ tier: c.tier,
+ type: c.slabType ?? 'Flat',
+ adjustmentPct: Number(c.adjustmentPct)
+ }));
+
+ const status: RegisterStatus = d.isActive ? 'Active' : 'Expired';
+ return {
+ id: d.id,
+ name: d.name,
+ effectiveFrom: d.effectiveFromDate,
+ effectiveTo: d.effectiveToDate ?? null,
+ currency: d.currencyCode ?? 'INR',
+ status,
+ createdBy: d.createdById != null ? `User #${d.createdById}` : 'System',
+ lastModified: (d.createdDate ?? d.effectiveFromDate ?? '').toString().slice(0, 10),
+ note: d.note,
+ slabs,
+ rows,
+ cibilSlabs,
+ baselineRows: this.cloneRows(rows),
+ baselineCibilSlabs: this.cloneCibilSlabs(cibilSlabs),
+ fallbackNoCibilSlab: d.fallbackNoCibilSlab ?? 2,
+ fallbackBelowMin: (d.fallbackBelowMin as 'use-min-slab' | 'block') ?? 'block'
+ };
+ }
+
+ /** Serialise a UI RateRegister into the JSON shape POST /loanproducts/baseinterestrates expects. */
+ private toBackend(r: RateRegister): any {
+ const slabs: any[] = [];
+ for (const row of r.rows) {
+ for (let j = 0; j < r.slabs.length; j++) {
+ const cell = row.rates[j];
+ const slabCol = r.slabs[j];
+ const isNa = cell === null;
+ const isFormula = typeof cell === 'string';
+ slabs.push({
+ productSrNo: row.srNo,
+ productName: row.particulars,
+ slabOrder: j,
+ slabLabel: slabCol.label,
+ amountUpto: slabCol.amountUpto,
+ rateValue: isNa || isFormula ? null : cell,
+ rateFormula: isFormula ? cell : null,
+ isFormula,
+ isNa
+ });
+ }
+ }
+ const cibilSlabs = r.cibilSlabs.map((c, i) => ({
+ scoreFrom: c.from,
+ scoreTo: c.to,
+ tier: c.tier,
+ slabType: c.type,
+ adjustmentPct: c.adjustmentPct,
+ displayOrder: i
+ }));
+ return {
+ name: r.name,
+ effectiveFromDate: r.effectiveFrom,
+ currencyCode: r.currency,
+ fallbackNoCibilSlab: r.fallbackNoCibilSlab,
+ fallbackBelowMin: r.fallbackBelowMin,
+ note: r.note,
+ products: r.rows.map((row) => ({
+ srNo: row.srNo,
+ name: row.particulars,
+ glAccountId: row.glAccountId ?? null
+ })),
+ slabs,
+ cibilSlabs
+ };
+ }
+
+ // ---- GL accounts for the particular → GL mapping ------------------------------
+
+ private glOptionsCache: GlOption[] | null = null;
+
+ /** Posting GL accounts the user can map a particular to. Cached after the first successful load. */
+ getGlOptions(): Observable {
+ if (this.glOptionsCache) {
+ return of(this.glOptionsCache);
+ }
+ return this.productsService.getLoanRegisterGlAccounts().pipe(
+ map((accounts: any[]) =>
+ (accounts ?? [])
+ // The server filters on type=1 (ASSET); this keeps asset-only even if that param is ignored.
+ .filter((a) => a.type == null || a.type.value === 'ASSET' || a.type.id === 1)
+ .sort((a, b) => String(a.glCode ?? '').localeCompare(String(b.glCode ?? '')))
+ .map((a) => ({
+ id: a.id,
+ label: a.glCode ? `${a.glCode} - ${a.name}` : a.name
+ }))
+ ),
+ tap((options) => {
+ this.glOptionsCache = options;
+ }),
+ catchError(() => of([] as GlOption[]))
+ );
+ }
+
+ /** Display label for a mapped GL id, or null when unmapped or the account list is not loaded. */
+ glLabel(id: number | null | undefined): string | null {
+ if (id == null) {
+ return null;
+ }
+ return this.glOptionsCache?.find((o) => o.id === id)?.label ?? `GL #${id}`;
+ }
+}
diff --git a/src/app/products/loan-interest-rate-register/submit-details-dialog/submit-details-dialog.component.ts b/src/app/products/loan-interest-rate-register/submit-details-dialog/submit-details-dialog.component.ts
new file mode 100644
index 000000000..e815d80f3
--- /dev/null
+++ b/src/app/products/loan-interest-rate-register/submit-details-dialog/submit-details-dialog.component.ts
@@ -0,0 +1,139 @@
+/**
+ * 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, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+
+export interface SubmitDetailsData {
+ name: string;
+ effectiveFrom: string;
+ effectiveTo: string;
+ /** Active version this one replaces, shown as context. */
+ activeName?: string;
+ activeFrom?: string;
+}
+
+export interface SubmitDetailsResult {
+ name: string;
+ effectiveFrom: string;
+ effectiveTo: string;
+}
+
+/** Asks the maker for the version details (name, effective from / to) just before sending for approval. */
+@Component({
+ selector: 'mifosx-submit-details-dialog',
+ imports: [
+ CommonModule,
+ FormsModule,
+ MatDialogModule,
+ MatButtonModule
+ ],
+ template: `
+ Version details
+
+
+ Confirm these details before sending the rate register for approval.
+ It will replace {{ data.activeName }} (effective {{ data.activeFrom }}) once approved.
+
+
+ REGISTER NAME *
+
+
+ {{ error }}
+
+
+ Cancel
+ Submit for approval
+
+ `,
+ styles: [
+ `
+ .sd {
+ min-width: 460px;
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+ }
+ .sd__hint {
+ margin: 0;
+ font-size: 12px;
+ color: #64748b;
+ }
+ .sd__row {
+ display: flex;
+ gap: 12px;
+ }
+ .sd__field {
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+ }
+ .sd__field label {
+ font-size: 10px;
+ font-weight: 600;
+ color: #64748b;
+ letter-spacing: 0.3px;
+ margin-bottom: 3px;
+ }
+ .sd__field input {
+ height: 34px;
+ border: 1px solid #cbd5e1;
+ border-radius: 6px;
+ padding: 0 10px;
+ font-size: 13px;
+ font-family: inherit;
+ }
+ .sd__error {
+ font-size: 12px;
+ color: #b91c1c;
+ }
+ `
+ ]
+})
+export class SubmitDetailsDialogComponent {
+ readonly ref = inject>(MatDialogRef);
+ readonly data = inject(MAT_DIALOG_DATA);
+
+ name = this.data.name;
+ effectiveFrom = this.data.effectiveFrom;
+ effectiveTo = this.data.effectiveTo;
+ error = '';
+
+ confirm(): void {
+ const name = this.name.trim();
+ if (!name) {
+ this.error = 'Enter the register name.';
+ return;
+ }
+ if (!this.effectiveFrom) {
+ this.error = 'Select the effective from date.';
+ return;
+ }
+ if (this.effectiveTo && this.effectiveTo < this.effectiveFrom) {
+ this.error = 'Effective to cannot be before effective from.';
+ return;
+ }
+ this.ref.close({ name, effectiveFrom: this.effectiveFrom, effectiveTo: this.effectiveTo });
+ }
+}
diff --git a/src/app/products/loan-products/create-loan-product/create-loan-product.component.html b/src/app/products/loan-products/create-loan-product/create-loan-product.component.html
index 260e066d8..d900c8414 100644
--- a/src/app/products/loan-products/create-loan-product/create-loan-product.component.html
+++ b/src/app/products/loan-products/create-loan-product/create-loan-product.component.html
@@ -42,19 +42,168 @@
-
-
-
-
-
-
+ @if (isAdvanceProduct) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @if (isOverdraftFacility) {
+
+
+
+
+
+
+ }
+ }
+
+ @if (isLoanAccount) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
@@ -109,11 +263,12 @@
+
diff --git a/src/app/products/loan-products/create-loan-product/create-loan-product.component.ts b/src/app/products/loan-products/create-loan-product/create-loan-product.component.ts
index 93785c36a..005e57c45 100644
--- a/src/app/products/loan-products/create-loan-product/create-loan-product.component.ts
+++ b/src/app/products/loan-products/create-loan-product/create-loan-product.component.ts
@@ -13,11 +13,22 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Components */
import { LoanProductDetailsStepComponent } from '../loan-product-stepper/loan-product-details-step/loan-product-details-step.component';
import { LoanProductCurrencyStepComponent } from '../loan-product-stepper/loan-product-currency-step/loan-product-currency-step.component';
+import { LoanProductSecurityLienStepComponent } from '../loan-product-stepper/loan-product-security-lien-step/loan-product-security-lien-step.component';
+import { LoanProductAdvanceLimitTenureStepComponent } from '../loan-product-stepper/loan-product-advance-limit-tenure-step/loan-product-advance-limit-tenure-step.component';
+import { LoanProductAdvanceInterestStepComponent } from '../loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component';
+import { LoanProductPenalNpaStepComponent } from '../loan-product-stepper/loan-product-penal-npa-step/loan-product-penal-npa-step.component';
+import { LoanProductRenewalClosureStepComponent } from '../loan-product-stepper/loan-product-renewal-closure-step/loan-product-renewal-closure-step.component';
+import { LoanProductChequeBookStepComponent } from '../loan-product-stepper/loan-product-cheque-book-step/loan-product-cheque-book-step.component';
import { LoanProductTermsStepComponent } from '../loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component';
import { LoanProductSettingsStepComponent } from '../loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component';
import { LoanProductChargesStepComponent } from '../loan-product-stepper/loan-product-charges-step/loan-product-charges-step.component';
import { LoanProductAccountingStepComponent } from '../loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component';
import { LoanProductInterestRefundStepComponent } from '../loan-product-stepper/loan-product-interest-refund-step/loan-product-interest-refund-step.component';
+import { LoanProductLoanSecurityStepComponent } from '../loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component';
+import { LoanProductLoanAmountTenureStepComponent } from '../loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component';
+import { LoanProductLoanRepaymentStepComponent } from '../loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component';
+import { LoanProductLoanInterestStepComponent } from '../loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component';
+import { LoanProductLoanPrepaymentStepComponent } from '../loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component';
/** Custom Services */
import { ProductsService } from 'app/products/products.service';
@@ -34,7 +45,7 @@ import {
import { Accounting } from 'app/core/utils/accounting';
import { StringEnumOptionData } from '../../../shared/models/option-data.model';
import { LoanProductDeferredIncomeRecognitionStepComponent } from '../loan-product-stepper/loan-product-capitalized-income-step/loan-product-deferred-income-recognition-step.component';
-import { UntypedFormGroup } from '@angular/forms';
+import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { LoanProductPaymentStrategyStepComponent } from '../loan-product-stepper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component';
import { LoanProductPreviewStepComponent } from '../loan-product-stepper/loan-product-preview-step/loan-product-preview-step.component';
@@ -51,12 +62,24 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
FaIconComponent,
LoanProductDetailsStepComponent,
LoanProductCurrencyStepComponent,
- LoanProductSettingsStepComponent,
- LoanProductInterestRefundStepComponent,
- LoanProductPaymentStrategyStepComponent,
- LoanProductTermsStepComponent,
+ LoanProductSecurityLienStepComponent,
+ LoanProductAdvanceLimitTenureStepComponent,
+ LoanProductAdvanceInterestStepComponent,
+ LoanProductPenalNpaStepComponent,
+ LoanProductRenewalClosureStepComponent,
+ LoanProductChequeBookStepComponent,
+ LoanProductLoanSecurityStepComponent,
+ LoanProductLoanAmountTenureStepComponent,
+ LoanProductLoanRepaymentStepComponent,
+ LoanProductLoanInterestStepComponent,
+ LoanProductLoanPrepaymentStepComponent,
+ // Old Loans A/C path — commented out for now (its tabs are commented out in the template):
+ // LoanProductSettingsStepComponent,
+ // LoanProductInterestRefundStepComponent,
+ // LoanProductPaymentStrategyStepComponent,
+ // LoanProductTermsStepComponent,
+ // LoanProductDeferredIncomeRecognitionStepComponent,
LoanProductChargesStepComponent,
- LoanProductDeferredIncomeRecognitionStepComponent,
LoanProductAccountingStepComponent,
LoanProductPreviewStepComponent
]
@@ -73,12 +96,39 @@ export class CreateLoanProductComponent implements OnInit {
@ViewChild(LoanProductDetailsStepComponent, { static: true }) loanProductDetailsStep: LoanProductDetailsStepComponent;
@ViewChild(LoanProductCurrencyStepComponent, { static: true })
loanProductCurrencyStep: LoanProductCurrencyStepComponent;
+ // Conditional tabs (Advances A/C only): static false — resolved after the @if renders them.
+ @ViewChild(LoanProductSecurityLienStepComponent)
+ loanProductSecurityLienStep: LoanProductSecurityLienStepComponent;
+ @ViewChild(LoanProductAdvanceLimitTenureStepComponent)
+ loanProductAdvanceLimitTenureStep: LoanProductAdvanceLimitTenureStepComponent;
+ @ViewChild(LoanProductAdvanceInterestStepComponent)
+ loanProductAdvanceInterestStep: LoanProductAdvanceInterestStepComponent;
+ @ViewChild(LoanProductPenalNpaStepComponent) loanProductPenalNpaStep: LoanProductPenalNpaStepComponent;
+ @ViewChild(LoanProductRenewalClosureStepComponent)
+ loanProductRenewalClosureStep: LoanProductRenewalClosureStepComponent;
+ @ViewChild(LoanProductChequeBookStepComponent) loanProductChequeBookStep: LoanProductChequeBookStepComponent;
+
+ // Conditional tabs (Loans A/C only): resolved after the @if renders them.
+ @ViewChild(LoanProductLoanSecurityStepComponent)
+ loanProductLoanSecurityStep: LoanProductLoanSecurityStepComponent;
+ @ViewChild(LoanProductLoanAmountTenureStepComponent)
+ loanProductLoanAmountTenureStep: LoanProductLoanAmountTenureStepComponent;
+ @ViewChild(LoanProductLoanRepaymentStepComponent)
+ loanProductLoanRepaymentStep: LoanProductLoanRepaymentStepComponent;
+ @ViewChild(LoanProductLoanInterestStepComponent)
+ loanProductLoanInterestStep: LoanProductLoanInterestStepComponent;
+ @ViewChild(LoanProductLoanPrepaymentStepComponent)
+ loanProductLoanPrepaymentStep: LoanProductLoanPrepaymentStepComponent;
+
+ /** Charges step needs a real control; Settings is absent on the Advances path, so fall back to this. */
+ readonly multiDisburseFallback = new UntypedFormControl(false);
@ViewChild(LoanProductInterestRefundStepComponent, { static: true })
loanProductInterestRefundStep: LoanProductInterestRefundStepComponent;
@ViewChild(LoanProductDeferredIncomeRecognitionStepComponent, { static: true })
loanProductDeferredIncomeRecognitionStep: LoanProductDeferredIncomeRecognitionStepComponent;
- @ViewChild(LoanProductTermsStepComponent, { static: true }) loanProductTermsStep: LoanProductTermsStepComponent;
- @ViewChild(LoanProductSettingsStepComponent, { static: true })
+ // Terms & Settings tabs are now conditional (Loans path only), so resolve them non-statically.
+ @ViewChild(LoanProductTermsStepComponent) loanProductTermsStep: LoanProductTermsStepComponent;
+ @ViewChild(LoanProductSettingsStepComponent)
loanProductSettingsStep: LoanProductSettingsStepComponent;
@ViewChild(LoanProductChargesStepComponent, { static: true }) loanProductChargesStep: LoanProductChargesStepComponent;
@ViewChild(LoanProductAccountingStepComponent, { static: true })
@@ -143,7 +193,23 @@ export class CreateLoanProductComponent implements OnInit {
}
get loanProductTermsForm() {
- return this.loanProductTermsStep.loanProductTermsForm;
+ // Absent on the Advances path (tab hidden), so guard for callers.
+ return this.loanProductTermsStep?.loanProductTermsForm;
+ }
+
+ /** True once the Advance Limit & Tenure step reports an Overdraft (running) facility. */
+ get isOverdraftFacility(): boolean {
+ return this.isAdvanceProduct && !!this.loanProductAdvanceLimitTenureStep?.isOverdraft;
+ }
+
+ /** The GL account chosen on the Details step; the rate register row can be matched by it. */
+ get productGlAccount(): number | string | null {
+ return this.loanProductDetailsStep?.loanProductDetailsForm?.get('glAccount')?.value ?? null;
+ }
+
+ /** Sub type chosen on the Details step; drives the FD 12–15 month tenure policy downstream. */
+ get advanceSubType(): string {
+ return this.loanProductDetailsStep?.loanProductDetailsForm?.get('productTypeSubGroup')?.value ?? '';
}
advancePaymentStrategy(value: string) {
@@ -231,47 +297,103 @@ export class CreateLoanProductComponent implements OnInit {
}
get loanProductSettingsForm() {
- return this.loanProductSettingsStep.loanProductSettingsForm;
+ // Absent on the Advances path (tab hidden), so guard for callers.
+ return this.loanProductSettingsStep?.loanProductSettingsForm;
}
get loanProductAccountingForm() {
return this.loanProductAccountingStep.loanProductAccountingForm;
}
+ /** The Details step's chosen product type; drives the Advances-only tabs. */
+ get isAdvanceProduct(): boolean {
+ return this.loanProductDetailsForm?.get('productTypeGroup')?.value === 'advances';
+ }
+
+ /** The Details step's chosen product type; drives the Loans A/C (EMI) tabs. */
+ get isLoanAccount(): boolean {
+ return this.loanProductDetailsForm?.get('productTypeGroup')?.value === 'loans';
+ }
+
get totalTabs(): number {
- let tabs = 6; // details, currency, settings, terms, charges, accounting
- if (this.isAdvancedPaymentStrategy) tabs += 3; // interest refund, payment allocation, deferred income
+ let tabs = 4; // details, currency, charges, accounting (always)
+ if (this.isAdvanceProduct) {
+ // security & lien, limit & tenure, interest, penal & npa, renewal & closure
+ tabs += 5;
+ if (this.isOverdraftFacility) tabs += 1; // cheque book
+ } else if (this.isLoanAccount) {
+ // security & collateral, amount & tenure, repayment & emi, interest, penal & npa, prepayment & closure
+ tabs += 6;
+ }
+ // Old Loans A/C path (Settings, Terms, Interest Refund, Payment Allocation, Deferred Income) — commented out:
+ // else {
+ // tabs += 2; // settings, terms
+ // if (this.isAdvancedPaymentStrategy) tabs += 3; // interest refund, payment allocation, deferred income
+ // }
if (this.loanProductFormValid) tabs += 1; // preview
return tabs;
}
get loanProductFormValid() {
- if (this.isAdvancedPaymentStrategy) {
+ const base =
+ this.loanProductDetailsForm.valid && this.loanProductCurrencyForm.valid && this.loanProductAccountingForm.valid;
+
+ // Advances A/C: the curated Figma steps gate the form; Settings/Terms tabs are hidden.
+ if (this.isAdvanceProduct) {
return (
- this.loanProductDetailsForm.valid &&
- this.loanProductCurrencyForm.valid &&
- this.loanProductTermsForm.valid &&
- this.loanProductSettingsForm.valid &&
- this.loanIncomeCapitalizationForm.valid &&
- this.loanProductAccountingForm.valid
- );
- } else {
- return (
- this.loanProductDetailsForm.valid &&
- this.loanProductCurrencyForm.valid &&
- this.loanProductTermsForm.valid &&
- this.loanProductSettingsForm.valid &&
- this.loanProductAccountingForm.valid
+ base &&
+ !!this.loanProductSecurityLienStep?.loanProductSecurityLienForm?.valid &&
+ !!this.loanProductAdvanceLimitTenureStep?.loanProductAdvanceLimitTenureForm?.valid &&
+ !!this.loanProductAdvanceInterestStep?.loanProductAdvanceInterestForm?.valid &&
+ !!this.loanProductPenalNpaStep?.loanProductPenalNpaForm?.valid &&
+ !!this.loanProductRenewalClosureStep?.loanProductRenewalClosureForm?.valid &&
+ (!this.isOverdraftFacility || !!this.loanProductChequeBookStep?.loanProductChequeBookForm?.valid)
);
}
+
+ // Loans A/C (EMI): the curated Loans steps gate the form; Settings/Terms tabs are commented out.
+ if (this.isLoanAccount) {
+ return (
+ base &&
+ !!this.loanProductLoanSecurityStep?.loanProductLoanSecurityForm?.valid &&
+ !!this.loanProductLoanAmountTenureStep?.loanProductLoanAmountTenureForm?.valid &&
+ !!this.loanProductLoanRepaymentStep?.loanProductLoanRepaymentForm?.valid &&
+ !!this.loanProductLoanInterestStep?.loanProductLoanInterestForm?.valid &&
+ !!this.loanProductPenalNpaStep?.loanProductPenalNpaForm?.valid &&
+ !!this.loanProductLoanPrepaymentStep?.loanProductLoanPrepaymentForm?.valid
+ );
+ }
+
+ // No product type chosen yet.
+ return false;
+
+ // Old Loans A/C path (Settings + Terms) — commented out for now:
+ // const loansValid = !!this.loanProductTermsForm?.valid && !!this.loanProductSettingsForm?.valid;
+ // if (this.isAdvancedPaymentStrategy) {
+ // return base && loansValid && !!this.loanIncomeCapitalizationForm?.valid;
+ // }
+ // return base && loansValid;
}
get loanProduct() {
+ // Advances A/C builds its own payload: the curated steps map onto Fineract's mandatory core fields
+ // (principal, tenure, rate, amortization defaults) plus the whitelisted satellite params.
+ if (this.isAdvanceProduct) {
+ return this.assembleAdvanceProduct();
+ }
+
+ // Loans A/C (EMI): builds its own payload from the Loans steps, mapped onto Fineract's core fields.
+ if (this.isLoanAccount) {
+ return this.assembleLoanProduct();
+ }
+ return {};
+
+ /* OLD LOANS A/C PATH (Settings/Terms composition) — commented out for now.
const loanProduct = {
...this.loanProductDetailsStep.loanProductDetails,
...this.loanProductCurrencyStep.loanProductCurrency,
- ...this.loanProductTermsStep.loanProductTerms,
- ...this.loanProductSettingsStep.loanProductSettings,
+ ...(this.loanProductTermsStep?.loanProductTerms ?? {}),
+ ...(this.loanProductSettingsStep?.loanProductSettings ?? {}),
...this.loanProductChargesStep.loanProductCharges,
...this.loanProductAccountingStep.loanProductAccounting
};
@@ -302,6 +424,340 @@ export class CreateLoanProductComponent implements OnInit {
}
}
return loanProduct;
+ */
+ }
+
+ /**
+ * Builds the create payload for a Loans A/C (EMI) product: the Loans steps mapped onto Fineract's core
+ * product fields (so the standard product saves). The Loans-only options that have no core field yet
+ * (eligibility, collateral rules, prepayment, repayment mode, floating reset, register link) stay UI-only
+ * and are not sent — an unknown key would be rejected by checkForUnsupportedParameters.
+ */
+ private assembleLoanProduct(): any {
+ const num = (v: any): number | undefined => (v === '' || v === null || v === undefined ? undefined : Number(v));
+
+ const d = this.loanProductDetailsStep.loanProductDetails;
+ const cur = this.loanProductCurrencyStep.loanProductCurrency;
+ const at = this.loanProductLoanAmountTenureStep.loanProductLoanAmountTenure;
+ const rp = this.loanProductLoanRepaymentStep.loanProductLoanRepayment;
+ const intr = this.loanProductLoanInterestStep.loanProductLoanInterest;
+ const sec = this.loanProductLoanSecurityStep.loanProductLoanSecurity;
+ const pp = this.loanProductLoanPrepaymentStep.loanProductLoanPrepayment;
+ const pn = this.loanProductPenalNpaStep.loanProductPenalNpa;
+
+ const stepper = this.loanProductLoanRepaymentStep;
+ const interestStep = this.loanProductLoanInterestStep;
+ const frequency = stepper.frequencyOptions.find((f) => f.id === rp.frequency)?.fineractId ?? 2;
+ const daysInYear = interestStep.daysInYearOptions.find((o) => o.id === intr.daysInYear)?.fineractId ?? 1;
+ const daysInMonth = interestStep.daysInMonthOptions.find((o) => o.id === intr.daysInMonth)?.fineractId ?? 1;
+
+ const defaultStrategy = this.loanProductsTemplate?.transactionProcessingStrategyOptions?.[0]?.code;
+ const minTenure = num(at.minTenure);
+ const minRate = num(intr.minRate);
+ const multiTranche = at.disbursementType === 'multiple';
+ const moratorium = num(rp.moratoriumMonths);
+
+ const payload: any = {
+ // identity + currency
+ name: d.name,
+ shortName: d.shortName,
+ description: d.description,
+ startDate: d.startDate,
+ closeDate: d.closeDate,
+ currencyCode: cur.currencyCode,
+ digitsAfterDecimal: cur.digitsAfterDecimal,
+ inMultiplesOf: cur.inMultiplesOf ?? 1,
+
+ // amount -> principal
+ minPrincipal: num(at.minAmount),
+ principal: num(at.defaultAmount) ?? num(at.minAmount),
+ maxPrincipal: num(at.maxAmount),
+
+ // tenure (months) -> number of repayments
+ minNumberOfRepayments: minTenure,
+ numberOfRepayments: num(at.defaultTenure) ?? minTenure,
+ maxNumberOfRepayments: num(at.maxTenure),
+ repaymentEvery: num(rp.repaidEvery) ?? 1,
+ repaymentFrequencyType: frequency,
+ graceOnPrincipalPayment: moratorium && moratorium > 0 ? moratorium : undefined,
+
+ // rate
+ minInterestRatePerPeriod: minRate,
+ interestRatePerPeriod: num(intr.defaultRate) ?? minRate,
+ maxInterestRatePerPeriod: num(intr.maxRate),
+ interestRateFrequencyType: 3, // per year
+
+ // amortization / calculation
+ amortizationType: rp.repaymentType === 'equal_principal' ? 0 : 1, // 0 equal principal, 1 equal installments
+ interestType: intr.calcMethod === 'flat' ? 1 : 0, // 0 declining balance, 1 flat
+ interestCalculationPeriodType: intr.calcPeriod === 'daily' ? 0 : 1, // 0 daily, 1 same as repayment period
+ transactionProcessingStrategyCode: defaultStrategy,
+ daysInYearType: daysInYear,
+ daysInMonthType: daysInMonth,
+ isInterestRecalculationEnabled: false,
+
+ // disbursement
+ multiDisburseLoan: multiTranche,
+ maxTrancheCount: multiTranche ? num(at.maxTranches) : undefined,
+
+ // NPA / delinquency map onto core product fields
+ overdueDaysForNPA: num(pn.npaDays),
+ graceOnArrearsAgeing: num(pn.graceOnArrearsAgeing),
+ inArrearsTolerance: num(pn.inArrearsTolerance),
+ delinquencyBucketId: pn.delinquencyBucketId || undefined,
+
+ // accounting rule + GL mappings + charges (all standard, whitelisted)
+ ...this.loanProductAccountingStep.loanProductAccounting,
+ ...this.loanProductChargesStep.loanProductCharges,
+
+ // Details-step satellite params (same whitelist the Advances path uses)
+ productTypeGroup: d.productTypeGroup,
+ productTypeSubGroup: d.productTypeSubGroup,
+ glAccount: d.glAccount || undefined,
+ loanProductCategory: d.loanProductCategory,
+ prioritySector: d.prioritySector,
+ cibilAccountType: d.cibilAccountType,
+ kfsEnabled: d.kfsEnabled,
+ aprEnabled: d.aprEnabled,
+
+ // Loans A/C (EMI) fields kept on the product satellite (same whitelist as the Advances fields)
+ margin: num(sec.margin),
+ ltv: sec.ltv,
+ securityType: sec.securityType,
+ repaymentType: rp.repaymentType,
+ appropriationOrder: rp.appropriationOrder,
+ interestCalcMethod: intr.calcMethod,
+ spread: num(intr.spread),
+ lockInMonths: num(pp.lockInMonths),
+ interestOnPreclosure: pp.interestOnPreclosure,
+ penalApplicable: pn.penalApplicable,
+ penalRate: num(pn.penalRate),
+ penalAppliedOn: pn.penalAppliedOn,
+ penalGraceDays: num(pn.penalGraceDays),
+ npaTrigger: pn.npaTrigger,
+ interestAfterNpa: pn.interestAfterNpa,
+ npaUpgradeOnlyAllArrears: pn.upgradeOnlyAllArrears,
+ npaKeepStandardIfDepositCovers: pn.keepStandardIfDepositCovers,
+ securityMandatory: sec.securityMandatory,
+ guarantorsRequired: num(sec.guarantorsRequired),
+ coApplicant: sec.coApplicant,
+ thirdPartySecurity: sec.thirdPartySecurity,
+ legalOpinionRequired: sec.legalOpinionRequired,
+ propertyInsuranceRequired: sec.propertyInsuranceRequired,
+ registerCharge: sec.registerCharge,
+ releaseSecurityOnClosure: sec.autoReleaseOnClosure,
+ allowMultipleSecurities: sec.allowMultipleSecurities,
+ allowThirdPartyDeposit: sec.allowThirdPartyDeposit,
+ minAge: num(at.minAge),
+ maxAgeAtMaturity: num(at.maxAgeAtMaturity),
+ minCibil: num(at.minCibil),
+ minMonthlyIncome: num(at.minMonthlyIncome),
+ maxFoir: num(at.maxFoir),
+ maxLoansPerCustomer: num(at.maxLoansPerCustomer),
+ disbursementType: at.disbursementType,
+ disbursementMode: at.disbursementMode,
+ undisbursedInterest: at.undisbursedInterest,
+ preEmiInterest: at.preEmiInterest,
+ emiDueDay: rp.emiDueDay,
+ holidayRule: rp.holidayRule,
+ moratoriumMonths: num(rp.moratoriumMonths),
+ moratoriumInterest: rp.moratoriumInterest,
+ variableInstallments: rp.variableInstallments,
+ repaymentMode: rp.repaymentMode,
+ linkedAccountType: rp.linkedAccountType,
+ pdcCollection: rp.pdcCollection,
+ mandateRequired: rp.mandateRequired,
+ advanceEmi: rp.advanceEmi,
+ rateType: intr.interestType,
+ registerParticular: intr.registerParticular,
+ applyCibilAdjustment: intr.applyCibilAdjustment,
+ rateResolvedAt: intr.rateResolvedAt,
+ calcPeriod: intr.calcPeriod,
+ interestStartsFrom: intr.interestStartsFrom,
+ compounding: intr.compounding,
+ benchmark: intr.benchmark,
+ resetFrequency: intr.resetFrequency,
+ resetChange: intr.resetChange,
+ partPrepaymentAllowed: pp.partPrepaymentAllowed,
+ minPartPayment: num(pp.minPartPayment),
+ allowedOn: pp.allowedOn,
+ partPaymentsPerYear: pp.partPaymentsPerYear,
+ partPrepaymentMode: pp.partPrepaymentMode,
+ foreclosureFloatingIndividual: num(pp.foreclosureFloatingIndividual),
+ foreclosureFixedIndividual: num(pp.foreclosureFixedIndividual),
+ foreclosureNonIndividual: num(pp.foreclosureNonIndividual),
+ foreclosureTakeover: num(pp.foreclosureTakeover),
+ foreclosureQuoteValidDays: num(pp.foreclosureQuoteValidDays),
+ autoCloseOnZeroBalance: pp.autoCloseOnZeroBalance,
+ nocLetter: pp.nocLetter,
+ restructuring: pp.restructuring,
+ releaseCollateralOnClosure: pp.releaseCollateralOnClosure,
+ topUpAllowed: pp.topUpAllowed,
+ balanceTransferOutAllowed: pp.balanceTransferOutAllowed
+ };
+
+ // Drop undefined keys so we never send an unresolved value.
+ Object.keys(payload).forEach((k) => payload[k] === undefined && delete payload[k]);
+ return payload;
+ }
+
+ /**
+ * Builds the create payload for an Advances A/C product: the curated wizard steps mapped onto Fineract's
+ * mandatory core fields (so the standard product saves) plus the whitelisted satellite params (persisted by
+ * LoanProductAdvanceExtService). Only keys the backend accepts are emitted — an unknown key would be
+ * rejected by checkForUnsupportedParameters.
+ */
+ private assembleAdvanceProduct(): any {
+ const num = (v: any): number | undefined => (v === '' || v === null || v === undefined ? undefined : Number(v));
+
+ const d = this.loanProductDetailsStep.loanProductDetails;
+ const cur = this.loanProductCurrencyStep.loanProductCurrency;
+ const sec = this.loanProductSecurityLienStep.loanProductSecurityLien;
+ const lt = this.loanProductAdvanceLimitTenureStep.loanProductAdvanceLimitTenure;
+ const intr = this.loanProductAdvanceInterestStep.loanProductAdvanceInterest;
+ const pn = this.loanProductPenalNpaStep.loanProductPenalNpa;
+ const rc = this.loanProductRenewalClosureStep.loanProductRenewalClosure;
+ const cb = this.isOverdraftFacility ? this.loanProductChequeBookStep?.loanProductChequeBook : null;
+
+ const defaultStrategy = this.loanProductsTemplate?.transactionProcessingStrategyOptions?.[0]?.code;
+ const minTenure = num(lt.minTenure);
+ const minRate = num(intr.minRate);
+
+ const payload: any = {
+ // identity + currency
+ name: d.name,
+ shortName: d.shortName,
+ description: d.description,
+ startDate: d.startDate,
+ closeDate: d.closeDate,
+ currencyCode: cur.currencyCode,
+ digitsAfterDecimal: cur.digitsAfterDecimal,
+ inMultiplesOf: 1,
+
+ // limit -> principal
+ minPrincipal: num(lt.minLimit),
+ principal: num(lt.defaultLimit) ?? num(lt.minLimit),
+ maxPrincipal: num(lt.maxLimit),
+
+ // tenure -> repayments (monthly)
+ minNumberOfRepayments: minTenure,
+ numberOfRepayments: num(lt.defaultTenure) ?? minTenure,
+ maxNumberOfRepayments: num(lt.maxTenure),
+ repaymentEvery: 1,
+ repaymentFrequencyType: 2, // months
+
+ // rate
+ minInterestRatePerPeriod: minRate,
+ // A deposit-linked row ("1% + FD") has no plain minimum or maximum, so the register step supplies the default.
+ interestRatePerPeriod: num(intr.defaultRate) ?? minRate,
+ maxInterestRatePerPeriod: num(intr.maxRate),
+ interestRateFrequencyType: 3, // per year
+
+ // Fineract mandatory engine defaults for an Advance (no EMI schedule shown to the officer)
+ amortizationType: 1, // equal installments
+ interestType: 0, // declining balance
+ interestCalculationPeriodType: 1, // same as repayment period
+ transactionProcessingStrategyCode: defaultStrategy,
+ daysInYearType: 1, // actual
+ daysInMonthType: 1, // actual
+ isInterestRecalculationEnabled: false,
+
+ // NPA / delinquency map onto core product fields
+ overdueDaysForNPA: num(pn.npaDays),
+ graceOnArrearsAgeing: num(pn.graceOnArrearsAgeing),
+ inArrearsTolerance: num(pn.inArrearsTolerance),
+ delinquencyBucketId: pn.delinquencyBucketId || undefined,
+
+ // accounting rule + GL mappings + charges (all standard, whitelisted)
+ ...this.loanProductAccountingStep.loanProductAccounting,
+ ...this.loanProductChargesStep.loanProductCharges,
+
+ // ---- satellite params (must match LoanProductAdvanceExtService.ADVANCE_PARAMETERS) ----
+ productTypeGroup: d.productTypeGroup,
+ productTypeSubGroup: d.productTypeSubGroup,
+ glAccount: d.glAccount || undefined,
+ loanProductCategory: d.loanProductCategory,
+ prioritySector: d.prioritySector,
+ cibilAccountType: d.cibilAccountType,
+ kfsEnabled: d.kfsEnabled,
+ aprEnabled: d.aprEnabled,
+ facilityType: lt.facilityType,
+ securityType: sec.securityType,
+ eligibleAmountBasis: sec.eligibleAmountBasis,
+ margin: num(sec.margin),
+ ltv: sec.ltv,
+ dpMethod: 'security_value_x_ltv',
+ lienRequired: this.loanProductSecurityLienStep.isLienSubType,
+ lienMarkingStage: sec.lienMarkingStage,
+ lienCertificateRequired: sec.lienCertificateRequired,
+ lienCertificatePrefix: sec.lienCertificatePrefix,
+ printCertificateOnDisbursement: sec.printOnDisbursement,
+ interestBasis: intr.interestBasis,
+ registerParticular: intr.registerParticular || undefined,
+ spread: num(intr.spread),
+ interestChargedOn: intr.interestChargedOn,
+ interestPostingFrequency: intr.postingFrequency,
+ penalApplicable: pn.penalApplicable,
+ penalRate: num(pn.penalRate),
+ penalAppliedOn: pn.penalAppliedOn,
+ penalGraceDays: num(pn.penalGraceDays),
+ npaTrigger: pn.npaTrigger,
+ interestAfterNpa: pn.interestAfterNpa,
+ renewalAllowed: rc.renewalAllowed,
+ renewalPeriodMonths: num(rc.renewalPeriodMonths),
+ renewalGraceDays: num(rc.renewalGraceDays),
+ preclosureAllowed: rc.preclosureAllowed,
+ lockInMonths: num(rc.lockInMonths),
+ interestOnPreclosure: rc.interestOnPreclosure,
+ chequeBookEnabled: this.isOverdraftFacility,
+ chequeType: cb?.chequeType,
+ defaultChequeBookSize: num(cb?.defaultBookSize),
+ ppsThreshold: num(cb?.ppsThreshold),
+ ppsMandatoryAbove: num(cb?.ppsMandatoryAbove),
+
+ // ---- remaining wizard fields ----
+ // security & lien extras (deposit list joined; rule checkboxes)
+ eligibleDepositProducts: (sec.eligibleDepositProducts ?? []).join('|'),
+ lienTenureNotExceedMaturity: sec.lienRules?.tenureNotExceedMaturity,
+ lienAutoReleaseOnClosure: sec.lienRules?.autoReleaseOnClosure,
+ lienAllowMultipleDeposits: sec.lienRules?.allowMultipleDeposits,
+ lienAdjustFromMaturity: sec.lienRules?.adjustFromMaturity,
+ lienAllowThirdParty: sec.lienRules?.allowThirdPartyDeposit,
+ lienAllowRenewalUnderLien: sec.lienRules?.allowRenewalUnderLien,
+ // limit & tenure extras
+ repaymentType: lt.repaymentType,
+ appropriationOrder: lt.appropriationOrder,
+ debitBalanceAllow: lt.debitBalanceAllow,
+ allowDebitAfterDueDate: lt.allowDebitTransAfterDueDate,
+ branchLevelAccountType: lt.branchLevelAccountType,
+ // interest extras
+ interestCalcMethod: intr.calcMethod,
+ interestOnCreditBalance: intr.interestOnCreditBalance,
+ interestPostingDay: intr.postingDay,
+ // NPA upgrade rules
+ npaUpgradeOnlyAllArrears: pn.upgradeOnlyAllArrears,
+ npaKeepStandardIfDepositCovers: pn.keepStandardIfDepositCovers,
+ // cheque book full config
+ chequeBookSizes: (cb?.bookSizes ?? []).join('|'),
+ chequeMaxBooksOutstanding: num(cb?.maxBooksOutstanding),
+ chequeReissueWhenLeaves: num(cb?.reissueWhenLeaves),
+ chequeFirstBookFree: cb?.firstBookFree,
+ chequeFreeBooksPerYear: num(cb?.freeBooksPerYear),
+ chequeNamePrinted: cb?.namePrinted,
+ chequePrintDescription: cb?.chequePrintDescription,
+ chequeStopPaymentAllowed: cb?.stopPaymentAllowed,
+ chequeMaintainStockRegister: cb?.maintainStockRegister,
+ chequeAllowWithdrawalSlip: cb?.allowWithdrawalSlip,
+ chequeBlockNpa: cb?.blockNpa,
+ chequeBlockLimitExpired: cb?.blockLimitExpired,
+ chequeBlockOverDp: cb?.blockOverDp,
+ chequeBlockFrozen: cb?.blockFrozen,
+ chequeBlockLienReleased: cb?.blockLienReleased
+ };
+
+ // Drop undefined keys so we never send an unresolved value.
+ Object.keys(payload).forEach((k) => payload[k] === undefined && delete payload[k]);
+ return payload;
}
submit() {
diff --git a/src/app/products/loan-products/loan-product-stepper/advance-steps.scss b/src/app/products/loan-products/loan-product-stepper/advance-steps.scss
new file mode 100644
index 000000000..062f2f8fe
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/advance-steps.scss
@@ -0,0 +1,216 @@
+/**
+ * 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/.
+ */
+
+/*
+ * Shared styling for the Advances A/C wizard steps (Security & Lien, Limit & Tenure,
+ * Interest, Penal & NPA, Renewal & Closure, Cheque Book).
+ */
+
+$accent: #0ea5e9;
+$border: #e2e8f0;
+$gray-50: #f8f9fa;
+$gray-200: #e8eaed;
+$gray-900: #202124;
+
+.adv-section {
+ border: 1px solid $border;
+ border-radius: 10px;
+ overflow: hidden;
+ background: #fff;
+
+ & + & {
+ margin-top: 16px;
+ }
+
+ &__header {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ padding: 12px 24px;
+ background: $gray-50;
+ border-bottom: 1px solid $gray-200;
+
+ i {
+ font-size: 14px;
+ color: $accent;
+ }
+
+ h3 {
+ margin: 0;
+ font-size: 14px;
+ font-weight: 600;
+ color: $gray-900;
+ }
+ }
+
+ &__hint {
+ margin-left: auto;
+ font-size: 12px;
+ color: #5f6368;
+ }
+}
+
+.adv-subsection {
+ padding: 16px 24px;
+
+ & + & {
+ border-top: 1px solid $border;
+ }
+}
+
+.adv-group {
+ margin: 0 0 12px;
+ font-size: 12px;
+ font-weight: 600;
+ letter-spacing: 0.06em;
+ text-transform: uppercase;
+ color: #5f6368;
+}
+
+.adv-grid {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ gap: 4px 16px;
+ padding: 16px 24px;
+
+ @media (width <= 600px) {
+ grid-template-columns: 1fr;
+ }
+}
+
+.adv-grid--3 {
+ grid-template-columns: repeat(3, 1fr);
+
+ @media (width <= 900px) {
+ grid-template-columns: repeat(2, 1fr);
+ }
+
+ @media (width <= 600px) {
+ grid-template-columns: 1fr;
+ }
+}
+
+.adv-subsection .adv-grid {
+ padding: 0;
+}
+
+.adv-field {
+ width: 100%;
+
+ &--full {
+ grid-column: 1 / -1;
+ }
+}
+
+.adv-checks {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ gap: 12px 32px;
+
+ @media (width <= 600px) {
+ grid-template-columns: 1fr;
+ }
+}
+
+.adv-type-options {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ gap: 12px;
+ padding: 16px 24px 0;
+
+ @media (width <= 600px) {
+ grid-template-columns: 1fr;
+ }
+}
+
+.adv-type-option {
+ border: 1px solid #cbd5e1;
+ border-radius: 8px;
+ padding: 10px 14px;
+
+ &__label {
+ display: block;
+ font-weight: 600;
+ color: $gray-900;
+ }
+
+ &__hint {
+ display: block;
+ font-size: 12px;
+ color: #5f6368;
+ }
+}
+
+.adv-note {
+ display: flex;
+ align-items: flex-start;
+ gap: 8px;
+ margin-top: 16px;
+ padding: 12px 24px;
+ border: 1px dashed $border;
+ border-radius: 10px;
+ font-size: 13px;
+ color: #5f6368;
+
+ i {
+ color: $accent;
+ margin-top: 2px;
+ }
+}
+
+.adv-info {
+ padding: 12px 16px;
+ border-radius: 8px;
+ background: #f0f9ff;
+ border: 1px solid #bae6fd;
+ font-size: 13px;
+ color: #075985;
+ line-height: 1.5;
+}
+
+/* Read-only reference tables (Loans A/C steps): collateral rules, foreclosure charges. */
+.adv-table {
+ width: 100%;
+ border-collapse: collapse;
+
+ th {
+ text-align: left;
+ font-size: 12px;
+ font-weight: 600;
+ letter-spacing: 0.05em;
+ text-transform: uppercase;
+ color: #475569;
+ padding: 12px 24px;
+ background: $gray-50;
+ border-bottom: 1px solid $border;
+ }
+
+ td {
+ font-size: 14px;
+ padding: 10px 24px;
+ border-bottom: 1px solid #eef2f6;
+ color: #1e293b;
+ }
+
+ .adv-table__no {
+ color: #94a3b8;
+ }
+
+ .adv-table__yes {
+ color: #047857;
+ font-weight: 600;
+ }
+}
+
+.adv-type-options--3 {
+ grid-template-columns: repeat(3, 1fr);
+
+ @media (width <= 900px) {
+ grid-template-columns: 1fr;
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.html
new file mode 100644
index 000000000..2c616c118
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.html
@@ -0,0 +1,98 @@
+
+
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.ts
new file mode 100644
index 000000000..4aa3d2dda
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.ts
@@ -0,0 +1,144 @@
+/**
+ * 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, Input, inject } from '@angular/core';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { RegisterRateSelection, RegisterRateViewComponent } from '../register-rate-view/register-rate-view.component';
+
+/**
+ * Interest step for an Advances A/C product (Figma step 5). Interest basis + spread, rate bounds,
+ * daily calculation and monthly posting. UI-only for now — not sent in the create payload.
+ */
+@Component({
+ selector: 'mifosx-loan-product-advance-interest-step',
+ templateUrl: './loan-product-advance-interest-step.component.html',
+ styleUrls: ['../advance-steps.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ RegisterRateViewComponent
+ ]
+})
+export class LoanProductAdvanceInterestStepComponent {
+ private formBuilder = inject(UntypedFormBuilder);
+
+ loanProductAdvanceInterestForm: UntypedFormGroup;
+
+ /** Sub type and GL account picked on the Details step; they choose the Loan Interest Rate Register row. */
+ @Input() productSubType = '';
+ @Input() glAccountId: number | string | null = null;
+
+ /** The register row the product takes its rate from; null while the register has no row for it. */
+ registerSelection: RegisterRateSelection | null = null;
+
+ readonly interestBasisOptions = [
+ { id: 'deposit_spread', label: 'Deposit Rate + Spread' },
+ { id: 'fixed', label: 'Fixed rate' },
+ { id: 'floating', label: 'Floating (EBLR-linked)' }
+ ];
+
+ readonly calcMethodOptions = [
+ { id: 'daily', label: 'Daily product (daily outstanding)' },
+ { id: 'monthly', label: 'Monthly average balance' }
+ ];
+
+ readonly daysInYearOptions = [
+ 'Actual (365 / 366)',
+ '365',
+ '360'
+ ];
+ readonly daysInMonthOptions = [
+ 'Actual',
+ '30'
+ ];
+
+ readonly chargedOnOptions = [
+ { id: 'utilised', label: 'Utilised (debit) balance' },
+ { id: 'limit', label: 'Sanctioned limit' }
+ ];
+
+ readonly postingFrequencyOptions = [
+ 'Monthly',
+ 'Quarterly',
+ 'Half-yearly',
+ 'At Maturity'
+ ];
+ readonly postingDayOptions = [
+ 'Last day of month',
+ '1st of month',
+ 'Anniversary day'
+ ];
+ readonly yesNoOptions = [
+ 'YES',
+ 'NO'
+ ];
+
+ constructor() {
+ this.loanProductAdvanceInterestForm = this.formBuilder.group({
+ interestBasis: ['deposit_spread'],
+ spread: [
+ 2.0,
+ [
+ Validators.min(0),
+ Validators.max(20)
+ ]
+ ],
+ // Filled from the register row; never typed in.
+ minRate: [''],
+ maxRate: [''],
+ defaultRate: [''],
+ // The rate comes from the Loan Interest Rate Register, so a product with no register row cannot be created.
+ registerParticular: [
+ '',
+ Validators.required
+ ],
+ calcMethod: ['daily'],
+ daysInYear: ['Actual (365 / 366)'],
+ daysInMonth: ['Actual'],
+ interestChargedOn: ['utilised'],
+ interestOnCreditBalance: ['NO'],
+ postingFrequency: ['Monthly'],
+ postingDay: ['Last day of month']
+ });
+ }
+
+ /**
+ * The register row decides the rate. A row of plain rates fixes the minimum and maximum; a deposit row
+ * ("1% + FD") is the deposit rate plus a spread, which has no plain minimum or maximum. With no row for the
+ * product the register particular stays empty, which keeps this step, and so the whole product, invalid until
+ * the product has been added to the register.
+ */
+ onRegisterSelection(selection: RegisterRateSelection | null): void {
+ this.registerSelection = selection;
+ const form = this.loanProductAdvanceInterestForm;
+ if (selection) {
+ form.patchValue(
+ {
+ interestBasis: selection.isFormula ? 'deposit_spread' : 'fixed',
+ spread: selection.isFormula ? selection.minSpread : 0,
+ minRate: selection.minRate ?? '',
+ maxRate: selection.maxRate ?? '',
+ defaultRate: selection.defaultRate ?? '',
+ registerParticular: selection.particular
+ },
+ { emitEvent: false }
+ );
+ } else {
+ form.patchValue({ minRate: '', maxRate: '', defaultRate: '', registerParticular: '' }, { emitEvent: false });
+ }
+ form.updateValueAndValidity({ emitEvent: false });
+ }
+
+ get showSpread(): boolean {
+ return this.loanProductAdvanceInterestForm.get('interestBasis').value === 'deposit_spread';
+ }
+
+ get loanProductAdvanceInterest() {
+ return this.loanProductAdvanceInterestForm.getRawValue();
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-advance-limit-tenure-step/loan-product-advance-limit-tenure-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-limit-tenure-step/loan-product-advance-limit-tenure-step.component.html
new file mode 100644
index 000000000..ed9f6e540
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-limit-tenure-step/loan-product-advance-limit-tenure-step.component.html
@@ -0,0 +1,155 @@
+
+
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-advance-limit-tenure-step/loan-product-advance-limit-tenure-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-limit-tenure-step/loan-product-advance-limit-tenure-step.component.ts
new file mode 100644
index 000000000..ddb60f62b
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-limit-tenure-step/loan-product-advance-limit-tenure-step.component.ts
@@ -0,0 +1,171 @@
+/**
+ * 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, inject, Input } from '@angular/core';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
+import { MatRadioButton, MatRadioGroup } from '@angular/material/radio';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/**
+ * Limit & Tenure step for an Advances A/C product (Figma step 4).
+ *
+ * Facility Type here decides the rest of the flow: an Overdraft (running) facility gets a cheque book,
+ * a Demand Loan does not. UI-only for now — not sent in the create payload.
+ */
+@Component({
+ selector: 'mifosx-loan-product-advance-limit-tenure-step',
+ templateUrl: './loan-product-advance-limit-tenure-step.component.html',
+ styleUrls: ['../advance-steps.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ MatRadioGroup,
+ MatRadioButton
+ ]
+})
+export class LoanProductAdvanceLimitTenureStepComponent {
+ private formBuilder = inject(UntypedFormBuilder);
+
+ loanProductAdvanceLimitTenureForm: UntypedFormGroup;
+
+ /**
+ * Product sub type picked on the Details step. "Loan against FD" is bank-policy capped to a
+ * 12–15 month tenure, so the officer cannot create an FD product outside that band. Other
+ * advance sub types (Gold, RD, CC, …) stay open.
+ */
+ private _productSubType = '';
+ @Input()
+ set productSubType(value: string) {
+ const next = value || '';
+ if (next === this._productSubType) {
+ return;
+ }
+ this._productSubType = next;
+ this.applyTenurePolicy();
+ }
+ get productSubType(): string {
+ return this._productSubType;
+ }
+
+ readonly repaymentTypeOptions = [
+ { id: 'bullet', label: 'Bullet – principal + interest at maturity' },
+ { id: 'running', label: 'Running – any time; clear by limit expiry' }
+ ];
+
+ readonly appropriationOrderOptions = [
+ { id: 'charges_penal_interest_principal', label: 'Charges → Penal → Interest → Principal' },
+ { id: 'principal_interest_penal_charges', label: 'Principal → Interest → Penal → Charges' }
+ ];
+
+ readonly yesNoOptions = [
+ 'YES',
+ 'NO'
+ ];
+
+ constructor() {
+ this.loanProductAdvanceLimitTenureForm = this.formBuilder.group({
+ facilityType: ['demand'],
+ minLimit: [
+ '',
+ Validators.required
+ ],
+ defaultLimit: [''],
+ maxLimit: [
+ '',
+ Validators.required
+ ],
+ minTenure: [
+ 12,
+ [
+ Validators.required,
+ Validators.min(1)
+ ]
+ ],
+ defaultTenure: [12],
+ maxTenure: [
+ 15,
+ [
+ Validators.required,
+ Validators.min(1)
+ ]
+ ],
+ repaymentType: ['bullet'],
+ appropriationOrder: ['charges_penal_interest_principal'],
+ debitBalanceAllow: ['YES'],
+ allowDebitTransAfterDueDate: ['NO'],
+ branchLevelAccountType: ['NO']
+ });
+ }
+
+ /** Read by the wizard to decide whether the Cheque Book step applies. */
+ get isOverdraft(): boolean {
+ return this.loanProductAdvanceLimitTenureForm.get('facilityType').value === 'overdraft';
+ }
+
+ get loanProductAdvanceLimitTenure() {
+ return this.loanProductAdvanceLimitTenureForm.getRawValue();
+ }
+
+ /** True when the FD 12–15 month cap is in force (drives the hints/errors in the template). */
+ get isFdTenureLocked(): boolean {
+ return this._productSubType === 'fd';
+ }
+
+ get tenureMin(): number {
+ return this.isFdTenureLocked ? 12 : 1;
+ }
+
+ get tenureMax(): number | null {
+ return this.isFdTenureLocked ? 15 : null;
+ }
+
+ /**
+ * FD advances are bank-policy capped to 12–15 months; every other sub type stays open (min 1).
+ * Called whenever the sub type changes so the validators — and thus the wizard's validity gate —
+ * match the selected product.
+ */
+ private applyTenurePolicy(): void {
+ const form = this.loanProductAdvanceLimitTenureForm;
+ if (!form) {
+ return;
+ }
+ const min = form.get('minTenure');
+ const def = form.get('defaultTenure');
+ const max = form.get('maxTenure');
+ if (this._productSubType === 'fd') {
+ const bounds = [
+ Validators.min(12),
+ Validators.max(15)
+ ];
+ min.setValidators([
+ Validators.required,
+ ...bounds
+ ]);
+ def.setValidators(bounds);
+ max.setValidators([
+ Validators.required,
+ ...bounds
+ ]);
+ min.setValue(12, { emitEvent: false });
+ def.setValue(12, { emitEvent: false });
+ max.setValue(15, { emitEvent: false });
+ } else {
+ min.setValidators([
+ Validators.required,
+ Validators.min(1)
+ ]);
+ def.setValidators([Validators.min(1)]);
+ max.setValidators([
+ Validators.required,
+ Validators.min(1)
+ ]);
+ }
+ min.updateValueAndValidity({ emitEvent: false });
+ def.updateValueAndValidity({ emitEvent: false });
+ max.updateValueAndValidity({ emitEvent: false });
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-cheque-book-step/loan-product-cheque-book-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-cheque-book-step/loan-product-cheque-book-step.component.html
new file mode 100644
index 000000000..cbac09492
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-cheque-book-step/loan-product-cheque-book-step.component.html
@@ -0,0 +1,144 @@
+
+
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-cheque-book-step/loan-product-cheque-book-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-cheque-book-step/loan-product-cheque-book-step.component.ts
new file mode 100644
index 000000000..3eade52c6
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-cheque-book-step/loan-product-cheque-book-step.component.ts
@@ -0,0 +1,92 @@
+/**
+ * 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, inject } from '@angular/core';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/**
+ * Cheque Book step (Figma step 8), shown only when the Facility Type is Overdraft (running).
+ * UI-only for now — not sent in the create payload.
+ */
+@Component({
+ selector: 'mifosx-loan-product-cheque-book-step',
+ templateUrl: './loan-product-cheque-book-step.component.html',
+ styleUrls: ['../advance-steps.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ MatCheckbox
+ ]
+})
+export class LoanProductChequeBookStepComponent {
+ private formBuilder = inject(UntypedFormBuilder);
+
+ loanProductChequeBookForm: UntypedFormGroup;
+
+ readonly chequeTypeOptions = [
+ 'CTS-2010 · Payable at par (multi-city)',
+ 'CTS-2010 · Local',
+ 'Non-CTS'
+ ];
+ readonly bookSizeOptions = [
+ '10',
+ '25',
+ '50',
+ '100'
+ ];
+ readonly namePrintedOptions = [
+ 'Account holder name',
+ 'Firm / entity name',
+ 'As per instruction'
+ ];
+ readonly yesNoOptions = [
+ 'YES',
+ 'NO'
+ ];
+
+ constructor() {
+ this.loanProductChequeBookForm = this.formBuilder.group({
+ chequeType: ['CTS-2010 · Payable at par (multi-city)'],
+ bookSizes: [
+ [
+ '10',
+ '25',
+ '50'
+ ]
+ ],
+ defaultBookSize: ['25'],
+ maxBooksOutstanding: [1],
+ reissueWhenLeaves: [5],
+ firstBookFree: ['YES'],
+ freeBooksPerYear: [1],
+ namePrinted: ['Account holder name'],
+ chequePrintDescription: [''],
+ ppsThreshold: [
+ 50000,
+ [
+ Validators.required,
+ Validators.min(0)
+ ]
+ ],
+ ppsMandatoryAbove: [500000],
+ stopPaymentAllowed: ['YES'],
+ maintainStockRegister: ['YES'],
+ allowWithdrawalSlip: ['NO'],
+ blockNpa: [true],
+ blockLimitExpired: [true],
+ blockOverDp: [true],
+ blockFrozen: [true],
+ blockLienReleased: [true]
+ });
+ }
+
+ get loanProductChequeBook() {
+ return this.loanProductChequeBookForm.getRawValue();
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.html
index 49df9f6d2..e35ab7664 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.html
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.html
@@ -7,178 +7,190 @@
-->
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.scss b/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.scss
index f6a3f62d5..a5eecb505 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.scss
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.scss
@@ -61,6 +61,57 @@ $gray-900: #202124;
&--full {
grid-column: 1 / -1;
}
+
+ // Starts a new row, so Start / Close Date sit together instead of one of them beside Short Name.
+ &--row-start {
+ grid-column-start: 1;
+ }
+}
+
+// Product Type — first section
+.lpd-type-options {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ gap: 12px;
+ padding: 16px 24px 0;
+
+ @media (width <= 600px) {
+ grid-template-columns: 1fr;
+ }
+}
+
+.lpd-type-option {
+ border: 1px solid $border;
+ border-radius: 8px;
+ padding: 8px 12px;
+
+ &__label {
+ display: block;
+ font-weight: 600;
+ color: $gray-900;
+ }
+
+ &__hint {
+ display: block;
+ font-size: 12px;
+ color: #5f6368;
+ }
+}
+
+.lpd-type-pending {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ margin-top: 16px;
+ padding: 12px 24px;
+ border: 1px dashed $border;
+ border-radius: 10px;
+ font-size: 13px;
+ color: #5f6368;
+
+ i {
+ color: $accent;
+ }
}
.lpd-checkbox-row {
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.ts
index ded56834c..6eb65abd2 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.ts
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.ts
@@ -15,7 +15,9 @@ import { Dates } from 'app/core/utils/dates';
import { SettingsService } from 'app/settings/settings.service';
import { MatTooltip } from '@angular/material/tooltip';
import { CdkTextareaAutosize } from '@angular/cdk/text-field';
+import { MatRadioButton, MatRadioGroup } from '@angular/material/radio';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { PRODUCT_SUB_TYPES, PRODUCT_TYPE_GROUPS } from '../../loan-product-types';
@Component({
selector: 'mifosx-loan-product-details-step',
@@ -24,7 +26,9 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
imports: [
...STANDALONE_SHARED_IMPORTS,
MatTooltip,
- CdkTextareaAutosize
+ CdkTextareaAutosize,
+ MatRadioGroup,
+ MatRadioButton
]
})
export class LoanProductDetailsStepComponent implements OnInit {
@@ -39,6 +43,14 @@ export class LoanProductDetailsStepComponent implements OnInit {
minDate = new Date(2000, 0, 1);
maxDate = new Date(new Date().setFullYear(new Date().getFullYear() + 10));
+ // Start Date policy: a new product must start on the current day — the picker allows only today
+ // (neither past nor future). Widened for an existing product so its saved start date stays valid.
+ startDateMin: Date = new Date();
+ startDateMax: Date = new Date();
+
+ // Close (End) Date accepts only future dates — default min is tomorrow; widened for an existing product.
+ closeDateMin: Date = new Date();
+
/**
* @param {FormBuilder} formBuilder Form Builder.
* @param {Dates} dateUtils Date Utils.
@@ -50,90 +62,133 @@ export class LoanProductDetailsStepComponent implements OnInit {
}
ngOnInit() {
+ // Product Type is not persisted by the backend yet, so an existing product comes back without one.
+ // Only a new product is made to pick it first; editing must not hide or block the rest of the form.
+ this.isExistingProduct = !!this.loanProductsTemplate?.id;
+ if (!this.isExistingProduct) {
+ this.loanProductDetailsForm.get('productTypeGroup').setValidators(Validators.required);
+ this.loanProductDetailsForm.get('productTypeSubGroup').setValidators(Validators.required);
+ this.loanProductDetailsForm.get('glAccount').setValidators(Validators.required);
+ // A new product's short name is exactly two capital letters. Saved products keep the old 4-character
+ // rule, so an existing short name such as 'PW16' does not stop the product from being edited.
+ this.loanProductDetailsForm.get('shortName').setValidators([
+ Validators.required,
+ Validators.pattern(/^[A-Z]{2}$/)
+ ]);
+ this.loanProductDetailsForm.get('productTypeGroup').updateValueAndValidity({ emitEvent: false });
+ this.loanProductDetailsForm.get('productTypeSubGroup').updateValueAndValidity({ emitEvent: false });
+ this.loanProductDetailsForm.get('glAccount').updateValueAndValidity({ emitEvent: false });
+ this.loanProductDetailsForm.get('shortName').updateValueAndValidity({ emitEvent: false });
+ }
+
+ // A loan / advance is an asset of the bank, so its ledger GL is always an asset account.
+ this.assetAccountOptions = this.loanProductsTemplate?.accountingMappingOptions?.assetAccountOptions ?? [];
+
+ // Start Date: default to today for a new product and lock the picker to the current day.
+ // An existing product keeps the wider range so its saved date remains selectable/valid.
+ if (this.isExistingProduct) {
+ this.startDateMin = this.minDate;
+ this.startDateMax = this.maxDate;
+ this.closeDateMin = this.minDate;
+ } else {
+ this.startDateMin = new Date();
+ this.startDateMax = new Date();
+ const tomorrow = new Date();
+ tomorrow.setDate(tomorrow.getDate() + 1);
+ this.closeDateMin = tomorrow;
+ }
+
this.loanProductDetailsForm.patchValue({
name: this.loanProductsTemplate.name,
shortName: this.loanProductsTemplate.shortName,
description: this.loanProductsTemplate.description,
- startDate: this.loanProductsTemplate.startDate && new Date(this.loanProductsTemplate.startDate),
+ startDate: this.loanProductsTemplate.startDate ? new Date(this.loanProductsTemplate.startDate) : new Date(),
closeDate: this.loanProductsTemplate.closeDate && new Date(this.loanProductsTemplate.closeDate)
});
-
- const mappingOptions = this.loanProductsTemplate?.accountingMappingOptions ?? {};
- this.assetAccountOptions = mappingOptions.assetAccountOptions ?? [];
- this.liabilityAccountOptions = mappingOptions.liabilityAccountOptions ?? [];
-
- this.loanProductDetailsForm.patchValue({
- debitIntCalculation: this.loanProductsTemplate.debitIntCalculation ?? false,
- separatePenalInterest: this.loanProductsTemplate.separatePenalInterest ?? false,
- creditIntCalculation: this.loanProductsTemplate.creditIntCalculation ?? false,
- subAccountTypeBalance: this.loanProductsTemplate.subAccountTypeBalance ?? false,
- finalIntRounding: this.loanProductsTemplate.finalIntRounding ?? false,
- roundingUpTo: this.loanProductsTemplate.roundingUpTo ?? null
- });
}
- /** Product Classification data */
- readonly productTypeGroups = [
- { id: 'loans', label: 'Loan' },
- { id: 'advanced', label: 'Advanced' }
+ /** True when editing a saved product; see ngOnInit. */
+ isExistingProduct = false;
+
+ /** Product Type -- picked first, since it decides which sections the rest of the wizard shows. */
+ /** Category and type lists are shared with the product list and the loan account product picker. */
+ readonly productTypeGroups = PRODUCT_TYPE_GROUPS;
+
+ readonly productTypeSubGroups = PRODUCT_SUB_TYPES;
+
+ /** Regulatory Classification options (UI-only; RBI / bureau reporting). */
+ readonly loanProductCategoryOptions = [
+ { id: 'advances_deposits', label: 'Advances against deposits' },
+ { id: 'gold_loan', label: 'Gold loan' },
+ { id: 'agriculture', label: 'Agriculture' },
+ { id: 'msme', label: 'MSME' },
+ { id: 'personal', label: 'Personal / retail' },
+ { id: 'housing', label: 'Housing' },
+ { id: 'other', label: 'Other' }
];
- readonly productTypeSubGroups: Record = {
- loans: [
- { id: 'emi', label: 'EMI' },
- { id: 'cc', label: 'CC (Cash Credit)' },
- { id: 'overdraft', label: 'Overdraft' },
- { id: 'warehouse', label: 'Warehouse' },
- { id: 'gold', label: 'Gold' }
- ],
- advanced: [
- { id: 'fd', label: 'FD (Fixed Deposit)' },
- { id: 'rd', label: 'RD (Recurring Deposit)' }
- ]
- };
+ readonly prioritySectorOptions = [
+ { id: 'yes', label: 'Yes' },
+ { id: 'no', label: 'No' }
+ ];
- /** Default GL per product type group */
- private readonly glDefaultMap: Record = {
- loans: 'asset',
- advanced: 'asset'
- };
+ readonly cibilAccountTypeOptions = [
+ { id: 'loan_bank_deposits', label: 'Loan against Bank Deposits' },
+ { id: 'gold_loan', label: 'Gold Loan' },
+ { id: 'overdraft', label: 'Overdraft' },
+ { id: 'business_loan', label: 'Business Loan' },
+ { id: 'other', label: 'Other' }
+ ];
+
+ readonly yesNoOptions = [
+ 'YES',
+ 'NO'
+ ];
+
+ /** The rest of the Details form stays hidden on a new product until its type and sub type are picked. */
+ get isProductTypeChosen(): boolean {
+ if (this.isExistingProduct) {
+ return true;
+ }
+ const value = this.loanProductDetailsForm.value;
+ return !!value.productTypeGroup && !!value.productTypeSubGroup;
+ }
get availableSubGroups() {
const group = this.loanProductDetailsForm.get('productTypeGroup')?.value;
return group ? (this.productTypeSubGroups[group] ?? []) : [];
}
- get glOptions(): string[] {
- return [
- 'asset',
- 'liability'
- ];
- }
-
+ /**
+ * Asset GLs offered for the product's ledger GL -- the GL the product's loan account numbers are
+ * generated from. Separate from the Accounting tab mappings, which drive the journal entries.
+ */
assetAccountOptions: any[] = [];
- liabilityAccountOptions: any[] = [];
-
- get availableGlAccounts(): any[] {
- const type = this.loanProductDetailsForm.get('glClassification')?.value;
- if (type === 'asset') return this.assetAccountOptions;
- if (type === 'liability') return this.liabilityAccountOptions;
- return [];
- }
-
- get glClassificationLabel(): string {
- const type = this.loanProductDetailsForm.get('glClassification')?.value;
- return type === 'liability' ? 'Liability' : 'Asset';
- }
get selectedGroupLabel(): string {
const group = this.loanProductDetailsForm.get('productTypeGroup')?.value;
return this.productTypeGroups.find((g) => g.id === group)?.label ?? '';
}
- readonly yesNoOptions = [
- { value: true, label: 'YES' },
- { value: false, label: 'NO' }
- ];
+ /**
+ * A new product's short name is two capital letters, so what is typed or pasted is upper-cased, anything
+ * that is not a letter is dropped, and only the first two letters are kept. Trimming here rather than with
+ * maxlength means a paste like 'g1old' still yields 'GO' instead of being cut to 'g1' first.
+ */
+ normalizeShortName(event: Event) {
+ if (this.isExistingProduct) {
+ return;
+ }
+ // Read from the input itself: this handler can run before the form control has taken the new value.
+ const typed = (event.target as HTMLInputElement).value ?? '';
+ const cleaned = typed
+ .toUpperCase()
+ .replace(/[^A-Z]/g, '')
+ .slice(0, 2);
+ if (cleaned !== typed) {
+ this.loanProductDetailsForm.get('shortName').setValue(cleaned);
+ }
+ }
createLoanProductDetailsForm() {
this.loanProductDetailsForm = this.formBuilder.group({
@@ -150,21 +205,26 @@ export class LoanProductDetailsStepComponent implements OnInit {
closeDate: [''],
productTypeGroup: [''],
productTypeSubGroup: [''],
- glClassification: ['asset'],
glAccount: [''],
- debitIntCalculation: [false],
- separatePenalInterest: [false],
- creditIntCalculation: [false],
- subAccountTypeBalance: [false],
- finalIntRounding: [false],
- roundingUpTo: [null]
+ // Regulatory Classification (UI-only; stripped in buildPayload)
+ loanProductCategory: ['advances_deposits'],
+ prioritySector: ['no'],
+ cibilAccountType: ['loan_bank_deposits'],
+ kfsEnabled: ['YES'],
+ aprEnabled: ['YES']
});
- // Auto-set GL based on product type group
- this.loanProductDetailsForm.get('productTypeGroup')?.valueChanges.subscribe((group: string) => {
- const defaultVal = this.glDefaultMap[group] ?? 'asset';
- this.loanProductDetailsForm.get('glClassification')?.setValue(defaultVal);
- this.loanProductDetailsForm.get('glAccount')?.setValue('');
+ // A sub type belongs to one group, so changing the group clears it.
+ this.loanProductDetailsForm.get('productTypeGroup')?.valueChanges.subscribe(() => {
+ this.loanProductDetailsForm.get('productTypeSubGroup')?.setValue('');
+ });
+
+ // Picking a sub type pre-fills the Short Name with its code; the user can still change it.
+ this.loanProductDetailsForm.get('productTypeSubGroup')?.valueChanges.subscribe((subGroupId: string) => {
+ const subGroup = this.availableSubGroups.find((s) => s.id === subGroupId);
+ if (subGroup) {
+ this.loanProductDetailsForm.get('shortName').setValue(subGroup.shortName);
+ }
});
}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.html
new file mode 100644
index 000000000..72b1d72d7
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.html
@@ -0,0 +1,150 @@
+
+
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.ts
new file mode 100644
index 000000000..ff547810f
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.ts
@@ -0,0 +1,106 @@
+/**
+ * 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, inject } from '@angular/core';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { MatRadioButton, MatRadioGroup } from '@angular/material/radio';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/**
+ * Amount & Tenure step for a Loans A/C (EMI) product (step 4): fixed sanctioned amount, tenure,
+ * borrower eligibility and disbursement. Amount, tenure and tranches feed Fineract's core product
+ * fields; eligibility is UI-only for now.
+ */
+@Component({
+ selector: 'mifosx-loan-product-loan-amount-tenure-step',
+ templateUrl: './loan-product-loan-amount-tenure-step.component.html',
+ styleUrls: ['../advance-steps.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ MatCheckbox,
+ MatRadioGroup,
+ MatRadioButton
+ ]
+})
+export class LoanProductLoanAmountTenureStepComponent {
+ private formBuilder = inject(UntypedFormBuilder);
+
+ loanProductLoanAmountTenureForm: UntypedFormGroup;
+
+ readonly disbursementModeOptions = [
+ { id: 'transfer_dd_vendor', label: 'Transfer to A/C, DD, Direct to vendor' },
+ { id: 'transfer', label: 'Transfer to A/C only' },
+ { id: 'dd', label: 'Demand draft only' }
+ ];
+
+ readonly undisbursedInterestOptions = [
+ { id: 'none', label: 'None — interest only on disbursed' },
+ { id: 'commitment', label: 'Commitment charge on undisbursed' }
+ ];
+
+ constructor() {
+ this.loanProductLoanAmountTenureForm = this.formBuilder.group({
+ minAmount: [
+ '',
+ [
+ Validators.required,
+ Validators.min(0)
+ ]
+ ],
+ defaultAmount: [''],
+ maxAmount: [
+ '',
+ [
+ Validators.required,
+ Validators.min(0)
+ ]
+ ],
+ minTenure: [
+ 12,
+ [
+ Validators.required,
+ Validators.min(1)
+ ]
+ ],
+ defaultTenure: [
+ '',
+ Validators.min(1)
+ ],
+ maxTenure: [
+ 360,
+ [
+ Validators.required,
+ Validators.min(1)
+ ]
+ ],
+ minAge: [21],
+ maxAgeAtMaturity: [70],
+ minCibil: [650],
+ minMonthlyIncome: [''],
+ maxFoir: [50],
+ maxLoansPerCustomer: [1],
+ disbursementType: ['single'],
+ maxTranches: [
+ 2,
+ Validators.min(2)
+ ],
+ disbursementMode: ['transfer_dd_vendor'],
+ undisbursedInterest: ['none'],
+ preEmiInterest: [true]
+ });
+ }
+
+ get isMultiTranche(): boolean {
+ return this.loanProductLoanAmountTenureForm.get('disbursementType').value === 'multiple';
+ }
+
+ get loanProductLoanAmountTenure() {
+ return this.loanProductLoanAmountTenureForm.getRawValue();
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.html
new file mode 100644
index 000000000..0a08d2380
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.html
@@ -0,0 +1,161 @@
+
+
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.ts
new file mode 100644
index 000000000..a29bc3534
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.ts
@@ -0,0 +1,188 @@
+/**
+ * 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, Input, inject } from '@angular/core';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
+import { MatRadioButton, MatRadioGroup } from '@angular/material/radio';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { RegisterRateSelection, RegisterRateViewComponent } from '../register-rate-view/register-rate-view.component';
+
+/**
+ * Interest step for a Loans A/C (EMI) product (step 6). The rate normally comes from the central
+ * Loan Interest Rate Register (amount slab + CIBIL adjustment); the min / default / max rate and the
+ * calculation method feed Fineract's core product fields. Register link, spread and floating reset
+ * are UI-only for now.
+ */
+@Component({
+ selector: 'mifosx-loan-product-loan-interest-step',
+ templateUrl: './loan-product-loan-interest-step.component.html',
+ styleUrls: ['../advance-steps.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ MatRadioGroup,
+ MatRadioButton,
+ RegisterRateViewComponent
+ ]
+})
+export class LoanProductLoanInterestStepComponent {
+ private formBuilder = inject(UntypedFormBuilder);
+
+ loanProductLoanInterestForm: UntypedFormGroup;
+
+ /** Sub type and GL account picked on the Details step; they choose the Loan Interest Rate Register row. */
+ @Input() productSubType = '';
+ @Input() glAccountId: number | string | null = null;
+
+ /** The register row the product takes its rate from; null while the register has no row for it. */
+ registerSelection: RegisterRateSelection | null = null;
+
+ /** The 16 default particulars of the Loan Interest Rate Register. */
+ readonly registerParticulars = [
+ 'Housing Loan (Purchase/Construction)',
+ 'Home Repair/Renovation',
+ 'Personal Loan (Unsecured)',
+ 'Personal Loan (Secured/Property)',
+ 'Two Wheeler Loan',
+ 'Car Loan (New)',
+ 'Used Car/Vehicle Loan',
+ 'Commercial Vehicle Loan',
+ 'Gold Loan',
+ 'Business Term Loan',
+ 'Machinery & Equipment Loan',
+ 'Cash Credit',
+ 'Overdraft',
+ 'Agriculture Loan',
+ 'Loan against FDR',
+ 'Loan against RD'
+ ];
+
+ readonly yesNoOptions = [
+ 'YES',
+ 'NO'
+ ];
+
+ readonly rateResolvedAtOptions = [
+ { id: 'sanction', label: 'Sanction' },
+ { id: 'disbursement', label: 'First disbursement' }
+ ];
+
+ readonly calcMethodOptions = [
+ { id: 'declining', label: 'Declining Balance' },
+ { id: 'flat', label: 'Flat' }
+ ];
+
+ /** `fineractId` maps to Fineract's daysInYearType (1 = actual). */
+ readonly daysInYearOptions = [
+ { id: 'actual', label: 'Actual (365 / 366)', fineractId: 1 },
+ { id: '365', label: '365', fineractId: 365 },
+ { id: '360', label: '360', fineractId: 360 }
+ ];
+
+ /** `fineractId` maps to Fineract's daysInMonthType (1 = actual). */
+ readonly daysInMonthOptions = [
+ { id: 'actual', label: 'Actual', fineractId: 1 },
+ { id: '30', label: '30', fineractId: 30 }
+ ];
+
+ readonly calcPeriodOptions = [
+ { id: 'same', label: 'Same as repayment period' },
+ { id: 'daily', label: 'Daily' }
+ ];
+
+ readonly interestStartOptions = [
+ { id: 'disbursement', label: 'Disbursement date' },
+ { id: 'first_emi', label: 'First EMI date' }
+ ];
+
+ readonly compoundingOptions = [
+ { id: 'none', label: 'None (simple on outstanding)' },
+ { id: 'monthly', label: 'Monthly' }
+ ];
+
+ readonly benchmarkOptions = [
+ { id: 'repo', label: 'Repo / MCLR / Bank base rate' },
+ { id: 'eblr', label: 'External benchmark (EBLR)' }
+ ];
+
+ readonly resetFrequencyOptions = [
+ { id: 'quarterly', label: 'Quarterly' },
+ { id: 'half_yearly', label: 'Half-yearly' },
+ { id: 'yearly', label: 'Yearly' }
+ ];
+
+ readonly resetChangeOptions = [
+ { id: 'tenure', label: 'Tenure (EMI stays constant)' },
+ { id: 'emi', label: 'EMI (tenure stays constant)' }
+ ];
+
+ constructor() {
+ this.loanProductLoanInterestForm = this.formBuilder.group({
+ interestType: ['fixed'],
+ // The rate comes from the Loan Interest Rate Register, so a product with no register row cannot be created.
+ registerParticular: [
+ '',
+ Validators.required
+ ],
+ applyCibilAdjustment: ['YES'],
+ spread: [
+ 0,
+ [
+ Validators.min(0),
+ Validators.max(20)
+ ]
+ ],
+ rateResolvedAt: ['sanction'],
+ // Filled from the register row; never typed in.
+ minRate: [''],
+ defaultRate: [''],
+ maxRate: [''],
+ calcMethod: ['declining'],
+ daysInYear: ['actual'],
+ daysInMonth: ['actual'],
+ calcPeriod: ['same'],
+ interestStartsFrom: ['disbursement'],
+ compounding: ['none'],
+ benchmark: ['repo'],
+ resetFrequency: ['quarterly'],
+ resetChange: ['tenure']
+ });
+ }
+
+ /**
+ * The register row decides the rate limits. With no row for the product the register particular stays empty,
+ * which keeps this step, and so the whole product, invalid until the product has been added to the register.
+ */
+ onRegisterSelection(selection: RegisterRateSelection | null): void {
+ this.registerSelection = selection;
+ const form = this.loanProductLoanInterestForm;
+ if (selection) {
+ form.patchValue(
+ {
+ registerParticular: selection.particular,
+ minRate: selection.minRate ?? '',
+ maxRate: selection.maxRate ?? '',
+ defaultRate: selection.defaultRate ?? ''
+ },
+ { emitEvent: false }
+ );
+ } else {
+ form.patchValue({ registerParticular: '', minRate: '', maxRate: '', defaultRate: '' }, { emitEvent: false });
+ }
+ form.updateValueAndValidity({ emitEvent: false });
+ }
+
+ /** Reset options only apply to a floating or hybrid rate. */
+ get isFloatingOrHybrid(): boolean {
+ const type = this.loanProductLoanInterestForm.get('interestType').value;
+ return type === 'floating' || type === 'hybrid';
+ }
+
+ get loanProductLoanInterest() {
+ return this.loanProductLoanInterestForm.getRawValue();
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.html
new file mode 100644
index 000000000..b17ca654c
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.html
@@ -0,0 +1,144 @@
+
+
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.ts
new file mode 100644
index 000000000..e5c6487e8
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.ts
@@ -0,0 +1,117 @@
+/**
+ * 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, inject } from '@angular/core';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { MatRadioButton, MatRadioGroup } from '@angular/material/radio';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/**
+ * Prepayment & Closure step for a Loans A/C (EMI) product (step 8). A loan has no renewal; it ends at
+ * maturity or on pre-closure. UI-only for now: not sent in the create payload.
+ */
+@Component({
+ selector: 'mifosx-loan-product-loan-prepayment-step',
+ templateUrl: './loan-product-loan-prepayment-step.component.html',
+ styleUrls: ['../advance-steps.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ MatCheckbox,
+ MatRadioGroup,
+ MatRadioButton
+ ]
+})
+export class LoanProductLoanPrepaymentStepComponent {
+ private formBuilder = inject(UntypedFormBuilder);
+
+ loanProductLoanPrepaymentForm: UntypedFormGroup;
+
+ readonly allowedOnOptions = [
+ { id: 'emi_date', label: 'EMI due date' },
+ { id: 'any_day', label: 'Any day' }
+ ];
+
+ readonly perYearOptions = [
+ { id: 'unlimited', label: 'Unlimited' },
+ { id: 'one', label: 'Once a year' },
+ { id: 'two', label: 'Twice a year' }
+ ];
+
+ readonly interestOnPreclosureOptions = [
+ { id: 'till_date', label: 'Till date of payment' },
+ { id: 'full_month', label: 'Full current month' }
+ ];
+
+ readonly autoCloseOptions = [
+ 'YES',
+ 'NO'
+ ];
+
+ readonly nocOptions = [
+ { id: 'auto', label: 'Auto-generate' },
+ { id: 'manual', label: 'On request' }
+ ];
+
+ readonly restructuringOptions = [
+ { id: 'approval', label: 'Allowed with approval' },
+ { id: 'no', label: 'Not allowed' }
+ ];
+
+ constructor() {
+ const percent = [
+ Validators.min(0),
+ Validators.max(100)
+ ];
+ this.loanProductLoanPrepaymentForm = this.formBuilder.group({
+ partPrepaymentAllowed: [true],
+ minPartPayment: [
+ '',
+ Validators.min(0)
+ ],
+ allowedOn: ['emi_date'],
+ partPaymentsPerYear: ['unlimited'],
+ partPrepaymentMode: ['reduce_tenure'],
+ foreclosureFloatingIndividual: [
+ 0,
+ percent
+ ],
+ foreclosureFixedIndividual: [
+ 2,
+ percent
+ ],
+ foreclosureNonIndividual: [
+ 3,
+ percent
+ ],
+ foreclosureTakeover: [
+ 2,
+ percent
+ ],
+ lockInMonths: [
+ 0,
+ Validators.min(0)
+ ],
+ interestOnPreclosure: ['till_date'],
+ foreclosureQuoteValidDays: [
+ 7,
+ Validators.min(1)
+ ],
+ autoCloseOnZeroBalance: ['YES'],
+ nocLetter: ['auto'],
+ restructuring: ['approval'],
+ releaseCollateralOnClosure: [true],
+ topUpAllowed: [false],
+ balanceTransferOutAllowed: [true]
+ });
+ }
+
+ get loanProductLoanPrepayment() {
+ return this.loanProductLoanPrepaymentForm.getRawValue();
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.html
new file mode 100644
index 000000000..4972737f7
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.html
@@ -0,0 +1,155 @@
+
+
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.ts
new file mode 100644
index 000000000..162f2cd8d
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.ts
@@ -0,0 +1,129 @@
+/**
+ * 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, inject } from '@angular/core';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { MatRadioButton, MatRadioGroup } from '@angular/material/radio';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/**
+ * Repayment & EMI step for a Loans A/C (EMI) product (step 5) — the step an Advance does not have.
+ * Repayment type and frequency feed Fineract's core product fields; the repayment mode and the
+ * rest of the schedule options are UI-only for now.
+ */
+@Component({
+ selector: 'mifosx-loan-product-loan-repayment-step',
+ templateUrl: './loan-product-loan-repayment-step.component.html',
+ styleUrls: ['../advance-steps.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ MatCheckbox,
+ MatRadioGroup,
+ MatRadioButton
+ ]
+})
+export class LoanProductLoanRepaymentStepComponent {
+ private formBuilder = inject(UntypedFormBuilder);
+
+ loanProductLoanRepaymentForm: UntypedFormGroup;
+
+ readonly repaymentTypeOptions = [
+ { id: 'emi', label: 'EMI', hint: 'Reducing balance, equal instalments' },
+ { id: 'equal_principal', label: 'Equal principal', hint: 'Falling instalments' },
+ { id: 'flat', label: 'Flat rate', hint: 'Interest on original amount' },
+ { id: 'bullet', label: 'Bullet', hint: 'Pay everything at maturity' },
+ { id: 'step', label: 'Step-up / Balloon', hint: 'Custom schedule' }
+ ];
+
+ /** `fineractId` is Fineract's repaymentFrequencyType (0 days, 1 weeks, 2 months). */
+ readonly frequencyOptions = [
+ { id: 'months', label: 'Months', fineractId: 2 },
+ { id: 'weeks', label: 'Weeks', fineractId: 1 },
+ { id: 'days', label: 'Days', fineractId: 0 }
+ ];
+
+ readonly emiDueDayOptions = [
+ { id: 'disbursement_day', label: 'Same day as disbursement' },
+ { id: 'fixed_day', label: 'Fixed day of month (5th)' }
+ ];
+
+ readonly holidayRuleOptions = [
+ { id: 'next', label: 'Next working day' },
+ { id: 'previous', label: 'Previous working day' },
+ { id: 'same', label: 'Same day' }
+ ];
+
+ readonly moratoriumInterestOptions = [
+ { id: 'pre_emi', label: 'Pay monthly (Pre-EMI)' },
+ { id: 'capitalise', label: 'Capitalise into loan' }
+ ];
+
+ readonly repaymentModeOptions = [
+ { id: 'nach', label: 'Auto-debit (NACH / ECS)' },
+ { id: 'pdc', label: 'Post-dated cheques (PDC)' },
+ { id: 'cash', label: 'Cash / transfer at branch' }
+ ];
+
+ readonly linkedAccountOptions = [
+ { id: 'savings_current', label: 'Savings / Current' },
+ { id: 'savings', label: 'Savings only' }
+ ];
+
+ readonly pdcOptions = [
+ { id: 'mandatory', label: 'Mandatory — 3 cheques' },
+ { id: 'optional', label: 'Optional' },
+ { id: 'none', label: 'Not collected' }
+ ];
+
+ readonly appropriationOrderOptions = [
+ { id: 'charges_penal_interest_principal', label: 'Charges → Penal → Interest → Principal' },
+ { id: 'principal_interest_penal_charges', label: 'Principal → Interest → Penal → Charges' }
+ ];
+
+ readonly advanceEmiOptions = [
+ { id: 'adjust_next', label: 'Allowed — adjust next EMI' },
+ { id: 'not_allowed', label: 'Not allowed' }
+ ];
+
+ constructor() {
+ this.loanProductLoanRepaymentForm = this.formBuilder.group({
+ repaymentType: ['emi'],
+ repaidEvery: [
+ 1,
+ [
+ Validators.required,
+ Validators.min(1)
+ ]
+ ],
+ frequency: ['months'],
+ minDaysToFirstRepayment: [
+ '',
+ Validators.min(0)
+ ],
+ emiDueDay: ['fixed_day'],
+ holidayRule: ['next'],
+ moratoriumMonths: [
+ 0,
+ Validators.min(0)
+ ],
+ moratoriumInterest: ['pre_emi'],
+ variableInstallments: [false],
+ repaymentMode: ['nach'],
+ linkedAccountType: ['savings_current'],
+ pdcCollection: ['mandatory'],
+ mandateRequired: [true],
+ appropriationOrder: ['charges_penal_interest_principal'],
+ advanceEmi: ['adjust_next']
+ });
+ }
+
+ get loanProductLoanRepayment() {
+ return this.loanProductLoanRepaymentForm.getRawValue();
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.html
new file mode 100644
index 000000000..6650b8f5a
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.html
@@ -0,0 +1,130 @@
+
+
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.ts
new file mode 100644
index 000000000..39caf70e0
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.ts
@@ -0,0 +1,127 @@
+/**
+ * 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, inject } from '@angular/core';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/**
+ * Security & Collateral step for a Loans A/C (EMI) product (step 3).
+ *
+ * Unlike an Advance, the security only decides eligibility at sanction — it does not set a running
+ * limit. UI-only for now: not sent in the create payload.
+ */
+@Component({
+ selector: 'mifosx-loan-product-loan-security-step',
+ templateUrl: './loan-product-loan-security-step.component.html',
+ styleUrls: ['../advance-steps.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ MatCheckbox
+ ]
+})
+export class LoanProductLoanSecurityStepComponent {
+ private formBuilder = inject(UntypedFormBuilder);
+
+ loanProductLoanSecurityForm: UntypedFormGroup;
+
+ readonly securityMandatoryOptions = [
+ { id: 'yes', label: 'Yes — no sanction without security' },
+ { id: 'no', label: 'No — unsecured' }
+ ];
+
+ readonly coApplicantOptions = [
+ { id: 'joint_property', label: 'Mandatory for joint property' },
+ { id: 'always', label: 'Always mandatory' },
+ { id: 'optional', label: 'Optional' }
+ ];
+
+ readonly thirdPartyOptions = [
+ { id: 'consent', label: 'Allowed with owner consent' },
+ { id: 'no', label: 'Not allowed' }
+ ];
+
+ /** Reference table: which security a loan on this product may accept. */
+ readonly collateralRules = [
+ {
+ security: 'Residential property',
+ allowed: true,
+ ltv: '80',
+ valuation: 'Empanelled valuer',
+ insurance: 'Mandatory',
+ charge: 'Mortgage + CERSAI'
+ },
+ {
+ security: 'Commercial property',
+ allowed: true,
+ ltv: '70',
+ valuation: 'Empanelled valuer',
+ insurance: 'Mandatory',
+ charge: 'Mortgage + CERSAI'
+ },
+ {
+ security: 'Fixed / Recurring Deposit',
+ allowed: true,
+ ltv: '90',
+ valuation: 'Not needed',
+ insurance: 'Not needed',
+ charge: 'Lien marked'
+ },
+ {
+ security: 'LIC policy',
+ allowed: true,
+ ltv: '90',
+ valuation: 'Surrender value',
+ insurance: 'Not needed',
+ charge: 'Assignment'
+ },
+ { security: 'Vehicle', allowed: false, ltv: '—', valuation: '—', insurance: '—', charge: '—' },
+ { security: 'Gold ornaments', allowed: false, ltv: '—', valuation: '—', insurance: '—', charge: '—' }
+ ];
+
+ constructor() {
+ this.loanProductLoanSecurityForm = this.formBuilder.group({
+ securityType: ['Immovable property (mortgage)'],
+ securityMandatory: ['yes'],
+ margin: [
+ 20,
+ [
+ Validators.required,
+ Validators.min(0),
+ Validators.max(100)
+ ]
+ ],
+ guarantorsRequired: [
+ 1,
+ Validators.min(0)
+ ],
+ coApplicant: ['joint_property'],
+ thirdPartySecurity: ['consent'],
+ legalOpinionRequired: [true],
+ propertyInsuranceRequired: [true],
+ registerCharge: [true],
+ autoReleaseOnClosure: [true],
+ allowMultipleSecurities: [false],
+ allowThirdPartyDeposit: [false]
+ });
+ }
+
+ /** Maximum LTV is derived from the margin (100 − margin) and shown read-only. */
+ get ltv(): number {
+ const margin = Number(this.loanProductLoanSecurityForm.get('margin').value);
+ return Number.isFinite(margin) ? Math.max(0, 100 - margin) : 100;
+ }
+
+ get loanProductLoanSecurity() {
+ return {
+ ...this.loanProductLoanSecurityForm.getRawValue(),
+ ltv: this.ltv
+ };
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-penal-npa-step/loan-product-penal-npa-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-penal-npa-step/loan-product-penal-npa-step.component.html
new file mode 100644
index 000000000..30c8eda8e
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-penal-npa-step/loan-product-penal-npa-step.component.html
@@ -0,0 +1,106 @@
+
+
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-penal-npa-step/loan-product-penal-npa-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-penal-npa-step/loan-product-penal-npa-step.component.ts
new file mode 100644
index 000000000..0df4451de
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-penal-npa-step/loan-product-penal-npa-step.component.ts
@@ -0,0 +1,90 @@
+/**
+ * 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, Input, inject } from '@angular/core';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/**
+ * Penal charges & asset-classification (SMA / NPA) step for an Advances A/C product (Figma step 6).
+ * UI-only for now — not sent in the create payload.
+ */
+@Component({
+ selector: 'mifosx-loan-product-penal-npa-step',
+ templateUrl: './loan-product-penal-npa-step.component.html',
+ styleUrls: ['../advance-steps.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ MatCheckbox
+ ]
+})
+export class LoanProductPenalNpaStepComponent {
+ private formBuilder = inject(UntypedFormBuilder);
+
+ @Input() loanProductsTemplate: any;
+
+ loanProductPenalNpaForm: UntypedFormGroup;
+
+ readonly yesNoOptions = [
+ 'YES',
+ 'NO'
+ ];
+
+ readonly appliedOnOptions = [
+ { id: 'overdue', label: 'Overdue amount' },
+ { id: 'outstanding', label: 'Full outstanding' }
+ ];
+
+ readonly npaTriggerOptions = [
+ { id: 'maturity', label: 'Dues overdue after maturity' },
+ { id: 'out_of_order', label: 'Out of order 90 days (CC/OD)' }
+ ];
+
+ readonly interestAfterNpaOptions = [
+ { id: 'undebited', label: 'Move to Undebited Interest GL' },
+ { id: 'suspense', label: 'Move to Interest Suspense GL' }
+ ];
+
+ get delinquencyBucketOptions(): any[] {
+ return this.loanProductsTemplate?.delinquencyBucketOptions ?? [];
+ }
+
+ constructor() {
+ this.loanProductPenalNpaForm = this.formBuilder.group({
+ penalApplicable: ['YES'],
+ penalRate: [
+ 2.0,
+ [
+ Validators.min(0),
+ Validators.max(100)
+ ]
+ ],
+ penalAppliedOn: ['overdue'],
+ penalGraceDays: [0],
+ delinquencyBucketId: [''],
+ npaDays: [
+ 90,
+ [
+ Validators.required,
+ Validators.min(0)
+ ]
+ ],
+ npaTrigger: ['maturity'],
+ interestAfterNpa: ['undebited'],
+ graceOnArrearsAgeing: [0],
+ inArrearsTolerance: [0],
+ upgradeOnlyAllArrears: [true],
+ keepStandardIfDepositCovers: [true]
+ });
+ }
+
+ get loanProductPenalNpa() {
+ return this.loanProductPenalNpaForm.getRawValue();
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-renewal-closure-step/loan-product-renewal-closure-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-renewal-closure-step/loan-product-renewal-closure-step.component.html
new file mode 100644
index 000000000..3a062eb6a
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-renewal-closure-step/loan-product-renewal-closure-step.component.html
@@ -0,0 +1,69 @@
+
+
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-renewal-closure-step/loan-product-renewal-closure-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-renewal-closure-step/loan-product-renewal-closure-step.component.ts
new file mode 100644
index 000000000..984ade3bc
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-renewal-closure-step/loan-product-renewal-closure-step.component.ts
@@ -0,0 +1,64 @@
+/**
+ * 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, inject } from '@angular/core';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/**
+ * Limit renewal & pre-closure rules for an Advances A/C product (Figma step 7). Fees live on the
+ * Charges step. UI-only for now — not sent in the create payload.
+ */
+@Component({
+ selector: 'mifosx-loan-product-renewal-closure-step',
+ templateUrl: './loan-product-renewal-closure-step.component.html',
+ styleUrls: ['../advance-steps.scss'],
+ imports: [...STANDALONE_SHARED_IMPORTS]
+})
+export class LoanProductRenewalClosureStepComponent {
+ private formBuilder = inject(UntypedFormBuilder);
+
+ loanProductRenewalClosureForm: UntypedFormGroup;
+
+ readonly yesNoOptions = [
+ 'YES',
+ 'NO'
+ ];
+
+ readonly preclosureOptions = [
+ { id: 'anytime', label: 'Anytime' },
+ { id: 'after_lockin', label: 'After lock-in period' },
+ { id: 'not_allowed', label: 'Not allowed' }
+ ];
+
+ readonly preclosureInterestOptions = [
+ { id: 'till_closing', label: 'Till closing date (broken period)' },
+ { id: 'full_period', label: 'Full current period' }
+ ];
+
+ constructor() {
+ this.loanProductRenewalClosureForm = this.formBuilder.group({
+ renewalAllowed: ['YES'],
+ renewalPeriodMonths: [
+ 12,
+ [
+ Validators.required,
+ Validators.min(1)
+ ]
+ ],
+ renewalGraceDays: [30],
+ preclosureAllowed: ['anytime'],
+ lockInMonths: [0],
+ interestOnPreclosure: ['till_closing']
+ });
+ }
+
+ get loanProductRenewalClosure() {
+ return this.loanProductRenewalClosureForm.getRawValue();
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-security-lien-step/loan-product-security-lien-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-security-lien-step/loan-product-security-lien-step.component.html
new file mode 100644
index 000000000..c2410aea5
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-security-lien-step/loan-product-security-lien-step.component.html
@@ -0,0 +1,160 @@
+
+
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-security-lien-step/loan-product-security-lien-step.component.scss b/src/app/products/loan-products/loan-product-stepper/loan-product-security-lien-step/loan-product-security-lien-step.component.scss
new file mode 100644
index 000000000..7d57dfc5e
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-security-lien-step/loan-product-security-lien-step.component.scss
@@ -0,0 +1,117 @@
+/**
+ * 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/.
+ */
+
+$accent: #0ea5e9;
+$border: #e2e8f0;
+$gray-50: #f8f9fa;
+$gray-200: #e8eaed;
+$gray-900: #202124;
+
+.lsl-section {
+ border: 1px solid $border;
+ border-radius: 10px;
+ overflow: hidden;
+ background: #fff;
+
+ & + & {
+ margin-top: 16px;
+ }
+
+ &__header {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ padding: 12px 24px;
+ background: $gray-50;
+ border-bottom: 1px solid $gray-200;
+
+ i {
+ font-size: 14px;
+ color: $accent;
+ }
+
+ h3 {
+ margin: 0;
+ font-size: 14px;
+ font-weight: 600;
+ color: $gray-900;
+ }
+ }
+
+ &__hint {
+ margin-left: auto;
+ font-size: 12px;
+ color: #5f6368;
+ }
+}
+
+.lsl-subsection {
+ padding: 16px 24px;
+
+ & + & {
+ border-top: 1px solid $border;
+ }
+}
+
+.lsl-group {
+ margin: 0 0 12px;
+ font-size: 12px;
+ font-weight: 600;
+ letter-spacing: 0.06em;
+ text-transform: uppercase;
+ color: #5f6368;
+}
+
+.lsl-grid {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ gap: 4px 16px;
+ padding: 16px 24px;
+
+ @media (width <= 600px) {
+ grid-template-columns: 1fr;
+ }
+}
+
+.lsl-subsection .lsl-grid {
+ padding: 0;
+}
+
+.lsl-field {
+ width: 100%;
+
+ &--full {
+ grid-column: 1 / -1;
+ }
+}
+
+.lsl-checks {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ gap: 12px 32px;
+
+ @media (width <= 600px) {
+ grid-template-columns: 1fr;
+ }
+}
+
+.lsl-note {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ margin-top: 16px;
+ padding: 12px 24px;
+ border: 1px dashed $border;
+ border-radius: 10px;
+ font-size: 13px;
+ color: #5f6368;
+
+ i {
+ color: $accent;
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-security-lien-step/loan-product-security-lien-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-security-lien-step/loan-product-security-lien-step.component.ts
new file mode 100644
index 000000000..d0327c94a
--- /dev/null
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-security-lien-step/loan-product-security-lien-step.component.ts
@@ -0,0 +1,196 @@
+/**
+ * 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, Input, inject } from '@angular/core';
+import { AbstractControl, UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
+import { MatTooltip } from '@angular/material/tooltip';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/**
+ * Security & Lien step, shown only for an "Advances A/C" product.
+ *
+ * For a deposit-backed advance (Loan against FD / RD / DDS / LIC) the bank marks a lien on the
+ * customer's own deposit. This step captures the product-level rules for that: the margin (from which
+ * the LTV and drawing power follow), which deposit products may be pledged, and the lien certificate.
+ *
+ * UI-only for now: its values are NOT sent in the create payload, because the backend has no column to
+ * store them yet. Once the satellite table lands, wire `loanProductSecurityLien` into the payload.
+ */
+@Component({
+ selector: 'mifosx-loan-product-security-lien-step',
+ templateUrl: './loan-product-security-lien-step.component.html',
+ styleUrls: ['./loan-product-security-lien-step.component.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ MatTooltip,
+ MatCheckbox
+ ]
+})
+export class LoanProductSecurityLienStepComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+
+ @Input() loanProductsTemplate: any;
+ /** The Details step's Product Type controls, so this step reacts to the chosen group / sub type. */
+ @Input() productTypeGroup: AbstractControl;
+ @Input() productTypeSubGroup: AbstractControl;
+
+ loanProductSecurityLienForm: UntypedFormGroup;
+
+ /** Sub type -> the security it is backed by. Only deposit / policy sub types get a lien section. */
+ private readonly securityTypeBySubGroup: Record = {
+ fd: 'Fixed Deposit',
+ rd: 'Recurring Deposit',
+ dds: 'Daily Deposit Scheme',
+ lic: 'LIC Policy',
+ gold: 'Gold Ornaments',
+ warehouse: 'Warehouse Receipt',
+ cc: 'Stock / Book Debts',
+ overdraft: 'Deposit / Property'
+ };
+
+ /** Sub types whose security is lien-marked on a deposit (rather than pledged / hypothecated). */
+ private readonly lienSubGroups = [
+ 'fd',
+ 'rd',
+ 'dds',
+ 'lic'
+ ];
+
+ /** Default margin % per sub type (bank policy in real use); LTV is derived from it. */
+ private readonly defaultMarginBySubGroup: Record = {
+ fd: 10,
+ rd: 10,
+ dds: 10,
+ lic: 40
+ };
+
+ readonly eligibleAmountBasisOptions = [
+ { id: 'balance_accrued', label: 'Deposit balance + accrued interest' },
+ { id: 'balance', label: 'Deposit balance only' },
+ { id: 'surrender', label: 'Surrender value (LIC)' }
+ ];
+
+ readonly lienMarkingStageOptions = [
+ { id: 'disbursement', label: 'At Disbursement' },
+ { id: 'sanction', label: 'At Sanction' }
+ ];
+
+ readonly depositProductOptions = [
+ 'Fixed Deposit – Regular',
+ 'Fixed Deposit – Senior Citizen',
+ 'Recurring Deposit – Regular',
+ 'Daily Deposit Scheme'
+ ];
+
+ readonly yesNoOptions = [
+ 'YES',
+ 'NO'
+ ];
+
+ constructor() {
+ this.createForm();
+ }
+
+ ngOnInit() {
+ this.applySubGroup(this.productTypeSubGroup?.value);
+ // Keep Security Type and the default margin in step with the sub type chosen on the Details step.
+ this.productTypeSubGroup?.valueChanges.subscribe((subGroup: string) => this.applySubGroup(subGroup));
+ }
+
+ private applySubGroup(subGroup: string): void {
+ this.loanProductSecurityLienForm
+ .get('securityType')
+ .setValue(this.securityTypeBySubGroup[subGroup] ?? '', { emitEvent: false });
+ const margin = this.defaultMarginBySubGroup[subGroup];
+ if (margin != null && !this.loanProductSecurityLienForm.get('margin').dirty) {
+ this.loanProductSecurityLienForm.get('margin').setValue(margin, { emitEvent: false });
+ }
+ }
+
+ /** This whole step is only relevant to an Advances A/C product. */
+ get isAdvance(): boolean {
+ return this.productTypeGroup?.value === 'advances';
+ }
+
+ /** The lien block shows only for deposit / policy sub types; gold, warehouse, CC etc. are pledged. */
+ get isLienSubType(): boolean {
+ return this.lienSubGroups.includes(this.productTypeSubGroup?.value);
+ }
+
+ /** LTV = 100 − margin, shown read-only next to the margin. */
+ get ltv(): number | null {
+ const margin = this.loanProductSecurityLienForm.get('margin').value;
+ if (margin === null || margin === '' || isNaN(margin)) {
+ return null;
+ }
+ return 100 - Number(margin);
+ }
+
+ createForm() {
+ this.loanProductSecurityLienForm = this.formBuilder.group({
+ securityType: [{ value: '', disabled: true }],
+ eligibleAmountBasis: [
+ 'balance_accrued',
+ Validators.required
+ ],
+ margin: [
+ 10,
+ [
+ Validators.required,
+ Validators.min(0),
+ Validators.max(100)
+ ]
+ ],
+ lienMarkingStage: [
+ 'disbursement',
+ Validators.required
+ ],
+ eligibleDepositProducts: [
+ ['Fixed Deposit – Regular'],
+ Validators.required
+ ],
+ tenureNotExceedMaturity: [true],
+ autoReleaseOnClosure: [true],
+ allowMultipleDeposits: [false],
+ adjustFromMaturity: [true],
+ allowThirdPartyDeposit: [false],
+ allowRenewalUnderLien: [true],
+ lienCertificateRequired: ['YES'],
+ lienCertificatePrefix: [
+ 'LC/FD/',
+ Validators.required
+ ],
+ printOnDisbursement: ['YES']
+ });
+ }
+
+ /** Flat values for the payload. Not wired into submit yet — see the class comment. */
+ get loanProductSecurityLien() {
+ const value = this.loanProductSecurityLienForm.getRawValue();
+ return {
+ securityType: value.securityType,
+ eligibleAmountBasis: value.eligibleAmountBasis,
+ margin: value.margin,
+ ltv: this.ltv,
+ lienMarkingStage: value.lienMarkingStage,
+ eligibleDepositProducts: value.eligibleDepositProducts,
+ lienRules: {
+ tenureNotExceedMaturity: value.tenureNotExceedMaturity,
+ autoReleaseOnClosure: value.autoReleaseOnClosure,
+ allowMultipleDeposits: value.allowMultipleDeposits,
+ adjustFromMaturity: value.adjustFromMaturity,
+ allowThirdPartyDeposit: value.allowThirdPartyDeposit,
+ allowRenewalUnderLien: value.allowRenewalUnderLien
+ },
+ lienCertificateRequired: value.lienCertificateRequired,
+ lienCertificatePrefix: value.lienCertificatePrefix,
+ printOnDisbursement: value.printOnDisbursement
+ };
+ }
+}
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html
index 5853a8895..c255df105 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html
@@ -7,1100 +7,1212 @@
-->