diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/closure-requests/closure-review-dialog/closure-review-dialog.component.html b/src/app/tasks/checker-inbox-and-tasks-tabs/closure-requests/closure-review-dialog/closure-review-dialog.component.html index a330b0317..d337a8b36 100644 --- a/src/app/tasks/checker-inbox-and-tasks-tabs/closure-requests/closure-review-dialog/closure-review-dialog.component.html +++ b/src/app/tasks/checker-inbox-and-tasks-tabs/closure-requests/closure-review-dialog/closure-review-dialog.component.html @@ -58,6 +58,41 @@ + +
+
+ payments + Payout Amount +
+
+
+ Exact Closing Amount + ₹{{ request.closing_amount | number: '1.2-2' }} +
+ @if (request.rounding_amount && request.rounding_amount !== 0) { +
+ Rounding ({{ request.rounding_amount > 0 ? 'up' : 'down' }}) + {{ request.rounding_amount > 0 ? '+' : '' }}₹{{ request.rounding_amount | number: '1.2-2' }} +
+ } +
+ Cash to Hand Over + ₹{{ request.cashier_disbursed_amount | number: '1.2-2' }} +
+ @if (request.voucher_no) { +
+ Voucher No + {{ request.voucher_no }} +
+ } +
+
+
@@ -77,6 +112,16 @@ Token No {{ request.tok_no || '—' }}
+
+ Interest Posted As On + {{ formatDate(request.closure_date) }} +
+ @if (request.txn_id) { +
+ Transaction Id + {{ request.txn_id }} +
+ } @if (request.description) {
Reason / Narration @@ -86,36 +131,22 @@
- - @if (request.closing_amount != null) { -
+ + @if (request.status === 'CLOSED' && request.disbursed_at) { +
- calculate - Computed at Approval + storefront + Handed Over By Cashier
- Exact Closing Amount - ₹{{ request.closing_amount | number: '1.2-2' }} + Cashier + {{ request.disbursed_by || '—' }}
- @if (request.rounding_amount && request.rounding_amount !== 0) { -
- Rounding ({{ request.rounding_amount > 0 ? 'up' : 'down' }}) - {{ request.rounding_amount > 0 ? '+' : '' }}₹{{ request.rounding_amount | number: '1.2-2' }} -
- }
- Cash to Hand Over - ₹{{ request.cashier_disbursed_amount | number: '1.2-2' }} + Disbursed At + {{ formatDateTime(request.disbursed_at) }}
- @if (request.voucher_no) { -
- Voucher No - {{ request.voucher_no }} -
- }
} diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/closure-requests/closure-review-dialog/closure-review-dialog.component.ts b/src/app/tasks/checker-inbox-and-tasks-tabs/closure-requests/closure-review-dialog/closure-review-dialog.component.ts index 432ea649e..a42277df7 100644 --- a/src/app/tasks/checker-inbox-and-tasks-tabs/closure-requests/closure-review-dialog/closure-review-dialog.component.ts +++ b/src/app/tasks/checker-inbox-and-tasks-tabs/closure-requests/closure-review-dialog/closure-review-dialog.component.ts @@ -128,6 +128,16 @@ export class ClosureReviewDialogComponent implements OnInit { return n.toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 }); } + formatDate(val: any): string { + if (!val) return '—'; + try { + const d = new Date(val); + return d.toLocaleDateString('en-IN', { day: '2-digit', month: 'short', year: 'numeric' }); + } catch { + return String(val); + } + } + formatDateTime(val: any): string { if (!val) return '—'; try {