fix(current-accounts): show bank/branch letterhead on passbook, matching savings
Current account passbook hardcoded "LincPay Co-operative Bank Ltd." and had no branch identification line at all, unlike the savings passbook which pulls the bank name and branch/IFSC/MICR details from the Institution and Branch Profile. Wire up the same OrganizationService lookup so the current account statement shows real bank/branch details too. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
+53
-1
@@ -11,11 +11,12 @@ import { Component, OnInit, OnDestroy, inject, ElementRef, ViewChild } from '@an
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
import { UntypedFormBuilder } from '@angular/forms';
|
||||
import { CurrencyPipe } from '@angular/common';
|
||||
import { Subject, takeUntil } from 'rxjs';
|
||||
import { Subject, takeUntil, catchError, forkJoin, of } from 'rxjs';
|
||||
|
||||
/** Custom Services */
|
||||
import { SettingsService } from 'app/settings/settings.service';
|
||||
import { Dates } from 'app/core/utils/dates';
|
||||
import { OrganizationService } from '../../../organization/organization.service';
|
||||
import { Currency } from 'app/shared/models/general.model';
|
||||
import {
|
||||
CurrentAccountTransaction,
|
||||
@@ -44,6 +45,7 @@ export class PassbookTabComponent implements OnInit, OnDestroy {
|
||||
private formBuilder = inject(UntypedFormBuilder);
|
||||
private settingsService = inject(SettingsService);
|
||||
private dateUtils = inject(Dates);
|
||||
private organizationService = inject(OrganizationService);
|
||||
|
||||
private destroy$ = new Subject<void>();
|
||||
|
||||
@@ -60,6 +62,17 @@ export class PassbookTabComponent implements OnInit, OnDestroy {
|
||||
availableBalance: number = 0;
|
||||
activatedOnDate: any = null;
|
||||
|
||||
/** Bank/branch letterhead — real values from Institution Profile + Branch Profile (Organization
|
||||
* module) rather than a hardcoded name, so a printed passbook actually identifies which bank and
|
||||
* branch issued it, the way a real UCB's core banking system does. Falls back to a generic label
|
||||
* if the profile was never filled in, rather than showing a fabricated bank name. */
|
||||
bankName = 'Bank';
|
||||
bankSubtitle = 'Current Account Statement';
|
||||
branchName = '';
|
||||
branchAddress = '';
|
||||
ifscCode = '';
|
||||
micrCode = '';
|
||||
|
||||
/** Transactions */
|
||||
allTransactions: CurrentAccountTransaction[] = [];
|
||||
filteredTransactions: CurrentAccountTransaction[] = [];
|
||||
@@ -92,6 +105,33 @@ export class PassbookTabComponent implements OnInit, OnDestroy {
|
||||
fromDate: [''],
|
||||
toDate: ['']
|
||||
});
|
||||
|
||||
this.loadLetterhead();
|
||||
}
|
||||
|
||||
/** Institution Profile is the bank's own single record; Branch Profile is per-office. There is no
|
||||
* office id on the current account data reaching this tab, and this deployment runs a single
|
||||
* branch, so the first branch profile on record is the correct one here — a genuinely
|
||||
* multi-branch deployment would need the account's own office id threaded through instead. */
|
||||
private loadLetterhead(): void {
|
||||
forkJoin({
|
||||
institution: this.organizationService.getInstitutionProfile().pipe(catchError(() => of(null))),
|
||||
branches: this.organizationService.getBranchProfiles().pipe(catchError(() => of([])))
|
||||
}).subscribe(({ institution, branches }: any) => {
|
||||
if (institution) {
|
||||
this.bankName = institution.passbookHeaderName || institution.bankName || institution.legalName || 'Bank';
|
||||
this.bankSubtitle = institution.licenseNumber
|
||||
? `Lic. No. ${institution.licenseNumber}`
|
||||
: 'Current Account Statement';
|
||||
}
|
||||
const branch = Array.isArray(branches) ? branches[0] : null;
|
||||
if (branch) {
|
||||
this.branchName = branch.officeName || '';
|
||||
this.branchAddress = branch.address || '';
|
||||
this.ifscCode = branch.ifscCode || '';
|
||||
this.micrCode = branch.micrCode || '';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private computeRunningBalances(transactions: CurrentAccountTransaction[]): CurrentAccountTransaction[] {
|
||||
@@ -279,6 +319,18 @@ export class PassbookTabComponent implements OnInit, OnDestroy {
|
||||
margin-top: 3px;
|
||||
}
|
||||
|
||||
/* Branch identification line */
|
||||
.branch-line {
|
||||
background: #e8edf5;
|
||||
border-bottom: 1px solid #d0d7e3;
|
||||
padding: 5px 20px;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 4px 16px;
|
||||
font-size: 9.5px;
|
||||
color: #4a5a7a;
|
||||
}
|
||||
|
||||
/* Account details band */
|
||||
.account-details-band {
|
||||
background: #f0f3f9;
|
||||
|
||||
Reference in New Issue
Block a user