feat: cash-only registers, day book sections and DD amendments
This commit is contained in:
@@ -10,10 +10,8 @@
|
||||
<header class="pg-head vr-no-print">
|
||||
<div>
|
||||
<div class="pg-eyebrow">CASHIER · REPORT</div>
|
||||
<h1 class="pg-title">Voucher Report</h1>
|
||||
<p class="pg-sub">
|
||||
Every voucher raised over a day or a month — the number, what was debited, what was credited, and who raised it.
|
||||
</p>
|
||||
<h1 class="pg-title">{{ title }}</h1>
|
||||
<p class="pg-sub">{{ subtitle }}</p>
|
||||
</div>
|
||||
<div class="pg-toolbar">
|
||||
<label class="pg-field">
|
||||
@@ -42,10 +40,8 @@
|
||||
<button type="button" class="pg-btn pg-btn--primary" (click)="load()" [disabled]="loading">
|
||||
<mat-icon>refresh</mat-icon> Run
|
||||
</button>
|
||||
@if (report && report.count > 0) {
|
||||
<button type="button" class="pg-btn" (click)="print()">
|
||||
<mat-icon>print</mat-icon> Print
|
||||
</button>
|
||||
@if (report && count > 0) {
|
||||
<button type="button" class="pg-btn" (click)="print()"><mat-icon>print</mat-icon> Print</button>
|
||||
}
|
||||
</div>
|
||||
</header>
|
||||
@@ -64,8 +60,7 @@
|
||||
@if (report.from !== report.to) {
|
||||
— {{ report.to | date: 'dd MMM yyyy' }}
|
||||
}
|
||||
· {{ report.count }} voucher{{ report.count === 1 ? '' : 's' }}
|
||||
· ₹{{ report.totalAmount | number: '1.2-2' }}
|
||||
· {{ count }} {{ noun }}{{ count === 1 ? '' : 's' }} · ₹{{ totalAmount | number: '1.2-2' }}
|
||||
@if (report.username) {
|
||||
· {{ report.username }}
|
||||
}
|
||||
@@ -74,10 +69,46 @@
|
||||
@if (!report.canSeeAllUsers) {
|
||||
<span class="vr-scope-note">Your own vouchers</span>
|
||||
}
|
||||
<!-- The total on a cash register means something narrower than the whole voucher book, so the
|
||||
screen says which one it is instead of leaving the figure ambiguous. -->
|
||||
@if (cashOnly) {
|
||||
<span class="vr-scope-note">Cash only</span>
|
||||
}
|
||||
</div>
|
||||
|
||||
@if (report.count === 0) {
|
||||
<div class="pg-empty">No vouchers were raised in this period.</div>
|
||||
<!-- A voucher with no CR/DR prefix belongs to neither report. Say so, so the two reports not
|
||||
adding up to the day's total is explained rather than left to be puzzled over. -->
|
||||
@if (unclassifiedCount > 0) {
|
||||
<div class="pg-alert vr-no-print">
|
||||
{{ unclassifiedCount }} voucher{{ unclassifiedCount === 1 ? '' : 's' }} in this period
|
||||
{{ unclassifiedCount === 1 ? 'carries' : 'carry' }} no CR or DR prefix, so
|
||||
{{ unclassifiedCount === 1 ? 'it appears' : 'they appear' }} on neither the Received nor the Payment report.
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Which part of the total has notes and coins counted behind it. Shown on the cash register
|
||||
as well as the full one: a voucher with no breakdown is still real money, so it stays in
|
||||
the total, and what the drawer can be checked against is stated instead of assumed. -->
|
||||
@if (uncountedCount > 0) {
|
||||
<div class="pg-alert vr-no-print">
|
||||
{{ uncountedCount }} of these {{ noun }}s {{ uncountedCount === 1 ? 'has' : 'have' }} no denomination breakdown
|
||||
recorded, totalling ₹{{ uncountedTotal | number: '1.2-2' }}. Some registers pay out without counting notes
|
||||
against the voucher, so these are still cash — ₹{{ countedTotal | number: '1.2-2' }} of the total has a
|
||||
breakdown behind it.
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Explains the blank Debit/Credit cells instead of leaving them looking like lost data. -->
|
||||
@if (missingSidesCount > 0) {
|
||||
<div class="pg-alert vr-no-print">
|
||||
{{ missingSidesCount }} of these {{ noun }}s {{ missingSidesCount === 1 ? 'has' : 'have' }} no debit or credit
|
||||
recorded. The sides are attached when a request is approved, so vouchers raised before that step was added keep
|
||||
their number and amount but show no accounts. Newly raised {{ noun }}s carry both sides.
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (count === 0) {
|
||||
<div class="pg-empty">No {{ noun }}s were raised in this period.</div>
|
||||
} @else {
|
||||
<div class="vr-summaries">
|
||||
<div class="pg-card">
|
||||
@@ -129,7 +160,7 @@
|
||||
</div>
|
||||
|
||||
<div class="pg-card">
|
||||
<div class="pos-section-label">Vouchers</div>
|
||||
<div class="pos-section-label">{{ isReceived ? 'Receipts' : 'Payments' }}</div>
|
||||
<table class="pg-table vr-rows">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -143,33 +174,39 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@for (row of report.vouchers; track row.voucherNo) {
|
||||
@for (row of rows; track row.voucherNo) {
|
||||
<tr>
|
||||
<td>
|
||||
<a class="vr-link" [routerLink]="['/cashier/voucher']" [queryParams]="{ voucherNo: row.voucherNo }">
|
||||
{{ row.voucherNo }}
|
||||
</a>
|
||||
{{ row.voucherNo }}
|
||||
@if (row.verificationStatus === 'EXCEPTION') {
|
||||
<mat-icon class="vr-flag" title="An exception was raised against this voucher">error_outline</mat-icon>
|
||||
<mat-icon class="vr-flag" title="An exception was raised against this voucher"
|
||||
>error_outline</mat-icon
|
||||
>
|
||||
}
|
||||
</td>
|
||||
<td>{{ row.voucherType || '—' }}</td>
|
||||
<td>
|
||||
<div class="vr-party">{{ row.debitParty || '—' }}</div>
|
||||
@if (row.debitAccount) {
|
||||
<div class="vr-acct">{{ row.debitAccount }}</div>
|
||||
}
|
||||
</td>
|
||||
<td>
|
||||
<div class="vr-party">{{ row.creditParty || '—' }}</div>
|
||||
@if (row.creditAccount) {
|
||||
<div class="vr-acct">{{ row.creditAccount }}</div>
|
||||
}
|
||||
<!-- A DD with charges, or a compound journal, has sides this row does not show. -->
|
||||
@if (row.extraLines > 0) {
|
||||
<div class="vr-more">+{{ row.extraLines }} more on voucher</div>
|
||||
}
|
||||
</td>
|
||||
<!-- A voucher raised before its sides were recorded has neither. Say that once,
|
||||
across both cells, rather than showing two dashes that read as "nowhere". -->
|
||||
@if (!hasSides(row)) {
|
||||
<td colspan="2" class="vr-nosides">Sides not recorded</td>
|
||||
} @else {
|
||||
<td>
|
||||
<div class="vr-party">{{ row.debitParty || '—' }}</div>
|
||||
@if (row.debitAccount) {
|
||||
<div class="vr-acct">{{ row.debitAccount }}</div>
|
||||
}
|
||||
</td>
|
||||
<td>
|
||||
<div class="vr-party">{{ row.creditParty || '—' }}</div>
|
||||
@if (row.creditAccount) {
|
||||
<div class="vr-acct">{{ row.creditAccount }}</div>
|
||||
}
|
||||
<!-- A DD with charges, or a compound journal, has sides this row does not show. -->
|
||||
@if (row.extraLines > 0) {
|
||||
<div class="vr-more">+{{ row.extraLines }} more on voucher</div>
|
||||
}
|
||||
</td>
|
||||
}
|
||||
<td class="num">{{ row.amount | number: '1.2-2' }}</td>
|
||||
<td>{{ row.username || '—' }}</td>
|
||||
<td>{{ row.createdAt | date: 'dd MMM, HH:mm' }}</td>
|
||||
|
||||
Reference in New Issue
Block a user