{{ 'labels.inputs.Note' | translate }}
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.ts
index 789d1e902..d481a87bf 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.ts
@@ -133,29 +133,32 @@ export class PaymentDialogComponent implements OnInit {
note: ['']
});
- const dashboardRow = this.dashboardRenewalRow;
- if (dashboardRow) {
- // Computed from the grace window, never picked -- the date field stays in the form (the generic
- // submit path and reinvestCap/processingOnOrAfterMaturity both key off it) but its picker is
- // hidden in this mode (see the template), so it can't be moved off this value.
- this.paymentForm
- .get('closedOnDate')
- .setValue(dashboardRow.withinGraceWindow ? new Date(dashboardRow.maturityDate) : this.maxDate);
- this.gapInterestPending = !dashboardRow.withinGraceWindow;
-
- this.renewalPreviewLoading = true;
- this.fixedDepositsService.getFdRenewalPreview(this.data.accountId).subscribe({
- next: (preview: any) => {
- this.renewalPreview = preview;
- this.renewalPreviewLoading = false;
- },
- // Non-fatal -- the plain timing text above still explains what will happen even if the
- // numeric breakdown couldn't be fetched; only the numbers are missing, not the action itself.
- error: () => {
- this.renewalPreviewLoading = false;
+ // Fetched every time this dialog opens, not just from the FD Dashboard -- Payment is now only ever
+ // offered once an FD has Matured (see FixedDepositsButtonsConfiguration), so a plain Payment on it
+ // is exactly the same "late renewal" scenario the Dashboard's Renew action handles, and needs the
+ // exact same date-locking/gap-interest treatment, or an FD closed this way instead of from the
+ // Dashboard would silently skip crediting interest it genuinely earned.
+ this.renewalPreviewLoading = true;
+ this.fixedDepositsService.getFdRenewalPreview(this.data.accountId).subscribe({
+ next: (preview: any) => {
+ this.renewalPreview = preview;
+ this.renewalPreviewLoading = false;
+ if (preview?.isMatured) {
+ // Computed from the grace window, never picked -- the date field stays in the form (the
+ // generic submit path and reinvestCap/processingOnOrAfterMaturity both key off it) but its
+ // picker is hidden once matured (see the template), so it can't be moved off this value.
+ this.paymentForm
+ .get('closedOnDate')
+ .setValue(preview.withinGrace ? new Date(preview.maturityDate) : this.maxDate);
+ this.gapInterestPending = !preview.withinGrace;
}
- });
- }
+ },
+ // Non-fatal -- Confirm still works from here (backend re-derives the same numbers on submit),
+ // only the numeric preview and its date-locking are unavailable, not the action itself.
+ error: () => {
+ this.renewalPreviewLoading = false;
+ }
+ });
this.paymentForm.get('onAccountClosureId').valueChanges.subscribe((id: number) => this.onClosureTypeChange(id));
// The cap depends on whether the chosen date is on or after maturity, so a date change can make an
@@ -195,13 +198,19 @@ export class PaymentDialogComponent implements OnInit {
return this.data.dashboardRenewal?.row ?? null;
}
- /** What clicking Confirm is actually about to do -- shown above the (hidden-picker) date in this
- * mode, since the date itself is no longer visible to explain it. */
- get dashboardRenewalTimingText(): string {
- const row = this.dashboardRenewalRow;
- if (!row) return '';
- return row.withinGraceWindow
- ? `Backdated to its original maturity date (${row.maturityDate}), at the currently active interest rate.`
+ /** True once the loaded preview confirms this FD has actually Matured -- which, since Payment is
+ * only ever offered on a Matured account, is every real open of this dialog now, from either entry
+ * point. Drives the date-locking and gap-interest preview/crediting identically either way. */
+ get isMaturedRenewal(): boolean {
+ return !!this.renewalPreview?.isMatured;
+ }
+
+ /** What clicking Confirm is actually about to do -- shown above the (hidden-picker) date once
+ * matured, since the date itself is no longer visible to explain it. */
+ get maturedRenewalTimingText(): string {
+ if (!this.renewalPreview) return '';
+ return this.renewalPreview.withinGrace
+ ? `Backdated to its original maturity date (${this.renewalPreview.maturityDate}), at the currently active interest rate.`
: `This FD's grace period has passed -- gap-period interest (for the days since maturity) will be ` +
`credited at the linked account's rate first, then this renews from today.`;
}
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/premature-close-dialog/premature-close-dialog.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/premature-close-dialog/premature-close-dialog.component.html
new file mode 100644
index 000000000..018b95331
--- /dev/null
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/premature-close-dialog/premature-close-dialog.component.html
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+ @if (loadFailed) {
+
+
+ } @else {
+
+ }
+
+
+
+
+ {{ 'labels.buttons.Cancel' | translate }}
+
+
+ {{ submitting ? ('labels.buttons.Processing' | translate) : ('labels.buttons.Confirm' | translate) }}
+
+
+
+ * The premature amount is date-dependent (unlike Payment's one-shot template load): every change to
+ * Closed On Date re-calls `calculatePrematureAmount`, same as the full-page form this replaces did.
+ */
+@Component({
+ selector: 'mifosx-premature-close-dialog',
+ templateUrl: './premature-close-dialog.component.html',
+ styleUrls: ['./premature-close-dialog.component.scss'],
+ imports: [
+ ...STANDALONE_SHARED_IMPORTS,
+ CdkScrollable,
+ MatDialogContent,
+ MatDialogActions,
+ MatDialogClose,
+ CdkTextareaAutosize,
+ FaIconComponent,
+ FormatNumberPipe
+ ]
+})
+export class PrematureCloseDialogComponent implements OnInit {
+ /** The `onAccountClosureId` codes Premature Close can offer -- same codes Payment/Close use. */
+ private static readonly WITHDRAW_DEPOSIT_ID = 100;
+ private static readonly TRANSFER_TO_SAVINGS_ID = 200;
+
+ private static readonly ACTION_ICONS: Record = {
+ [PrematureCloseDialogComponent.WITHDRAW_DEPOSIT_ID]: 'money-bill-wave',
+ [PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID]: 'wallet'
+ };
+
+ private static readonly ACTION_DESCRIPTIONS: Record = {
+ [PrematureCloseDialogComponent.WITHDRAW_DEPOSIT_ID]: 'Pay out the full balance in cash',
+ [PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID]: 'Move the full balance to another savings account'
+ };
+
+ dialogRef = inject>(MatDialogRef);
+ data: {
+ accountId: number | string;
+ accountNo?: string;
+ depositAmount?: number;
+ nominalAnnualInterestRate?: number;
+ preClosurePenalApplicable?: boolean;
+ preClosurePenalInterest?: number;
+ preClosurePenalInterestOnType?: { value: string };
+ } = inject(MAT_DIALOG_DATA);
+ private formBuilder = inject(UntypedFormBuilder);
+ private fixedDepositsService = inject(FixedDepositsService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+
+ prematureCloseForm: UntypedFormGroup;
+ onAccountClosureOptions: any[] = [];
+ savingsAccountsData: any[] = [];
+ maturityAmount: number = null;
+ loadingAmount = true;
+ loadFailed = false;
+ submitting = false;
+ submitError: string = null;
+ minDate = new Date(2000, 0, 1);
+ maxDate: Date;
+
+ ngOnInit(): void {
+ this.maxDate = this.settingsService.businessDate;
+ this.prematureCloseForm = this.formBuilder.group({
+ closedOnDate: [
+ this.maxDate,
+ Validators.required
+ ]
+ });
+
+ this.prematureCloseForm
+ .get('closedOnDate')
+ .valueChanges.subscribe((date: Date) => this.calculatePrematureAmount(date));
+ // Same date the form already starts with -- without this the amount/options never load unless the
+ // maker happens to touch the date picker, which the full-page form this replaces required too.
+ this.calculatePrematureAmount(this.maxDate);
+ }
+
+ private calculatePrematureAmount(date: Date): void {
+ this.loadingAmount = true;
+ this.loadFailed = false;
+ const locale = this.settingsService.language.code;
+ const dateFormat = this.settingsService.dateFormat;
+ const data = {
+ closedOnDate: this.dateUtils.formatDate(date, dateFormat),
+ dateFormat,
+ locale
+ };
+ this.fixedDepositsService
+ .executeFixedDepositsAccountCommand(this.data.accountId as string, 'calculatePrematureAmount', data)
+ .subscribe({
+ next: (response: any) => {
+ this.savingsAccountsData = response.savingsAccounts ?? [];
+ this.onAccountClosureOptions = response.onAccountClosureOptions ?? [];
+ this.maturityAmount = response.maturityAmount;
+ this.loadingAmount = false;
+ if (!this.prematureCloseForm.contains('onAccountClosureId')) {
+ this.prematureCloseForm.addControl('onAccountClosureId', new UntypedFormControl('', Validators.required));
+ this.prematureCloseForm.addControl('note', new UntypedFormControl(''));
+ this.prematureCloseForm
+ .get('onAccountClosureId')
+ .valueChanges.subscribe((id: number) => this.onClosureTypeChange(id));
+ }
+ },
+ // Without this the spinner would run forever on a failed load, leaving Cancel as the only way out.
+ error: () => {
+ this.loadingAmount = false;
+ this.loadFailed = true;
+ }
+ });
+ }
+
+ /** Adds/removes the destination-account control to match what the chosen type needs. */
+ private onClosureTypeChange(id: number): void {
+ if (id === PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID) {
+ if (!this.prematureCloseForm.contains('toSavingsAccountId')) {
+ this.prematureCloseForm.addControl('toSavingsAccountId', new UntypedFormControl('', Validators.required));
+ this.prematureCloseForm.addControl('transferDescription', new UntypedFormControl(''));
+ }
+ } else {
+ this.prematureCloseForm.removeControl('toSavingsAccountId');
+ this.prematureCloseForm.removeControl('transferDescription');
+ }
+ }
+
+ /** The gap between the deposit and the computed maturity amount -- the actual interest this premature
+ * closure earns, at whatever rate (contracted, or the lower pre-closure-penalty one below) applied. */
+ get interestEarned(): number | null {
+ if (this.maturityAmount === null || this.maturityAmount === undefined || !this.data.depositAmount) {
+ return null;
+ }
+ return Number(this.maturityAmount) - Number(this.data.depositAmount);
+ }
+
+ /** True when the chosen action needs a destination account but the customer has none to pick. */
+ get noDestinationAccounts(): boolean {
+ return (
+ !this.loadingAmount &&
+ this.prematureCloseForm?.contains('toSavingsAccountId') &&
+ this.savingsAccountsData.length === 0
+ );
+ }
+
+ iconFor(id: number): string {
+ return PrematureCloseDialogComponent.ACTION_ICONS[id] ?? 'circle';
+ }
+
+ descriptionFor(id: number): string {
+ return PrematureCloseDialogComponent.ACTION_DESCRIPTIONS[id] ?? '';
+ }
+
+ selectClosureType(id: number): void {
+ this.prematureCloseForm.get('onAccountClosureId').setValue(id);
+ this.prematureCloseForm.get('onAccountClosureId').markAsTouched();
+ }
+
+ submit(): void {
+ const formValue = { ...this.prematureCloseForm.value };
+ const locale = this.settingsService.language.code;
+ const dateFormat = this.settingsService.dateFormat;
+ if (formValue.closedOnDate instanceof Date) {
+ formValue.closedOnDate = this.dateUtils.formatDate(formValue.closedOnDate, dateFormat);
+ }
+ const data = { ...formValue, dateFormat, locale };
+ this.submitting = true;
+ this.submitError = null;
+ this.fixedDepositsService
+ .executeFixedDepositsAccountCommand(this.data.accountId as string, 'prematureClose', data)
+ .subscribe({
+ next: () => {
+ this.dialogRef.close({ confirm: true });
+ },
+ // Keep the dialog open with the entered values and say what went wrong, rather than leaving a
+ // permanently disabled Confirm behind whatever modal the global interceptor threw up.
+ error: (error: any) => {
+ this.submitting = false;
+ this.submitError =
+ error?.error?.defaultUserMessage ??
+ error?.error?.errors?.[0]?.defaultUserMessage ??
+ 'This account could not be prematurely closed. Please review the details and try again.';
+ }
+ });
+ }
+}
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts
index 42f39f6c5..a07dde825 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts
@@ -17,6 +17,7 @@ import { CalculateInterestDialogComponent } from './custom-dialogs/calculate-int
import { PostInterestDialogComponent } from './custom-dialogs/post-interest-dialog/post-interest-dialog.component';
import { ToggleWithholdTaxDialogComponent } from './custom-dialogs/toggle-withhold-tax-dialog/toggle-withhold-tax-dialog.component';
import { PaymentDialogComponent } from './custom-dialogs/payment-dialog/payment-dialog.component';
+import { PrematureCloseDialogComponent } from './custom-dialogs/premature-close-dialog/premature-close-dialog.component';
import { DepositCertificateDialogComponent } from 'app/shared/deposit-certificate-dialog/deposit-certificate-dialog.component';
/** Custom Button Config. */
@@ -238,7 +239,6 @@ export class FixedDepositAccountViewComponent implements OnInit {
case 'Undo Activation':
case 'Add Charge':
case 'Withdrawn by Client':
- case 'Premature Close':
case 'Deposit':
case 'Withdrawal':
this.router.navigate([`actions/${name}`], { relativeTo: this.route });
@@ -267,12 +267,17 @@ export class FixedDepositAccountViewComponent implements OnInit {
case 'Payment':
this.openPaymentDialog();
break;
+ case 'Premature Close':
+ this.openPrematureCloseDialog();
+ break;
}
}
/**
- * Opens the Payment action -- unlike Premature Close/Close, works whether the account is Active or
- * Matured, and is the only place a Partial Reinvest can be done.
+ * Opens the Payment action -- only offered once the FD has actually Matured (see
+ * FixedDepositsButtonsConfiguration), and the only place a Partial Reinvest can be done. Also the
+ * exact same dialog the FD Dashboard's Renew action opens (see fd-dashboard.component.ts's
+ * openRenewDialog), just without dashboardRenewal data, so its date picker stays visible.
*/
private openPaymentDialog(): void {
const paymentDialogRef = this.dialog.open(PaymentDialogComponent, {
@@ -293,6 +298,34 @@ export class FixedDepositAccountViewComponent implements OnInit {
});
}
+ /**
+ * Opens the Premature Close action -- Active-only, no reinvest option, since the deposit hasn't
+ * matured yet.
+ */
+ private openPrematureCloseDialog(): void {
+ const prematureCloseDialogRef = this.dialog.open(PrematureCloseDialogComponent, {
+ width: '720px',
+ maxWidth: '95vw',
+ data: {
+ accountId: this.fixedDepositsAccountData.id,
+ accountNo: this.fixedDepositsAccountData.fdAccountNumber || this.fixedDepositsAccountData.accountNo,
+ // calculatePrematureAmount only ever returns the final maturityAmount, not how it was reached --
+ // these come from the account's own data (already loaded for this page) so the dialog can show
+ // the breakdown (deposit, contracted rate, penalty, interest earned) behind that one number.
+ depositAmount: this.fixedDepositsAccountData.depositAmount,
+ nominalAnnualInterestRate: this.fixedDepositsAccountData.nominalAnnualInterestRate,
+ preClosurePenalApplicable: this.fixedDepositsAccountData.preClosurePenalApplicable,
+ preClosurePenalInterest: this.fixedDepositsAccountData.preClosurePenalInterest,
+ preClosurePenalInterestOnType: this.fixedDepositsAccountData.preClosurePenalInterestOnType
+ }
+ });
+ prematureCloseDialogRef.afterClosed().subscribe((response: any) => {
+ if (response?.confirm) {
+ this.reload();
+ }
+ });
+ }
+
/**
* Deletes Fixed Deposits Account.
*/
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts
index 76abd062d..9ce40ede6 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts
@@ -110,7 +110,18 @@ export class FixedDepositsButtonsConfiguration {
setOptions(status: string) {
switch (status) {
case 'Active':
+ this.optionArray = [
+ {
+ name: 'Post Interest'
+ },
+ {
+ name: 'Add Charge'
+ }
+ ];
+ break;
case 'Matured':
+ // Payment only makes sense once the deposit has actually matured -- an Active FD that needs
+ // closing early already has Premature Close for that.
this.optionArray = [
{
name: 'Post Interest'
diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.html b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.html
index f20e46af8..92b1d954b 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.html
+++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.html
@@ -24,9 +24,6 @@
@if (actions['Add Charge']) {
-
Reserve rates
-
- Rates are effective-dated rather than overwritten: a return filed for an earlier period keeps reporting the rate
- that was actually in force then. Saving against a date that already has a rate edits it; a new date adds one.
-
+
+
Reserve rates
+
+ Rates are effective-dated rather than overwritten: a return filed for an earlier period keeps reporting the
+ rate that was actually in force then. Saving against a date that already has a rate edits it; a new date adds
+ one.
+
-
- @for (type of ['CRR', 'SLR', 'SAVINGS_DEMAND']; track type) {
-
-
- {{ type === 'SAVINGS_DEMAND' ? 'Savings demand share' : type }} in force today
-
- @if (currentRate(type); as rate) {
- {{ rate.percentage }}%
- @if (rate.seedDefault) {
-
- Placeholder — confirm the rate actually in force
-
- } @else {
- since {{ rate.effectiveFrom }}
- }
- } @else {
- Not set
- {{ type === 'CRR' ? 'Form 1' : 'Form 9' }} cannot compute
- }
-
- }
-
-
-
-
- Rate
-
- CRR — Form 1
- SLR — Form 9
-
- Savings — demand share
-
-
-
-
- Percentage (%)
-
-
-
- Effective from
-
-
-
- {{ savingRate ? 'Saving…' : 'Save rate' }}
-
-
-
-
-
-
- Rate
- Percentage
- Effective from
- Status
-
-
-
- @for (rate of rates; track rate.id) {
-
- {{ rate.rateType }} {{ rate.percentage }}%
- {{ rate.effectiveFrom }}
-
- @if (isFuture(rate)) {
- Future-dated
- } @else if (currentRate(rate.rateType)?.id === rate.id) {
- In force
- } @else {
- Superseded
- }
+
+ @for (type of ['CRR', 'SLR', 'SAVINGS_DEMAND']; track type) {
+
+
+ {{ type === 'SAVINGS_DEMAND' ? 'Savings demand share' : type }} in force today
+
+ @if (currentRate(type); as rate) {
+ {{ rate.percentage }}%
@if (rate.seedDefault) {
- Placeholder
+
+ Placeholder — confirm the rate actually in force
+
+ } @else {
+ since {{ rate.effectiveFrom }}
}
-
-
-
-
-
-
+ } @else {
+ Not set
+ {{ type === 'CRR' ? 'Form 1' : 'Form 9' }} cannot compute
+ }
+
}
-
-
-
+
+
+ Rate
+
+ CRR — Form 1
+ SLR — Form 9
+
+ Savings — demand share
+
+
+
+
+ Percentage (%)
+
+
+
+ Effective from
+
+
+
+ {{ savingRate ? 'Saving…' : 'Save rate' }}
+
+
+
+
+
+
+ Rate
+ Percentage
+ Effective from
+ Status
+
+
+
+ @for (rate of rates; track rate.id) {
+
+
+ {{ rate.rateType }}
+
+ {{ rate.percentage }}%
+ {{ rate.effectiveFrom }}
+
+ @if (isFuture(rate)) {
+ Future-dated
+ } @else if (currentRate(rate.rateType)?.id === rate.id) {
+ In force
+ } @else {
+ Superseded
+ }
+ @if (rate.seedDefault) {
+ Placeholder
+ }
+
+
+
+
+
+
+ }
+
+
+
}
@@ -324,6 +327,17 @@
+
+