feat(rbi-reserve,savings): Form 1/Form 9 returns UI, branch-wise interest posting reports and summary
- Reports > Interest Posting Reports: per branch and product, generate/regenerate at any time, approve; branch column, HO-on-behalf marker, posted txn per account - Reports > Interest Posting Summary (branch-wise) for the head office, with Excel export - Day Close warns and disables Close Day while the branch's interest report is unapproved - Savings product accounting: Interest On Savings (expense), Savings Interest Payable and Paid (liability rows, required) - RBI Form 1 statutory and Form 9 return screens, reserve config updates - Interest posting report GETs exempted from the response cache Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Opus 5.5
@@ -0,0 +1,190 @@
|
||||
<!--
|
||||
Copyright since 2025 Mifos Initiative
|
||||
|
||||
This Source Code Form is subject to the terms of the Mozilla Public
|
||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
-->
|
||||
|
||||
<div class="ipr">
|
||||
<div class="ipr-head">
|
||||
<div>
|
||||
<h2 class="ipr-head-t"><fa-icon icon="percentage"></fa-icon> Interest Posting Reports</h2>
|
||||
<div class="ipr-head-s">
|
||||
Each branch gets its own report for each savings product, generated automatically at 12:00 PM on the posting
|
||||
date and open to generating or regenerating at any time. The branch approves it, and its approved interest is
|
||||
posted when the branch closes the day — it cannot close until then. The head office closes last.
|
||||
</div>
|
||||
</div>
|
||||
<div class="ipr-head-a">
|
||||
<label class="ipr-date">
|
||||
Posting date
|
||||
<input type="date" [(ngModel)]="postingDate" (change)="load()" />
|
||||
</label>
|
||||
<button class="ipr-btn" (click)="load()" [disabled]="loading"><fa-icon icon="undo"></fa-icon> Reload</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if (errorMessage) {
|
||||
<div class="ipr-alert ipr-alert--error">
|
||||
<fa-icon icon="exclamation-triangle"></fa-icon>
|
||||
<div>{{ errorMessage }}</div>
|
||||
</div>
|
||||
}
|
||||
@if (notice) {
|
||||
<div class="ipr-alert ipr-alert--ok">
|
||||
<fa-icon icon="check"></fa-icon>
|
||||
<div>{{ notice }}</div>
|
||||
</div>
|
||||
}
|
||||
@if (pendingCount > 0) {
|
||||
<div class="ipr-alert ipr-alert--warn">
|
||||
<fa-icon icon="clock"></fa-icon>
|
||||
<div>{{ pendingCount }} report(s) waiting for approval. The day cannot be closed until they are approved.</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (due.length > 0) {
|
||||
<div class="ipr-alert ipr-alert--warn ipr-due">
|
||||
<fa-icon icon="exclamation-triangle"></fa-icon>
|
||||
<div class="ipr-due-body">
|
||||
<div>Interest is due but no report has been generated yet for:</div>
|
||||
@for (d of due; track d.productId + '-' + d.officeId) {
|
||||
<div class="ipr-due-row">
|
||||
<strong>{{ d.productName }}</strong> <span>· {{ d.officeName }} · {{ d.postingDate }}</span>
|
||||
<button class="ipr-btn ipr-btn--primary ipr-btn--slim" (click)="generate(d)" [disabled]="busy">
|
||||
<fa-icon icon="sync"></fa-icon> Generate report
|
||||
</button>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="ipr-card">
|
||||
<table class="ipr-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Branch</th>
|
||||
<th>Product</th>
|
||||
<th>Posting date</th>
|
||||
<th class="num">Accounts</th>
|
||||
<th class="num">Total interest</th>
|
||||
<th>Status</th>
|
||||
<th>Generated</th>
|
||||
<th>Approved</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@for (r of reports; track r.id) {
|
||||
<tr [class.is-selected]="selected?.id === r.id" (click)="open(r)">
|
||||
<td>{{ r.officeName }}</td>
|
||||
<td>
|
||||
<strong>{{ r.productName }}</strong>
|
||||
</td>
|
||||
<td>{{ r.postingDate }}</td>
|
||||
<td class="num">{{ r.accountCount }}</td>
|
||||
<td class="num">₹{{ r.totalInterest | number: '1.2-2' }}</td>
|
||||
<td>
|
||||
<span class="ipr-badge" [ngClass]="statusClass(r.status)">{{ r.status }}</span>
|
||||
@if (r.failureReason) {
|
||||
<div class="ipr-fail" [title]="r.failureReason">Posting failed: {{ r.failureReason }}</div>
|
||||
}
|
||||
</td>
|
||||
<td class="muted">
|
||||
{{ r.generatedBy || 'System' }} · {{ r.generationMode }}<br />{{ r.generatedAt | date: 'dd MMM, HH:mm' }}
|
||||
</td>
|
||||
<td class="muted">
|
||||
@if (r.approvedAt) {
|
||||
{{ r.approvedBy }}
|
||||
@if (r.approvedOnBehalf) {
|
||||
<span class="ipr-behalf">(HO)</span>
|
||||
}
|
||||
<br />{{ r.approvedAt | date: 'dd MMM, HH:mm' }}
|
||||
} @else {
|
||||
—
|
||||
}
|
||||
</td>
|
||||
<td class="actions" (click)="$event.stopPropagation()">
|
||||
@if (canRegenerate(r)) {
|
||||
<button class="ipr-btn ipr-btn--slim" (click)="regenerate(r)" [disabled]="busy">
|
||||
<fa-icon icon="sync"></fa-icon> Regenerate
|
||||
</button>
|
||||
}
|
||||
@if (canApprove(r)) {
|
||||
<button class="ipr-btn ipr-btn--primary ipr-btn--slim" (click)="approve(r)" [disabled]="busy">
|
||||
<fa-icon icon="check"></fa-icon> Approve
|
||||
</button>
|
||||
}
|
||||
</td>
|
||||
</tr>
|
||||
} @empty {
|
||||
<tr>
|
||||
<td colspan="9" class="ipr-empty">
|
||||
@if (loading) {
|
||||
Loading…
|
||||
} @else {
|
||||
No interest posting report for {{ postingDate || 'this date' }}. Reports are generated at 12:00 PM on a
|
||||
product's posting date.
|
||||
}
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@if (selected) {
|
||||
<div class="ipr-card">
|
||||
<div class="ipr-detail-head">
|
||||
<div>
|
||||
<h3>{{ selected.officeName }} · {{ selected.productName }} — {{ selected.postingDate }}</h3>
|
||||
<div class="muted">
|
||||
Dr {{ selected.expenseGlCode }} {{ selected.expenseGlName }} → Cr {{ selected.payableGlCode }}
|
||||
{{ selected.payableGlName }}; Dr {{ selected.payableGlCode }} → Cr {{ selected.paidGlCode }}
|
||||
{{ selected.paidGlName }}; then Dr {{ selected.paidGlCode }} → Cr each account below
|
||||
</div>
|
||||
</div>
|
||||
<div class="ipr-total">
|
||||
<span>Total interest</span>
|
||||
<strong>₹{{ selected.totalInterest | number: '1.2-2' }}</strong>
|
||||
<span class="muted">{{ selected.accountCount }} account(s)</span>
|
||||
</div>
|
||||
</div>
|
||||
<table class="ipr-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Account no</th>
|
||||
<th>Account holder</th>
|
||||
<th class="num">Interest</th>
|
||||
<th class="num">Balance before posting</th>
|
||||
<th class="num">Balance after posting</th>
|
||||
<th>Posted txn</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@for (l of selected.lines; track l.savingsAccountId) {
|
||||
<tr>
|
||||
<td>{{ l.accountNo }}</td>
|
||||
<td>{{ l.clientName }}</td>
|
||||
<td class="num">₹{{ l.interestAmount | number: '1.2-2' }}</td>
|
||||
<td class="num">₹{{ l.balanceBefore | number: '1.2-2' }}</td>
|
||||
<td class="num">₹{{ l.balanceAfter | number: '1.2-2' }}</td>
|
||||
<td class="muted">{{ l.savingsTransactionId ? '#' + l.savingsTransactionId : '—' }}</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="2"><strong>Total</strong></td>
|
||||
<td class="num">
|
||||
<strong>₹{{ selected.totalInterest | number: '1.2-2' }}</strong>
|
||||
</td>
|
||||
<td colspan="3"></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
@@ -0,0 +1,276 @@
|
||||
/**
|
||||
* Copyright since 2025 Mifos Initiative
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
:host {
|
||||
--i-navy: #1a237e;
|
||||
--i-blue: #1d4ed8;
|
||||
--i-blue-l: #eff6ff;
|
||||
--i-green: #15803d;
|
||||
--i-green-l: #dcfce7;
|
||||
--i-amber: #b45309;
|
||||
--i-amber-l: #fef3c7;
|
||||
--i-red: #c0392b;
|
||||
--i-red-l: #fdecea;
|
||||
--i-g100: #f1f5f9;
|
||||
--i-g200: #e2e8f0;
|
||||
--i-g500: #64748b;
|
||||
--i-g900: #0f172a;
|
||||
|
||||
display: block;
|
||||
font-family: 'DM Sans', system-ui, sans-serif;
|
||||
color: var(--i-g900);
|
||||
}
|
||||
|
||||
.ipr {
|
||||
max-width: 1280px;
|
||||
margin: 0 auto;
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
.ipr-head {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-between;
|
||||
align-items: flex-end;
|
||||
gap: 12px;
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
.ipr-head-t {
|
||||
margin: 0;
|
||||
font-size: 22px;
|
||||
color: var(--i-navy);
|
||||
}
|
||||
|
||||
.ipr-head-s {
|
||||
max-width: 720px;
|
||||
margin-top: 4px;
|
||||
font-size: 13px;
|
||||
color: var(--i-g500);
|
||||
}
|
||||
|
||||
.ipr-head-a {
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.ipr-date {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
font-size: 11px;
|
||||
color: var(--i-g500);
|
||||
|
||||
input,
|
||||
select {
|
||||
padding: 6px 8px;
|
||||
border: 1px solid var(--i-g200);
|
||||
border-radius: 6px;
|
||||
font: inherit;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
|
||||
.ipr-btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 7px 12px;
|
||||
border: 1px solid var(--i-g200);
|
||||
border-radius: 6px;
|
||||
background: #fff;
|
||||
font: inherit;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
|
||||
&:disabled {
|
||||
opacity: 0.55;
|
||||
cursor: default;
|
||||
}
|
||||
}
|
||||
|
||||
.ipr-btn--primary {
|
||||
border-color: var(--i-blue);
|
||||
background: var(--i-blue);
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.ipr-btn--slim {
|
||||
padding: 4px 10px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.ipr-alert {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
margin-bottom: 10px;
|
||||
padding: 10px 14px;
|
||||
border-radius: 8px;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.ipr-alert--error {
|
||||
background: var(--i-red-l);
|
||||
color: var(--i-red);
|
||||
}
|
||||
|
||||
.ipr-alert--ok {
|
||||
background: var(--i-green-l);
|
||||
color: var(--i-green);
|
||||
}
|
||||
|
||||
.ipr-alert--warn {
|
||||
background: var(--i-amber-l);
|
||||
color: var(--i-amber);
|
||||
}
|
||||
|
||||
.ipr-card {
|
||||
margin-bottom: 14px;
|
||||
border: 1px solid var(--i-g200);
|
||||
border-radius: 10px;
|
||||
background: #fff;
|
||||
overflow-x: auto;
|
||||
}
|
||||
|
||||
.ipr-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-size: 13px;
|
||||
|
||||
th,
|
||||
td {
|
||||
padding: 9px 12px;
|
||||
border-bottom: 1px solid var(--i-g100);
|
||||
text-align: left;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
th {
|
||||
background: var(--i-g100);
|
||||
font-size: 11px;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.03em;
|
||||
color: var(--i-g500);
|
||||
}
|
||||
|
||||
tbody tr {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
tbody tr.is-selected {
|
||||
background: var(--i-blue-l);
|
||||
}
|
||||
|
||||
.num {
|
||||
text-align: right;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.actions {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
justify-content: flex-end;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
tfoot td {
|
||||
background: var(--i-g100);
|
||||
}
|
||||
}
|
||||
|
||||
.muted {
|
||||
color: var(--i-g500);
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.ipr-empty {
|
||||
padding: 24px !important;
|
||||
text-align: center !important;
|
||||
color: var(--i-g500);
|
||||
}
|
||||
|
||||
.ipr-badge {
|
||||
display: inline-block;
|
||||
padding: 2px 8px;
|
||||
border-radius: 10px;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.ipr-badge--pending {
|
||||
background: var(--i-amber-l);
|
||||
color: var(--i-amber);
|
||||
}
|
||||
|
||||
.ipr-badge--approved {
|
||||
background: var(--i-blue-l);
|
||||
color: var(--i-blue);
|
||||
}
|
||||
|
||||
.ipr-badge--posted {
|
||||
background: var(--i-green-l);
|
||||
color: var(--i-green);
|
||||
}
|
||||
|
||||
.ipr-badge--muted {
|
||||
background: var(--i-g100);
|
||||
color: var(--i-g500);
|
||||
}
|
||||
|
||||
.ipr-fail {
|
||||
margin-top: 4px;
|
||||
font-size: 11px;
|
||||
color: var(--i-red);
|
||||
}
|
||||
|
||||
.ipr-detail-head {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
padding: 14px 16px;
|
||||
|
||||
h3 {
|
||||
margin: 0 0 4px;
|
||||
font-size: 16px;
|
||||
color: var(--i-navy);
|
||||
}
|
||||
}
|
||||
|
||||
.ipr-total {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-end;
|
||||
|
||||
strong {
|
||||
font-size: 22px;
|
||||
color: var(--i-navy);
|
||||
}
|
||||
}
|
||||
|
||||
.ipr-due-body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.ipr-due-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
// Approved by the head office on behalf of a branch that did not open that day.
|
||||
.ipr-behalf {
|
||||
margin-left: 4px;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
color: var(--i-amber);
|
||||
}
|
||||
@@ -0,0 +1,200 @@
|
||||
/**
|
||||
* Copyright since 2025 Mifos Initiative
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
import { Component, OnInit, inject } from '@angular/core';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
|
||||
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
import { SettingsService } from 'app/settings/settings.service';
|
||||
import {
|
||||
InterestPostingDue,
|
||||
InterestPostingReport,
|
||||
InterestPostingReportDetail,
|
||||
InterestPostingReportService
|
||||
} from './interest-posting-report.service';
|
||||
|
||||
/**
|
||||
* Savings interest posting reports.
|
||||
*
|
||||
* On a product's posting date the system generates, at noon, the list of what each savings account
|
||||
* will be paid. It is reviewed and approved here; the approved amounts are posted when the last
|
||||
* branch closes the day, and until then no branch can close. Regenerating replaces the report and
|
||||
* needs approving again.
|
||||
*/
|
||||
@Component({
|
||||
selector: 'mifosx-interest-posting-report',
|
||||
templateUrl: './interest-posting-report.component.html',
|
||||
styleUrls: ['./interest-posting-report.component.scss'],
|
||||
imports: [
|
||||
...STANDALONE_SHARED_IMPORTS,
|
||||
FormsModule,
|
||||
FaIconComponent
|
||||
]
|
||||
})
|
||||
export class InterestPostingReportComponent implements OnInit {
|
||||
private reportService = inject(InterestPostingReportService);
|
||||
private settingsService = inject(SettingsService);
|
||||
|
||||
postingDate = '';
|
||||
loading = false;
|
||||
busy = false;
|
||||
errorMessage = '';
|
||||
notice = '';
|
||||
|
||||
reports: InterestPostingReport[] = [];
|
||||
selected: InterestPostingReportDetail | null = null;
|
||||
/** Products with interest due and no report yet — the noon job ran before they had anything due, or failed. */
|
||||
due: InterestPostingDue[] = [];
|
||||
|
||||
ngOnInit(): void {
|
||||
this.postingDate = this.businessDateIso();
|
||||
this.load();
|
||||
}
|
||||
|
||||
load(): void {
|
||||
this.loading = true;
|
||||
this.errorMessage = '';
|
||||
this.reportService.list(this.postingDate || undefined).subscribe({
|
||||
next: (reports) => {
|
||||
this.reports = reports ?? [];
|
||||
this.loading = false;
|
||||
const stillThere = this.selected && this.reports.find((r) => r.id === this.selected?.id);
|
||||
if (stillThere) {
|
||||
this.open(stillThere);
|
||||
} else {
|
||||
this.selected = null;
|
||||
}
|
||||
},
|
||||
error: (err) => {
|
||||
this.loading = false;
|
||||
this.errorMessage = this.messageOf(err, 'Could not load the interest posting reports.');
|
||||
}
|
||||
});
|
||||
this.reportService.dueWithoutReport(this.postingDate || undefined).subscribe({
|
||||
next: (due) => (this.due = due ?? []),
|
||||
error: () => (this.due = [])
|
||||
});
|
||||
}
|
||||
|
||||
generate(item: InterestPostingDue): void {
|
||||
this.busy = true;
|
||||
this.notice = '';
|
||||
this.errorMessage = '';
|
||||
this.reportService.regenerate(item.productId, item.officeId, item.postingDate).subscribe({
|
||||
next: (res) => {
|
||||
this.busy = false;
|
||||
this.notice = `Report generated for ${item.productName} — ${item.officeName}. Review and approve it.`;
|
||||
this.load();
|
||||
this.reportService.detail(res.reportId).subscribe((detail) => (this.selected = detail));
|
||||
},
|
||||
error: (err) => {
|
||||
this.busy = false;
|
||||
this.errorMessage = this.messageOf(err, 'Could not generate the report.');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
open(report: InterestPostingReport): void {
|
||||
this.errorMessage = '';
|
||||
this.reportService.detail(report.id).subscribe({
|
||||
next: (detail) => (this.selected = detail),
|
||||
error: (err) => (this.errorMessage = this.messageOf(err, 'Could not load the report.'))
|
||||
});
|
||||
}
|
||||
|
||||
regenerate(report: InterestPostingReport): void {
|
||||
if (
|
||||
!confirm(
|
||||
`Regenerate the interest posting report for ${report.productName} — ${report.officeName}? It will need approving again.`
|
||||
)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
this.busy = true;
|
||||
this.notice = '';
|
||||
this.errorMessage = '';
|
||||
this.reportService.regenerate(report.productId, report.officeId, report.postingDate).subscribe({
|
||||
next: (res) => {
|
||||
this.busy = false;
|
||||
this.notice = `Report regenerated for ${report.productName}. Review and approve it.`;
|
||||
this.selected = null;
|
||||
this.load();
|
||||
this.reportService.detail(res.reportId).subscribe((detail) => (this.selected = detail));
|
||||
},
|
||||
error: (err) => {
|
||||
this.busy = false;
|
||||
this.errorMessage = this.messageOf(err, 'Could not regenerate the report.');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
approve(report: InterestPostingReport): void {
|
||||
if (
|
||||
!confirm(
|
||||
`Approve interest of ₹${report.totalInterest} across ${report.accountCount} account(s) for ${report.productName}? ` +
|
||||
'It will be posted when the branch closes the day.'
|
||||
)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
this.busy = true;
|
||||
this.notice = '';
|
||||
this.errorMessage = '';
|
||||
this.reportService.approve(report.id).subscribe({
|
||||
next: () => {
|
||||
this.busy = false;
|
||||
this.notice = `Approved. Interest for ${report.productName} — ${report.officeName} will be posted when the branch closes the day.`;
|
||||
this.load();
|
||||
},
|
||||
error: (err) => {
|
||||
this.busy = false;
|
||||
this.errorMessage = this.messageOf(err, 'Could not approve the report.');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
canRegenerate(report: InterestPostingReport): boolean {
|
||||
return report.canAct && (report.status === 'GENERATED' || report.status === 'APPROVED');
|
||||
}
|
||||
|
||||
canApprove(report: InterestPostingReport): boolean {
|
||||
return report.canAct && report.status === 'GENERATED';
|
||||
}
|
||||
|
||||
statusClass(status: string): string {
|
||||
return (
|
||||
{
|
||||
GENERATED: 'ipr-badge--pending',
|
||||
APPROVED: 'ipr-badge--approved',
|
||||
POSTED: 'ipr-badge--posted',
|
||||
SUPERSEDED: 'ipr-badge--muted'
|
||||
}[status] ?? 'ipr-badge--muted'
|
||||
);
|
||||
}
|
||||
|
||||
get pendingCount(): number {
|
||||
return this.reports.filter((r) => r.status === 'GENERATED').length;
|
||||
}
|
||||
|
||||
private businessDateIso(): string {
|
||||
const businessDate = this.settingsService.businessDate as any;
|
||||
const parsed = businessDate ? new Date(businessDate) : new Date();
|
||||
if (isNaN(parsed.getTime())) {
|
||||
return new Date().toISOString().slice(0, 10);
|
||||
}
|
||||
const month = String(parsed.getMonth() + 1).padStart(2, '0');
|
||||
const day = String(parsed.getDate()).padStart(2, '0');
|
||||
return `${parsed.getFullYear()}-${month}-${day}`;
|
||||
}
|
||||
|
||||
private messageOf(err: any, fallback: string): string {
|
||||
return (
|
||||
err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.defaultUserMessage ?? err?.error?.message ?? fallback
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,137 @@
|
||||
/**
|
||||
* Copyright since 2025 Mifos Initiative
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { HttpClient, HttpParams } from '@angular/common/http';
|
||||
import { Observable } from 'rxjs';
|
||||
|
||||
export type InterestPostingReportStatus = 'GENERATED' | 'APPROVED' | 'POSTED' | 'SUPERSEDED';
|
||||
|
||||
export interface InterestPostingReport {
|
||||
id: number;
|
||||
productId: number;
|
||||
productName: string;
|
||||
officeId: number;
|
||||
officeName: string;
|
||||
postingDate: string;
|
||||
status: InterestPostingReportStatus;
|
||||
totalInterest: number;
|
||||
accountCount: number;
|
||||
generationMode: 'AUTO' | 'MANUAL';
|
||||
generatedAt: string;
|
||||
generatedBy: string | null;
|
||||
approvedAt: string | null;
|
||||
approvedBy: string | null;
|
||||
approvedOnBehalf: boolean;
|
||||
postedAt: string | null;
|
||||
failureReason: string | null;
|
||||
/** Whether the signed-in user may regenerate or approve it: their own branch, or the head office for a branch that did not open. */
|
||||
canAct: boolean;
|
||||
}
|
||||
|
||||
export interface InterestPostingReportLine {
|
||||
savingsAccountId: number;
|
||||
accountNo: string;
|
||||
clientName: string;
|
||||
interestAmount: number;
|
||||
balanceBefore: number;
|
||||
balanceAfter: number;
|
||||
savingsTransactionId: number | null;
|
||||
}
|
||||
|
||||
export interface InterestPostingReportDetail extends InterestPostingReport {
|
||||
payableGlCode: string | null;
|
||||
payableGlName: string | null;
|
||||
paidGlCode: string | null;
|
||||
paidGlName: string | null;
|
||||
expenseGlCode: string | null;
|
||||
expenseGlName: string | null;
|
||||
lines: InterestPostingReportLine[];
|
||||
}
|
||||
|
||||
export interface InterestPostingDue {
|
||||
productId: number;
|
||||
productName: string;
|
||||
officeId: number;
|
||||
officeName: string;
|
||||
postingDate: string;
|
||||
}
|
||||
|
||||
export interface InterestPostingSummaryRow {
|
||||
id: number;
|
||||
postingDate: string;
|
||||
officeId: number;
|
||||
officeName: string;
|
||||
productId: number;
|
||||
productName: string;
|
||||
accountCount: number;
|
||||
totalInterest: number;
|
||||
status: InterestPostingReportStatus;
|
||||
approvedBy: string | null;
|
||||
approvedOnBehalf: boolean;
|
||||
approvedAt: string | null;
|
||||
postedAt: string | null;
|
||||
}
|
||||
|
||||
/**
|
||||
* The savings interest posting reports, one per branch and product: generated at noon on a posting
|
||||
* date, approved by the branch, posted when the branch closes the day.
|
||||
*/
|
||||
@Injectable({ providedIn: 'root' })
|
||||
export class InterestPostingReportService {
|
||||
private http = inject(HttpClient);
|
||||
private readonly base = '/savingsinterestpostingreports';
|
||||
|
||||
list(postingDate?: string, status?: string, officeId?: number): Observable<InterestPostingReport[]> {
|
||||
let params = new HttpParams();
|
||||
if (postingDate) params = params.set('postingDate', postingDate);
|
||||
if (status) params = params.set('status', status);
|
||||
if (officeId) params = params.set('officeId', String(officeId));
|
||||
return this.http.get<InterestPostingReport[]>(this.base, { params });
|
||||
}
|
||||
|
||||
/** Branch and product pairs with interest due by the date and no report yet, that this user may generate. */
|
||||
dueWithoutReport(postingDate?: string): Observable<InterestPostingDue[]> {
|
||||
let params = new HttpParams();
|
||||
if (postingDate) params = params.set('postingDate', postingDate);
|
||||
return this.http.get<InterestPostingDue[]>(`${this.base}/due-without-report`, { params });
|
||||
}
|
||||
|
||||
detail(reportId: number): Observable<InterestPostingReportDetail> {
|
||||
return this.http.get<InterestPostingReportDetail>(`${this.base}/${reportId}`);
|
||||
}
|
||||
|
||||
regenerate(
|
||||
productId: number,
|
||||
officeId: number,
|
||||
postingDate: string
|
||||
): Observable<{ reportId: number; status: string }> {
|
||||
return this.http.post<{ reportId: number; status: string }>(
|
||||
this.base,
|
||||
{ productId, officeId, postingDate },
|
||||
{ params: new HttpParams().set('command', 'regenerate') }
|
||||
);
|
||||
}
|
||||
|
||||
approve(reportId: number): Observable<{ reportId: number; status: string }> {
|
||||
return this.http.post<{ reportId: number; status: string }>(
|
||||
`${this.base}/${reportId}`,
|
||||
{},
|
||||
{ params: new HttpParams().set('command', 'approve') }
|
||||
);
|
||||
}
|
||||
|
||||
/** The head office's branch-wise view over a date range. */
|
||||
summary(fromDate?: string, toDate?: string, productId?: number): Observable<InterestPostingSummaryRow[]> {
|
||||
let params = new HttpParams();
|
||||
if (fromDate) params = params.set('fromDate', fromDate);
|
||||
if (toDate) params = params.set('toDate', toDate);
|
||||
if (productId) params = params.set('productId', String(productId));
|
||||
return this.http.get<InterestPostingSummaryRow[]>(`${this.base}/summary`, { params });
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user