feat: update kyc tab, branch day register, and dormancy reports
This commit is contained in:
@@ -283,7 +283,7 @@
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@if (isLateClose) {
|
||||
@if (needsForceReason) {
|
||||
<p class="db-panel__warn">
|
||||
This day is being closed after its own date. It will be recorded as a
|
||||
<strong>force close</strong>, with the reason below kept permanently against it.
|
||||
@@ -592,10 +592,25 @@
|
||||
</p>
|
||||
|
||||
@if (hasUnreconciledOrUnsettledCashiers) {
|
||||
<div class="pg-alert pg-alert--error bd-reconcile-block">
|
||||
<mat-icon>block</mat-icon>
|
||||
<!-- A wall on the day itself, a warning on a past one. Today the cashier is still here and
|
||||
the cash can be counted, so nothing excuses closing over it. On a past date it cannot be
|
||||
counted for that date at all, and blocking would leave a day nobody could ever close —
|
||||
so it goes through on the reason a late close already requires, with the names recorded
|
||||
against the day. -->
|
||||
<div
|
||||
class="pg-alert bd-reconcile-block"
|
||||
[class.pg-alert--error]="blocksSameDayClose"
|
||||
[class.bd-reconcile-block--warn]="!blocksSameDayClose"
|
||||
>
|
||||
<mat-icon>{{ blocksSameDayClose ? 'block' : 'warning' }}</mat-icon>
|
||||
<div>
|
||||
<strong>Cannot close the day — cashiers still holding cash have not been reconciled or settled.</strong>
|
||||
@if (blocksSameDayClose) {
|
||||
<strong
|
||||
>Cannot close today — cashiers still holding cash have not been reconciled or settled.</strong
|
||||
>
|
||||
} @else {
|
||||
<strong>This day's cash was never reconciled or settled.</strong>
|
||||
}
|
||||
<ul class="bd-reconcile-block__list">
|
||||
@for (detail of unreconciledOrUnsettledCashierDetails; track detail.name) {
|
||||
<li>
|
||||
@@ -610,17 +625,24 @@
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
<span class="db-muted"
|
||||
>Each cashier must reconcile their cash and settle it back to the vault before the branch day can be
|
||||
closed.</span
|
||||
>
|
||||
@if (blocksSameDayClose) {
|
||||
<span class="db-muted"
|
||||
>Each cashier must count their drawer, reconcile it, and settle the cash back to the vault. Then this
|
||||
day can be closed.</span
|
||||
>
|
||||
} @else {
|
||||
<span class="db-muted"
|
||||
>The cash cannot be counted for a date that has passed. Record why above — their names are kept
|
||||
against the record.</span
|
||||
>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="db-panel__actions">
|
||||
<button type="button" class="pg-btn pg-btn--primary" (click)="submitClose()" [disabled]="!canSubmitClose">
|
||||
{{ isLateClose ? 'Force Close Day' : 'Close Day' }}
|
||||
{{ needsForceReason ? 'Force Close Day' : 'Close Day' }}
|
||||
</button>
|
||||
<button type="button" class="pg-btn" (click)="cancelClose()">Cancel</button>
|
||||
</div>
|
||||
|
||||
@@ -328,3 +328,17 @@
|
||||
line-height: 1.6;
|
||||
}
|
||||
}
|
||||
|
||||
/* Amber, not red: an unreconciled cashier is now a reason to record why the day is being closed
|
||||
rather than a refusal to close it at all. Red said "you cannot", which was true when the button
|
||||
was disabled and misleading once a force close became possible. */
|
||||
.bd-reconcile-block--warn {
|
||||
background: #fffbeb;
|
||||
border-color: #fde68a;
|
||||
border-left-color: #d97706;
|
||||
color: #92400e;
|
||||
|
||||
mat-icon {
|
||||
color: #d97706;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -571,6 +571,16 @@ export class BranchDayComponent implements OnInit {
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether a reason has to be given before the day can close.
|
||||
*
|
||||
* Only for a late close. Cash still sitting with a cashier is not something a reason excuses —
|
||||
* see canSubmitClose.
|
||||
*/
|
||||
get needsForceReason(): boolean {
|
||||
return this.isLateClose;
|
||||
}
|
||||
|
||||
get canSubmitClose(): boolean {
|
||||
const hasFigure = this.closingCash != null || this.closeDenomTotal > 0;
|
||||
if (!this.closeTarget || !hasFigure || this.closing) return false;
|
||||
|
||||
Reference in New Issue
Block a user