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:
Claude Sonnet 5
@@ -125,13 +125,102 @@
|
||||
</label>
|
||||
<label class="pg-field">
|
||||
<span>Opening cash (leave blank to carry forward)</span>
|
||||
<input type="number" step="0.01" [(ngModel)]="openingCash" placeholder="Carried from last close" />
|
||||
<input
|
||||
type="number"
|
||||
step="0.01"
|
||||
[(ngModel)]="openingCash"
|
||||
[disabled]="openDenomTotal > 0"
|
||||
placeholder="Carried from last close"
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
<p class="bd-hint">
|
||||
Left blank, yesterday's closing figure carries forward automatically — which is what keeps the opening balance
|
||||
from drifting.
|
||||
Left blank with no notes/coins counted below, yesterday's closing figure carries forward automatically — which
|
||||
is what keeps the opening balance from drifting. Counting the drawer below is what actually records the
|
||||
note/coin stock the branch can check a vault handout against later.
|
||||
</p>
|
||||
|
||||
<div class="pg-card bd-denom">
|
||||
<table class="pg-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Denomination</th>
|
||||
<th style="text-align: center">Count</th>
|
||||
<th class="num">Amount</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@if (notes.length) {
|
||||
<tr class="pg-section">
|
||||
<td colspan="3">Bank Notes</td>
|
||||
</tr>
|
||||
}
|
||||
@for (d of notes; track d.id) {
|
||||
<tr>
|
||||
<td>
|
||||
<span class="pg-chip">{{ d.label }}</span>
|
||||
</td>
|
||||
<td style="display: flex; justify-content: center">
|
||||
<div class="pg-step">
|
||||
<button
|
||||
type="button"
|
||||
(click)="bumpCount(openCounts, d, -1)"
|
||||
[disabled]="countFor(openCounts, d) === 0"
|
||||
>
|
||||
−
|
||||
</button>
|
||||
<input
|
||||
type="number"
|
||||
min="0"
|
||||
[value]="countFor(openCounts, d)"
|
||||
(input)="onCountChange(openCounts, d, $any($event.target).value)"
|
||||
/>
|
||||
<button type="button" (click)="bumpCount(openCounts, d, 1)">+</button>
|
||||
</div>
|
||||
</td>
|
||||
<td class="num">₹{{ subtotalFor(openCounts, d) | number: '1.2-2' }}</td>
|
||||
</tr>
|
||||
}
|
||||
@if (coins.length) {
|
||||
<tr class="pg-section">
|
||||
<td colspan="3">Coins</td>
|
||||
</tr>
|
||||
}
|
||||
@for (d of coins; track d.id) {
|
||||
<tr>
|
||||
<td>
|
||||
<span class="pg-chip pg-chip--coin">{{ d.label }}</span>
|
||||
</td>
|
||||
<td style="display: flex; justify-content: center">
|
||||
<div class="pg-step">
|
||||
<button
|
||||
type="button"
|
||||
(click)="bumpCount(openCounts, d, -1)"
|
||||
[disabled]="countFor(openCounts, d) === 0"
|
||||
>
|
||||
−
|
||||
</button>
|
||||
<input
|
||||
type="number"
|
||||
min="0"
|
||||
[value]="countFor(openCounts, d)"
|
||||
(input)="onCountChange(openCounts, d, $any($event.target).value)"
|
||||
/>
|
||||
<button type="button" (click)="bumpCount(openCounts, d, 1)">+</button>
|
||||
</div>
|
||||
</td>
|
||||
<td class="num">₹{{ subtotalFor(openCounts, d) | number: '1.2-2' }}</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@if (openDenomTotal > 0) {
|
||||
<p class="bd-hint">
|
||||
Denomination total: <strong>₹{{ openDenomTotal | number: '1.2-2' }}</strong>
|
||||
</p>
|
||||
}
|
||||
|
||||
<div class="db-panel__actions">
|
||||
<button type="button" class="pg-btn pg-btn--primary" (click)="submitOpen()" [disabled]="opening || !openDate">
|
||||
Open Day
|
||||
@@ -174,29 +263,133 @@
|
||||
<span>+ Cash deposits taken (approved)</span>
|
||||
<span class="bd-calc__amt">₹{{ preview.deposits | number: '1.2-2' }}</span>
|
||||
</div>
|
||||
<div class="bd-calc__row bd-calc__row--in">
|
||||
<span>+ Cash drawn from vault</span>
|
||||
<span class="bd-calc__amt">₹{{ preview.vaultIn | number: '1.2-2' }}</span>
|
||||
</div>
|
||||
<div class="bd-calc__row bd-calc__row--out">
|
||||
<span>− Cash paid out (approved withdrawals)</span>
|
||||
<span class="bd-calc__amt">₹{{ preview.withdrawals | number: '1.2-2' }}</span>
|
||||
</div>
|
||||
<div class="bd-calc__row bd-calc__row--out">
|
||||
<span>− Cash settled back to vault</span>
|
||||
<span class="bd-calc__amt">₹{{ preview.settledOut | number: '1.2-2' }}</span>
|
||||
</div>
|
||||
<div class="bd-calc__row bd-calc__row--total">
|
||||
<span>Cash the branch should be holding</span>
|
||||
<span class="bd-calc__amt">₹{{ preview.expectedCash | number: '1.2-2' }}</span>
|
||||
</div>
|
||||
@if (preview.vaultIn > 0 || preview.settledOut > 0) {
|
||||
<div class="bd-calc__memo">
|
||||
Vault activity today — moves cash within the branch, not counted in the total above: ₹{{
|
||||
preview.vaultIn | number: '1.2-2'
|
||||
}}
|
||||
handed to a cashier, ₹{{ preview.settledOut | number: '1.2-2' }} settled back to the vault.
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- What every cash point under this branch is actually holding right now, fetched
|
||||
automatically — so closing the day doesn't mean separately checking Vault Position and
|
||||
every cashier's own Cashier Position screen by hand. -->
|
||||
@if (eodLoading) {
|
||||
<p class="db-muted">Fetching vault and cashier positions…</p>
|
||||
}
|
||||
|
||||
<!-- The question that actually matters at close: does the WHOLE branch tally, not just the
|
||||
vault. Only shown once both the book preview and every teller/cashier position have
|
||||
loaded, since it adds them together. -->
|
||||
@if (branchTotalSummary; as bt) {
|
||||
<div class="bd-eod bd-eod--total">
|
||||
<div class="bd-eod__head">
|
||||
<mat-icon>account_balance_wallet</mat-icon>
|
||||
<strong>Branch Total (Vault + All Cashiers)</strong>
|
||||
</div>
|
||||
<div class="bd-eod__totals">
|
||||
<span>Vault ₹{{ bt.vaultTotal | number: '1.2-2' }}</span>
|
||||
<span>+ Cashiers ₹{{ bt.cashierTotal | number: '1.2-2' }}</span>
|
||||
<span class="bd-eod__totals-sum">= ₹{{ bt.grandTotal | number: '1.2-2' }}</span>
|
||||
<span class="db-muted">vs. book ₹{{ bt.expected | number: '1.2-2' }}</span>
|
||||
</div>
|
||||
@if (bt.difference === 0) {
|
||||
<span class="db-badge db-badge--ok">Branch Tallied</span>
|
||||
} @else {
|
||||
<span class="db-badge db-badge--rejected">
|
||||
{{ bt.difference > 0 ? 'Excess' : 'Short' }} ₹{{ absValue(bt.difference) | number: '1.2-2' }}
|
||||
</span>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
|
||||
@for (t of eodTellers; track t.tellerId) {
|
||||
<div class="bd-eod">
|
||||
<div class="bd-eod__head">
|
||||
<mat-icon>account_balance</mat-icon>
|
||||
<strong>{{ t.tellerName }}</strong>
|
||||
<span class="db-muted">
|
||||
vault holds
|
||||
{{ t.vault?.hasBreakdown ? '₹' + (t.vault.totalAmount | number: '1.2-2') : 'no breakdown recorded' }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@if (t.vault?.hasBreakdown && t.vault.denominations.length > 0) {
|
||||
<div class="bd-eod__denoms">
|
||||
@for (d of t.vault.denominations; track d.denominationId) {
|
||||
<span class="bd-eod__chip">₹{{ d.denominationValue }} × {{ d.count }}</span>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (t.cashiers.length === 0) {
|
||||
<p class="db-muted bd-eod__empty">No cashiers allocated under this vault.</p>
|
||||
}
|
||||
@for (c of t.cashiers; track c.cashierId) {
|
||||
<div class="bd-eod__cashier">
|
||||
<div class="bd-eod__cashier-head">
|
||||
<span>{{ c.cashierName }}</span>
|
||||
<span class="db-muted">
|
||||
morning ₹{{ c.morningTotal | number: '1.2-2' }} → current ₹{{ c.currentTotal | number: '1.2-2' }} ·
|
||||
{{ c.txnCount ?? '—' }} txn{{ c.txnCount === 1 ? '' : 's' }} today
|
||||
</span>
|
||||
</div>
|
||||
<div class="bd-eod__status">
|
||||
@if (c.reconciled === true) {
|
||||
<span class="db-badge db-badge--ok">Reconciled</span>
|
||||
} @else if (c.reconciled === false) {
|
||||
<span class="db-badge db-badge--pending">Not Reconciled</span>
|
||||
}
|
||||
@if (c.alreadySettled === true) {
|
||||
<span class="db-badge db-badge--ok">Settled to Vault</span>
|
||||
} @else if (c.alreadySettled === false) {
|
||||
<span class="db-badge">Not Settled</span>
|
||||
}
|
||||
</div>
|
||||
@if (c.denominations.length > 0) {
|
||||
<div class="bd-eod__denoms">
|
||||
@for (d of c.denominations; track d.denominationId) {
|
||||
<span
|
||||
class="bd-eod__chip"
|
||||
[class.bd-eod__chip--up]="d.delta > 0"
|
||||
[class.bd-eod__chip--down]="d.delta < 0"
|
||||
>
|
||||
₹{{ d.denominationValue }}: {{ d.morningCount }} → {{ d.count }}
|
||||
@if (d.delta !== 0) {
|
||||
({{ d.delta > 0 ? '+' : '' }}{{ d.delta }})
|
||||
}
|
||||
</span>
|
||||
}
|
||||
</div>
|
||||
} @else {
|
||||
<span class="db-muted bd-eod__empty">No balance.</span>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="db-panel__body">
|
||||
<label class="pg-field">
|
||||
<span>Physical cash counted</span>
|
||||
<input type="number" step="0.01" [(ngModel)]="closingCash" placeholder="0.00" />
|
||||
<span>Physical cash counted (or count denominations below)</span>
|
||||
<input
|
||||
type="number"
|
||||
step="0.01"
|
||||
[(ngModel)]="closingCash"
|
||||
[disabled]="closeDenomTotal > 0"
|
||||
placeholder="0.00"
|
||||
/>
|
||||
</label>
|
||||
@if (preview && liveDifference !== null) {
|
||||
@if (liveDifference === 0) {
|
||||
@@ -222,9 +415,91 @@
|
||||
|
||||
<p class="bd-hint">
|
||||
Pre-filled with what the books expect — change it only if the drawer counted something different, and that
|
||||
difference is then recorded against the day.
|
||||
difference is then recorded against the day. Counting the denominations below overrides the typed figure with
|
||||
what was actually counted, note by note.
|
||||
</p>
|
||||
|
||||
<div class="pg-card bd-denom">
|
||||
<table class="pg-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Denomination</th>
|
||||
<th style="text-align: center">Count</th>
|
||||
<th class="num">Amount</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@if (notes.length) {
|
||||
<tr class="pg-section">
|
||||
<td colspan="3">Bank Notes</td>
|
||||
</tr>
|
||||
}
|
||||
@for (d of notes; track d.id) {
|
||||
<tr>
|
||||
<td>
|
||||
<span class="pg-chip">{{ d.label }}</span>
|
||||
</td>
|
||||
<td style="display: flex; justify-content: center">
|
||||
<div class="pg-step">
|
||||
<button
|
||||
type="button"
|
||||
(click)="bumpCount(closeCounts, d, -1)"
|
||||
[disabled]="countFor(closeCounts, d) === 0"
|
||||
>
|
||||
−
|
||||
</button>
|
||||
<input
|
||||
type="number"
|
||||
min="0"
|
||||
[value]="countFor(closeCounts, d)"
|
||||
(input)="onCountChange(closeCounts, d, $any($event.target).value)"
|
||||
/>
|
||||
<button type="button" (click)="bumpCount(closeCounts, d, 1)">+</button>
|
||||
</div>
|
||||
</td>
|
||||
<td class="num">₹{{ subtotalFor(closeCounts, d) | number: '1.2-2' }}</td>
|
||||
</tr>
|
||||
}
|
||||
@if (coins.length) {
|
||||
<tr class="pg-section">
|
||||
<td colspan="3">Coins</td>
|
||||
</tr>
|
||||
}
|
||||
@for (d of coins; track d.id) {
|
||||
<tr>
|
||||
<td>
|
||||
<span class="pg-chip pg-chip--coin">{{ d.label }}</span>
|
||||
</td>
|
||||
<td style="display: flex; justify-content: center">
|
||||
<div class="pg-step">
|
||||
<button
|
||||
type="button"
|
||||
(click)="bumpCount(closeCounts, d, -1)"
|
||||
[disabled]="countFor(closeCounts, d) === 0"
|
||||
>
|
||||
−
|
||||
</button>
|
||||
<input
|
||||
type="number"
|
||||
min="0"
|
||||
[value]="countFor(closeCounts, d)"
|
||||
(input)="onCountChange(closeCounts, d, $any($event.target).value)"
|
||||
/>
|
||||
<button type="button" (click)="bumpCount(closeCounts, d, 1)">+</button>
|
||||
</div>
|
||||
</td>
|
||||
<td class="num">₹{{ subtotalFor(closeCounts, d) | number: '1.2-2' }}</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@if (closeDenomTotal > 0) {
|
||||
<p class="bd-hint">
|
||||
Denomination total: <strong>₹{{ closeDenomTotal | number: '1.2-2' }}</strong>
|
||||
</p>
|
||||
}
|
||||
|
||||
@if (isLateClose) {
|
||||
<label class="pg-field bd-panel__wide">
|
||||
<span>Why was this day left open? (required)</span>
|
||||
|
||||
Reference in New Issue
Block a user