feat(cashier,organization): denomination-aware vault UI, Bank/Branch Profile screens, popup disbursement review
Branch Day open/close now captures a denomination-wise count (carried forward automatically to the next day), and shows an auto-fetched EOD summary at close time -- vault + every cashier's position, a branch-total reconciliation against the book figure, and each cashier's reconciliation/settlement status and transaction count -- so closing the day no longer means separately checking Vault Position and every cashier's own screen by hand. New Vault Position screen (branch-ops menu) mirrors Cashier Position for the teller/vault. Cash Transfer now shows the vault's live per-denomination availability while counting a handout, with a client-side warning before it can be over-counted. New Organization screens for Bank Profile, Branch Profile and Clearing GL Configuration, wired into the Organization landing page and the previously-dead "Bank Profile" admin menu button. Cashier Transaction Entry: TYPE is now Receipt/Payment only (cash-only TXN TP.) on the cashier side, with no change to the clerk dashboard's own Withdrawal Slip/Cheque/Disbursement/Enter Bank Transfer/DD flow beyond adding a new Fund Transfer type alongside Disbursement for a GL credit that isn't a loan payout. Neither TYPE nor TXN TP. offers a blank placeholder option anymore -- a new row starts on a real default instead. Footer no longer polls the business-date config for cashier/clerk roles, who never have permission to read it. Disbursement & Transfer Requests: "Review" now opens the review screen as a popup instead of navigating to a separate route, refreshing the list on close; the review screen recognises the new Fund Transfer request type too, and its non-functional "+ Disbursement Review" tab-styled label is now a plain heading. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -29,7 +29,10 @@ interface Denom {
|
||||
@Component({
|
||||
selector: 'mifosx-cash-transfer',
|
||||
templateUrl: './cash-transfer.component.html',
|
||||
styleUrls: ['../cashier-shared.scss'],
|
||||
styleUrls: [
|
||||
'../cashier-shared.scss',
|
||||
'./cash-transfer.component.scss'
|
||||
],
|
||||
standalone: true,
|
||||
imports: [
|
||||
CommonModule,
|
||||
@@ -70,6 +73,14 @@ export class CashTransferComponent implements OnInit {
|
||||
];
|
||||
}
|
||||
|
||||
/** What the selected vault currently holds, denomination-wise — fetched so a clerk can see
|
||||
* before counting whether the vault even has enough of a given note, instead of finding out
|
||||
* only after the backend rejects the transfer. */
|
||||
vaultAvailable: Record<number, number> = {};
|
||||
vaultTotalAvailable = 0;
|
||||
vaultHasBreakdown = true;
|
||||
loadingVault = false;
|
||||
|
||||
ngOnInit(): void {
|
||||
const d = new Date();
|
||||
this.transferDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
|
||||
@@ -101,7 +112,8 @@ export class CashTransferComponent implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
/** When a From-teller is chosen, load ONLY that teller's cashiers into the To dropdown. */
|
||||
/** When a From-teller is chosen, load ONLY that teller's cashiers into the To dropdown, and the
|
||||
* vault's own current denomination-wise stock so it can be shown against every count field. */
|
||||
onTellerSelect(tellerId: number): void {
|
||||
this.fromTellerId = tellerId;
|
||||
const teller = this.tellers.find((t) => t.id === tellerId);
|
||||
@@ -109,6 +121,7 @@ export class CashTransferComponent implements OnInit {
|
||||
this.toParty = '';
|
||||
this.toCashierId = null;
|
||||
this.cashiers = [];
|
||||
this.loadVaultAvailability();
|
||||
if (!tellerId) {
|
||||
return;
|
||||
}
|
||||
@@ -125,6 +138,45 @@ export class CashTransferComponent implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
/** Refetched whenever the vault or the transfer date changes — the vault's stock is only ever
|
||||
* meaningful as of a specific business date. */
|
||||
loadVaultAvailability(): void {
|
||||
this.vaultAvailable = {};
|
||||
this.vaultTotalAvailable = 0;
|
||||
this.vaultHasBreakdown = true;
|
||||
if (!this.fromTellerId) return;
|
||||
this.loadingVault = true;
|
||||
this.service
|
||||
.vaultPosition(this.fromTellerId, this.transferDate)
|
||||
.pipe(catchError(() => of(null)))
|
||||
.subscribe((res: any) => {
|
||||
this.loadingVault = false;
|
||||
this.vaultHasBreakdown = !!res?.hasBreakdown;
|
||||
this.vaultTotalAvailable = Number(res?.totalAmount ?? 0);
|
||||
const map: Record<number, number> = {};
|
||||
((res?.denominations || []) as any[]).forEach((d: any) => (map[d.denominationId] = d.count));
|
||||
this.vaultAvailable = map;
|
||||
});
|
||||
}
|
||||
|
||||
onDateChange(value: string): void {
|
||||
this.transferDate = value;
|
||||
this.loadVaultAvailability();
|
||||
}
|
||||
|
||||
/** How many of this denomination the vault currently holds — 0, not undefined, when the vault's
|
||||
* breakdown is known but simply doesn't list this denomination (i.e. it truly has none left). */
|
||||
availableFor(d: Denom): number {
|
||||
return this.vaultAvailable[d.id] ?? 0;
|
||||
}
|
||||
|
||||
/** Whether the count entered for this denomination is more than the vault is known to hold —
|
||||
* only flagged once the vault's breakdown has actually loaded, so an empty in-flight state
|
||||
* doesn't flash every row as over-limit. */
|
||||
exceedsAvailable(d: Denom): boolean {
|
||||
return this.vaultHasBreakdown && this.countFor(d) > this.availableFor(d);
|
||||
}
|
||||
|
||||
/** When a To-cashier is chosen, capture its id and name. */
|
||||
onCashierSelect(cashierId: number): void {
|
||||
this.toCashierId = cashierId;
|
||||
@@ -152,8 +204,24 @@ export class CashTransferComponent implements OnInit {
|
||||
return this.denoms.reduce((s, d) => s + this.subtotal(d), 0);
|
||||
}
|
||||
|
||||
/** True once any counted denomination is over what the vault holds — checked client-side purely
|
||||
* so the clerk sees it before submitting; the backend enforces this too regardless. */
|
||||
get anyDenomExceedsAvailable(): boolean {
|
||||
return this.denoms.some((d) => this.exceedsAvailable(d));
|
||||
}
|
||||
|
||||
get exceedsVaultTotal(): boolean {
|
||||
return this.vaultHasBreakdown && this.total > this.vaultTotalAvailable && this.total > 0;
|
||||
}
|
||||
|
||||
get valid(): boolean {
|
||||
return this.total > 0 && !!this.fromTellerId && !!this.toCashierId;
|
||||
return (
|
||||
this.total > 0 &&
|
||||
!!this.fromTellerId &&
|
||||
!!this.toCashierId &&
|
||||
!this.anyDenomExceedsAvailable &&
|
||||
!this.exceedsVaultTotal
|
||||
);
|
||||
}
|
||||
|
||||
clear(): void {
|
||||
|
||||
Reference in New Issue
Block a user