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:
+2
-17
@@ -124,23 +124,8 @@
|
||||
<tr class="wri-row" (click)="review(r)">
|
||||
<td class="cell-mono wri-voucher">{{ r.voucher_no || '—' }}</td>
|
||||
<td>
|
||||
<span
|
||||
class="wri-credit-badge"
|
||||
[style.background]="
|
||||
r.request_type === 'BANK_TRANSFER'
|
||||
? '#e3f2fd'
|
||||
: r.request_type === 'COLLECTION'
|
||||
? '#fce4ec'
|
||||
: '#e8f5e9'
|
||||
"
|
||||
>
|
||||
{{
|
||||
r.request_type === 'BANK_TRANSFER'
|
||||
? 'Bank Transfer'
|
||||
: r.request_type === 'COLLECTION'
|
||||
? 'Collection'
|
||||
: 'Disbursement'
|
||||
}}
|
||||
<span class="wri-credit-badge" [style.background]="typeColor(r)">
|
||||
{{ typeLabel(r) }}
|
||||
</span>
|
||||
</td>
|
||||
<td>
|
||||
|
||||
+29
-7
@@ -9,10 +9,11 @@
|
||||
import { Component, OnInit, inject } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { Router, RouterModule } from '@angular/router';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import { MatIconModule } from '@angular/material/icon';
|
||||
import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
|
||||
import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import { MatNativeDateModule } from '@angular/material/core';
|
||||
import { MatFormFieldModule } from '@angular/material/form-field';
|
||||
import { MatInputModule } from '@angular/material/input';
|
||||
@@ -22,6 +23,7 @@ import { of } from 'rxjs';
|
||||
|
||||
import { ClerkDisbursementService } from '../../../cashier/clerk-disbursement.service';
|
||||
import { SettingsService } from '../../../settings/settings.service';
|
||||
import { DisbursementReviewComponent } from '../../../clerk/disbursement-review/disbursement-review.component';
|
||||
|
||||
@Component({
|
||||
selector: 'mifosx-disbursement-requests',
|
||||
@@ -43,9 +45,9 @@ import { SettingsService } from '../../../settings/settings.service';
|
||||
})
|
||||
export class DisbursementRequestsComponent implements OnInit {
|
||||
private service = inject(ClerkDisbursementService);
|
||||
private router = inject(Router);
|
||||
private snackBar = inject(MatSnackBar);
|
||||
private settingsService = inject(SettingsService);
|
||||
private dialog = inject(MatDialog);
|
||||
|
||||
requests: any[] = [];
|
||||
totalRecords = 0;
|
||||
@@ -164,11 +166,13 @@ export class DisbursementRequestsComponent implements OnInit {
|
||||
}
|
||||
|
||||
review(req: any): void {
|
||||
this.router.navigate([
|
||||
'/checker-inbox-and-tasks/disbursement-requests',
|
||||
req.id,
|
||||
'review'
|
||||
]);
|
||||
this.dialog
|
||||
.open(DisbursementReviewComponent, {
|
||||
data: { requestId: req.id },
|
||||
autoFocus: false
|
||||
})
|
||||
.afterClosed()
|
||||
.subscribe(() => this.load());
|
||||
}
|
||||
|
||||
creditCount(req: any): number {
|
||||
@@ -180,6 +184,24 @@ export class DisbursementRequestsComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
typeLabel(req: any): string {
|
||||
const map: Record<string, string> = {
|
||||
BANK_TRANSFER: 'Bank Transfer',
|
||||
COLLECTION: 'Collection',
|
||||
FUND_TRANSFER: 'Fund Transfer'
|
||||
};
|
||||
return map[req.request_type] ?? 'Disbursement';
|
||||
}
|
||||
|
||||
typeColor(req: any): string {
|
||||
const map: Record<string, string> = {
|
||||
BANK_TRANSFER: '#e3f2fd',
|
||||
COLLECTION: '#fce4ec',
|
||||
FUND_TRANSFER: '#ede7f6'
|
||||
};
|
||||
return map[req.request_type] ?? '#e8f5e9';
|
||||
}
|
||||
|
||||
statusClass(status: string): string {
|
||||
const map: Record<string, string> = {
|
||||
PENDING: 'wri-status--pending',
|
||||
|
||||
Reference in New Issue
Block a user