, onClose: () => void): void {
+ this.dialogRef?.close();
+ this.dialogRef = this.dialog.open(template, { width: '600px', maxWidth: '95vw', autoFocus: false });
+ this.dialogRef.afterClosed().subscribe(onClose);
+ }
+
+ private fail(err: any, fallback: string): void {
+ const msg = err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.defaultUserMessage ?? fallback;
+ this.snackBar.open(msg, 'Close', { duration: 6000 });
+ }
+}
diff --git a/src/app/cashier/voucher-report/voucher-report.component.html b/src/app/cashier/voucher-report/voucher-report.component.html
index 73ac94478..592554b20 100644
--- a/src/app/cashier/voucher-report/voucher-report.component.html
+++ b/src/app/cashier/voucher-report/voucher-report.component.html
@@ -169,6 +169,7 @@
| Debit |
Credit |
Amount |
+ Correction |
User |
+
+
+ @if (!row.voucherStatus || row.voucherStatus === 'ACTIVE') {
+ —
+ }
+ |
{{ row.username || '—' }} |
@if (systemOnly) {
diff --git a/src/app/cashier/voucher-report/voucher-report.component.scss b/src/app/cashier/voucher-report/voucher-report.component.scss
index 1fe7a3b97..d7e7cc51e 100644
--- a/src/app/cashier/voucher-report/voucher-report.component.scss
+++ b/src/app/cashier/voucher-report/voucher-report.component.scss
@@ -92,3 +92,8 @@
text-transform: uppercase;
color: #7c3aed;
}
+
+.vr-active {
+ font-size: 11px;
+ color: #94a3b8;
+}
diff --git a/src/app/cashier/voucher-report/voucher-report.component.ts b/src/app/cashier/voucher-report/voucher-report.component.ts
index d6c148d91..3d04bd8a6 100644
--- a/src/app/cashier/voucher-report/voucher-report.component.ts
+++ b/src/app/cashier/voucher-report/voucher-report.component.ts
@@ -14,6 +14,7 @@ import { MatIconModule } from '@angular/material/icon';
import { catchError, of } from 'rxjs';
import { CashierService } from '../cashier.service';
import { businessToday } from 'app/core/utils/business-today';
+import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
/**
* Which side of the register a screen shows.
@@ -26,6 +27,11 @@ export type VoucherSide = 'CR' | 'DR' | 'ALL';
/** One voucher as the register shows it: the number, the two sides, and who raised it. */
interface VoucherRow {
voucherNo: string;
+ /** Where the voucher stands after a correction: active, revoked, under correction, or corrected. */
+ voucherStatus?: VoucherStatus;
+ revokedByVoucherNo?: string | null;
+ replacesVoucherNo?: string | null;
+ correctionNote?: string | null;
voucherType: string | null;
amount: number | null;
createdAt: string | null;
@@ -82,7 +88,8 @@ interface VoucherReport {
imports: [
CommonModule,
FormsModule,
- MatIconModule
+ MatIconModule,
+ VoucherStatusComponent
]
})
export class VoucherReportComponent implements OnInit {
diff --git a/src/app/cashier/voucher-status/voucher-status.component.ts b/src/app/cashier/voucher-status/voucher-status.component.ts
new file mode 100644
index 000000000..a436de861
--- /dev/null
+++ b/src/app/cashier/voucher-status/voucher-status.component.ts
@@ -0,0 +1,137 @@
+/**
+ * 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 } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+/** Where a voucher stands after a voucher correction. */
+export type VoucherStatus =
+ | 'ACTIVE'
+ | 'REVOKED'
+ | 'UNPASS_PENDING'
+ | 'UNPASSED'
+ | 'CORRECTION_PENDING'
+ | 'CORRECTED'
+ | 'CLOSED'
+ | null
+ | undefined;
+
+/**
+ * A small badge saying whether a voucher was revoked, is under correction, or replaced another one.
+ * Nothing is shown for an ordinary (active) voucher, so the registers read as before.
+ */
+@Component({
+ selector: 'mifosx-voucher-status',
+ standalone: true,
+ imports: [CommonModule],
+ template: `
+ @if (label) {
+ {{ label }}
+ @if (note) {
+ {{ note }}
+ }
+ }
+ `,
+ styles: [
+ `
+ .vs {
+ display: inline-block;
+ margin-left: 6px;
+ padding: 1px 8px;
+ border-radius: 999px;
+ background: #e2e8f0;
+ color: #334155;
+ font-size: 10px;
+ font-weight: 700;
+ white-space: nowrap;
+ vertical-align: middle;
+ }
+
+ .vs-note {
+ margin-top: 2px;
+ max-width: 280px;
+ font-size: 11px;
+ line-height: 1.3;
+ color: #64748b;
+ }
+
+ .vs--REVOKED {
+ background: #fee2e2;
+ color: #991b1b;
+ }
+
+ .vs--UNPASS_PENDING,
+ .vs--CORRECTION_PENDING {
+ background: #fef3c7;
+ color: #92400e;
+ }
+
+ .vs--UNPASSED {
+ background: #dbeafe;
+ color: #1e40af;
+ }
+
+ .vs--CLOSED {
+ background: #f1f5f9;
+ color: #475569;
+ }
+
+ .vs--CORRECTED {
+ background: #d1fae5;
+ color: #065f46;
+ }
+ `
+ ]
+})
+export class VoucherStatusComponent {
+ @Input() status: VoucherStatus;
+ /** The voucher that replaced this one, when it is revoked. */
+ @Input() revokedBy: string | null | undefined;
+ /** The voucher this one replaced, when it is the corrected one. */
+ @Input() replaces: string | null | undefined;
+ /** Why: the reason the voucher was unpassed, or why the correction was closed. */
+ @Input() note: string | null | undefined;
+
+ get label(): string {
+ switch (this.status) {
+ case 'REVOKED':
+ return this.revokedBy ? `Revoked → ${this.revokedBy}` : 'Revoked';
+ case 'UNPASS_PENDING':
+ return 'Unpass pending';
+ case 'UNPASSED':
+ return 'Unpassed';
+ case 'CORRECTION_PENDING':
+ return 'Correction pending';
+ case 'CLOSED':
+ return 'Closed — cashier deposits separately';
+ case 'CORRECTED':
+ return this.replaces ? `Corrected (replaces ${this.replaces})` : 'Corrected';
+ default:
+ return '';
+ }
+ }
+
+ get hint(): string {
+ switch (this.status) {
+ case 'REVOKED':
+ return 'This voucher was revoked: its deposit was moved to another account and a new voucher replaced it.';
+ case 'UNPASS_PENDING':
+ return 'A manager has not yet approved unpassing this voucher.';
+ case 'UNPASSED':
+ return 'Unpassed: waiting for the cashier to enter the correct account.';
+ case 'CORRECTION_PENDING':
+ return 'The correct account is entered; waiting for a manager to approve.';
+ case 'CLOSED':
+ return 'The correction was closed by the cashier; the voucher stays as it was.';
+ case 'CORRECTED':
+ return 'This voucher was raised by a correction and replaces the earlier one.';
+ default:
+ return '';
+ }
+ }
+}
diff --git a/src/app/core/shell/shell.component.html b/src/app/core/shell/shell.component.html
index 420d10c4a..dab25a011 100644
--- a/src/app/core/shell/shell.component.html
+++ b/src/app/core/shell/shell.component.html
@@ -131,6 +131,14 @@
My Closure Requests
+
+
+ Voucher Correction
+
@if (clerkAccountLoaded) {
diff --git a/src/app/savings/common-resolvers/savings-account-view.resolver.ts b/src/app/savings/common-resolvers/savings-account-view.resolver.ts
index 264fa26ff..faf79efd1 100644
--- a/src/app/savings/common-resolvers/savings-account-view.resolver.ts
+++ b/src/app/savings/common-resolvers/savings-account-view.resolver.ts
@@ -11,10 +11,12 @@ import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
+import { catchError, map, switchMap } from 'rxjs/operators';
/** Custom Services */
import { SavingsService } from '../savings.service';
+import { VoucherCorrectionService } from '../../cashier/voucher-correction.service';
/**
* Savings Account data resolver.
@@ -22,14 +24,29 @@ import { SavingsService } from '../savings.service';
@Injectable()
export class SavingsAccountViewResolver {
private savingsService = inject(SavingsService);
+ private voucherCorrectionService = inject(VoucherCorrectionService);
/**
- * Returns the Savings Account data.
+ * Returns the Savings Account data, without the deposits a completed voucher correction took off this account:
+ * the passbook and the transaction list read their rows from here, and a deposit that was posted to the wrong
+ * account and moved should not appear on it at all.
* @param {ActivatedRouteSnapshot} route Route Snapshot
* @returns {Observable}
*/
resolve(route: ActivatedRouteSnapshot): Observable {
const savingAccountId = route.paramMap.get('savingAccountId');
- return this.savingsService.getSavingsAccountData(savingAccountId);
+ return this.savingsService.getSavingsAccountData(savingAccountId).pipe(
+ switchMap((account: any) =>
+ this.voucherCorrectionService.voidedTransactions(Number(savingAccountId)).pipe(
+ catchError(() => of([] as number[])),
+ map((voided: number[]) => {
+ if (voided.length && Array.isArray(account?.transactions)) {
+ account.transactions = account.transactions.filter((txn: any) => !voided.includes(txn.id));
+ }
+ return account;
+ })
+ )
+ )
+ );
}
}
diff --git a/src/app/tasks/checker-inbox-and-tasks/checker-inbox-and-tasks.component.html b/src/app/tasks/checker-inbox-and-tasks/checker-inbox-and-tasks.component.html
index 65f82890f..d8b22a6c4 100644
--- a/src/app/tasks/checker-inbox-and-tasks/checker-inbox-and-tasks.component.html
+++ b/src/app/tasks/checker-inbox-and-tasks/checker-inbox-and-tasks.component.html
@@ -144,6 +144,24 @@
Withdrawal Requests
+
+
+ Cash Transfers
+
+
+
+ Voucher Corrections
+
+ import('../cashier/cash-transfer-approvals/cash-transfer-approvals.component').then(
+ (m) => m.CashTransferApprovalsComponent
+ ),
+ data: { title: 'Cash Transfers' }
+ },
+ {
+ path: 'voucher-corrections',
+ loadComponent: () =>
+ import('../cashier/voucher-correction-approvals/voucher-correction-approvals.component').then(
+ (m) => m.VoucherCorrectionApprovalsComponent
+ ),
+ data: { title: 'Voucher Corrections' }
+ },
{
path: 'dividend-requests',
component: DividendRequestsComponent,
|