fix(savings): show a clear message when an action is parked for checker approval

Approve, close, reject, undo-approval, withdraw-by-client, and post-interest
on a savings account all silently behaved as if nothing happened when the
backend parks the command in the Checker Inbox instead of executing it
(HTTP 200 with rollbackTransaction: true) -- misleading the maker into
thinking the action either failed or quietly succeeded. Each now shows an
explicit alert naming what was sent for approval and that the account/
application is unchanged until a checker approves it.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

angular.json

@@ -31,8 +31,6 @@
               "@angular/localize/init"
             ],
             "assets": [
-              "src/favicon.ico",
-              "src/apple-touch-icon.png",
               "src/assets/images/cbsnexora-favicon.svg",
               "src/robots.txt",
               "src/manifest.json",
@@ -41,11 +39,6 @@
                 "glob": "**/*",
                 "input": "node_modules/tinymce",
                 "output": "assets/tinymce"
-              },
-              {
-                "glob": "lottie.min.js",
-                "input": "node_modules/lottie-web/build/player",
-                "output": "assets/js"
               }
             ],
             "styles": [
@@ -76,8 +69,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "18mb",
+                  "maximumWarning": "15mb",
-                  "maximumError": "20mb"
+                  "maximumError": "17mb"
                 },
                 {
                   "type": "anyComponentStyle",

package-lock.json

@@ -41,7 +41,6 @@
         "jspdf-autotable": "^5.0.2",
         "lightgallery": "^2.9.0",
         "lodash": "4.17.23",
-        "lottie-web": "^5.13.0",
         "moment": "^2.29.4",
         "ngx-image-cropper": "^9.1.6",
         "ngx-mat-select-search": "^8.0.2",
@@ -18381,12 +18380,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/lottie-web": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.13.0.tgz",
-      "integrity": "sha512-+gfBXl6sxXMPe8tKQm7qzLnUy5DUPJPKIyRHwtpCpyUEYjHYRJC/5gjUvdkuO2c3JllrPtHXH5UJJK8LRYl5yQ==",
-      "license": "MIT"
-    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",

package.json

@@ -71,7 +71,6 @@
     "jspdf-autotable": "^5.0.2",
     "lightgallery": "^2.9.0",
     "lodash": "4.17.23",
-    "lottie-web": "^5.13.0",
     "moment": "^2.29.4",
     "ngx-image-cropper": "^9.1.6",
     "ngx-mat-select-search": "^8.0.2",

src/app/account-transfers/view-account-transfer/view-account-transfer.component.html

@@ -7,6 +7,16 @@
 -->
 
 <div class="container">
+  <div class="container m-b-20 align-end gap-2px">
+    @if (!viewAccountTransferData.reversed) {
+      <span>
+        <button mat-raised-button color="warn" *mifosxHasPermission="'ADJUST_ACCOUNTTRANSFER'">
+          <fa-icon icon="undo" class="m-r-10"></fa-icon>{{ 'labels.buttons.Undo' | translate }}
+        </button>
+      </span>
+    }
+  </div>
+
   <mat-card>
     <mat-card-content>
       <div class="transfer-container">

src/app/accounting/accounting.service.ts

@@ -10,8 +10,7 @@
 
 /** Angular Imports */
 import { Injectable, inject } from '@angular/core';
-import { HttpClient, HttpContext, HttpParams } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
-import { SILENT_HTTP_ERROR } from 'app/core/http/silent-error.token';
 
 /** rxjs Imports */
 import { Observable } from 'rxjs';
@@ -199,16 +198,6 @@ export class AccountingService {
     return this.http.get('/journalentries/ledger', { params: httpParams });
   }
 
-  /**
-   * The whole transfer a ledger transaction belongs to, when it is one branch's part of a transfer between branches.
-   * An extra, informational lookup: if it fails the screen simply shows no banner, so a failure raises no error popup.
-   */
-  getInterBranchTransfer(transactionId: string): Observable<any> {
-    return this.http.get(`/accounting/interbranchtransfers/${transactionId}`, {
-      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
-    });
-  }
-
   /**
    * @param {string} transactionId Transaction ID to be reverted.
    * @param {string} comments Any comments.

src/app/accounting/search-journal-entry/search-journal-entry.component.html

@@ -353,7 +353,12 @@
       <div class="gl-fgroup">
         <label class="gl-flabel"><fa-icon icon="calendar-check"></fa-icon> Submitted From</label>
         <mat-form-field appearance="outline" class="gl-ffield">
-          <input matInput [matDatepicker]="dpSubFrom" [min]="minDate" [formControl]="submittedOnDateFrom" />
+          <input
+            matInput
+            [matDatepicker]="dpSubFrom"
+            [min]="minDate"
+            [formControl]="submittedOnDateFrom"
+          />
           <mat-datepicker-toggle matSuffix [for]="dpSubFrom"></mat-datepicker-toggle>
           <mat-datepicker #dpSubFrom></mat-datepicker>
         </mat-form-field>

src/app/accounts/accounts-list/accounts-list.component.html

@@ -139,13 +139,6 @@
             </td>
           </ng-container>
 
-          <ng-container matColumnDef="limit">
-            <th mat-header-cell *matHeaderCellDef class="acl-th acl-th--right">Sanctioned Limit</th>
-            <td mat-cell *matCellDef="let row" class="acl-td acl-td--right">
-              {{ getCurrencySymbol(row) }} {{ row.overdraftLimit | formatNumber }}
-            </td>
-          </ng-container>
-
           <ng-container matColumnDef="balance">
             <th mat-header-cell *matHeaderCellDef class="acl-th acl-th--right">Balance</th>
             <td mat-cell *matCellDef="let row" class="acl-td acl-td--right">

src/app/accounts/accounts-list/accounts-list.component.ts

@@ -34,7 +34,7 @@ import { FormatNumberPipe } from '../../pipes/format-number.pipe';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { AccountsService } from '../accounts.service';
 
-export type AccountType = 'savings' | 'current' | 'cc' | 'fixed-deposits' | 'recurring-deposits';
+export type AccountType = 'savings' | 'current' | 'fixed-deposits' | 'recurring-deposits';
 
 interface AccountConfig {
   label: string;
@@ -119,13 +119,6 @@ export class AccountsListComponent implements OnInit, OnDestroy {
       typeLabel: 'CA',
       typeBadgeClass: 'dtype--ca'
     },
-    cc: {
-      label: 'CC Accounts',
-      icon: 'hand-holding-usd',
-      accentClass: 'accent--current',
-      typeLabel: 'CC',
-      typeBadgeClass: 'dtype--ca'
-    },
     'fixed-deposits': {
       label: 'Fixed Deposit Accounts',
       icon: 'lock',
@@ -149,24 +142,6 @@ export class AccountsListComponent implements OnInit, OnDestroy {
   ngOnInit() {
     this.route.data.pipe(takeUntil(this.destroy$)).subscribe((data) => {
       this.accountType = data['accountType'] as AccountType;
-      this.displayedColumns = this.accountType === 'cc' ? [
-              'accountNo',
-              'depositType',
-              'clientName',
-              'productName',
-              'limit',
-              'balance',
-              'status',
-              'actions'
-            ] : [
-              'accountNo',
-              'depositType',
-              'clientName',
-              'productName',
-              'balance',
-              'status',
-              'actions'
-            ];
       this.pageIndex = 0;
       this.searchControl.setValue('', { emitEvent: false });
       this.loadAccounts();
@@ -208,12 +183,9 @@ export class AccountsListComponent implements OnInit, OnDestroy {
     const toVal = this.toDateControl.value;
     const bothDatesSet = !!(fromVal && toVal);
 
-    // CC accounts come from the server already narrowed to those that allow an overdraft; nothing else is read.
-    const isCc = this.accountType === 'cc';
     const params: import('../accounts.service').AccountListParams = {
-      offset: isCc ? 0 : this.pageIndex * this.pageSize,
+      offset: this.pageIndex * this.pageSize,
-      limit: isCc ? 500 : this.pageSize,
+      limit: this.pageSize,
-      ...(isCc && { overdraftOnly: true }),
       accountNo: this.searchType === 'accountNo' ? search || undefined : undefined,
       clientName: this.searchType === 'clientName' ? search || undefined : undefined,
       orderBy: 'id',
@@ -227,7 +199,7 @@ export class AccountsListComponent implements OnInit, OnDestroy {
     const obs$ =
       this.accountType === 'savings'
         ? this.accountsService.getSavingsAccounts(params)
-        : this.accountType === 'current' || this.accountType === 'cc'
+        : this.accountType === 'current'
           ? this.accountsService.getCurrentAccounts(params)
           : this.accountType === 'fixed-deposits'
             ? this.accountsService.getFixedDepositAccounts(params)
@@ -267,7 +239,7 @@ export class AccountsListComponent implements OnInit, OnDestroy {
           });
         }
 
-        this.totalRecords = isCc || Array.isArray(res) ? items.length : (res?.totalFilteredRecords ?? items.length);
+        this.totalRecords = Array.isArray(res) ? items.length : (res?.totalFilteredRecords ?? items.length);
         this.dataSource.data = items;
         this.isLoading = false;
       },
@@ -335,13 +307,6 @@ export class AccountsListComponent implements OnInit, OnDestroy {
         id,
         'general'
       ],
-      cc: [
-        '/clients',
-        account.clientId,
-        'current-accounts',
-        id,
-        'general'
-      ],
       'fixed-deposits': [
         '/clients',
         account.clientId,

src/app/accounts/accounts-routing.module.ts

@@ -11,14 +11,6 @@ import { Routes, RouterModule } from '@angular/router';
 
 import { Route } from '../core/route/route.service';
 import { AccountsListComponent } from './accounts-list/accounts-list.component';
-import { PartyMasterComponent } from '../deposits/party-master/party-master.component';
-import { CreatePartyComponent } from '../deposits/party-master/create-party/create-party.component';
-import { DueForClosureComponent } from '../deposits/party-master/due-for-closure/due-for-closure.component';
-import { DailyTransactionEntryComponent } from '../deposits/daily-transaction-entry/daily-transaction-entry.component';
-import { DdsReportsComponent } from '../deposits/dds-reports/dds-reports.component';
-import { ReportViewerComponent } from '../deposits/dds-reports/report-viewer/report-viewer.component';
-import { DdsAccountsComponent } from '../deposits/dds-accounts/dds-accounts.component';
-import { DdsAccountViewComponent } from '../deposits/dds-accounts/dds-account-view/dds-account-view.component';
 
 const routes: Routes = [
   Route.withShell([
@@ -36,12 +28,6 @@ const routes: Routes = [
           component: AccountsListComponent,
           data: { accountType: 'current', title: 'Current Accounts', breadcrumb: 'Current Accounts' }
         },
-        {
-          // Cash Credit: current accounts opened on a product that allows an overdraft.
-          path: 'cc',
-          component: AccountsListComponent,
-          data: { accountType: 'cc', title: 'CC Accounts', breadcrumb: 'CC Accounts' }
-        },
         {
           path: 'fixed-deposits',
           component: AccountsListComponent,
@@ -55,59 +41,6 @@ const routes: Routes = [
             title: 'Recurring Deposit Accounts',
             breadcrumb: 'Recurring Deposit Accounts'
           }
-        },
-        {
-          path: 'dds',
-          data: { title: 'Daily Deposit Scheme — Party Master', breadcrumb: 'Party Master' },
-          children: [
-            { path: '', component: PartyMasterComponent },
-            {
-              path: 'create',
-              component: CreatePartyComponent,
-              data: { title: 'Create Party', breadcrumb: 'Create' }
-            },
-            {
-              // Ahead of the :partyId routes, so "dueforclosure" is not read as a party id.
-              path: 'dueforclosure',
-              component: DueForClosureComponent,
-              data: { title: 'Accounts Due for Closure', breadcrumb: 'Due for Closure' }
-            },
-            {
-              path: ':partyId/edit',
-              component: CreatePartyComponent,
-              data: { title: 'Edit Party', breadcrumb: 'Edit' }
-            }
-          ]
-        },
-        {
-          // The DDS accounts listed like Savings Accounts, each opening onto its transactions.
-          path: 'dds-accounts',
-          data: { title: 'DDS Accounts', breadcrumb: 'DDS Accounts' },
-          children: [
-            { path: '', component: DdsAccountsComponent },
-            {
-              path: ':partyId',
-              component: DdsAccountViewComponent,
-              data: { title: 'DDS Account', breadcrumb: 'Account', routeParamBreadcrumb: false }
-            }
-          ]
-        },
-        {
-          path: 'dds-collection',
-          component: DailyTransactionEntryComponent,
-          data: { title: 'Daily Transaction Entry', breadcrumb: 'Daily Transaction Entry' }
-        },
-        {
-          path: 'dds-reports',
-          data: { title: 'DDS Reports', breadcrumb: 'DDS Reports' },
-          children: [
-            { path: '', component: DdsReportsComponent },
-            {
-              path: 'view/:reportName',
-              component: ReportViewerComponent,
-              data: { title: 'DDS Report', breadcrumb: 'reportName', routeParamBreadcrumb: 'reportName' }
-            }
-          ]
         }
       ]
     }

src/app/accounts/accounts.service.ts

@@ -21,8 +21,6 @@ export interface AccountListParams {
   fromDate?: string;
   toDate?: string;
   asOnDate?: string;
-  /** Current accounts only: just the Cash Credit (overdraft) accounts, filtered by the server. */
-  overdraftOnly?: boolean;
 }
 
 @Injectable({ providedIn: 'root' })
@@ -57,7 +55,6 @@ export class AccountsService {
     if (params.fromDate) httpParams = httpParams.set('fromDate', params.fromDate);
     if (params.toDate) httpParams = httpParams.set('toDate', params.toDate);
     if (params.asOnDate) httpParams = httpParams.set('asOnDate', params.asOnDate);
-    if (params.overdraftOnly) httpParams = httpParams.set('overdraftOnly', 'true');
     return this.http.get('/currentaccounts', { params: httpParams });
   }
 
@@ -88,11 +85,6 @@ export class AccountsService {
     return this.http.get('/fixeddepositaccounts/maturity-dashboard');
   }
 
-  /** RD Dashboard: running RDs with their installment position, closures and penalty income for the month. */
-  getRecurringDepositDashboard(): Observable<any> {
-    return this.http.get('/recurringdepositaccounts/dashboard');
-  }
-
   getRecurringDepositAccounts(params: AccountListParams = {}): Observable<any> {
     let httpParams = new HttpParams()
       .set('paged', 'true')

src/app/aml/aml.service.ts

@@ -142,32 +142,6 @@ export class AmlService {
     return this.http.get<any[]>('/aml/ctr-reports/lines', { params });
   }
 
-  /**
-   * Cash transactions of the threshold or more that no generated report contains yet, shaped like the lines above.
-   * They show on the FIU screen as soon as they are posted; generating the month is what files them.
-   */
-  getCtrPendingLines(): Observable<any[]> {
-    return this.http.get<any[]>('/aml/ctr-reports/pending-lines');
-  }
-
-  /**
-   * How much came into and went out of each current / Cash Credit account over the last `days` days, with the
-   * customer's declared turnover and the sanctioned limit alongside.
-   */
-  getCcTracking(days = 30): Observable<any> {
-    return this.http.get<any>('/aml/cc-tracking', { params: new HttpParams().set('days', String(days)) });
-  }
-
-  /**
-   * Every credit and debit on one CC account over the last `days` days, with the mode and counterparty each payment
-   * recorded, totalled by mode and by counterparty.
-   */
-  getCcAccountTrail(accountId: number, days = 30): Observable<any> {
-    return this.http.get<any>(`/aml/cc-tracking/${accountId}/trail`, {
-      params: new HttpParams().set('days', String(days))
-    });
-  }
-
   /** month format: yyyy-MM */
   generateCtrReport(month: string): Observable<any> {
     return this.http.post('/aml/ctr-reports/generate', { month });

src/app/api-management/api-import.util.ts

@@ -1,778 +0,0 @@
-/**
- * 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 { ApiMappingRow, KeyValue, kv } from './api-management.service';
-
-/**
- * Reads what a vendor's documentation or a Postman / browser / cURL capture gives - in any of these shapes - and turns
- * it into the pieces of an API: method, URL, path, query parameters, headers, content type, payload, response status,
- * response headers, response body, and a first guess at the CBS field mapping. Nothing is sent anywhere.
- *
- * Understood:
- *   - a cURL command
- *   - a Postman collection or a single Postman request / item (with its saved responses)
- *   - a HAR capture
- *   - an "API definition" object: { method, url | path, query, headers, body, status, ... }
- *   - a bare JSON payload (treated as the request body, or the response body on the response side)
- *   - form text (a=1&b=2) and other raw text
- *
- * Credentials found in headers or query strings are never kept: the value is replaced by {{secret}} and the row is
- * flagged as secret, so a key pasted from a sample cannot end up stored.
- */
-
-export interface ImportedRequest {
-  source: string;
-  method?: string;
-  /** The full URL when the file had one. */
-  url?: string;
-  /** Scheme and host of the URL, when present. */
-  baseUrl?: string;
-  path?: string;
-  queryParams: KeyValue[];
-  headers: KeyValue[];
-  contentType?: string;
-  body?: string;
-  /** A response found in the same file (Postman saved response, HAR entry, definition object). */
-  response?: ImportedResponse;
-  notes: string[];
-}
-
-export interface ImportedResponse {
-  source: string;
-  status?: number;
-  headers: KeyValue[];
-  body?: string;
-  errorBody?: string;
-  notes: string[];
-}
-
-const SECRET_HEADERS =
-  /^(authorization|proxy-authorization|x-api-key|api-key|apikey|authkey|x-auth-token|auth-token|token|x-access-token|cookie|set-cookie|x-hub-signature(-256)?)$/i;
-const SECRET_QUERY = /^(key|api[-_]?key|apikey|token|access[-_]?token|auth[-_]?key|secret|password|signature)$/i;
-const SECRET = '{{secret}}';
-
-// ── small helpers ───────────────────────────────────────────────────────────
-
-function isObject(v: unknown): v is Record<string, any> {
-  return typeof v === 'object' && v !== null && !Array.isArray(v);
-}
-
-function tryJson(text: string): any {
-  try {
-    return JSON.parse(text);
-  } catch {
-    return undefined;
-  }
-}
-
-function prettyJsonOrText(text: string): string {
-  const parsed = tryJson(text);
-  return parsed !== undefined && typeof parsed === 'object' ? JSON.stringify(parsed, null, 2) : text;
-}
-
-function bodyToText(body: unknown): string | undefined {
-  if (body === undefined || body === null) return undefined;
-  if (typeof body === 'string') return prettyJsonOrText(body);
-  return JSON.stringify(body, null, 2);
-}
-
-function toKeyValues(source: unknown, kind: 'header' | 'query' | 'plain'): KeyValue[] {
-  const out: KeyValue[] = [];
-  const add = (key: unknown, value: unknown, description = '', disabled = false) => {
-    const k = String(key ?? '').trim();
-    if (!k) return;
-    const secret = (kind === 'header' && SECRET_HEADERS.test(k)) || (kind === 'query' && SECRET_QUERY.test(k));
-    out.push({
-      key: k,
-      value: secret ? SECRET : value === undefined || value === null ? '' : String(value),
-      description,
-      enabled: !disabled,
-      secret
-    });
-  };
-  if (Array.isArray(source)) {
-    for (const item of source) {
-      if (isObject(item))
-        add(item.key ?? item.name, item.value, String(item.description ?? ''), item.disabled === true);
-    }
-  } else if (isObject(source)) {
-    for (const [
-      k,
-      v
-    ] of Object.entries(source)) add(k, v);
-  }
-  return out;
-}
-
-/** Splits a URL into its base, path and query without failing on {{placeholders}} or {path} parameters. */
-function splitUrl(raw: string): { baseUrl?: string; path: string; query: KeyValue[] } {
-  let rest = raw.trim();
-  let baseUrl: string | undefined;
-  const m = /^([a-zA-Z][a-zA-Z0-9+.-]*:\/\/[^/?#]+)(.*)$/.exec(rest);
-  if (m) {
-    baseUrl = m[1];
-    rest = m[2];
-  }
-  const hash = rest.indexOf('#');
-  if (hash >= 0) rest = rest.slice(0, hash);
-  let queryText = '';
-  const q = rest.indexOf('?');
-  if (q >= 0) {
-    queryText = rest.slice(q + 1);
-    rest = rest.slice(0, q);
-  }
-  const query: KeyValue[] = [];
-  for (const part of queryText.split('&')) {
-    if (!part) continue;
-    const eq = part.indexOf('=');
-    const key = safeDecode(eq >= 0 ? part.slice(0, eq) : part);
-    const value = eq >= 0 ? safeDecode(part.slice(eq + 1)) : '';
-    query.push(...toKeyValues([{ key, value }], 'query'));
-  }
-  return { baseUrl, path: rest || '/', query };
-}
-
-function safeDecode(s: string): string {
-  try {
-    return decodeURIComponent(s.replace(/\+/g, ' '));
-  } catch {
-    return s;
-  }
-}
-
-function detectContentType(
-  headers: KeyValue[],
-  body: string | undefined
-): { contentType?: string; headers: KeyValue[] } {
-  const ct = headers.find((h) => h.key.toLowerCase() === 'content-type');
-  const rest = headers.filter((h) => h.key.toLowerCase() !== 'content-type');
-  if (ct) return { contentType: ct.value.split(';')[0].trim(), headers: rest };
-  if (!body) return { headers: rest };
-  if (tryJson(body) !== undefined) return { contentType: 'application/json', headers: rest };
-  if (/^\s*</.test(body)) return { contentType: 'application/xml', headers: rest };
-  if (/^[^\s=&]+=[^&]*(&[^\s=&]+=[^&]*)*$/.test(body.trim()))
-    return { contentType: 'application/x-www-form-urlencoded', headers: rest };
-  return { contentType: 'text/plain', headers: rest };
-}
-
-/** Everything about a request is derived the same way once method / url / headers / body are known. */
-function finishRequest(
-  source: string,
-  method: string | undefined,
-  url: string | undefined,
-  pathOnly: string | undefined,
-  query: unknown,
-  headers: KeyValue[],
-  body: string | undefined,
-  contentTypeHint: string | undefined,
-  notes: string[]
-): ImportedRequest {
-  const parts = url ? splitUrl(url) : pathOnly ? splitUrl(pathOnly) : undefined;
-  const queryParams = [
-    ...(parts?.query ?? []),
-    ...toKeyValues(query, 'query')
-  ];
-  const detected = detectContentType(headers, body);
-  if (queryParams.some((q) => q.secret))
-    notes.push('A credential in the query string was replaced by {{secret}} - set it on the Connection tab.');
-  if (headers.some((h) => h.secret))
-    notes.push('Credentials in the headers were replaced by {{secret}} - set them on the Connection tab.');
-  return {
-    source,
-    method: method ? method.toUpperCase() : body ? 'POST' : undefined,
-    url,
-    baseUrl: parts?.baseUrl,
-    path: parts?.path,
-    queryParams,
-    headers: detected.headers,
-    contentType: contentTypeHint ?? detected.contentType,
-    body,
-    notes
-  };
-}
-
-// ── cURL ────────────────────────────────────────────────────────────────────
-
-/** Splits a shell command into words, honouring '…' "…" quotes and \ line continuations. */
-function shellWords(command: string): string[] {
-  const words: string[] = [];
-  let cur = '';
-  let quote: '"' | "'" | null = null;
-  let started = false;
-  const text = command.replace(/\\\r?\n/g, ' ').trim();
-  for (let i = 0; i < text.length; i++) {
-    const c = text[i];
-    if (quote) {
-      if (c === quote) quote = null;
-      else if (c === '\\' && quote === '"' && i + 1 < text.length) cur += text[++i];
-      else cur += c;
-    } else if (c === '"' || c === "'") {
-      quote = c;
-      started = true;
-    } else if (/\s/.test(c)) {
-      if (started || cur) words.push(cur);
-      cur = '';
-      started = false;
-    } else if (c === '\\' && i + 1 < text.length) {
-      cur += text[++i];
-    } else {
-      cur += c;
-    }
-  }
-  if (started || cur) words.push(cur);
-  return words;
-}
-
-function parseCurl(text: string): ImportedRequest {
-  const words = shellWords(text);
-  const notes: string[] = [];
-  let method: string | undefined;
-  let url: string | undefined;
-  const headers: KeyValue[] = [];
-  const data: string[] = [];
-  let form = false;
-  let getMode = false;
-  for (let i = 0; i < words.length; i++) {
-    const w = words[i];
-    const next = () => words[++i] ?? '';
-    if (w === 'curl') continue;
-    if (w === '-X' || w === '--request') method = next();
-    else if (w === '-H' || w === '--header') {
-      const h = next();
-      const c = h.indexOf(':');
-      if (c > 0) headers.push(...toKeyValues([{ key: h.slice(0, c), value: h.slice(c + 1).trim() }], 'header'));
-    } else if ([
-        '-d',
-        '--data',
-        '--data-raw',
-        '--data-binary',
-        '--data-ascii'
-      ].includes(w)) data.push(next());
-    else if (w === '--data-urlencode') {
-      data.push(next());
-      form = true;
-    } else if (w === '-F' || w === '--form') {
-      data.push(next());
-      form = true;
-      notes.push('Multipart form fields were read as name=value pairs.');
-    } else if (w === '--url') url = next();
-    else if (w === '-G' || w === '--get') getMode = true;
-    else if (w === '-u' || w === '--user') {
-      next();
-      headers.push({
-        key: 'Authorization',
-        value: SECRET,
-        description: 'Basic authentication from the cURL -u option',
-        enabled: true,
-        secret: true
-      });
-    } else if (w.startsWith('-')) {
-      // Flags that take a value we do not need.
-      if ([
-          '-o',
-          '--output',
-          '-A',
-          '--user-agent',
-          '-e',
-          '--referer',
-          '--connect-timeout',
-          '-m',
-          '--max-time',
-          '--proxy',
-          '-x'
-        ].includes(w)) next();
-    } else if (!url && /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(w)) url = w;
-    else if (!url && /^[\w.-]+(:\d+)?\//.test(w)) url = w;
-  }
-  let body = data.length ? data.join('&') : undefined;
-  if (body && getMode) {
-    url = url + (url?.includes('?') ? '&' : '?') + body;
-    body = undefined;
-  }
-  return finishRequest(
-    'cURL command',
-    method ?? (getMode ? 'GET' : body ? 'POST' : 'GET'),
-    url,
-    undefined,
-    undefined,
-    headers,
-    body ? prettyJsonOrText(body) : undefined,
-    form && !headers.some((h) => h.key.toLowerCase() === 'content-type')
-      ? 'application/x-www-form-urlencoded'
-      : undefined,
-    notes
-  );
-}
-
-// ── Postman / HAR / definition object ───────────────────────────────────────
-
-function findPostmanItem(node: any): any {
-  if (!node) return undefined;
-  if (node.request) return node;
-  if (Array.isArray(node.item)) {
-    for (const child of node.item) {
-      const found = findPostmanItem(child);
-      if (found) return found;
-    }
-  }
-  return undefined;
-}
-
-function postmanUrl(url: any): string | undefined {
-  if (!url) return undefined;
-  if (typeof url === 'string') return url;
-  if (typeof url.raw === 'string') return url.raw;
-  const host = Array.isArray(url.host) ? url.host.join('.') : url.host;
-  const path = Array.isArray(url.path) ? url.path.join('/') : url.path;
-  return `${url.protocol ? url.protocol + '://' : ''}${host ?? ''}/${path ?? ''}`;
-}
-
-function postmanResponse(r: any): ImportedResponse {
-  return {
-    source: 'Postman saved response',
-    status: typeof r?.code === 'number' ? r.code : undefined,
-    headers: toKeyValues(r?.header, 'header'),
-    body: bodyToText(r?.body),
-    notes: []
-  };
-}
-
-function fromPostman(item: any): ImportedRequest {
-  const req = item.request;
-  const notes: string[] = [];
-  let body: string | undefined;
-  let contentType: string | undefined;
-  const b = req?.body;
-  if (b?.mode === 'raw') {
-    body = bodyToText(b.raw);
-    const lang = b.options?.raw?.language;
-    if (lang === 'json') contentType = 'application/json';
-  } else if (b?.mode === 'urlencoded') {
-    body = (b.urlencoded ?? [])
-      .filter((p: any) => !p.disabled)
-      .map((p: any) => `${encodeURIComponent(p.key)}=${encodeURIComponent(p.value ?? '')}`)
-      .join('&');
-    contentType = 'application/x-www-form-urlencoded';
-  } else if (b?.mode === 'formdata') {
-    body = (b.formdata ?? []).map((p: any) => `${p.key}=${p.value ?? ''}`).join('&');
-    contentType = 'multipart/form-data';
-  }
-  const request = finishRequest(
-    'Postman request',
-    typeof req?.method === 'string' ? req.method : undefined,
-    postmanUrl(req?.url),
-    undefined,
-    undefined,
-    toKeyValues(req?.header, 'header'),
-    body,
-    contentType,
-    notes
-  );
-  if (Array.isArray(item.response) && item.response.length) request.response = postmanResponse(item.response[0]);
-  if (req?.auth)
-    notes.push('The request had an auth section; it was not read. Set authentication on the Connection tab.');
-  return request;
-}
-
-function fromHar(har: any): ImportedRequest {
-  const entry = har.log.entries[0];
-  const r = entry.request ?? {};
-  const body = r.postData?.text ? prettyJsonOrText(r.postData.text) : undefined;
-  const request = finishRequest(
-    'HAR capture',
-    r.method,
-    r.url,
-    undefined,
-    undefined,
-    toKeyValues(r.headers, 'header'),
-    body,
-    typeof r.postData?.mimeType === 'string' ? r.postData.mimeType.split(';')[0] : undefined,
-    []
-  );
-  const res = entry.response;
-  if (res) {
-    request.response = {
-      source: 'HAR capture',
-      status: typeof res.status === 'number' ? res.status : undefined,
-      headers: toKeyValues(res.headers, 'header'),
-      body: res.content?.text ? prettyJsonOrText(res.content.text) : undefined,
-      notes: []
-    };
-  }
-  return request;
-}
-
-function definitionResponse(def: any): ImportedResponse | undefined {
-  const r = def.response ?? def.responseDefinition;
-  const status = def.status ?? def.statusCode ?? def.successCode ?? r?.status ?? r?.statusCode ?? r?.code;
-  const headers = def.responseHeaders ?? r?.headers;
-  const body = def.responseBody ?? (isObject(r) ? (r.body ?? r.data) : r);
-  const errorBody = def.errorBody ?? def.errorResponse ?? r?.errorBody;
-  if (status === undefined && headers === undefined && body === undefined && errorBody === undefined) return undefined;
-  return {
-    source: 'API definition',
-    status: typeof status === 'number' ? status : status ? Number(status) || undefined : undefined,
-    headers: toKeyValues(headers, 'header'),
-    body: bodyToText(body),
-    errorBody: bodyToText(errorBody),
-    notes: []
-  };
-}
-
-function fromDefinition(def: any): ImportedRequest {
-  const body = def.body ?? def.payload ?? def.data ?? def.requestBody ?? def.request;
-  const bodyText = isObject(body) && ('method' in body || 'url' in body) ? undefined : bodyToText(body);
-  const url = def.url ?? def.endpoint ?? def.uri;
-  const request = finishRequest(
-    'API definition',
-    def.method ?? def.httpMethod,
-    typeof url === 'string' ? url : undefined,
-    typeof def.path === 'string' ? def.path : undefined,
-    def.query ?? def.queryParams ?? def.params,
-    toKeyValues(def.headers, 'header'),
-    bodyText,
-    typeof def.contentType === 'string' ? def.contentType : undefined,
-    []
-  );
-  request.response = definitionResponse(def);
-  return request;
-}
-
-// ── public: request side ────────────────────────────────────────────────────
-
-export function parseRequestText(text: string): ImportedRequest {
-  const t = (text ?? '').trim();
-  if (!t) throw new Error('Nothing to read - paste the request or choose a file.');
-  if (/^curl\b/i.test(t)) return parseCurl(t);
-
-  const parsed = tryJson(t);
-  if (parsed === undefined) {
-    // Not JSON: a cURL command in the middle of text, form data, or other raw text.
-    const curl = /curl\b[\s\S]*/i.exec(t);
-    if (curl && /https?:\/\//.test(curl[0])) return parseCurl(curl[0]);
-    const detected = detectContentType([], t);
-    return finishRequest('Raw text', undefined, undefined, undefined, undefined, [], t, detected.contentType, [
-      'The text is not JSON; it was kept as the request payload.'
-    ]);
-  }
-  if (isObject(parsed) && isObject(parsed.log) && Array.isArray(parsed.log.entries) && parsed.log.entries.length)
-    return fromHar(parsed);
-  if (isObject(parsed) && (parsed.item || parsed.info?.schema)) {
-    const item = findPostmanItem(parsed);
-    if (!item) throw new Error('The Postman collection has no request in it.');
-    return fromPostman(item);
-  }
-  if (
-    isObject(parsed) &&
-    isObject(parsed.request) &&
-    (parsed.request.url || parsed.request.method || parsed.request.header)
-  )
-    return fromPostman(parsed);
-  if (isObject(parsed) && [
-      'method',
-      'httpMethod',
-      'url',
-      'endpoint',
-      'uri',
-      'headers',
-      'queryParams',
-      'requestBody',
-      'payload'
-    ].some((k) => k in parsed) && !('statuses' in parsed)) {
-    return fromDefinition(parsed);
-  }
-  // A bare JSON payload.
-  return finishRequest(
-    'JSON payload',
-    undefined,
-    undefined,
-    undefined,
-    undefined,
-    [],
-    JSON.stringify(parsed, null, 2),
-    'application/json',
-    []
-  );
-}
-
-// ── public: response side ───────────────────────────────────────────────────
-
-export function parseResponseText(text: string): ImportedResponse {
-  const t = (text ?? '').trim();
-  if (!t) throw new Error('Nothing to read - paste the response or choose a file.');
-  const parsed = tryJson(t);
-  if (parsed === undefined) {
-    return {
-      source: 'Raw text',
-      headers: [],
-      body: t,
-      notes: ['The text is not JSON; it was kept as the response body.']
-    };
-  }
-  if (isObject(parsed) && isObject(parsed.log) && Array.isArray(parsed.log.entries) && parsed.log.entries.length) {
-    return (
-      fromHar(parsed).response ?? { source: 'HAR capture', headers: [], notes: ['The HAR entry has no response.'] }
-    );
-  }
-  if (isObject(parsed) && (parsed.item || parsed.info?.schema)) {
-    const item = findPostmanItem(parsed);
-    const res = item ? fromPostman(item).response : undefined;
-    if (!res) throw new Error('The Postman collection has no saved response.');
-    return res;
-  }
-  if (isObject(parsed) && Array.isArray(parsed.response) && parsed.response.length && (parsed.request || parsed.name)) {
-    return postmanResponse(parsed.response[0]);
-  }
-  if (isObject(parsed) && [
-      'status',
-      'statusCode',
-      'headers',
-      'responseHeaders',
-      'responseBody',
-      'errorBody'
-    ].some(
-      (k) => k in parsed
-    ) && ('body' in parsed || 'responseBody' in parsed || 'headers' in parsed || 'responseHeaders' in parsed || 'errorBody' in parsed || 'data' in parsed)) {
-    const r = definitionResponse({
-      status: parsed.status ?? parsed.statusCode,
-      responseHeaders: parsed.responseHeaders ?? parsed.headers,
-      responseBody: parsed.responseBody ?? parsed.body ?? parsed.data,
-      errorBody: parsed.errorBody
-    });
-    if (r) return r;
-  }
-  return { source: 'JSON body', headers: [], body: JSON.stringify(parsed, null, 2), notes: [] };
-}
-
-// ── JSON → mapping rows ─────────────────────────────────────────────────────
-
-export interface JsonLeaf {
-  path: string;
-  value: unknown;
-}
-
-/** Every value in a JSON document with its path: `a.b[0].c`. Only the first item of an array is walked. */
-export function flatten(json: unknown, prefix = ''): JsonLeaf[] {
-  const out: JsonLeaf[] = [];
-  if (Array.isArray(json)) {
-    if (json.length) out.push(...flatten(json[0], `${prefix}[0]`));
-  } else if (isObject(json)) {
-    for (const [
-      k,
-      v
-    ] of Object.entries(json)) {
-      out.push(...flatten(v, prefix ? `${prefix}.${k}` : k));
-    }
-  } else if (prefix) {
-    out.push({ path: prefix, value: json });
-  }
-  return out;
-}
-
-function lastKey(path: string): string {
-  const m = /([A-Za-z0-9_$-]+)(\[\d+\])*$/.exec(path);
-  return m ? m[1] : path;
-}
-
-const norm = (s: string) => s.toLowerCase().replace(/[^a-z0-9]/g, '');
-
-const REQUEST_GUESS: [RegExp, string, boolean][] = [
-  [
-    /^(mobile|mobiles|mobileno|mobilenumber|msisdn|phone|phoneno|phonenumber|to|destination|recipient|recipients|number|contact)$/,
-    'customer.mobile',
-    true
-  ],
-  [
-    /^(templateid|template|templatename|dlttemplateid|flowid)$/,
-    'message.templateId',
-    true
-  ],
-  [
-    /^(message|text|body|content|sms|msg|smstext|var1|messagetext)$/,
-    'message.text',
-    true
-  ],
-  [
-    /^(sender|senderid|from|source|shortcode)$/,
-    'bank.senderId',
-    false
-  ],
-  [
-    /^(email|emailid|mail|emailaddress)$/,
-    'customer.email',
-    false
-  ],
-  [
-    /^(customername|fullname|firstname|name)$/,
-    'customer.name',
-    false
-  ],
-  [
-    /^(otp|code|pin)$/,
-    'message.otp',
-    false
-  ],
-  [
-    /^(pan|pannumber)$/,
-    'customer.pan',
-    false
-  ],
-  [
-    /^(aadhaar|aadhar|aadhaarnumber)$/,
-    'customer.aadhaar',
-    false
-  ],
-  [
-    /^(dob|dateofbirth|birthdate)$/,
-    'customer.dob',
-    false
-  ],
-  [
-    /^(membercode|memberid|memberreference)$/,
-    'bank.memberCode',
-    false
-  ],
-  [
-    /^(accountno|accountnumber|acno|account)$/,
-    'account.number',
-    false
-  ],
-  [
-    /^(cif|customerid|clientid|cifno)$/,
-    'customer.cif',
-    false
-  ],
-  [
-    /^(amount|amt|txnamount|transactionamount)$/,
-    'txn.amount',
-    false
-  ],
-  [
-    /^(txnid|transactionid|transactionreference|txnref)$/,
-    'txn.reference',
-    false
-  ],
-  [
-    /^(txndate|transactiondate)$/,
-    'txn.date',
-    false
-  ],
-  [
-    /^(fromdate|startdate|datefrom)$/,
-    'request.fromDate',
-    false
-  ],
-  [
-    /^(todate|enddate|dateto)$/,
-    'request.toDate',
-    false
-  ],
-  [
-    /^(reference|referenceno|referencenumber|ref|requestid|clientreference|correlationid)$/,
-    'request.reference',
-    false
-  ],
-  [
-    /^(tenantidentifier|tenantid)$/,
-    'tenant.identifier',
-    false
-  ],
-  [
-    /^(providerid)$/,
-    'sms.providerId',
-    false
-  ]
-];
-
-function guessTransform(cbsField: string, value: unknown): string {
-  if (cbsField === 'customer.mobile') return 'DIGITS_ONLY';
-  if (cbsField === 'customer.email') return 'LOWER';
-  if (cbsField === 'bank.senderId') return 'UPPER';
-  if (cbsField === 'txn.amount') return 'NUMBER';
-  if (typeof value === 'boolean') return 'BOOLEAN';
-  if (typeof value === 'number') return 'NUMBER';
-  if (typeof value === 'string') {
-    if (/^\d{8}$/.test(value) && cbsField.includes('Date')) return 'DATE_DDMMYYYY';
-    if (/^\d{4}-\d{2}-\d{2}/.test(value)) return 'DATE_YYYY_MM_DD';
-  }
-  return 'NONE';
-}
-
-/**
- * A first mapping for a request payload: each value that looks like a known CBS field (mobile, message, template,
- * sender ...) becomes "CBS field → path"; every other value becomes a fixed value at its path, so the whole payload is
- * reproduced. Review and adjust.
- */
-export function guessRequestRows(bodyText: string): ApiMappingRow[] {
-  const parsed = tryJson(bodyText);
-  if (parsed === undefined || typeof parsed !== 'object' || parsed === null) return [];
-  const rows: ApiMappingRow[] = [];
-  const used = new Set<string>();
-  for (const leaf of flatten(parsed)) {
-    const key = norm(lastKey(leaf.path));
-    const hit = REQUEST_GUESS.find(([re]) => re.test(key));
-    if (hit && !used.has(hit[1])) {
-      used.add(hit[1]);
-      rows.push({
-        from: hit[1],
-        to: leaf.path,
-        transform: guessTransform(hit[1], leaf.value),
-        defaultValue: '',
-        mandatory: hit[2]
-      });
-    } else {
-      rows.push({
-        from: '',
-        to: leaf.path,
-        transform: guessTransform('', leaf.value),
-        defaultValue: leaf.value === null ? '' : String(leaf.value),
-        mandatory: false
-      });
-    }
-  }
-  return rows.filter((r) => r.from || r.defaultValue);
-}
-
-/**
- * A first mapping for a response body: every value at its path → a CBS field named after the vendor and the key
- * (`sms.messageId`). Ids / references are marked required.
- */
-export function guessResponseRows(bodyText: string, vendorCode: string): ApiMappingRow[] {
-  const parsed = tryJson(bodyText);
-  if (parsed === undefined || typeof parsed !== 'object' || parsed === null) return [];
-  const prefix = vendorCode.toLowerCase().split('_')[0] || 'vendor';
-  const rows: ApiMappingRow[] = [];
-  const used = new Set<string>();
-  for (const leaf of flatten(parsed)) {
-    const key = lastKey(leaf.path);
-    const n = norm(key);
-    let target: string;
-    if (/^(messageid|msgid|id|reference|requestid|referenceid|messageid)$/.test(n)) target = 'reference';
-    else if (/^(status|state|result|type)$/.test(n)) target = 'status';
-    else if (/^(error|errormessage|errormsg|reason|detail|description)$/.test(n)) target = 'error';
-    else target = key.replace(/[^A-Za-z0-9]+(.)?/g, (_m, c: string) => (c ? c.toUpperCase() : ''));
-    let to = `${prefix}.${target}`;
-    for (let i = 2; used.has(to); i++) to = `${prefix}.${target}${i}`;
-    used.add(to);
-    rows.push({
-      from: leaf.path,
-      to,
-      transform: target === 'status' ? 'UPPER' : guessTransform('', leaf.value),
-      defaultValue: '',
-      mandatory: target === 'reference'
-    });
-  }
-  return rows;
-}
-
-export function secretNote(rows: KeyValue[]): string | null {
-  const n = rows.filter((r) => r.secret).length;
-  return n ? `${n} credential value(s) were hidden.` : null;
-}
-
-export { kv };

src/app/api-management/api-key-value-editor/api-key-value-editor.component.html

@@ -1,61 +0,0 @@
-<!--
-  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/.
--->
-
-@if (!rows.length) {
-  <div class="muted" style="font-size: 12px; margin-bottom: 6px">{{ emptyText }}</div>
-} @else {
-  <div class="cic-table-wrap">
-    <table class="cic-table">
-      <thead>
-        <tr>
-          <th style="width: 34px">On</th>
-          <th>{{ keyLabel }}</th>
-          <th>{{ valueLabel }}</th>
-          <th>Note</th>
-          <th style="width: 60px">Secret</th>
-          @if (!fixedKeys) {
-            <th style="width: 40px"></th>
-          }
-        </tr>
-      </thead>
-      <tbody>
-        @for (r of rows; track $index; let i = $index) {
-          <tr>
-            <td style="text-align: center">
-              <input type="checkbox" [(ngModel)]="r.enabled" style="width: auto" />
-            </td>
-            <td>
-              <input class="cic-mono" [(ngModel)]="r.key" [placeholder]="keyPlaceholder" [readonly]="fixedKeys" />
-            </td>
-            <td>
-              <input
-                class="cic-mono"
-                [type]="r.secret ? 'password' : 'text'"
-                [(ngModel)]="r.value"
-                [placeholder]="valuePlaceholder"
-                autocomplete="off"
-              />
-            </td>
-            <td><input [(ngModel)]="r.description" /></td>
-            <td style="text-align: center">
-              <input type="checkbox" [(ngModel)]="r.secret" style="width: auto" title="Show the value masked" />
-            </td>
-            @if (!fixedKeys) {
-              <td>
-                <button class="cic-btn sm danger" (click)="remove(i)">✕</button>
-              </td>
-            }
-          </tr>
-        }
-      </tbody>
-    </table>
-  </div>
-}
-@if (!fixedKeys) {
-  <button class="cic-btn sm" style="margin-top: 8px" (click)="add()">{{ addLabel }}</button>
-}

src/app/api-management/api-key-value-editor/api-key-value-editor.component.ts

@@ -1,44 +0,0 @@
-/**
- * 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 { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-
-import { KeyValue } from '../api-management.service';
-
-/** An editable table of name / value pairs: headers, query parameters, path parameters. Edits the array in place. */
-@Component({
-  selector: 'mifosx-api-key-value-editor',
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule
-  ],
-  templateUrl: './api-key-value-editor.component.html',
-  styleUrls: ['../../credit-bureau/cic-shared.scss']
-})
-export class ApiKeyValueEditorComponent {
-  @Input() rows: KeyValue[] = [];
-  @Input() keyLabel = 'Name';
-  @Input() valueLabel = 'Value';
-  @Input() keyPlaceholder = '';
-  @Input() valuePlaceholder = '';
-  @Input() addLabel = '+ Add';
-  /** Path parameters come from the path itself; the names cannot be edited or removed. */
-  @Input() fixedKeys = false;
-  @Input() emptyText = 'None.';
-
-  add(): void {
-    this.rows.push({ key: '', value: '', description: '', enabled: true, secret: false });
-  }
-
-  remove(i: number): void {
-    this.rows.splice(i, 1);
-  }
-}

src/app/api-management/api-log-detail/api-log-detail.component.html

@@ -1,55 +0,0 @@
-<!--
-  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/.
--->
-
-@if (log) {
-  <div class="cic-modal-backdrop" (click)="closed.emit()">
-    <div class="cic-modal" style="width: min(1100px, 100%)" (click)="$event.stopPropagation()">
-      <h3>
-        {{ log.vendorName }} · {{ log.apiName }}
-        <span class="cic-badge" [class.brand]="log.direction === 'IN'" [class.ok]="log.direction === 'OUT'">{{
-          log.direction
-        }}</span>
-        <span class="cic-badge" [class.good]="log.result === 'SUCCESS'" [class.bad]="log.result === 'FAILED'">{{
-          log.result
-        }}</span>
-      </h3>
-      <dl class="cic-kv" style="grid-template-columns: 120px minmax(0, 1fr); margin-bottom: 12px">
-        <dt>Reference</dt>
-        <dd class="cic-mono">{{ log.reference }}</dd>
-        <dt>Call</dt>
-        <dd class="cic-mono">{{ log.method }} {{ log.url }}</dd>
-        <dt>Result</dt>
-        <dd>HTTP {{ log.httpStatus }} in {{ log.durationMs }} ms · {{ log.time | slice: 0 : 16 }}</dd>
-        @if (log.error) {
-          <dt>Error</dt>
-          <dd class="tone-bad">{{ log.error }}</dd>
-        }
-      </dl>
-      <div class="cic-split">
-        <div>
-          <h4 style="margin: 0 0 6px; font-size: 13px">
-            {{ log.direction === 'OUT' ? 'Request headers' : 'Headers received / sent' }}
-            <span class="muted" style="font-weight: 400">(credentials masked)</span>
-          </h4>
-          <pre class="cic-code" style="max-height: 160px">{{ log.requestHeaders }}</pre>
-          <h4 style="margin: 12px 0 6px; font-size: 13px">Request payload</h4>
-          <pre class="cic-code">{{ log.request || '(empty)' }}</pre>
-        </div>
-        <div>
-          <h4 style="margin: 0 0 6px; font-size: 13px">Response headers</h4>
-          <pre class="cic-code" style="max-height: 160px">{{ log.responseHeaders }}</pre>
-          <h4 style="margin: 12px 0 6px; font-size: 13px">Response body</h4>
-          <pre class="cic-code">{{ log.response || '(empty)' }}</pre>
-        </div>
-      </div>
-      <div class="foot">
-        <button class="cic-btn" (click)="closed.emit()">Close</button>
-      </div>
-    </div>
-  </div>
-}

src/app/api-management/api-log-detail/api-log-detail.component.ts

@@ -1,25 +0,0 @@
-/**
- * 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 { CommonModule } from '@angular/common';
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-
-import { ApiLog } from '../api-management.service';
-
-/** One API call: what was sent and what came back. */
-@Component({
-  selector: 'mifosx-api-log-detail',
-  standalone: true,
-  imports: [CommonModule],
-  templateUrl: './api-log-detail.component.html',
-  styleUrls: ['../../credit-bureau/cic-shared.scss']
-})
-export class ApiLogDetailComponent {
-  @Input() log: ApiLog | null = null;
-  @Output() closed = new EventEmitter<void>();
-}

src/app/api-management/api-logs/api-logs.component.html

@@ -1,122 +0,0 @@
-<!--
-  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="cic-page">
-  <div class="cic-head">
-    <div>
-      <h1>API Call Logs</h1>
-      <p>Every API call the CBS made (OUT) or received (IN), across all vendors, with its request and response.</p>
-    </div>
-    <div class="cic-actions">
-      <a class="cic-btn" routerLink="/api-management/vendors">← All vendors</a>
-    </div>
-  </div>
-
-  <div class="cic-card">
-    <div class="cic-grid cols-4" style="align-items: end">
-      <div class="cic-field">
-        <label>Vendor</label>
-        <select [(ngModel)]="filter.vendorId">
-          <option value="">All vendors</option>
-          @for (v of vendors; track v.id) {
-            <option [value]="v.id">{{ v.name }}</option>
-          }
-        </select>
-      </div>
-      <div class="cic-field">
-        <label>Direction</label>
-        <select [(ngModel)]="filter.direction">
-          <option value="">IN and OUT</option>
-          <option value="IN">IN — received</option>
-          <option value="OUT">OUT — sent</option>
-        </select>
-      </div>
-      <div class="cic-field">
-        <label>Result</label>
-        <select [(ngModel)]="filter.result">
-          <option value="">All</option>
-          <option value="SUCCESS">Success</option>
-          <option value="FAILED">Failed</option>
-        </select>
-      </div>
-      <div class="cic-field">
-        <label>Search</label>
-        <input [(ngModel)]="filter.search" (keyup.enter)="apply()" placeholder="Reference, API, path" />
-      </div>
-    </div>
-    <div class="cic-actions" style="margin-top: 12px; justify-content: flex-end">
-      <button class="cic-btn" (click)="reset()">Reset</button>
-      <button class="cic-btn primary" (click)="apply()">Apply</button>
-    </div>
-  </div>
-
-  <div class="cic-card">
-    <h2>
-      {{ total }} call(s)
-      <span class="cic-card-sub">
-        <span class="tone-good">{{ success }} success</span> ·
-        <span [class.tone-bad]="failed > 0">{{ failed }} failed</span>
-      </span>
-    </h2>
-    @if (loading && !items.length) {
-      <div class="cic-empty">Loading…</div>
-    } @else if (!items.length) {
-      <div class="cic-empty">No call matches the filter.</div>
-    } @else {
-      <div class="cic-table-wrap">
-        <table class="cic-table">
-          <thead>
-            <tr>
-              <th>Time</th>
-              <th>Vendor</th>
-              <th>API</th>
-              <th>Direction</th>
-              <th>Call</th>
-              <th>HTTP</th>
-              <th class="num">ms</th>
-              <th>Result</th>
-              <th>Reference</th>
-            </tr>
-          </thead>
-          <tbody>
-            @for (l of items; track l.id) {
-              <tr class="clickable" (click)="openLog = l">
-                <td>{{ l.time | slice: 0 : 16 }}</td>
-                <td>{{ l.vendorName }}</td>
-                <td>{{ l.apiName }}</td>
-                <td>
-                  <span class="cic-badge" [class.brand]="l.direction === 'IN'" [class.ok]="l.direction === 'OUT'">{{
-                    l.direction
-                  }}</span>
-                </td>
-                <td class="cic-mono" style="font-size: 12px">{{ l.method }} {{ l.path }}</td>
-                <td>{{ l.httpStatus }}</td>
-                <td class="num">{{ l.durationMs }}</td>
-                <td>
-                  <span class="cic-badge" [class.good]="l.result === 'SUCCESS'" [class.bad]="l.result === 'FAILED'">{{
-                    l.result
-                  }}</span>
-                </td>
-                <td class="cic-mono" style="font-size: 12px">{{ l.reference }}</td>
-              </tr>
-            }
-          </tbody>
-        </table>
-      </div>
-      <div class="cic-pager">
-        <span>{{ offset + 1 }}–{{ offset + items.length }} of {{ total }}</span>
-        <span class="cic-actions">
-          <button class="cic-btn sm" (click)="page(-1)" [disabled]="offset === 0">Previous</button>
-          <button class="cic-btn sm" (click)="page(1)" [disabled]="offset + limit >= total">Next</button>
-        </span>
-      </div>
-    }
-  </div>
-</div>
-
-<mifosx-api-log-detail [log]="openLog" (closed)="openLog = null"></mifosx-api-log-detail>

src/app/api-management/api-logs/api-logs.component.ts

@@ -1,77 +0,0 @@
-/**
- * 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 { CommonModule } from '@angular/common';
-import { Component, OnInit, inject } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { ActivatedRoute, RouterModule } from '@angular/router';
-
-import { ApiLogDetailComponent } from '../api-log-detail/api-log-detail.component';
-import { ApiLog, ApiManagementService, ApiVendor } from '../api-management.service';
-
-/** Every API call, IN and OUT, across all vendors, with its request and response. */
-@Component({
-  selector: 'mifosx-api-logs',
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    RouterModule,
-    ApiLogDetailComponent
-  ],
-  templateUrl: './api-logs.component.html',
-  styleUrls: ['../../credit-bureau/cic-shared.scss']
-})
-export class ApiLogsComponent implements OnInit {
-  private service = inject(ApiManagementService);
-  private route = inject(ActivatedRoute);
-
-  vendors: ApiVendor[] = [];
-  filter = { vendorId: '', direction: '', result: '', search: '' };
-  items: ApiLog[] = [];
-  total = 0;
-  success = 0;
-  failed = 0;
-  offset = 0;
-  readonly limit = 15;
-  loading = false;
-  openLog: ApiLog | null = null;
-
-  ngOnInit(): void {
-    const vendorId = this.route.snapshot.queryParamMap.get('vendorId');
-    if (vendorId) this.filter.vendorId = vendorId;
-    this.service.vendors().subscribe((v) => (this.vendors = v));
-    this.load();
-  }
-
-  load(): void {
-    this.loading = true;
-    this.service.logs({ ...this.filter, offset: this.offset, limit: this.limit }).subscribe((r) => {
-      this.items = r.items;
-      this.total = r.total;
-      this.success = r.success;
-      this.failed = r.failed;
-      this.loading = false;
-    });
-  }
-
-  apply(): void {
-    this.offset = 0;
-    this.load();
-  }
-
-  reset(): void {
-    this.filter = { vendorId: '', direction: '', result: '', search: '' };
-    this.apply();
-  }
-
-  page(delta: number): void {
-    this.offset = Math.max(0, this.offset + delta * this.limit);
-    this.load();
-  }
-}

src/app/api-management/api-management-routing.module.ts

@@ -1,58 +0,0 @@
-/**
- * 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 { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { Route } from '../core/route/route.service';
-import { ApiVendorsComponent } from './api-vendors/api-vendors.component';
-import { ApiVendorSetupComponent } from './api-vendor-setup/api-vendor-setup.component';
-import { ApiLogsComponent } from './api-logs/api-logs.component';
-
-const routes: Routes = [
-  Route.withShell([
-    {
-      path: 'api-management',
-      data: { title: 'API Management', breadcrumb: 'API Management' },
-      children: [
-        {
-          path: '',
-          redirectTo: 'vendors',
-          pathMatch: 'full'
-        },
-        {
-          path: 'vendors',
-          data: { breadcrumb: 'Vendors' },
-          children: [
-            {
-              path: '',
-              component: ApiVendorsComponent,
-              data: { title: 'API Vendors & Setup' }
-            },
-            {
-              path: ':id',
-              component: ApiVendorSetupComponent,
-              data: { title: 'Vendor Setup', breadcrumb: 'Setup' }
-            }
-          ]
-        },
-        {
-          path: 'logs',
-          component: ApiLogsComponent,
-          data: { title: 'API Call Logs', breadcrumb: 'Call Logs' }
-        }
-      ]
-    }
-  ])
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class ApiManagementRoutingModule {}

src/app/api-management/api-management.module.ts

@@ -1,29 +0,0 @@
-/**
- * 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 { NgModule } from '@angular/core';
-
-import { SharedModule } from '../shared/shared.module';
-import { ApiManagementRoutingModule } from './api-management-routing.module';
-import { ApiVendorsComponent } from './api-vendors/api-vendors.component';
-import { ApiVendorSetupComponent } from './api-vendor-setup/api-vendor-setup.component';
-import { ApiLogsComponent } from './api-logs/api-logs.component';
-import { ApiLogDetailComponent } from './api-log-detail/api-log-detail.component';
-
-/** API Management: connect any outside API service (CIC, SMS, WhatsApp ...) - vendor, work, API set, IN / OUT. */
-@NgModule({
-  imports: [
-    SharedModule,
-    ApiManagementRoutingModule,
-    ApiVendorsComponent,
-    ApiVendorSetupComponent,
-    ApiLogsComponent,
-    ApiLogDetailComponent
-  ]
-})
-export class ApiManagementModule {}

src/app/api-management/api-vendor-setup/api-vendor-setup.component.html

@@ -1,777 +0,0 @@
-<!--
-  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="cic-page">
-  <div class="cic-head">
-    <div>
-      <h1>{{ vendor?.name || 'Vendor setup' }}</h1>
-      <p>{{ vendor?.work }}</p>
-    </div>
-    <div class="cic-actions">
-      @if (vendor) {
-        <span class="cic-badge" [class.good]="vendor.active">{{ vendor.active ? 'Active' : 'Switched off' }}</span>
-        <span
-          class="cic-badge"
-          [class.warn]="vendor.environment === 'SIMULATOR'"
-          [class.good]="vendor.environment === 'PRODUCTION'"
-          >{{ vendor.environment }}</span
-        >
-      }
-      <a class="cic-btn" routerLink="/api-management/vendors">← All vendors</a>
-    </div>
-  </div>
-
-  @if (error && !editing && !importOpen) {
-    <div class="cic-alert error">{{ error }}</div>
-  }
-  @if (info && !editing) {
-    <div class="cic-alert success">{{ info }}</div>
-  }
-  @if (loading && !vendor) {
-    <div class="cic-card cic-empty">Loading…</div>
-  }
-
-  @if (vendor) {
-    @if (vendor.configNote) {
-      <div class="cic-alert info">{{ vendor.configNote }}</div>
-    }
-    @if (vendor.links.length) {
-      <div class="cic-alert info">
-        {{ vendor.code }} also has its own screens:
-        @for (l of vendor.links; track l.route) {
-          <a class="cic-btn sm" style="margin-left: 6px" [routerLink]="l.route">{{ l.label }}</a>
-        }
-      </div>
-    }
-
-    <div class="cic-tabs">
-      <button [class.active]="tab === 'connection'" (click)="tab = 'connection'">1 · Connection</button>
-      <button [class.active]="tab === 'apis'" (click)="tab = 'apis'">2 · API set ({{ vendor.apis.length }})</button>
-      <button [class.active]="tab === 'test'" (click)="tab = 'test'">3 · Test</button>
-      <button [class.active]="tab === 'calls'" (click)="tab = 'calls'; loadCalls()">Recent calls</button>
-    </div>
-
-    <!-- CONNECTION -->
-    @if (tab === 'connection') {
-      <div class="cic-card">
-        <h2>Vendor and connection</h2>
-        <div class="cic-grid cols-2">
-          <div class="cic-field">
-            <label>Vendor name</label>
-            <input [(ngModel)]="form.name" />
-          </div>
-          <div class="cic-field">
-            <label>Environment</label>
-            <select [(ngModel)]="form.environment">
-              <option value="SIMULATOR">SIMULATOR — no network call</option>
-              <option value="UAT">UAT — vendor's test environment</option>
-              <option value="PRODUCTION">PRODUCTION — live</option>
-            </select>
-          </div>
-          <div class="cic-field" style="grid-column: 1 / -1">
-            <label>Work — what this vendor is used for</label>
-            <input [(ngModel)]="form.work" />
-          </div>
-          <div class="cic-field" style="grid-column: 1 / -1">
-            <label>Base URL</label>
-            <input class="cic-mono" [(ngModel)]="form.baseUrl" placeholder="https://api.vendor.example/v1" />
-            <span class="hint">Every OUT / pull API path is added to this. PRODUCTION needs https://.</span>
-          </div>
-          <div class="cic-field">
-            <label>Authentication</label>
-            <select [(ngModel)]="form.authType">
-              @for (a of authTypes; track a.key) {
-                <option [value]="a.key">{{ a.label }}</option>
-              }
-            </select>
-          </div>
-          @if (form.authType === 'BASIC') {
-            <div class="cic-field">
-              <label>User id</label>
-              <input [(ngModel)]="form.username" autocomplete="off" />
-            </div>
-          }
-          @if (form.authType === 'API_KEY') {
-            <div class="cic-field">
-              <label>API key header name</label>
-              <input class="cic-mono" [(ngModel)]="form.apiKeyHeader" />
-            </div>
-          }
-          @if (needsSecret()) {
-            <div class="cic-field">
-              <label>{{ secretLabel() }}</label>
-              <input
-                type="password"
-                [(ngModel)]="form.secret"
-                autocomplete="new-password"
-                [placeholder]="vendor.hasSecret ? '•••••• stored — leave blank to keep' : 'Enter to store (encrypted)'"
-              />
-              @if (vendor.hasSecret) {
-                <label style="display: flex; gap: 6px; align-items: center; font-weight: 500; font-size: 12px">
-                  <input type="checkbox" [(ngModel)]="form.clearSecret" style="width: auto" /> Remove the stored
-                  credential
-                </label>
-              }
-            </div>
-          }
-          <div class="cic-field">
-            <label>Sender / member id</label>
-            <input [(ngModel)]="form.senderId" />
-            <span class="hint"
-              >The bank's id at this vendor (SMS sender id, WhatsApp number id, CIC member code …).</span
-            >
-          </div>
-          <div class="cic-field">
-            <label>Timeout (ms)</label>
-            <input type="number" min="1000" max="300000" [(ngModel)]="form.timeoutMs" />
-          </div>
-          <div class="cic-field">
-            <label>Retries on failure</label>
-            <input type="number" min="0" max="5" [(ngModel)]="form.retries" />
-          </div>
-          <label style="display: flex; gap: 8px; align-items: center; font-size: 13px">
-            <input type="checkbox" [(ngModel)]="form.active" /> Vendor active
-          </label>
-        </div>
-
-        <h4 style="margin: 18px 0 6px; font-size: 13px">
-          Default headers
-          <span class="muted" style="font-weight: 400"
-            >— sent on every API of this vendor (an API can override one)</span
-          >
-        </h4>
-        <mifosx-api-key-value-editor
-          [rows]="form.defaultHeaders"
-          keyLabel="Header"
-          keyPlaceholder="Accept"
-          addLabel="+ Add header"
-          emptyText="No default header."
-        ></mifosx-api-key-value-editor>
-
-        <div class="cic-actions" style="margin-top: 16px">
-          <button class="cic-btn primary" (click)="saveConnection()" [disabled]="saving">
-            {{ saving ? 'Saving…' : 'Save connection' }}
-          </button>
-          <button class="cic-btn" (click)="tab = 'apis'">Next: API set →</button>
-        </div>
-      </div>
-    }
-
-    <!-- API SET -->
-    @if (tab === 'apis') {
-      <div class="cic-card">
-        <h2>
-          API set
-          <span class="cic-actions">
-            <button class="cic-btn sm" (click)="newApi('OUT')">+ OUT API (CBS calls vendor)</button>
-            <button class="cic-btn sm" (click)="newApi('IN')">+ IN API (data comes into CBS)</button>
-          </span>
-        </h2>
-        @if (!vendor.apis.length) {
-          <div class="cic-empty">
-            No API yet. Add one, then fill it in by hand or read it from a JSON / cURL / Postman file.
-          </div>
-        } @else {
-          <div class="cic-table-wrap">
-            <table class="cic-table">
-              <thead>
-                <tr>
-                  <th>API</th>
-                  <th>Direction</th>
-                  <th>Call</th>
-                  <th>Used for</th>
-                  <th>Headers / query</th>
-                  <th>Mapping</th>
-                  <th>Active</th>
-                  <th></th>
-                </tr>
-              </thead>
-              <tbody>
-                @for (a of vendor.apis; track a.id) {
-                  <tr>
-                    <td>
-                      <b>{{ a.name }}</b>
-                    </td>
-                    <td>
-                      <span class="cic-badge" [class.brand]="a.direction === 'IN'" [class.ok]="a.direction === 'OUT'">{{
-                        a.direction
-                      }}</span>
-                      @if (a.mode) {
-                        <span class="muted" style="font-size: 11px"> {{ a.mode === 'PULL' ? 'pull' : 'push' }}</span>
-                      }
-                    </td>
-                    <td class="cic-mono" style="font-size: 12px">{{ a.method }} {{ a.path }}</td>
-                    <td style="max-width: 260px; white-space: normal">{{ a.usedFor }}</td>
-                    <td>{{ a.headers.length }} / {{ a.queryParams.length }}</td>
-                    <td>{{ a.requestRows.length }} / {{ a.responseRows.length }}</td>
-                    <td>
-                      <span class="cic-badge" [class.good]="a.active">{{ a.active ? 'Yes' : 'Off' }}</span>
-                    </td>
-                    <td style="white-space: nowrap">
-                      <button class="cic-btn sm" (click)="editApi(a)">Edit</button>
-                      <button class="cic-btn sm danger" (click)="deleteApi(a)">✕</button>
-                    </td>
-                  </tr>
-                }
-              </tbody>
-            </table>
-          </div>
-        }
-      </div>
-    }
-
-    <!-- TEST -->
-    @if (tab === 'test') {
-      <div class="cic-card">
-        <h2>
-          Test an API
-          <span class="cic-card-sub">simulated — nothing is sent to the vendor; the result is added to the logs</span>
-        </h2>
-        @if (!vendor.apis.length) {
-          <div class="cic-empty">Add an API first.</div>
-        } @else {
-          <div class="cic-field" style="max-width: 420px">
-            <label>API</label>
-            <select [(ngModel)]="testApiId" (ngModelChange)="fillTestBody()">
-              @for (a of vendor.apis; track a.id) {
-                <option [ngValue]="a.id">{{ a.direction }} · {{ a.name }}</option>
-              }
-            </select>
-          </div>
-          @if (testPreview; as p) {
-            <h4 style="margin: 14px 0 6px; font-size: 13px">The request</h4>
-            <pre class="cic-code" style="max-height: 200px">{{ p.method }} {{ p.url }}
-@for (h of p.headers; track h.key) {
-{{ h.key }}: {{ h.value }}
-}</pre>
-          }
-          <div class="cic-field" style="margin-top: 12px">
-            <label>Request body</label>
-            <textarea class="cic-mono" rows="9" [(ngModel)]="testBody"></textarea>
-          </div>
-          <button class="cic-btn primary" style="margin-top: 12px" (click)="runTest()" [disabled]="testing">
-            {{ testing ? 'Sending…' : 'Send test' }}
-          </button>
-        }
-      </div>
-      @if (testResult) {
-        <div class="cic-alert success">
-          {{ testResult.reference }} — HTTP {{ testResult.httpStatus }} in {{ testResult.durationMs }} ms
-        </div>
-        <div class="cic-split">
-          <div class="cic-card">
-            <h2>Response headers</h2>
-            <pre class="cic-code">{{ testResult.responseHeaders }}</pre>
-          </div>
-          <div class="cic-card">
-            <h2>Response body</h2>
-            <pre class="cic-code">{{ testResult.response || '(empty)' }}</pre>
-          </div>
-        </div>
-      }
-    }
-
-    <!-- RECENT CALLS -->
-    @if (tab === 'calls') {
-      <div class="cic-card">
-        <h2>
-          Recent calls
-          <a class="cic-btn sm" routerLink="/api-management/logs" [queryParams]="{ vendorId: vendor.id }">All logs</a>
-        </h2>
-        @if (!calls.length) {
-          <div class="cic-empty">No call yet.</div>
-        } @else {
-          <div class="cic-table-wrap">
-            <table class="cic-table">
-              <thead>
-                <tr>
-                  <th>Time</th>
-                  <th>API</th>
-                  <th>Direction</th>
-                  <th>HTTP</th>
-                  <th class="num">ms</th>
-                  <th>Result</th>
-                  <th>Reference</th>
-                </tr>
-              </thead>
-              <tbody>
-                @for (l of calls; track l.id) {
-                  <tr class="clickable" (click)="openLog = l">
-                    <td>{{ l.time | slice: 0 : 16 }}</td>
-                    <td>{{ l.apiName }}</td>
-                    <td>
-                      <span class="cic-badge" [class.brand]="l.direction === 'IN'" [class.ok]="l.direction === 'OUT'">{{
-                        l.direction
-                      }}</span>
-                    </td>
-                    <td>{{ l.httpStatus }}</td>
-                    <td class="num">{{ l.durationMs }}</td>
-                    <td>
-                      <span
-                        class="cic-badge"
-                        [class.good]="l.result === 'SUCCESS'"
-                        [class.bad]="l.result === 'FAILED'"
-                        >{{ l.result }}</span
-                      >
-                    </td>
-                    <td class="cic-mono" style="font-size: 12px">{{ l.reference }}</td>
-                  </tr>
-                }
-              </tbody>
-            </table>
-          </div>
-        }
-      </div>
-    }
-  }
-</div>
-
-<!-- API editor -->
-@if (editing) {
-  <div class="cic-modal-backdrop" (click)="editing = null">
-    <div class="cic-modal" style="width: min(1100px, 100%)" (click)="$event.stopPropagation()">
-      <div style="display: flex; justify-content: space-between; gap: 12px; align-items: flex-start">
-        <h3 style="margin: 0">
-          {{ isNewApi ? 'New' : 'Edit' }} API
-          <span class="cic-badge" [class.brand]="editing.direction === 'IN'" [class.ok]="editing.direction === 'OUT'">{{
-            editing.direction
-          }}</span>
-          @if (editing.mode) {
-            <span class="muted" style="font-size: 12px; font-weight: 500">
-              {{ editing.mode === 'PULL' ? 'pull' : 'push' }}</span
-            >
-          }
-        </h3>
-        <button class="cic-btn sm primary" (click)="openImport()">⬆ Import from JSON / cURL / Postman</button>
-      </div>
-      <p class="muted" style="font-size: 12px; margin: 6px 0 10px">
-        @if (editing.direction === 'OUT') {
-          OUT — the CBS calls the vendor: fill the request it sends and the response it expects.
-        } @else if (editing.mode === 'PULL') {
-          IN (pull) — the CBS asks the vendor for data on a schedule: fill the request it sends and the response it
-          reads.
-        } @else {
-          IN (push) — the vendor calls a CBS path: fill what the vendor sends us and what we answer.
-        }
-        Type everything in, or read it from a file with the import button — then check each tab.
-      </p>
-
-      @if (info) {
-        <div class="cic-alert success">{{ info }}</div>
-      }
-      @if (error) {
-        <div class="cic-alert error">{{ error }}</div>
-      }
-
-      <div class="cic-tabs">
-        <button [class.active]="editorTab === 'basics'" (click)="editorTab = 'basics'">1 · Basics</button>
-        <button [class.active]="editorTab === 'request'" (click)="editorTab = 'request'">
-          2 · {{ outbound ? 'Request' : 'What the vendor sends' }}
-        </button>
-        <button [class.active]="editorTab === 'response'" (click)="editorTab = 'response'">
-          3 · {{ outbound ? 'Response' : 'Our answer' }}
-        </button>
-      </div>
-
-      <!-- BASICS -->
-      @if (editorTab === 'basics') {
-        <div class="cic-grid cols-4">
-          <div class="cic-field" style="grid-column: span 2">
-            <label>API name</label>
-            <input [(ngModel)]="editing.name" placeholder="e.g. Send SMS" />
-          </div>
-          <div class="cic-field">
-            <label>Direction</label>
-            <select [(ngModel)]="editing.direction" (ngModelChange)="directionChanged()">
-              <option value="OUT">OUT — CBS calls vendor</option>
-              <option value="IN">IN — data comes into CBS</option>
-            </select>
-          </div>
-          @if (editing.direction === 'IN') {
-            <div class="cic-field">
-              <label>How data arrives</label>
-              <select [(ngModel)]="editing.mode">
-                <option value="PULL">PULL — CBS asks on a schedule</option>
-                <option value="PUSH">PUSH — vendor calls a CBS path</option>
-              </select>
-            </div>
-          } @else {
-            <div></div>
-          }
-          <div class="cic-field">
-            <label>HTTP method</label>
-            <select [(ngModel)]="editing.method">
-              @for (m of methods; track m) {
-                <option [value]="m">{{ m }}</option>
-              }
-            </select>
-          </div>
-          <div class="cic-field" style="grid-column: span 3">
-            <label>{{ outbound ? "Vendor's API path (after the base URL)" : 'CBS path the vendor calls' }}</label>
-            <input
-              class="cic-mono"
-              [(ngModel)]="editing.path"
-              (ngModelChange)="pathChanged()"
-              placeholder="/messages/send"
-            />
-            <span class="hint"
-              >Use {{ '{' }}name{{ '}' }} for a value that changes, e.g. /v21.0/{{ '{' }}senderId{{
-                '}'
-              }}/messages.</span
-            >
-          </div>
-          <div class="cic-field" style="grid-column: span 3">
-            <label>When is it used</label>
-            <input [(ngModel)]="editing.usedFor" placeholder="e.g. OTP and transaction alerts" />
-          </div>
-          <div class="cic-field">
-            <label>Timeout for this API (ms)</label>
-            <input type="number" min="1000" max="300000" [(ngModel)]="editing.timeoutMs" placeholder="vendor's" />
-          </div>
-          <div class="cic-field">
-            <label>Retries for this API</label>
-            <input type="number" min="0" max="5" [(ngModel)]="editing.retries" placeholder="vendor's" />
-          </div>
-        </div>
-        <label style="display: flex; gap: 8px; align-items: center; font-size: 13px; margin: 12px 0">
-          <input type="checkbox" [(ngModel)]="editing.active" /> API active
-        </label>
-
-        @if (preview(editing); as p) {
-          <h4 style="margin: 14px 0 6px; font-size: 13px">
-            {{ outbound ? 'The call as it will go out' : 'The call the vendor will make to us' }}
-            <span class="muted" style="font-weight: 400"> (credentials masked)</span>
-          </h4>
-          <pre class="cic-code" style="max-height: 220px">{{ p.method }} {{ p.url }}
-@for (h of p.headers; track h.key) {
-{{ h.key }}: {{ h.value }}
-}
-{{ p.body }}</pre>
-        }
-      }
-
-      <!-- REQUEST -->
-      @if (editorTab === 'request') {
-        <h4 style="margin: 4px 0 6px; font-size: 13px">Path parameters</h4>
-        <mifosx-api-key-value-editor
-          [rows]="editing.pathParams"
-          keyLabel="Parameter"
-          valueLabel="Value (a CBS placeholder or fixed value)"
-          [fixedKeys]="true"
-          emptyText="The path has no {name} placeholder."
-        ></mifosx-api-key-value-editor>
-
-        <h4 style="margin: 16px 0 6px; font-size: 13px">Query parameters</h4>
-        <mifosx-api-key-value-editor
-          [rows]="editing.queryParams"
-          keyLabel="Parameter"
-          keyPlaceholder="version"
-          addLabel="+ Add query parameter"
-          emptyText="No query parameter."
-        ></mifosx-api-key-value-editor>
-
-        <h4 style="margin: 16px 0 6px; font-size: 13px">
-          Headers
-          <span class="muted" style="font-weight: 400"
-            >— this API's own; the vendor's default headers and its authentication are added automatically</span
-          >
-        </h4>
-        <mifosx-api-key-value-editor
-          [rows]="editing.headers"
-          keyLabel="Header"
-          keyPlaceholder="X-Request-Id"
-          valuePlaceholder="{{ '{{' }}request.reference{{ '}}' }}"
-          addLabel="+ Add header"
-          emptyText="No header of its own."
-        ></mifosx-api-key-value-editor>
-
-        <div class="cic-grid cols-4" style="margin-top: 16px">
-          <div class="cic-field" style="grid-column: span 2">
-            <label>Content type</label>
-            <select [(ngModel)]="editing.contentType">
-              @for (c of contentTypes; track c.key) {
-                <option [value]="c.key">{{ c.label }}</option>
-              }
-            </select>
-          </div>
-        </div>
-
-        <div class="cic-field" style="margin-top: 12px">
-          <label>{{ outbound ? 'Request payload' : 'Payload the vendor sends us' }}</label>
-          <textarea class="cic-mono" rows="10" [(ngModel)]="editing.requestBody"></textarea>
-          <span class="hint">
-            {{
-              outbound
-                ? 'The constant parts of the payload; the mapping below puts CBS values into it.'
-                : 'A sample of what arrives; the mapping reads values out of it.'
-            }}
-          </span>
-        </div>
-
-        <h4 style="margin: 16px 0 6px; font-size: 13px">
-          {{ mappingTitle('request') }}
-          <span class="muted" style="font-weight: 400; font-size: 12px">
-            · {{ matchedCount('request') }} of {{ editing.requestRows.length }} rows found in the sample
-            {{ 'request' === 'request' ? 'payload' : 'body' }}
-          </span>
-          <button class="cic-btn sm" style="margin-left: 8px" (click)="generateRows('request')">
-            Build rows from the payload
-          </button>
-        </h4>
-        <div class="cic-table-wrap">
-          <table class="cic-table">
-            <thead>
-              <tr>
-                <th>{{ fromLabel('request') }}</th>
-                <th>{{ toLabel('request') }}</th>
-                <th>Transform</th>
-                <th>Fixed / default value</th>
-                <th>In the sample payload</th>
-                <th>Required</th>
-                <th style="width: 40px"></th>
-              </tr>
-            </thead>
-            <tbody>
-              @let requestMatch = sampleMatches('request');
-              @for (r of editing.requestRows; track $index; let i = $index) {
-                <tr>
-                  <td>
-                    @if (fromIsCbs('request')) {
-                      <select [(ngModel)]="r.from">
-                        <option value="">— fixed value (set it on the right) —</option>
-                        @for (f of cbsFields; track f.key) {
-                          <option [value]="f.key">{{ f.label }}</option>
-                        }
-                      </select>
-                    } @else {
-                      <input class="cic-mono" [(ngModel)]="r.from" />
-                    }
-                  </td>
-                  <td><input class="cic-mono" [(ngModel)]="r.to" /></td>
-                  <td>
-                    <select [(ngModel)]="r.transform">
-                      @for (t of transforms; track t.key) {
-                        <option [value]="t.key">{{ t.label }}</option>
-                      }
-                    </select>
-                  </td>
-                  <td><input [(ngModel)]="r.defaultValue" /></td>
-                  <td class="cic-mono" style="font-size: 12px; white-space: nowrap">
-                    @if (requestMatch[i].found) {
-                      <span class="tone-good">✓ {{ requestMatch[i].value }}</span>
-                    } @else if (r.defaultValue) {
-                      <span class="muted">fixed: {{ r.defaultValue }}</span>
-                    } @else {
-                      <span class="tone-bad">✗ {{ requestMatch[i].value || 'no path' }}</span>
-                    }
-                  </td>
-                  <td style="text-align: center">
-                    <input type="checkbox" [(ngModel)]="r.mandatory" style="width: auto" />
-                  </td>
-                  <td><button class="cic-btn sm danger" (click)="removeRow('request', i)">✕</button></td>
-                </tr>
-              }
-            </tbody>
-          </table>
-        </div>
-        <button class="cic-btn sm" style="margin-top: 8px" (click)="addRow('request')">+ Add field</button>
-      }
-
-      <!-- RESPONSE -->
-      @if (editorTab === 'response') {
-        <div class="cic-grid cols-4">
-          <div class="cic-field">
-            <label>Success status code(s)</label>
-            <input class="cic-mono" [(ngModel)]="editing.successCodes" placeholder="200, 202" />
-            <span class="hint">{{
-              outbound ? 'Codes the vendor answers with when it worked.' : 'Codes the CBS answers with.'
-            }}</span>
-          </div>
-        </div>
-
-        <h4 style="margin: 16px 0 6px; font-size: 13px">
-          {{ outbound ? 'Response headers' : 'Headers of our answer' }}
-        </h4>
-        <mifosx-api-key-value-editor
-          [rows]="editing.responseHeaders"
-          keyLabel="Header"
-          keyPlaceholder="Content-Type"
-          addLabel="+ Add header"
-          emptyText="No response header noted."
-        ></mifosx-api-key-value-editor>
-
-        <div class="cic-grid cols-2" style="margin-top: 16px">
-          <div class="cic-field">
-            <label>{{ outbound ? 'Success response body' : 'Our answer body' }}</label>
-            <textarea class="cic-mono" rows="10" [(ngModel)]="editing.responseBody"></textarea>
-          </div>
-          <div class="cic-field">
-            <label>Error response body</label>
-            <textarea class="cic-mono" rows="10" [(ngModel)]="editing.errorBody"></textarea>
-            <span class="hint"
-              >What comes back when it fails (wrong key, rate limit …) — shown in the logs for a failed call.</span
-            >
-          </div>
-        </div>
-
-        <h4 style="margin: 16px 0 6px; font-size: 13px">
-          {{ mappingTitle('response') }}
-          <span class="muted" style="font-weight: 400; font-size: 12px">
-            · {{ matchedCount('response') }} of {{ editing.responseRows.length }} rows found in the sample
-            {{ 'response' === 'request' ? 'payload' : 'body' }}
-          </span>
-          <button class="cic-btn sm" style="margin-left: 8px" (click)="generateRows('response')">
-            Build rows from the body
-          </button>
-        </h4>
-        <div class="cic-table-wrap">
-          <table class="cic-table">
-            <thead>
-              <tr>
-                <th>{{ fromLabel('response') }}</th>
-                <th>{{ toLabel('response') }}</th>
-                <th>Transform</th>
-                <th>Fixed / default value</th>
-                <th>In the sample payload</th>
-                <th>Required</th>
-                <th style="width: 40px"></th>
-              </tr>
-            </thead>
-            <tbody>
-              @let responseMatch = sampleMatches('response');
-              @for (r of editing.responseRows; track $index; let i = $index) {
-                <tr>
-                  <td>
-                    @if (fromIsCbs('response')) {
-                      <select [(ngModel)]="r.from">
-                        <option value="">— fixed value (set it on the right) —</option>
-                        @for (f of cbsFields; track f.key) {
-                          <option [value]="f.key">{{ f.label }}</option>
-                        }
-                      </select>
-                    } @else {
-                      <input class="cic-mono" [(ngModel)]="r.from" />
-                    }
-                  </td>
-                  <td><input class="cic-mono" [(ngModel)]="r.to" /></td>
-                  <td>
-                    <select [(ngModel)]="r.transform">
-                      @for (t of transforms; track t.key) {
-                        <option [value]="t.key">{{ t.label }}</option>
-                      }
-                    </select>
-                  </td>
-                  <td><input [(ngModel)]="r.defaultValue" /></td>
-                  <td class="cic-mono" style="font-size: 12px; white-space: nowrap">
-                    @if (responseMatch[i].found) {
-                      <span class="tone-good">✓ {{ responseMatch[i].value }}</span>
-                    } @else if (r.defaultValue) {
-                      <span class="muted">fixed: {{ r.defaultValue }}</span>
-                    } @else {
-                      <span class="tone-bad">✗ {{ responseMatch[i].value || 'no path' }}</span>
-                    }
-                  </td>
-                  <td style="text-align: center">
-                    <input type="checkbox" [(ngModel)]="r.mandatory" style="width: auto" />
-                  </td>
-                  <td><button class="cic-btn sm danger" (click)="removeRow('response', i)">✕</button></td>
-                </tr>
-              }
-            </tbody>
-          </table>
-        </div>
-        <button class="cic-btn sm" style="margin-top: 8px" (click)="addRow('response')">+ Add field</button>
-      }
-
-      <div class="foot">
-        <button class="cic-btn" (click)="editing = null">Cancel</button>
-        <button class="cic-btn primary" (click)="saveApi()" [disabled]="savingApi">
-          {{ savingApi ? 'Saving…' : 'Save API' }}
-        </button>
-      </div>
-    </div>
-  </div>
-}
-
-<!-- Import from JSON / cURL / Postman / HAR -->
-@if (importOpen && editing) {
-  <div class="cic-modal-backdrop" style="z-index: 1100" (click)="importOpen = false">
-    <div class="cic-modal" style="width: min(1000px, 100%)" (click)="$event.stopPropagation()">
-      <h3>Import from JSON / cURL / Postman</h3>
-      <p class="muted" style="font-size: 12px; margin: 0 0 10px">
-        Paste it or choose a file —
-        {{ outbound ? 'the request and the response' : 'what the vendor sends us and what we answer' }}. Any of these
-        works: a <b>cURL</b> command, a <b>Postman</b> collection or request, a <b>HAR</b> capture, an API definition
-        (<code>{{ '{' }} method, url, headers, query, body, status … {{ '}' }}</code
-        >), or just the <b>JSON payload</b>. The method, URL / path, query parameters, headers, content type, payload,
-        status code, response headers, bodies and a first CBS mapping are filled in for you. Passwords, keys and tokens
-        are never kept.
-      </p>
-      @if (importError) {
-        <div class="cic-alert error">{{ importError }}</div>
-      }
-      <div class="cic-grid cols-2">
-        <div class="cic-field">
-          <label
-            >{{ outbound ? 'Request' : 'What the vendor sends us' }} — cURL, Postman, HAR, definition or payload</label
-          >
-          <textarea
-            class="cic-mono"
-            rows="12"
-            [(ngModel)]="importRequestText"
-            placeholder="curl -X POST 'https://api.vendor.in/v1/send' -H 'Content-Type: application/json' -d '{ ... }'"
-          ></textarea>
-          <div style="display: flex; gap: 8px; align-items: center">
-            <input
-              type="file"
-              accept=".json,.txt,.curl,.har,.sh,application/json,text/plain"
-              (change)="onFile($event, 'request')"
-            />
-            @if (importRequestFile) {
-              <span class="muted" style="font-size: 12px">{{ importRequestFile }}</span>
-            }
-          </div>
-        </div>
-        <div class="cic-field">
-          <label>{{ outbound ? 'Response' : 'Our answer' }} — JSON body, or with status and headers (optional)</label>
-          <textarea
-            class="cic-mono"
-            rows="12"
-            [(ngModel)]="importResponseText"
-            placeholder='{ "status": 200, "headers": { "Content-Type": "application/json" }, "body": { ... } }'
-          ></textarea>
-          <div style="display: flex; gap: 8px; align-items: center">
-            <input
-              type="file"
-              accept=".json,.txt,.har,application/json,text/plain"
-              (change)="onFile($event, 'response')"
-            />
-            @if (importResponseFile) {
-              <span class="muted" style="font-size: 12px">{{ importResponseFile }}</span>
-            }
-          </div>
-        </div>
-      </div>
-      <div style="display: flex; gap: 20px; flex-wrap: wrap; margin-top: 12px; font-size: 13px">
-        <label style="display: flex; gap: 6px; align-items: center">
-          <input type="checkbox" [(ngModel)]="importReplace" /> Replace what is there now (headers, query, mapping rows)
-          — untick to add to it
-        </label>
-        <label style="display: flex; gap: 6px; align-items: center">
-          <input type="checkbox" [(ngModel)]="importGenerate" /> Build the CBS field mapping from the payloads
-        </label>
-      </div>
-      <div class="foot">
-        <button class="cic-btn" (click)="importOpen = false">Cancel</button>
-        <button class="cic-btn primary" (click)="applyImport()">Read and fill in</button>
-      </div>
-    </div>
-  </div>
-}
-
-<mifosx-api-log-detail [log]="openLog" (closed)="openLog = null"></mifosx-api-log-detail>

src/app/api-management/api-vendor-setup/api-vendor-setup.component.ts

@@ -1,600 +0,0 @@
-/**
- * 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 { CommonModule } from '@angular/common';
-import { Component, OnInit, inject } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { ActivatedRoute, RouterModule } from '@angular/router';
-
-import { ApiKeyValueEditorComponent } from '../api-key-value-editor/api-key-value-editor.component';
-import { ApiLogDetailComponent } from '../api-log-detail/api-log-detail.component';
-import {
-  guessRequestRows,
-  guessResponseRows,
-  ImportedRequest,
-  ImportedResponse,
-  parseRequestText,
-  parseResponseText
-} from '../api-import.util';
-import {
-  API_AUTH_TYPES,
-  API_CBS_FIELDS,
-  API_CONTENT_TYPES,
-  API_METHODS,
-  API_TRANSFORMS,
-  ApiLog,
-  ApiManagementService,
-  ApiMappingRow,
-  ApiVendor,
-  blankApi,
-  buildRequestPreview,
-  callsVendor,
-  KeyValue,
-  pathParamNames,
-  RequestPreview,
-  VendorApi
-} from '../api-management.service';
-
-/**
- * One vendor's setup: its connection (URL, authentication, default headers, credentials), its API set - each API IN or
- * OUT with the full HTTP detail and the field mapping, typed in or read from a JSON / cURL / Postman / HAR file - a
- * test call, and its recent calls.
- */
-@Component({
-  selector: 'mifosx-api-vendor-setup',
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    RouterModule,
-    ApiLogDetailComponent,
-    ApiKeyValueEditorComponent
-  ],
-  templateUrl: './api-vendor-setup.component.html',
-  styleUrls: ['../../credit-bureau/cic-shared.scss']
-})
-export class ApiVendorSetupComponent implements OnInit {
-  private service = inject(ApiManagementService);
-  private route = inject(ActivatedRoute);
-
-  vendor: ApiVendor | null = null;
-  tab: 'connection' | 'apis' | 'test' | 'calls' = 'connection';
-  loading = false;
-  error: string | null = null;
-  info: string | null = null;
-
-  // connection
-  form: any = {};
-  saving = false;
-
-  // API set
-  editing: VendorApi | null = null;
-  isNewApi = false;
-  savingApi = false;
-  editorTab: 'basics' | 'request' | 'response' = 'basics';
-
-  // import from JSON / cURL / Postman / HAR
-  importOpen = false;
-  importRequestText = '';
-  importResponseText = '';
-  importRequestFile = '';
-  importResponseFile = '';
-  importReplace = true;
-  importGenerate = true;
-  importError: string | null = null;
-
-  // test
-  testApiId: number | null = null;
-  testBody = '';
-  testing = false;
-  testResult: ApiLog | null = null;
-
-  // calls
-  calls: ApiLog[] = [];
-  openLog: ApiLog | null = null;
-
-  readonly authTypes = Object.entries(API_AUTH_TYPES).map(
-    ([
-      key,
-      label
-    ]) => ({ key, label })
-  );
-  readonly contentTypes = Object.entries(API_CONTENT_TYPES).map(
-    ([
-      key,
-      label
-    ]) => ({ key, label })
-  );
-  readonly transforms = Object.entries(API_TRANSFORMS).map(
-    ([
-      key,
-      label
-    ]) => ({ key, label })
-  );
-  readonly cbsFields = Object.entries(API_CBS_FIELDS).map(
-    ([
-      key,
-      label
-    ]) => ({ key, label })
-  );
-  readonly methods = API_METHODS;
-
-  ngOnInit(): void {
-    this.load(Number(this.route.snapshot.paramMap.get('id')));
-  }
-
-  load(id: number): void {
-    this.loading = true;
-    this.service.vendor(id).subscribe({
-      next: (v) => {
-        this.vendor = v;
-        this.loading = false;
-        this.resetForm(v);
-        if (!this.testApiId || !v.apis.some((a) => a.id === this.testApiId)) this.testApiId = v.apis[0]?.id ?? null;
-        this.fillTestBody();
-        this.loadCalls();
-      },
-      error: (e) => {
-        this.loading = false;
-        this.error = e?.error?.defaultUserMessage ?? 'Could not load the vendor.';
-      }
-    });
-  }
-
-  private resetForm(v: ApiVendor): void {
-    this.form = {
-      name: v.name,
-      work: v.work,
-      environment: v.environment,
-      baseUrl: v.baseUrl,
-      authType: v.authType,
-      username: v.username,
-      apiKeyHeader: v.apiKeyHeader,
-      secret: '',
-      clearSecret: false,
-      senderId: v.senderId,
-      timeoutMs: v.timeoutMs,
-      retries: v.retries,
-      defaultHeaders: JSON.parse(JSON.stringify(v.defaultHeaders)),
-      active: v.active
-    };
-  }
-
-  loadCalls(): void {
-    if (!this.vendor) return;
-    this.service.logs({ vendorId: String(this.vendor.id), limit: 12 }).subscribe((r) => (this.calls = r.items));
-  }
-
-  // ── connection ──
-
-  needsSecret(): boolean {
-    return this.form.authType !== 'NONE';
-  }
-
-  secretLabel(): string {
-    const a = this.form.authType;
-    return a === 'BASIC'
-      ? 'Password'
-      : a === 'API_KEY'
-        ? 'API key'
-        : a === 'BEARER_TOKEN'
-          ? 'Bearer token'
-          : 'Client secret';
-  }
-
-  saveConnection(): void {
-    if (!this.vendor) return;
-    this.saving = true;
-    this.error = null;
-    this.info = null;
-    const body = { ...this.form };
-    if (!body.secret) delete body.secret;
-    this.service.saveVendor(this.vendor.id, body).subscribe({
-      next: (v) => {
-        this.saving = false;
-        this.vendor = v;
-        this.resetForm(v);
-        this.info = `${v.name} connection saved.`;
-      },
-      error: (e) => {
-        this.saving = false;
-        this.error = e?.error?.defaultUserMessage ?? 'Could not save the connection.';
-      }
-    });
-  }
-
-  // ── API set ──
-
-  newApi(direction: 'IN' | 'OUT'): void {
-    this.isNewApi = true;
-    this.error = null;
-    this.info = null;
-    this.editorTab = 'basics';
-    this.editing = blankApi(direction);
-  }
-
-  editApi(a: VendorApi): void {
-    this.isNewApi = false;
-    this.error = null;
-    this.info = null;
-    this.editorTab = 'basics';
-    this.editing = JSON.parse(JSON.stringify(a));
-  }
-
-  /** True when the CBS makes the HTTP call (OUT, or IN pull); false for an IN push webhook. */
-  get outbound(): boolean {
-    return !!this.editing && callsVendor(this.editing);
-  }
-
-  directionChanged(): void {
-    if (!this.editing) return;
-    this.editing.mode = this.editing.direction === 'IN' ? (this.editing.mode ?? 'PUSH') : undefined;
-  }
-
-  /** Keeps the path-parameter table in step with the {names} typed in the path. */
-  pathChanged(): void {
-    if (!this.editing) return;
-    const names = pathParamNames(this.editing.path);
-    const kept = this.editing.pathParams.filter((p) => names.includes(p.key));
-    for (const n of names) {
-      if (!kept.some((p) => p.key === n))
-        kept.push({ key: n, value: '', description: '', enabled: true, secret: false });
-    }
-    this.editing.pathParams = kept;
-  }
-
-  rowsOf(side: 'request' | 'response'): ApiMappingRow[] {
-    if (!this.editing) return [];
-    return side === 'request' ? this.editing.requestRows : this.editing.responseRows;
-  }
-
-  /** Whether the left column of a mapping table holds a CBS value (a pick list) or a path in the vendor's JSON. */
-  fromIsCbs(side: 'request' | 'response'): boolean {
-    return this.outbound ? side === 'request' : side === 'response';
-  }
-
-  mappingTitle(side: 'request' | 'response'): string {
-    if (this.outbound) return side === 'request' ? 'Request mapping (CBS → vendor)' : 'Response mapping (vendor → CBS)';
-    return side === 'request' ? 'Incoming data mapping (vendor → CBS)' : 'Answer mapping (CBS → vendor)';
-  }
-
-  fromLabel(side: 'request' | 'response'): string {
-    return this.fromIsCbs(side) ? 'CBS value' : "Vendor's JSON path";
-  }
-
-  toLabel(side: 'request' | 'response'): string {
-    if (this.fromIsCbs(side)) return side === 'request' ? "Vendor's request path" : 'Answer path';
-    return 'CBS field';
-  }
-
-  private parsedCache = new Map<string, unknown>();
-
-  private parsed(text: string): unknown {
-    if (!this.parsedCache.has(text)) {
-      let v: unknown = undefined;
-      try {
-        v = JSON.parse(text);
-      } catch {
-        v = undefined;
-      }
-      if (this.parsedCache.size > 20) this.parsedCache.clear();
-      this.parsedCache.set(text, v);
-    }
-    return this.parsedCache.get(text);
-  }
-
-  /** Reads a.b[0].c out of a parsed payload; undefined when it is not there. */
-  private readPath(root: unknown, path: string): unknown {
-    let cur: any = root;
-    for (const part of path.match(/[^.[\]]+/g) ?? []) {
-      if (cur === null || cur === undefined) return undefined;
-      cur = cur[/^\d+$/.test(part) ? Number(part) : part];
-    }
-    return cur;
-  }
-
-  /**
-   * How a mapping row matches the sample payload on its side: the value found at the row's JSON path. Rows after a
-   * list (e.g. data.alerts) are read from the first item of that list, as the CBS does for each item.
-   */
-  sampleMatches(side: 'request' | 'response'): { found: boolean; value: string }[] {
-    if (!this.editing) return [];
-    const body = this.parsed(side === 'request' ? this.editing.requestBody : this.editing.responseBody);
-    const pathIsTo = this.fromIsCbs(side);
-    let item: unknown = undefined;
-    return this.rowsOf(side).map((r) => {
-      const path = (pathIsTo ? r.to : r.from).trim();
-      if (!path || body === undefined) return { found: false, value: body === undefined ? 'payload is not JSON' : '' };
-      let v = this.readPath(body, path);
-      if (v === undefined && item !== undefined) v = this.readPath(item, path);
-      if (Array.isArray(v)) {
-        if (item === undefined && v.length) item = v[0];
-        return { found: true, value: `list of ${v.length}` };
-      }
-      if (v === undefined) return { found: false, value: 'not in the sample payload' };
-      const text = typeof v === 'object' ? JSON.stringify(v) : String(v);
-      return { found: true, value: text.length > 40 ? text.slice(0, 40) + '…' : text };
-    });
-  }
-
-  matchedCount(side: 'request' | 'response'): number {
-    return this.sampleMatches(side).filter((m) => m.found).length;
-  }
-
-  addRow(side: 'request' | 'response'): void {
-    this.rowsOf(side).push({ from: '', to: '', transform: 'NONE', defaultValue: '', mandatory: false });
-  }
-
-  removeRow(side: 'request' | 'response', i: number): void {
-    this.rowsOf(side).splice(i, 1);
-  }
-
-  /** Builds mapping rows from the payload typed or imported for that side. */
-  generateRows(side: 'request' | 'response'): void {
-    if (!this.editing || !this.vendor) return;
-    const body = side === 'request' ? this.editing.requestBody : this.editing.responseBody;
-    // Reading values OUT of a payload (vendor → CBS) vs putting values INTO one (CBS → vendor).
-    const reading = !this.fromIsCbs(side);
-    const rows = reading ? guessResponseRows(body, this.vendor.code) : guessRequestRows(body);
-    if (!rows.length) {
-      this.error = 'That payload has no JSON values to build a mapping from.';
-      return;
-    }
-    this.error = null;
-    const target = this.rowsOf(side);
-    const have = new Set(target.map((r) => r.to));
-    target.push(...rows.filter((r) => !have.has(r.to)));
-    this.info = `${rows.length} mapping row(s) read from the payload. Review the CBS fields and adjust.`;
-  }
-
-  saveApi(): void {
-    if (!this.vendor || !this.editing) return;
-    this.savingApi = true;
-    this.error = null;
-    this.service.saveApi(this.vendor.id, this.editing).subscribe({
-      next: (a) => {
-        this.savingApi = false;
-        this.info = `${a.name} saved.`;
-        this.editing = null;
-        this.load(this.vendor!.id);
-      },
-      error: (e) => {
-        this.savingApi = false;
-        this.error = e?.error?.defaultUserMessage ?? 'Could not save the API.';
-      }
-    });
-  }
-
-  deleteApi(a: VendorApi): void {
-    if (!this.vendor || !confirm(`Delete the API "${a.name}"?`)) return;
-    this.service.deleteApi(this.vendor.id, a.id).subscribe(() => {
-      this.editing = null;
-      this.info = `${a.name} deleted.`;
-      this.load(this.vendor!.id);
-    });
-  }
-
-  /** The request this API would send (or receive), as the Test tab and the editor show it. */
-  preview(a: VendorApi | null): RequestPreview | null {
-    return this.vendor && a ? buildRequestPreview(this.vendor, a) : null;
-  }
-
-  // ── import ──
-
-  openImport(): void {
-    this.importOpen = true;
-    this.importError = null;
-    this.importReplace = this.isNewApi;
-    this.importRequestText = '';
-    this.importResponseText = '';
-    this.importRequestFile = '';
-    this.importResponseFile = '';
-  }
-
-  onFile(event: Event, which: 'request' | 'response'): void {
-    const input = event.target as HTMLInputElement;
-    const file = input.files?.[0];
-    if (!file) return;
-    if (file.size > 5 * 1024 * 1024) {
-      this.importError = 'The file is larger than 5 MB.';
-      return;
-    }
-    const reader = new FileReader();
-    reader.onload = () => {
-      const text = String(reader.result ?? '');
-      if (which === 'request') {
-        this.importRequestText = text;
-        this.importRequestFile = file.name;
-      } else {
-        this.importResponseText = text;
-        this.importResponseFile = file.name;
-      }
-    };
-    reader.readAsText(file);
-    input.value = '';
-  }
-
-  applyImport(): void {
-    if (!this.editing || !this.vendor) return;
-    this.importError = null;
-    let req: ImportedRequest | null = null;
-    let res: ImportedResponse | null = null;
-    try {
-      if (this.importRequestText.trim()) req = parseRequestText(this.importRequestText);
-      if (this.importResponseText.trim()) res = parseResponseText(this.importResponseText);
-      else if (req?.response) res = req.response;
-    } catch (e: any) {
-      this.importError = e?.message ?? 'Could not read the file.';
-      return;
-    }
-    if (!req && !res) {
-      this.importError = 'Paste or choose a request, a response, or both.';
-      return;
-    }
-
-    const a = this.editing;
-    const done: string[] = [];
-    const notes: string[] = [
-      ...(req?.notes ?? []),
-      ...(res?.notes ?? [])
-    ];
-    const replace = this.importReplace;
-
-    const mergePairs = (target: KeyValue[], incoming: KeyValue[]): KeyValue[] => {
-      if (replace) return incoming;
-      const out = [...target];
-      for (const p of incoming) {
-        const i = out.findIndex((x) => x.key.toLowerCase() === p.key.toLowerCase());
-        if (i >= 0) out[i] = p;
-        else out.push(p);
-      }
-      return out;
-    };
-
-    if (req) {
-      if (req.method && this.methods.includes(req.method)) {
-        a.method = req.method as VendorApi['method'];
-        done.push(`method ${req.method}`);
-      }
-      if (req.path && req.path !== '/') {
-        a.path = this.stripVendorBasePath(req.path);
-        done.push(`path ${a.path}`);
-      }
-      if (req.baseUrl) {
-        if (!this.form.baseUrl) {
-          this.form.baseUrl = req.baseUrl;
-          notes.push(`Base URL ${req.baseUrl} was put on the Connection tab - save it there.`);
-        } else if (this.form.baseUrl.replace(/\/+$/, '') !== req.baseUrl) {
-          notes.push(
-            `The file's host (${req.baseUrl}) is not this vendor's base URL (${this.form.baseUrl}); only the path was used.`
-          );
-        }
-      }
-      if (req.queryParams.length) {
-        a.queryParams = mergePairs(a.queryParams, req.queryParams);
-        done.push(`${req.queryParams.length} query parameter(s)`);
-      }
-      if (req.headers.length) {
-        a.headers = mergePairs(a.headers, req.headers);
-        done.push(`${req.headers.length} header(s)`);
-      }
-      if (req.contentType) {
-        a.contentType = Object.keys(API_CONTENT_TYPES).includes(req.contentType) ? req.contentType : a.contentType;
-        done.push(`content type ${a.contentType}`);
-      }
-      if (req.body !== undefined) {
-        a.requestBody = req.body;
-        done.push('request payload');
-      }
-      if (!a.name.trim() && a.path) {
-        const last =
-          a.path
-            .split('/')
-            .filter((s) => s && !s.includes('{'))
-            .pop() ?? 'API';
-        a.name = last.charAt(0).toUpperCase() + last.slice(1).replace(/[-_]+/g, ' ');
-      }
-      this.pathChanged();
-    }
-
-    if (res) {
-      const failure = res.status !== undefined && (res.status < 200 || res.status > 299);
-      if (res.status !== undefined && !failure) {
-        a.successCodes = String(res.status);
-        done.push(`success code ${res.status}`);
-      }
-      if (res.headers.length) {
-        a.responseHeaders = mergePairs(a.responseHeaders, res.headers);
-        done.push(`${res.headers.length} response header(s)`);
-      }
-      if (res.body !== undefined) {
-        if (failure) {
-          a.errorBody = res.body;
-          done.push(`error body (HTTP ${res.status})`);
-        } else {
-          a.responseBody = res.body;
-          done.push('response body');
-        }
-      }
-      if (res.errorBody !== undefined) {
-        a.errorBody = res.errorBody;
-        done.push('error body');
-      }
-    }
-
-    if (this.importGenerate) {
-      const addRows = (side: 'request' | 'response', body: string) => {
-        const reading = !this.fromIsCbs(side);
-        const rows = reading ? guessResponseRows(body, this.vendor!.code) : guessRequestRows(body);
-        if (!rows.length) return;
-        const target = replace ? [] : this.rowsOf(side);
-        const have = new Set(target.map((r) => r.to));
-        const merged = [
-          ...target,
-          ...rows.filter((r) => !have.has(r.to))
-        ];
-        if (side === 'request') a.requestRows = merged;
-        else a.responseRows = merged;
-        done.push(`${rows.length} ${side === 'request' ? 'request' : 'response'} mapping row(s)`);
-      };
-      if (req?.body !== undefined) addRows('request', a.requestBody);
-      if (res?.body !== undefined && !(res.status !== undefined && (res.status < 200 || res.status > 299)))
-        addRows('response', a.responseBody);
-    }
-
-    this.importOpen = false;
-    this.error = null;
-    this.info = `Read from ${[
-      req?.source,
-      res?.source
-    ]
-      .filter(Boolean)
-      .join(' + ')}: ${done.join(', ') || 'nothing new'}. ${notes.join(' ')} Review each tab, then Save API.`;
-  }
-
-  /** A path read from a full URL may repeat the path already in the vendor's base URL. */
-  private stripVendorBasePath(path: string): string {
-    const base = String(this.form.baseUrl ?? '');
-    const m = /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\/[^/]+(\/.+)$/.exec(base.replace(/\/+$/, ''));
-    if (m && path.startsWith(m[1] + '/')) return path.slice(m[1].length);
-    return path;
-  }
-
-  // ── test ──
-
-  get testApi(): VendorApi | null {
-    return this.vendor?.apis.find((x) => x.id === this.testApiId) ?? null;
-  }
-
-  fillTestBody(): void {
-    this.testBody = this.testApi?.requestBody ?? '{}';
-    this.testResult = null;
-  }
-
-  get testPreview(): RequestPreview | null {
-    const a = this.testApi;
-    return this.vendor && a ? buildRequestPreview(this.vendor, { ...a, requestBody: this.testBody }) : null;
-  }
-
-  runTest(): void {
-    if (!this.vendor || !this.testApiId) return;
-    this.testing = true;
-    this.error = null;
-    this.service.testApi(this.vendor.id, this.testApiId, this.testBody).subscribe({
-      next: (log) => {
-        this.testing = false;
-        this.testResult = log;
-        this.loadCalls();
-      },
-      error: (e) => {
-        this.testing = false;
-        this.error = e?.error?.defaultUserMessage ?? 'Test failed.';
-      }
-    });
-  }
-}

src/app/api-management/api-vendors/api-vendors.component.html

@@ -1,172 +0,0 @@
-<!--
-  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="cic-page">
-  <div class="cic-head">
-    <div>
-      <h1>API Management</h1>
-      <p>
-        Connect any API service to the CBS the same way: <b>Vendor → Work → API set</b>. <b>IN</b> = data comes into the
-        CBS from the vendor (CIC alerts, delivery reports, replies). <b>OUT</b> = the CBS calls the vendor (send an SMS
-        or WhatsApp message).
-      </p>
-    </div>
-    <div class="cic-actions">
-      <a class="cic-btn" routerLink="/api-management/logs">API call logs</a>
-      <button class="cic-btn primary" (click)="startAdd()">+ Add vendor</button>
-    </div>
-  </div>
-
-  @if (error && !adding) {
-    <div class="cic-alert error">{{ error }}</div>
-  }
-  @if (info) {
-    <div class="cic-alert success">{{ info }}</div>
-  }
-
-  <div class="cic-grid cols-4" style="margin-bottom: 16px">
-    <div class="cic-stat">
-      <div class="k">Vendors</div>
-      <div class="v">{{ vendors.length }}</div>
-      <div class="s">{{ activeVendors }} active</div>
-    </div>
-    <div class="cic-stat">
-      <div class="k">APIs</div>
-      <div class="v">{{ totalIn + totalOut }}</div>
-      <div class="s">{{ totalIn }} IN · {{ totalOut }} OUT</div>
-    </div>
-    <div class="cic-stat">
-      <div class="k">Calls in 24 hours</div>
-      <div class="v">{{ summary.callsToday }}</div>
-      <div class="s">both directions</div>
-    </div>
-    <div class="cic-stat">
-      <div class="k">Failed in 24 hours</div>
-      <div class="v" [class.tone-bad]="summary.failedToday > 0">{{ summary.failedToday }}</div>
-      <div class="s">see the call logs</div>
-    </div>
-  </div>
-
-  <div class="cic-card">
-    <h2>Vendors</h2>
-    @if (loading && !vendors.length) {
-      <div class="cic-empty">Loading…</div>
-    } @else {
-      <div class="cic-table-wrap">
-        <table class="cic-table">
-          <thead>
-            <tr>
-              <th>Vendor</th>
-              <th>Work</th>
-              <th>APIs</th>
-              <th>Environment</th>
-              <th>24 h calls</th>
-              <th>Last call</th>
-              <th>Active</th>
-              <th></th>
-            </tr>
-          </thead>
-          <tbody>
-            @for (v of vendors; track v.id) {
-              <tr>
-                <td>
-                  <b>{{ v.name }}</b>
-                  <div class="muted cic-mono" style="font-size: 11px">{{ v.code }}</div>
-                </td>
-                <td style="max-width: 340px; white-space: normal">{{ v.work }}</td>
-                <td>
-                  @if (count(v, 'IN')) {
-                    <span class="cic-badge brand">IN × {{ count(v, 'IN') }}</span>
-                  }
-                  @if (count(v, 'OUT')) {
-                    <span class="cic-badge ok">OUT × {{ count(v, 'OUT') }}</span>
-                  }
-                  @if (!v.apis.length) {
-                    <span class="muted">none yet</span>
-                  }
-                </td>
-                <td>
-                  <span
-                    class="cic-badge"
-                    [class.warn]="v.environment === 'SIMULATOR'"
-                    [class.good]="v.environment === 'PRODUCTION'"
-                    >{{ v.environment }}</span
-                  >
-                </td>
-                <td>
-                  {{ calls(v).calls }}
-                  @if (calls(v).failed) {
-                    <span class="tone-bad" style="font-size: 12px"> · {{ calls(v).failed }} failed</span>
-                  }
-                </td>
-                <td>{{ v.lastCallOn ? (v.lastCallOn | slice: 0 : 16) : '—' }}</td>
-                <td>
-                  <span class="cic-switch">
-                    <input type="checkbox" [checked]="v.active" (change)="toggle(v, $event)" />
-                    <span></span>
-                  </span>
-                </td>
-                <td style="white-space: nowrap">
-                  <a class="cic-btn sm primary" [routerLink]="['/api-management/vendors', v.id]">Set up</a>
-                </td>
-              </tr>
-              @if (v.links.length) {
-                <tr>
-                  <td colspan="8" style="background: var(--cic-soft); padding: 6px 12px">
-                    <span class="muted" style="font-size: 12px">{{ v.code }} also has:</span>
-                    @for (l of v.links; track l.route) {
-                      <a class="cic-btn sm" style="margin-left: 6px" [routerLink]="l.route">{{ l.label }}</a>
-                    }
-                  </td>
-                </tr>
-              }
-            }
-          </tbody>
-        </table>
-      </div>
-    }
-  </div>
-
-  @if (adding) {
-    <div class="cic-modal-backdrop" (click)="adding = false">
-      <div class="cic-modal" (click)="$event.stopPropagation()">
-        <h3>Add an API vendor</h3>
-        @if (error) {
-          <div class="cic-alert error">{{ error }}</div>
-        }
-        <div class="cic-grid cols-1" style="gap: 12px">
-          <div class="cic-field">
-            <label>Vendor name</label>
-            <input [(ngModel)]="form.name" placeholder="e.g. Aadhaar eKYC, Payment gateway, E-mail" />
-          </div>
-          <div class="cic-field">
-            <label>Work — what is this vendor used for?</label>
-            <textarea rows="3" [(ngModel)]="form.work" placeholder="e.g. Verify customer Aadhaar during KYC"></textarea>
-          </div>
-          <div class="cic-field">
-            <label>Environment</label>
-            <select [(ngModel)]="form.environment">
-              <option value="SIMULATOR">SIMULATOR — no network call</option>
-              <option value="UAT">UAT — vendor's test environment</option>
-              <option value="PRODUCTION">PRODUCTION — live</option>
-            </select>
-          </div>
-        </div>
-        <p class="muted" style="font-size: 12px; margin: 12px 0 0">
-          Next you set up the connection and add its APIs, each marked IN or OUT.
-        </p>
-        <div class="foot">
-          <button class="cic-btn" (click)="adding = false">Cancel</button>
-          <button class="cic-btn primary" (click)="saveNew()" [disabled]="saving">
-            {{ saving ? 'Adding…' : 'Add and set up' }}
-          </button>
-        </div>
-      </div>
-    </div>
-  }
-</div>

src/app/api-management/api-vendors/api-vendors.component.ts

@@ -1,121 +0,0 @@
-/**
- * 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 { CommonModule } from '@angular/common';
-import { Component, OnInit, inject } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { Router, RouterModule } from '@angular/router';
-
-import { ApiManagementService, ApiVendor } from '../api-management.service';
-
-/** Every outside API service the CBS uses: vendor, its work, its APIs (IN / OUT) and whether it is switched on. */
-@Component({
-  selector: 'mifosx-api-vendors',
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    RouterModule
-  ],
-  templateUrl: './api-vendors.component.html',
-  styleUrls: ['../../credit-bureau/cic-shared.scss']
-})
-export class ApiVendorsComponent implements OnInit {
-  private service = inject(ApiManagementService);
-  private router = inject(Router);
-
-  vendors: ApiVendor[] = [];
-  summary: { callsToday: number; failedToday: number; perVendor: Record<number, { calls: number; failed: number }> } = {
-    callsToday: 0,
-    failedToday: 0,
-    perVendor: {}
-  };
-  loading = false;
-  error: string | null = null;
-  info: string | null = null;
-
-  adding = false;
-  saving = false;
-  form: { name: string; work: string; environment: ApiVendor['environment'] } = this.blankForm();
-
-  ngOnInit(): void {
-    this.load();
-  }
-
-  private blankForm() {
-    return { name: '', work: '', environment: 'SIMULATOR' as ApiVendor['environment'] };
-  }
-
-  load(): void {
-    this.loading = true;
-    this.service.vendors().subscribe((v) => {
-      this.vendors = v;
-      this.loading = false;
-    });
-    this.service.summary().subscribe((s) => (this.summary = s));
-  }
-
-  count(v: ApiVendor, direction: 'IN' | 'OUT'): number {
-    return v.apis.filter((a) => a.direction === direction).length;
-  }
-
-  get totalIn(): number {
-    return this.vendors.reduce((s, v) => s + this.count(v, 'IN'), 0);
-  }
-
-  get totalOut(): number {
-    return this.vendors.reduce((s, v) => s + this.count(v, 'OUT'), 0);
-  }
-
-  get activeVendors(): number {
-    return this.vendors.filter((v) => v.active).length;
-  }
-
-  calls(v: ApiVendor): { calls: number; failed: number } {
-    return this.summary.perVendor[v.id] ?? { calls: 0, failed: 0 };
-  }
-
-  toggle(v: ApiVendor, event: Event): void {
-    const want = (event.target as HTMLInputElement).checked;
-    (event.target as HTMLInputElement).checked = v.active;
-    this.error = null;
-    this.info = null;
-    this.service.saveVendor(v.id, { active: want }).subscribe({
-      next: (u) => {
-        v.active = u.active;
-        this.info = `${u.name} is now ${u.active ? 'active' : 'switched off'}.`;
-      },
-      error: (e) => (this.error = e?.error?.defaultUserMessage ?? 'Could not change the vendor.')
-    });
-  }
-
-  startAdd(): void {
-    this.adding = true;
-    this.form = this.blankForm();
-    this.error = null;
-  }
-
-  saveNew(): void {
-    this.saving = true;
-    this.error = null;
-    this.service.addVendor(this.form).subscribe({
-      next: (v) => {
-        this.saving = false;
-        this.adding = false;
-        this.router.navigate([
-          '/api-management/vendors',
-          v.id
-        ]);
-      },
-      error: (e) => {
-        this.saving = false;
-        this.error = e?.error?.defaultUserMessage ?? 'Could not add the vendor.';
-      }
-    });
-  }
-}

src/app/app.module.ts

@@ -64,7 +64,6 @@ import { BankCalendarModule } from './bank-calendar/bank-calendar.module';
 import { DeafModule } from './deaf/deaf.module';
 import { SavingsDailyInterestModule } from './savings-daily-interest/savings-daily-interest.module';
 import { FdDashboardModule } from './fd-dashboard/fd-dashboard.module';
-import { RdDashboardModule } from './rd-dashboard/rd-dashboard.module';
 import { DicgcModule } from './dicgc/dicgc.module';
 import { FiuModule } from './fiu/fiu.module';
 import { GlReportsModule } from './gl-reports/gl-reports.module';
@@ -73,13 +72,10 @@ import { InvestmentModule } from './investment/investment.module';
 import { NpaModule } from './npa/npa.module';
 import { ReconciliationModule } from './reconciliation/reconciliation.module';
 import { LoanOriginationModule } from './loan-origination/loan-origination.module';
-import { CreditBureauModule } from './credit-bureau/credit-bureau.module';
-import { ApiManagementModule } from './api-management/api-management.module';
 import { DigitalModule } from './digital/digital.module';
 import { LetterMgmtModule } from './letter-mgmt/letter-mgmt.module';
 import { AccountsModule } from './accounts/accounts.module';
 import { ElectionModule } from './election/election.module';
-import { LoanEligibilityModule } from './loan-eligibility/loan-eligibility.module';
 import { SponsorDDModule } from './sponsor-dd/sponsor-dd.module';
 import { SponsorDDReconciliationModule } from './sponsor-dd-reconciliation/sponsor-dd-reconciliation.module';
 import { PortalModule } from '@angular/cdk/portal';
@@ -100,7 +96,6 @@ import { TokenInterceptor as ZitadelTokenInterceptor } from './zitadel/token.int
 import { AuthService } from './zitadel/auth.service';
 import { environment } from '../environments/environment';
 import { CallbackComponent } from './zitadel/callback/callback.component';
-import { LoadingScreenComponent } from './shared/loading-screen/loading-screen.component';
 import { OAuthModule } from 'angular-oauth2-oidc';
 
 export class CustomMissingTranslationHandler implements MissingTranslationHandler {
@@ -183,7 +178,6 @@ export function HttpLoaderFactory(http: HttpClient) {
     DeafModule,
     SavingsDailyInterestModule,
     FdDashboardModule,
-    RdDashboardModule,
     DicgcModule,
     FiuModule,
     GlReportsModule,
@@ -192,19 +186,15 @@ export function HttpLoaderFactory(http: HttpClient) {
     NpaModule,
     ReconciliationModule,
     LoanOriginationModule,
-    CreditBureauModule,
-    ApiManagementModule,
     DigitalModule,
     LetterMgmtModule,
     AccountsModule,
     ElectionModule,
-    LoanEligibilityModule,
     SponsorDDModule,
     SponsorDDReconciliationModule,
     AppRoutingModule,
     NotFoundComponent,
     CallbackComponent,
-    LoadingScreenComponent,
     OAuthModule.forRoot()
   ],
   providers: [

src/app/bank-calendar/bank-calendar.component.html

@@ -44,11 +44,8 @@
     <div class="cal-stat sat2nd4th">
       <fa-icon icon="calendar-times" class="cal-stat__icon"></fa-icon>
       <div class="cal-stat__info">
-        <div class="cal-stat__value">{{ overallStats.sat2nd4th + overallStats.weeklyOff }}</div>
+        <div class="cal-stat__value">{{ overallStats.sat2nd4th }}</div>
-        <div class="cal-stat__label">
+        <div class="cal-stat__label">2nd &amp; 4th Sat</div>
-          {{ saturdayIsWorkingDay ? '2nd & 4th Sat' : 'Saturdays'
-          }}{{ overallStats.weeklyOff > 0 ? ' / Weekly Off' : '' }}
-        </div>
       </div>
     </div>
     <div class="cal-stat holidays">
@@ -72,11 +69,7 @@
     <div class="cal-legend__items">
       <div class="cal-legend__item"><span class="cal-legend__dot working"></span> Working Day</div>
       <div class="cal-legend__item"><span class="cal-legend__dot sunday"></span> Sunday</div>
-      <div class="cal-legend__item">
+      <div class="cal-legend__item"><span class="cal-legend__dot sat2nd4th"></span> 2nd / 4th Saturday</div>
-        <span class="cal-legend__dot sat2nd4th"></span>
-        {{ saturdayIsWorkingDay ? '2nd / 4th Saturday' : 'Saturday'
-        }}{{ overallStats.weeklyOff > 0 ? ' / Weekly Off' : '' }}
-      </div>
       <div class="cal-legend__item"><span class="cal-legend__dot holiday"></span> Holiday</div>
       <div class="cal-legend__item"><span class="cal-legend__dot today"></span> Today</div>
     </div>
@@ -326,9 +319,7 @@
               [class.cal-grid__day--other]="!day.isCurrentMonth"
               [class.cal-grid__day--today]="day.isToday"
               [class.cal-grid__day--sunday]="day.isSunday && day.isCurrentMonth"
-              [class.cal-grid__day--sat2nd4th]="
+              [class.cal-grid__day--sat2nd4th]="(day.is2ndSaturday || day.is4thSaturday) && day.isCurrentMonth"
-                (day.is2ndSaturday || day.is4thSaturday || day.isWeeklyOff) && day.isCurrentMonth
-              "
               [class.cal-grid__day--holiday]="day.isHoliday && day.isCurrentMonth"
               [class.cal-grid__day--working]="day.isWorking && day.isCurrentMonth"
               [matTooltip]="
@@ -337,11 +328,9 @@
                   ? '2nd Saturday Off'
                   : day.is4thSaturday
                     ? '4th Saturday Off'
-                    : day.isWeeklyOff && day.isCurrentMonth
+                    : day.isSunday && day.isCurrentMonth
-                      ? weekDays[day.dayOfWeek] + ' Off (Working Days)'
+                      ? 'Sunday'
-                      : day.isSunday && day.isCurrentMonth
+                      : '')
-                        ? 'Sunday'
-                        : '')
               "
             >
               {{ day.isCurrentMonth ? day.date : '' }}
@@ -354,15 +343,10 @@
           @if (month.holidays > 0) {
             <span class="summary-tag holiday">{{ month.holidays }} Holiday{{ month.holidays > 1 ? 's' : '' }}</span>
           }
-          @if (month.sundays > 0) {
+          <span class="summary-tag sun">{{ month.sundays }} Sun</span>
-            <span class="summary-tag sun">{{ month.sundays }} Sun</span>
-          }
           @if (month.secondFourthSat > 0) {
             <span class="summary-tag sat">{{ month.secondFourthSat }} Sat Off</span>
           }
-          @if (month.weeklyOff > 0) {
-            <span class="summary-tag sat">{{ month.weeklyOff }} Weekly Off</span>
-          }
         </div>
       </div>
     }

src/app/bank-calendar/bank-calendar.component.ts

@@ -63,8 +63,6 @@ interface CalendarDay {
   isSunday: boolean;
   is2ndSaturday: boolean;
   is4thSaturday: boolean;
-  /** Off every week because Admin > Working Days leaves this weekday out (Sunday aside). */
-  isWeeklyOff: boolean;
   holidayName?: string;
   dayOfWeek: number; // 0=Sun, 6=Sat
 }
@@ -78,23 +76,9 @@ interface MonthData {
   nonWorkingDays: number;
   holidays: number;
   sundays: number;
-  /** Saturdays off: the 2nd and 4th when Saturday is a working day, every one when it is not. */
   secondFourthSat: number;
-  /** Other weekdays off every week because Working Days leaves them out. */
-  weeklyOff: number;
 }
 
-/** Weekday codes in Date#getDay() order, as used by the /workingdays recurrence (BYDAY=MO,TU,...). */
-const DAY_CODES = [
-  'SU',
-  'MO',
-  'TU',
-  'WE',
-  'TH',
-  'FR',
-  'SA'
-];
-
 @Component({
   selector: 'mifosx-bank-calendar',
   templateUrl: './bank-calendar.component.html',
@@ -134,7 +118,7 @@ export class BankCalendarComponent implements OnInit {
   ];
   workingDaysConfig: string[] = [];
   holidays: any[] = [];
-  overallStats = { working: 0, nonWorking: 0, holidays: 0, sundays: 0, sat2nd4th: 0, weeklyOff: 0, totalDays: 0 };
+  overallStats = { working: 0, nonWorking: 0, holidays: 0, sundays: 0, sat2nd4th: 0, totalDays: 0 };
 
   // ───── Holiday list (office-wise) ─────
   offices: OfficeLite[] = [];
@@ -218,8 +202,7 @@ export class BankCalendarComponent implements OnInit {
   }
 
   private loadWorkingDays() {
-    // Default Indian banking working days: Mon-Sat (Sun off, 2nd & 4th Sat off), used until
+    // Default Indian banking working days: Mon-Sat (Sun off, 2nd & 4th Sat off)
-    // Admin > Working Days answers, or if it cannot be read.
     this.workingDaysConfig = [
       'MO',
       'TU',
@@ -232,19 +215,6 @@ export class BankCalendarComponent implements OnInit {
     this.buildCalendar();
     this.rebuildHolidayRows();
 
-    // The calendar has to agree with Admin > Working Days: a weekday unticked there is off every
-    // week here too.
-    this.organizationService.getWorkingDays().subscribe({
-      next: (data: any) => {
-        const configured = this.parseWorkingDays(data?.recurrence);
-        if (configured.length > 0) {
-          this.workingDaysConfig = configured;
-          this.buildCalendar();
-        }
-      },
-      error: () => {}
-    });
-
     // Pull offices then fan-out a per-office holiday fetch so each office's
     // calendar entries are surfaced in the list panel (calendar grid still
     // unions everything for the year-at-a-glance view).
@@ -303,23 +273,6 @@ export class BankCalendarComponent implements OnInit {
     });
   }
 
-  /** Weekday codes out of a recurrence such as "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR". */
-  private parseWorkingDays(recurrence: string | undefined): string[] {
-    const byDay = /BYDAY=([^;]*)/.exec(recurrence || '');
-    if (!byDay) {
-      return [];
-    }
-    return byDay[1]
-      .split(',')
-      .map((d) => d.trim().toUpperCase())
-      .filter((d) => DAY_CODES.includes(d));
-  }
-
-  /** True when Admin > Working Days counts Saturday as a working day (so only the 2nd and 4th are off). */
-  get saturdayIsWorkingDay(): boolean {
-    return this.workingDaysConfig.includes('SA');
-  }
-
   /** Flatten the holidays array into a presentable list with office labels. */
   private rebuildHolidayRows(): void {
     this.holidayRows = this.holidays.map((h: any) => {
@@ -558,15 +511,7 @@ export class BankCalendarComponent implements OnInit {
 
   buildCalendar() {
     this.months = [];
-    this.overallStats = {
+    this.overallStats = { working: 0, nonWorking: 0, holidays: 0, sundays: 0, sat2nd4th: 0, totalDays: 0 };
-      working: 0,
-      nonWorking: 0,
-      holidays: 0,
-      sundays: 0,
-      sat2nd4th: 0,
-      weeklyOff: 0,
-      totalDays: 0
-    };
 
     for (let m = 0; m < 12; m++) {
       const monthData = this.buildMonth(m, this.currentYear);
@@ -576,7 +521,6 @@ export class BankCalendarComponent implements OnInit {
       this.overallStats.holidays += monthData.holidays;
       this.overallStats.sundays += monthData.sundays;
       this.overallStats.sat2nd4th += monthData.secondFourthSat;
-      this.overallStats.weeklyOff += monthData.weeklyOff;
     }
     this.overallStats.totalDays = this.overallStats.working + this.overallStats.nonWorking;
   }
@@ -608,7 +552,6 @@ export class BankCalendarComponent implements OnInit {
     let holidayCount = 0;
     let sundayCount = 0;
     let sat2nd4thCount = 0;
-    let weeklyOffCount = 0;
 
     // Previous month padding
     const prevMonthDays = new Date(year, month, 0).getDate();
@@ -624,7 +567,6 @@ export class BankCalendarComponent implements OnInit {
         isSunday: false,
         is2ndSaturday: false,
         is4thSaturday: false,
-        isWeeklyOff: false,
         dayOfWeek: (startDayOfWeek - i - 1 + 7) % 7
       });
     }
@@ -634,29 +576,24 @@ export class BankCalendarComponent implements OnInit {
     for (let d = 1; d <= daysInMonth; d++) {
       const date = new Date(year, month, d);
       const dow = date.getDay();
+      const isSunday = dow === 0;
       const isSaturday = dow === 6;
-      const isWorkingWeekday = this.workingDaysConfig.includes(DAY_CODES[dow]);
-      const isSunday = dow === 0 && !isWorkingWeekday;
 
       if (isSaturday) saturdayCount++;
 
-      // RBI: when Saturday is a working day the 2nd and 4th are still off. When Working Days leaves
+      const is2ndSat = isSaturday && saturdayCount === 2;
-      // Saturday out, every Saturday is a weekly off instead.
+      const is4thSat = isSaturday && saturdayCount === 4;
-      const is2ndSat = isSaturday && isWorkingWeekday && saturdayCount === 2;
-      const is4thSat = isSaturday && isWorkingWeekday && saturdayCount === 4;
-      const isWeeklyOff = dow !== 0 && !isWorkingWeekday;
       const isToday = date.toDateString() === today.toDateString();
 
       // Check if holiday
       const holiday = this.getHolidayForDate(year, month, d);
       const isHoliday = !!holiday;
 
-      // Non-working: Sunday, 2nd Sat, 4th Sat, a weekly off from Working Days, or holiday
+      // Non-working: Sunday, 2nd Sat, 4th Sat, or holiday
-      const isNonWorking = isSunday || is2ndSat || is4thSat || isWeeklyOff || isHoliday;
+      const isNonWorking = isSunday || is2ndSat || is4thSat || isHoliday;
 
       if (isSunday) sundayCount++;
-      if (is2ndSat || is4thSat || (isSaturday && isWeeklyOff)) sat2nd4thCount++;
+      if (is2ndSat || is4thSat) sat2nd4thCount++;
-      if (isWeeklyOff && !isSaturday) weeklyOffCount++;
       if (isHoliday) holidayCount++;
 
       if (isNonWorking) {
@@ -676,7 +613,6 @@ export class BankCalendarComponent implements OnInit {
         isSunday,
         is2ndSaturday: is2ndSat,
         is4thSaturday: is4thSat,
-        isWeeklyOff,
         holidayName: holiday?.name,
         dayOfWeek: dow
       });
@@ -696,7 +632,6 @@ export class BankCalendarComponent implements OnInit {
         isSunday: false,
         is2ndSaturday: false,
         is4thSaturday: false,
-        isWeeklyOff: false,
         dayOfWeek: days.length % 7
       });
     }
@@ -710,8 +645,7 @@ export class BankCalendarComponent implements OnInit {
       nonWorkingDays: nonWorkingCount,
       holidays: holidayCount,
       sundays: sundayCount,
-      secondFourthSat: sat2nd4thCount,
+      secondFourthSat: sat2nd4thCount
-      weeklyOff: weeklyOffCount
     };
   }
 

src/app/cashier/account-register/account-register.component.ts

@@ -12,7 +12,6 @@ import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface RegisterRow {
   accountId: number;
@@ -84,7 +83,7 @@ export class AccountRegisterComponent implements OnInit {
 
   /** Local date — toISOString() would shift the day in any timezone behind UTC. */
   private today(): string {
-    const d = businessToday();
+    const d = new Date();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 

src/app/cashier/branch-cash-position/branch-cash-position.component.html

@@ -1,114 +0,0 @@
-<!--
-  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="pg">
-  <header class="pg-head">
-    <div>
-      <div class="pg-eyebrow">BRANCH OPERATIONS · BRANCH CASH POSITION</div>
-      <h1 class="pg-title">Branch Cash Position</h1>
-      <p class="pg-sub">
-        The notes and coins the branch holds, denomination by denomination: the vault plus every cashier's drawer. Cash
-        moving between the vault and a cashier nets out; deposits, withdrawals and exchanges change it.
-      </p>
-    </div>
-  </header>
-
-  <div class="pg-toolbar pg-toolbar--mat">
-    <mat-form-field appearance="outline" subscriptSizing="dynamic">
-      <mat-label>As of Date</mat-label>
-      <input matInput type="date" [value]="asOfDate" (change)="onDateChange($any($event.target).value)" />
-    </mat-form-field>
-    <button type="button" class="pg-btn pg-btn--primary" (click)="load()" [disabled]="loading">
-      <mat-icon>refresh</mat-icon> Refresh
-    </button>
-  </div>
-
-  @if (errorMsg) {
-    <div class="pg-empty bcp-error">{{ errorMsg }}</div>
-  }
-  @if (loading) {
-    <div class="pg-empty">Loading…</div>
-  }
-
-  @if (position; as p) {
-    <div class="bcp-totals">
-      <div class="bcp-total">
-        <span>Branch</span><strong>{{ p.officeName }}</strong>
-      </div>
-      <div class="bcp-total">
-        <span>Vault</span><strong>₹{{ p.vaultAmount | number: '1.2-2' }}</strong>
-      </div>
-      <div class="bcp-total">
-        <span>Cashiers' drawers</span><strong>₹{{ p.cashiersAmount | number: '1.2-2' }}</strong>
-      </div>
-      <div class="bcp-total bcp-total--main">
-        <span>Bank total</span><strong>₹{{ p.totalAmount | number: '1.2-2' }}</strong>
-      </div>
-    </div>
-
-    @if (!p.vaultHasBreakdown) {
-      <div class="pg-empty bcp-note">
-        No vault denomination breakdown was recorded on or before {{ p.asOfDate }}, so the vault column reads 0. Open
-        the business day with a note/coin count to start tracking it.
-      </div>
-    }
-
-    <ng-template #table let-rows let-label="label" let-coin="coin">
-      @if (rows.length > 0) {
-        <div class="pos-section-label" [class.pos-section-label--coin]="coin">{{ label }}</div>
-        <table class="pg-table">
-          <thead>
-            <tr>
-              <th>Denomination</th>
-              <th class="num">Vault</th>
-              <th class="num">Cashiers</th>
-              <th class="num">Bank total (count)</th>
-              <th class="num">Bank total (₹)</th>
-              <th class="num">Exchange today</th>
-            </tr>
-          </thead>
-          <tbody>
-            @for (d of rows; track d.denominationId) {
-              <tr>
-                <td>
-                  <span class="pg-chip" [class.pg-chip--coin]="coin">₹{{ d.denominationValue }}</span>
-                </td>
-                <td class="num">{{ d.vaultCount }}</td>
-                <td class="num">{{ d.cashierCount }}</td>
-                <td class="num bcp-strong">{{ d.totalCount }}</td>
-                <td class="num">₹{{ d.totalAmount | number: '1.2-2' }}</td>
-                <td
-                  class="num bcp-move"
-                  [class.bcp-move--in]="d.exchangeNet > 0"
-                  [class.bcp-move--out]="d.exchangeNet < 0"
-                >
-                  {{ movement(d.exchangeNet) }}
-                </td>
-              </tr>
-            }
-          </tbody>
-        </table>
-      }
-    </ng-template>
-
-    <div class="pg-card bcp-card">
-      <ng-container
-        *ngTemplateOutlet="table; context: { $implicit: notes(), label: 'Notes', coin: false }"
-      ></ng-container>
-      <ng-container
-        *ngTemplateOutlet="table; context: { $implicit: coins(), label: 'Coins', coin: true }"
-      ></ng-container>
-    </div>
-
-    <p class="bcp-foot">
-      <strong>Exchange today</strong> is the notes taken in less the notes given out by cash exchanges on
-      {{ p.asOfDate }}. It is already part of the Cashiers column; it is shown beside the total so a change in the mix
-      can be seen.
-    </p>
-  }
-</div>

src/app/cashier/branch-cash-position/branch-cash-position.component.scss

@@ -1,82 +0,0 @@
-/**
- * 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/.
- */
-
-.bcp-error {
-  color: #dc2626;
-}
-
-.bcp-note {
-  margin-bottom: 12px;
-  text-align: left;
-}
-
-.bcp-totals {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 12px;
-  margin-bottom: 14px;
-}
-
-.bcp-total {
-  flex: 1 1 180px;
-  padding: 12px 14px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 12px;
-
-  span {
-    display: block;
-    font-size: 11px;
-    font-weight: 600;
-    letter-spacing: 0.04em;
-    text-transform: uppercase;
-    color: #64748b;
-  }
-
-  strong {
-    font-size: 18px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &--main {
-    background: #e6f4ee;
-    border-color: #1f7a4d;
-
-    strong {
-      color: #0f4f3c;
-    }
-  }
-}
-
-.bcp-card {
-  margin-bottom: 14px;
-}
-
-.bcp-strong {
-  font-weight: 700;
-}
-
-.bcp-move {
-  font-weight: 700;
-  color: #94a3b8;
-
-  &--in {
-    color: #16a34a;
-  }
-
-  &--out {
-    color: #dc2626;
-  }
-}
-
-.bcp-foot {
-  margin: 0;
-  font-size: 12px;
-  color: #64748b;
-}

src/app/cashier/branch-cash-position/branch-cash-position.component.ts

@@ -1,112 +0,0 @@
-/**
- * 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 { CommonModule } from '@angular/common';
-import { MatIconModule } from '@angular/material/icon';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import { of } from 'rxjs';
-import { catchError } from 'rxjs/operators';
-import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
-
-interface BranchDenomRow {
-  denominationId: number;
-  denominationValue: number;
-  kind: string;
-  vaultCount: number;
-  cashierCount: number;
-  totalCount: number;
-  totalAmount: number;
-  /** Notes taken in less notes given out by exchanges on the day. */
-  exchangeNet: number;
-}
-
-interface BranchPosition {
-  officeId: number;
-  officeName: string;
-  asOfDate: string;
-  vaultHasBreakdown: boolean;
-  vaultAmount: number;
-  cashiersAmount: number;
-  totalAmount: number;
-  denominations: BranchDenomRow[];
-}
-
-/**
- * What the branch holds, denomination by denomination: the vault plus every cashier's drawer. An exchange
- * (a customer hands in 10 x ₹500 and leaves with 50 x ₹100) leaves the vault alone and changes a drawer, so
- * it only shows up in this total -- +10 on ₹500, -50 on ₹100.
- */
-@Component({
-  selector: 'mifosx-branch-cash-position',
-  templateUrl: './branch-cash-position.component.html',
-  styleUrls: [
-    '../cashier-shared.scss',
-    '../cashier-position/cashier-position.component.scss',
-    './branch-cash-position.component.scss'
-  ],
-  standalone: true,
-  imports: [
-    CommonModule,
-    MatIconModule,
-    MatFormFieldModule,
-    MatInputModule
-  ]
-})
-export class BranchCashPositionComponent implements OnInit {
-  private service = inject(CashierService);
-
-  asOfDate = '';
-  loading = false;
-  errorMsg = '';
-  position: BranchPosition | null = null;
-
-  ngOnInit(): void {
-    const d = businessToday();
-    this.asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
-    this.load();
-  }
-
-  load(): void {
-    this.loading = true;
-    this.errorMsg = '';
-    this.position = null;
-    this.service
-      .branchCashPosition(this.asOfDate)
-      .pipe(catchError(() => of(null)))
-      .subscribe((data: BranchPosition | null) => {
-        this.loading = false;
-        if (!data) {
-          this.errorMsg = 'Could not load the branch cash position.';
-          return;
-        }
-        this.position = data;
-      });
-  }
-
-  onDateChange(value: string): void {
-    this.asOfDate = value;
-    this.load();
-  }
-
-  notes(): BranchDenomRow[] {
-    return (this.position?.denominations || []).filter((d) => d.kind !== 'coin');
-  }
-
-  coins(): BranchDenomRow[] {
-    return (this.position?.denominations || []).filter((d) => d.kind === 'coin');
-  }
-
-  /** "+10", "-50", or a dash when the day's exchanges did not touch the denomination. */
-  movement(net: number): string {
-    if (!net) return '—';
-    return net > 0 ? `+${net}` : `${net}`;
-  }
-}

src/app/cashier/branch-day/branch-day.component.html

@@ -352,51 +352,6 @@
         </div>
       }
 
-      <!-- Interest waiting to be posted as this branch closes. Posting runs as part of the close, so
-           anything unapproved stops it: the branch sees here what it has to approve and where, rather
-           than finding out from a refusal after filling in the whole count. -->
-      @if (preview?.fdInterestDue?.length) {
-        <div class="bd-calc bd-calc--fd">
-          <div class="bd-calc__head">
-            <mat-icon>savings</mat-icon>
-            <strong>Fixed deposit interest due today</strong>
-          </div>
-          @for (d of preview.fdInterestDue; track d.productId) {
-            <div class="bd-calc__row">
-              <span>
-                {{ d.productName }} · {{ d.fdType }} · {{ d.accountCount }} deposit(s)
-                @if (d.reportStatus === 'APPROVED' || d.reportStatus === 'POSTED') {
-                  <span class="bd-fd-ok">{{ d.reportStatus }}</span>
-                } @else {
-                  <span class="bd-fd-pending">{{ d.reportStatus === 'NONE' ? 'NO REPORT' : d.reportStatus }}</span>
-                }
-              </span>
-              <span class="bd-calc__amt">₹{{ d.totalInterest | number: '1.2-2' }}</span>
-            </div>
-          }
-        </div>
-      }
-      @if (preview?.fdInterestPending?.length) {
-        <div class="bd-warn">
-          <mat-icon>warning</mat-icon>
-          <div>
-            <strong>The day cannot be closed yet.</strong> Fixed deposit interest is not approved for:
-            {{ preview.fdInterestPending.join(', ') }}. Approve it under Reports → FD Interest Posting Reports, then
-            close the day. The user who generated a report cannot approve it.
-          </div>
-        </div>
-      }
-      @if (preview?.savingsInterestPending?.length) {
-        <div class="bd-warn">
-          <mat-icon>warning</mat-icon>
-          <div>
-            <strong>The day cannot be closed yet.</strong> Savings interest is not approved for:
-            {{ preview.savingsInterestPending.join(', ') }}. Approve it under Reports → Interest Posting Reports, then
-            close the day.
-          </div>
-        </div>
-      }
-
       <!-- What every cash point under this branch is actually holding right now, fetched
            automatically — so closing the day doesn't mean separately checking Vault Position and
            every cashier's own Cashier Position screen by hand. -->

src/app/cashier/branch-day/branch-day.component.scss

@@ -195,75 +195,6 @@
     font-size: 11px;
     color: #94a3b8;
   }
-
-  /* Names the block, for the interest panels that sit beside the cash arithmetic. */
-  &__head {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    margin-bottom: 6px;
-    padding-bottom: 6px;
-    border-bottom: 1px solid #e2e8f0;
-    font-size: 13px;
-    color: #0d1b2a;
-
-    mat-icon {
-      font-size: 18px;
-      width: 18px;
-      height: 18px;
-      color: #1d4ed8;
-    }
-  }
-}
-
-/* Interest is money leaving as the day closes, not cash counted in the drawer. */
-.bd-calc--fd {
-  border-left: 3px solid #1d4ed8;
-}
-
-.bd-fd-ok,
-.bd-fd-pending {
-  display: inline-block;
-  margin-left: 6px;
-  padding: 1px 7px;
-  border-radius: 999px;
-  font-size: 10px;
-  font-weight: 700;
-  letter-spacing: 0.02em;
-}
-
-.bd-fd-ok {
-  background: #dcfce7;
-  color: #15803d;
-}
-
-.bd-fd-pending {
-  background: #fef3c7;
-  color: #b45309;
-}
-
-/* Why the close will be refused, said before the count is filled in rather than after. */
-.bd-warn {
-  display: flex;
-  align-items: flex-start;
-  gap: 8px;
-  max-width: 640px;
-  margin-bottom: 14px;
-  padding: 10px 14px;
-  background: #fffbeb;
-  border: 1px solid #fcd34d;
-  border-radius: 8px;
-  font-size: 12px;
-  line-height: 1.5;
-  color: #78350f;
-
-  mat-icon {
-    flex-shrink: 0;
-    font-size: 20px;
-    width: 20px;
-    height: 20px;
-    color: #b45309;
-  }
 }
 
 .bd-hint {

src/app/cashier/cash-clearing-transfer-summary/cash-clearing-transfer-summary.component.ts

@@ -11,7 +11,6 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { AuthenticationService } from '../../core/authentication/authentication.service';
 import { ExportSheetSpec, exportWorkbook } from '../cashier-export';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface SummaryRow {
   code: string;
@@ -1317,7 +1316,7 @@ export class CashClearingTransferSummaryComponent {
   private dateTag = '2607';
 
   constructor() {
-    const d = businessToday();
+    const d = new Date();
     this.asOnDate = `${String(d.getDate()).padStart(2, '0')}-${String(d.getMonth() + 1).padStart(2, '0')}-${d.getFullYear()}`;
     this.dateTag = `${String(d.getFullYear()).slice(-2)}${String(d.getMonth() + 1).padStart(2, '0')}`;
 

src/app/cashier/cash-exchange-entry/cash-exchange-entry.component.html

@@ -22,255 +22,50 @@
     </div>
   </header>
 
-  <!-- ── Cashier: whose drawer takes the customer's notes and gives the change ── -->
+  <!-- ── Customer Info Bar ── -->
-  @if (cashier) {
+  <div class="cx-customer-bar">
-    <section class="cx-cashier">
+    <div
-      <div class="cx-avatar cx-avatar--sm">{{ cashierInitials }}</div>
+      class="cx-customer-toggle"
-      <div class="cx-cashier__id">
+      [class.cx-customer-toggle--active]="isAccountHolder"
-        <div class="cx-cashier__label">Cashier at the counter</div>
+      (click)="toggleAccountHolder()"
-        <div class="cx-cashier__name">{{ cashier.name || '—' }}</div>
+    >
-        <div class="cx-cashier__flow">
+      <mat-icon>{{ isAccountHolder ? 'check_box' : 'check_box_outline_blank' }}</mat-icon>
-          <span><mat-icon>south</mat-icon> Receives from customer</span>
+      <span>Account Holder</span>
-          <span><mat-icon>north</mat-icon> Gives to customer</span>
-        </div>
-      </div>
-      <div class="cx-cashier__stats">
-        <div>
-          <span>Counter</span><strong>{{ cashier.tellerName || '—' }}</strong>
-        </div>
-        <div>
-          <span>Branch</span><strong>{{ cashier.officeName || '—' }}</strong>
-        </div>
-        <div>
-          <span>Allocated today</span
-          ><strong>{{
-            cashier.allocatedAmount === null ? '—' : '₹' + (cashier.allocatedAmount | number: '1.2-2')
-          }}</strong>
-        </div>
-        <div>
-          <span>Cash in hand</span><strong>₹{{ cashier.totalAmount | number: '1.2-2' }}</strong>
-        </div>
-      </div>
-    </section>
-  } @else if (noCashier) {
-    <section class="cx-cashier cx-cashier--none">
-      <mat-icon>person_off</mat-icon>
-      <div>
-        <div class="cx-cashier__name">Your login is not linked to a cashier</div>
-        <div class="cx-cashier__label">
-          A cash exchange moves notes in and out of a cashier's drawer, so it can only be recorded by a cashier. Log in
-          as a cashier to continue.
-        </div>
-      </div>
-    </section>
-  }
-
-  <!-- ── Customer: an existing client (details from their record) or a walk-in identified at the counter ── -->
-  <section class="cx-cust">
-    <header class="cx-cust__head">
-      <div class="cx-cust__title">
-        <span class="cx-cust__title-icon"><mat-icon>groups</mat-icon></span>
-        <div>
-          <div class="cx-cust__title-text">Customer</div>
-          <div class="cx-cust__title-sub">Who is exchanging cash at the counter</div>
-        </div>
-      </div>
-      <div class="cx-cust__modes" role="tablist" aria-label="Customer type">
-        <button
-          type="button"
-          role="tab"
-          class="cx-cust__mode"
-          [class.cx-cust__mode--active]="customerMode === 'existing'"
-          [attr.aria-selected]="customerMode === 'existing'"
-          (click)="setCustomerMode('existing')"
-        >
-          <mat-icon>badge</mat-icon> Existing Customer
-        </button>
-        <button
-          type="button"
-          role="tab"
-          class="cx-cust__mode"
-          [class.cx-cust__mode--active]="customerMode === 'walkin'"
-          [attr.aria-selected]="customerMode === 'walkin'"
-          (click)="setCustomerMode('walkin')"
-        >
-          <mat-icon>person_outline</mat-icon> Walk-in Customer
-        </button>
-      </div>
-    </header>
-
-    <div class="cx-cust__body">
-      <!-- Who -->
-      <div class="cx-cust__who">
-        @if (customerMode === 'existing') {
-          @if (loadingCustomer) {
-            <div class="cx-cust__empty">
-              <mat-icon class="cx-cust__empty-icon cx-spin">autorenew</mat-icon>
-              <div class="cx-cust__empty-title">Loading customer details…</div>
-            </div>
-          } @else if (!selectedCustomer) {
-            <div class="cx-cust__empty">
-              <mat-icon class="cx-cust__empty-icon">person_search</mat-icon>
-              <div class="cx-cust__empty-title">No customer selected</div>
-              <div class="cx-cust__empty-sub">Search by name, account no., PAN or Aadhaar</div>
-              <button type="button" class="cx-btn cx-btn--primary" (click)="openCustomerSearch()">
-                <mat-icon>search</mat-icon> Search Customer
-              </button>
-            </div>
-          } @else {
-            <div class="cx-cust__card">
-              <div class="cx-cust__card-top">
-                <div class="cx-avatar">{{ customerInitials }}</div>
-                <div class="cx-cust__card-id">
-                  <div class="cx-cust__name">{{ selectedCustomer.displayName }}</div>
-                  <div class="cx-cust__badges">
-                    <span
-                      class="cx-kyc"
-                      [class.cx-kyc--ok]="selectedCustomer.kycStatus === 'Verified'"
-                      [class.cx-kyc--warn]="selectedCustomer.kycStatus !== 'Verified'"
-                    >
-                      <mat-icon>{{
-                        selectedCustomer.kycStatus === 'Verified' ? 'verified_user' : 'gpp_maybe'
-                      }}</mat-icon>
-                      KYC: {{ selectedCustomer.kycStatus }}
-                    </span>
-                    @if (selectedCustomer.accountType) {
-                      <span class="cx-chip-tag">{{ selectedCustomer.accountType }}</span>
-                    }
-                  </div>
-                </div>
-                <div class="cx-cust__card-actions">
-                  <button type="button" class="cx-link-btn" (click)="openCustomerSearch()">
-                    <mat-icon>swap_horiz</mat-icon> Change
-                  </button>
-                  <button type="button" class="cx-link-btn cx-link-btn--danger" (click)="clearCustomer()">
-                    <mat-icon>close</mat-icon> Remove
-                  </button>
-                </div>
-              </div>
-              <div class="cx-cust__grid">
-                <div>
-                  <span>CIF No.</span><strong>{{ selectedCustomer.cifNumber || '—' }}</strong>
-                </div>
-                <div>
-                  <span>Client ID</span><strong>{{ selectedCustomer.clientId }}</strong>
-                </div>
-                <div>
-                  <span>Mobile</span><strong>{{ selectedCustomer.mobileNo || '—' }}</strong>
-                </div>
-                <div>
-                  <span>Branch</span><strong>{{ selectedCustomer.officeName || '—' }}</strong>
-                </div>
-                <div>
-                  <span>Account</span><strong>{{ selectedCustomer.accountNo || 'No account' }}</strong>
-                </div>
-                <div>
-                  <span>PAN on record</span>
-                  <strong>
-                    {{ selectedCustomer.kycPan || 'Not on record' }}
-                    @if (selectedCustomer.kycPan) {
-                      <span
-                        class="cx-kyc cx-kyc--sm"
-                        [class.cx-kyc--ok]="selectedCustomer.panVerified"
-                        [class.cx-kyc--warn]="!selectedCustomer.panVerified"
-                        >{{ selectedCustomer.panVerified ? 'Verified' : 'Not verified' }}</span
-                      >
-                    }
-                  </strong>
-                </div>
-              </div>
-            </div>
-          }
-        } @else {
-          <div class="cx-cust__walkin">
-            <label class="cx-field">
-              <span>Customer Name{{ needsPan ? ' *' : '' }}</span>
-              <input
-                type="text"
-                [value]="walkInName"
-                (input)="walkInName = $any($event.target).value"
-                placeholder="Full name as on ID"
-                maxlength="150"
-                autocomplete="off"
-              />
-            </label>
-            <label class="cx-field">
-              <span>Mobile</span>
-              <input
-                type="tel"
-                inputmode="numeric"
-                [value]="walkInMobile"
-                (input)="walkInMobile = $any($event.target).value"
-                placeholder="10-digit mobile number"
-                maxlength="15"
-                autocomplete="off"
-              />
-            </label>
-          </div>
-        }
-      </div>
-
-      <!-- PAN -->
-      <div
-        class="cx-pan"
-        [class.cx-pan--required]="panMissing"
-        [class.cx-pan--invalid]="panFormatInvalid"
-        [class.cx-pan--valid]="panValue && !panFormatInvalid"
-      >
-        <div class="cx-pan__head">
-          <mat-icon>credit_card</mat-icon>
-          <span class="cx-pan__label">PAN Card</span>
-          <span class="cx-pan__tag" [class.cx-pan__tag--on]="needsPan">{{ needsPan ? 'Mandatory' : 'Optional' }}</span>
-        </div>
-        <div class="cx-pan__input">
-          <input
-            type="text"
-            [value]="panNumber"
-            (input)="panNumber = $any($event.target).value.toUpperCase()"
-            placeholder="ABCDE1234F"
-            maxlength="10"
-            autocomplete="off"
-            spellcheck="false"
-            aria-label="PAN number"
-          />
-          @if (panValue && !panFormatInvalid) {
-            <mat-icon class="cx-pan__state cx-pan__state--ok">check_circle</mat-icon>
-          } @else if (panFormatInvalid) {
-            <mat-icon class="cx-pan__state cx-pan__state--bad">error</mat-icon>
-          }
-        </div>
-        <div class="cx-pan__hint">
-          @if (panFormatInvalid) {
-            PAN is 5 letters, 4 digits, 1 letter (e.g. ABCDE1234F).
-          } @else if (panFromKyc) {
-            <mat-icon>link</mat-icon> Fetched from the customer's KYC record.
-          } @else if (panMissing) {
-            Required: this exchange is above ₹50,000 (Income Tax Rule 114B / RBI).
-          } @else {
-            Mandatory for exchanges above ₹50,000.
-          }
-        </div>
-      </div>
     </div>
-  </section>
+
+    @if (isAccountHolder) {
+      <label class="cx-field cx-field--inline">
+        <span>Account No.</span>
+        <input
+          type="text"
+          [value]="accountNo"
+          (input)="accountNo = $any($event.target).value"
+          placeholder="e.g. 000101234567"
+        />
+      </label>
+    } @else {
+      <span class="cx-walk-in"><mat-icon>person_outline</mat-icon> Walk-in Customer</span>
+    }
+
+    @if (needsIdProof) {
+      <div class="cx-pan-required">
+        <mat-icon>warning</mat-icon>
+        <span>Amount ≥ ₹50,000 — Customer PAN / Aadhaar required (RBI)</span>
+      </div>
+      <label class="cx-field cx-field--inline cx-field--pan">
+        <span>PAN / Aadhaar *</span>
+        <input
+          type="text"
+          [value]="customerIdProof"
+          (input)="customerIdProof = $any($event.target).value"
+          placeholder="ABCDE1234F"
+          maxlength="20"
+        />
+      </label>
+    }
+  </div>
 
   <div class="cx-cols">
-    <!-- The cashier's count of a denomination and what this exchange does to it, updated as counts are typed. -->
-    <ng-template #drawerCell let-d="d">
-      @if (availableFor(d) === null) {
-        —
-      } @else {
-        In drawer <strong>{{ availableFor(d) }}</strong>
-        @if (netFor(d) !== 0) {
-          <span class="cx-after">
-            <mat-icon>{{ netFor(d) > 0 ? 'trending_up' : 'trending_down' }}</mat-icon>
-            <strong>{{ drawerAfter(d) }}</strong>
-            <small>({{ netFor(d) > 0 ? '+' : '' }}{{ netFor(d) }})</small>
-          </span>
-        }
-      }
-    </ng-template>
-
     <!-- RECEIVED -->
     <section class="cx-col cx-col--received">
       <header class="cx-col-head">
@@ -283,7 +78,7 @@
           <div class="cx-subhead">Bank Notes</div>
         }
         @for (d of notes; track d.id) {
-          <div class="cx-row cx-row--stock">
+          <div class="cx-row">
             <span class="cx-chip">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('r', d, -1)" [disabled]="countFor('r', d) === 0">−</button>
@@ -295,9 +90,6 @@
               />
               <button type="button" (click)="bump('r', d, 1)">+</button>
             </div>
-            <span class="cx-avail" [class.cx-avail--up]="netFor(d) > 0" [class.cx-avail--down]="netFor(d) < 0">
-              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
-            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('r', d) === 0"
               >₹{{ subtotal('r', d) | number: '1.2-2' }}</span
             >
@@ -307,7 +99,7 @@
           <div class="cx-subhead">Coins</div>
         }
         @for (d of coins; track d.id) {
-          <div class="cx-row cx-row--stock">
+          <div class="cx-row">
             <span class="cx-chip cx-chip--coin">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('r', d, -1)" [disabled]="countFor('r', d) === 0">−</button>
@@ -319,9 +111,6 @@
               />
               <button type="button" (click)="bump('r', d, 1)">+</button>
             </div>
-            <span class="cx-avail" [class.cx-avail--up]="netFor(d) > 0" [class.cx-avail--down]="netFor(d) < 0">
-              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
-            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('r', d) === 0"
               >₹{{ subtotal('r', d) | number: '1.2-2' }}</span
             >
@@ -342,7 +131,7 @@
           <div class="cx-subhead">Bank Notes</div>
         }
         @for (d of notes; track d.id) {
-          <div class="cx-row cx-row--stock" [class.cx-row--over]="exceedsAvailable(d)">
+          <div class="cx-row">
             <span class="cx-chip">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('g', d, -1)" [disabled]="countFor('g', d) === 0">−</button>
@@ -352,16 +141,8 @@
                 [value]="countFor('g', d)"
                 (input)="onChange('g', d, $any($event.target).value)"
               />
-              <button type="button" (click)="bump('g', d, 1)" [disabled]="!canGiveMore(d)">+</button>
+              <button type="button" (click)="bump('g', d, 1)">+</button>
             </div>
-            <span
-              class="cx-avail"
-              [class.cx-avail--up]="netFor(d) > 0"
-              [class.cx-avail--down]="netFor(d) < 0"
-              [class.cx-avail--over]="exceedsAvailable(d)"
-            >
-              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
-            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('g', d) === 0"
               >₹{{ subtotal('g', d) | number: '1.2-2' }}</span
             >
@@ -371,7 +152,7 @@
           <div class="cx-subhead">Coins</div>
         }
         @for (d of coins; track d.id) {
-          <div class="cx-row cx-row--stock" [class.cx-row--over]="exceedsAvailable(d)">
+          <div class="cx-row">
             <span class="cx-chip cx-chip--coin">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('g', d, -1)" [disabled]="countFor('g', d) === 0">−</button>
@@ -381,16 +162,8 @@
                 [value]="countFor('g', d)"
                 (input)="onChange('g', d, $any($event.target).value)"
               />
-              <button type="button" (click)="bump('g', d, 1)" [disabled]="!canGiveMore(d)">+</button>
+              <button type="button" (click)="bump('g', d, 1)">+</button>
             </div>
-            <span
-              class="cx-avail"
-              [class.cx-avail--up]="netFor(d) > 0"
-              [class.cx-avail--down]="netFor(d) < 0"
-              [class.cx-avail--over]="exceedsAvailable(d)"
-            >
-              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
-            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('g', d) === 0"
               >₹{{ subtotal('g', d) | number: '1.2-2' }}</span
             >
@@ -400,30 +173,6 @@
     </section>
   </div>
 
-  <!-- What this exchange does to the cashier's drawer, denomination by denomination. -->
-  @if (impactRows.length) {
-    <div class="cx-impact">
-      <div class="cx-impact__title"><mat-icon>inventory_2</mat-icon> Drawer after this exchange</div>
-      <div class="cx-impact__chips">
-        @for (r of impactRows; track r.id) {
-          <span
-            class="cx-impact__chip"
-            [class.cx-impact__chip--up]="r.net > 0"
-            [class.cx-impact__chip--down]="r.net < 0"
-          >
-            <b>{{ r.label }}</b>
-            {{ r.before }} → {{ r.after }}
-            <em>({{ r.net > 0 ? '+' : '' }}{{ r.net }})</em>
-          </span>
-        }
-      </div>
-      <div class="cx-impact__note">
-        The branch's total for each denomination moves by the same amount; the vault is not touched (Branch Ops → Branch
-        Cash Position).
-      </div>
-    </div>
-  }
-
   <div class="cx-summary">
     <div class="cx-sum">
       <span>Received</span><strong>₹{{ receivedTotal | number: '1.2-2' }}</strong>
@@ -464,15 +213,9 @@
       </div>
     </div>
   }
-  @if (panMissing) {
+  @if (needsIdProof && !customerIdProof.trim()) {
     <div class="cx-warn cx-warn--pan">
-      <mat-icon>badge</mat-icon> Enter the customer's PAN to proceed (amount above ₹50,000).
+      <mat-icon>badge</mat-icon> Enter customer PAN / Aadhaar to proceed (amount ≥ ₹50,000).
-    </div>
-  }
-  @if (!customerIdentified && !loadingCustomer) {
-    <div class="cx-warn cx-warn--pan">
-      <mat-icon>person_search</mat-icon>
-      {{ customerMode === 'existing' ? 'Search and select the customer.' : "Enter the walk-in customer's name." }}
     </div>
   }
 

src/app/cashier/cash-exchange-entry/cash-exchange-entry.component.scss

@@ -73,584 +73,99 @@
   }
 }
 
-/* ── Customer: existing client or walk-in, plus PAN ── */
+/* ── Customer info bar ── */
-.cx-cust {
+.cx-customer-bar {
-  background: #fff;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 10px 14px;
+  background: #f8fafc;
   border: 1px solid #e2e8f0;
-  border-radius: 14px;
+  border-radius: 10px;
-  box-shadow: 0 1px 2px rgb(15 23 42 / 4%);
+  flex-wrap: wrap;
-  overflow: hidden;
+}
 
-  &__head {
+.cx-customer-toggle {
-    display: flex;
+  display: flex;
-    align-items: center;
+  align-items: center;
-    justify-content: space-between;
+  gap: 6px;
-    flex-wrap: wrap;
+  font-size: 13px;
-    gap: 12px;
+  font-weight: 600;
-    padding: 12px 16px;
+  color: #475569;
-    background: linear-gradient(180deg, #f8fafc, #f1f5f9);
+  cursor: pointer;
-    border-bottom: 1px solid #e2e8f0;
+  user-select: none;
-  }
 
-  &__title {
+  mat-icon {
-    display: flex;
+    font-size: 20px;
-    align-items: center;
+    height: 20px;
-    gap: 10px;
+    width: 20px;
-  }
-
-  &__title-icon {
-    display: grid;
-    place-items: center;
-    width: 36px;
-    height: 36px;
-    border-radius: 10px;
-    background: #e6f4ee;
-    color: #0f4f3c;
-
-    mat-icon {
-      font-size: 20px;
-      width: 20px;
-      height: 20px;
-    }
-  }
-
-  &__title-text {
-    font-size: 14px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__title-sub {
-    font-size: 12px;
-    color: #64748b;
-  }
-
-  &__modes {
-    display: inline-flex;
-    padding: 3px;
-    background: #e2e8f0;
-    border-radius: 10px;
-  }
-
-  &__mode {
-    display: inline-flex;
-    align-items: center;
-    gap: 6px;
-    height: 32px;
-    padding: 0 14px;
-    border: 0;
-    border-radius: 8px;
-    background: transparent;
-    font-size: 13px;
-    font-weight: 600;
-    color: #475569;
-    cursor: pointer;
-    transition:
-      background 0.15s ease,
-      color 0.15s ease;
-
-    mat-icon {
-      font-size: 18px;
-      width: 18px;
-      height: 18px;
-    }
-
-    &:hover {
-      color: #0f172a;
-    }
-
-    &--active,
-    &--active:hover {
-      background: #fff;
-      color: #0f4f3c;
-      box-shadow: 0 1px 3px rgb(15 23 42 / 15%);
-    }
-  }
-
-  &__body {
-    display: grid;
-    grid-template-columns: minmax(0, 1.7fr) minmax(260px, 1fr);
-    gap: 16px;
-    padding: 16px;
-  }
-
-  &__who {
-    min-width: 0;
-  }
-
-  /* Nothing picked yet, or loading */
-  &__empty {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    gap: 4px;
-    min-height: 150px;
-    padding: 20px;
-    text-align: center;
-    background: #f8fafc;
-    border: 1.5px dashed #cbd5e1;
-    border-radius: 12px;
-  }
-
-  &__empty-icon {
-    font-size: 36px;
-    width: 36px;
-    height: 36px;
     color: #94a3b8;
   }
 
-  &__empty-title {
+  &--active {
-    font-size: 14px;
+    color: #1e40af;
-    font-weight: 600;
-    color: #334155;
-  }
 
-  &__empty-sub {
+    mat-icon {
-    margin-bottom: 8px;
+      color: #1e40af;
-    font-size: 12px;
-    color: #64748b;
-  }
-
-  /* A picked client */
-  &__card {
-    padding: 14px;
-    background: #fff;
-    border: 1px solid #e2e8f0;
-    border-radius: 12px;
-  }
-
-  &__card-top {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 12px;
-  }
-
-  &__card-id {
-    flex: 1 1 180px;
-    min-width: 0;
-  }
-
-  &__name {
-    font-size: 16px;
-    font-weight: 700;
-    color: #0f172a;
-    overflow-wrap: anywhere;
-  }
-
-  &__badges {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 6px;
-    margin-top: 4px;
-  }
-
-  &__card-actions {
-    display: flex;
-    gap: 4px;
-  }
-
-  &__grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
-    gap: 12px 16px;
-    margin-top: 12px;
-    padding-top: 12px;
-    border-top: 1px dashed #e2e8f0;
-
-    span {
-      display: block;
-      margin-bottom: 2px;
-      font-size: 11px;
-      color: #64748b;
     }
-
-    strong {
-      font-size: 13px;
-      font-weight: 600;
-      color: #0f172a;
-    }
-  }
-
-  /* A walk-in, identified at the counter */
-  &__walkin {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 12px;
-
-    .cx-field {
-      font-size: 12px;
-    }
-
-    .cx-field input {
-      width: 100%;
-      height: 40px;
-      box-sizing: border-box;
-    }
-  }
-
-  .cx-field input:focus {
-    outline: none;
-    border-color: #1f7a4d;
-    box-shadow: 0 0 0 3px rgb(31 122 77 / 15%);
   }
 }
 
-.cx-avatar {
+.cx-walk-in {
-  display: grid;
-  place-items: center;
-  flex: 0 0 auto;
-  width: 44px;
-  height: 44px;
-  border-radius: 50%;
-  background: linear-gradient(135deg, #1f7a4d, #0f4f3c);
-  font-size: 15px;
-  font-weight: 700;
-  letter-spacing: 0.02em;
-  color: #fff;
-
-  &--sm {
-    width: 40px;
-    height: 40px;
-    font-size: 14px;
-  }
-}
-
-/* The cashier at the counter, or why there is none */
-.cx-cashier {
   display: flex;
   align-items: center;
-  flex-wrap: wrap;
-  gap: 14px 20px;
-  padding: 12px 16px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-left: 4px solid #1f7a4d;
-  border-radius: 14px;
-  box-shadow: 0 1px 2px rgb(15 23 42 / 4%);
-
-  &__id {
-    flex: 1 1 220px;
-    min-width: 0;
-  }
-
-  &__label {
-    font-size: 11px;
-    font-weight: 600;
-    letter-spacing: 0.04em;
-    text-transform: uppercase;
-    color: #64748b;
-  }
-
-  &__name {
-    font-size: 16px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__flow {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 4px 14px;
-    margin-top: 2px;
-    font-size: 12px;
-    color: #475569;
-
-    span {
-      display: inline-flex;
-      align-items: center;
-      gap: 2px;
-    }
-
-    mat-icon {
-      font-size: 14px;
-      width: 14px;
-      height: 14px;
-      color: #94a3b8;
-    }
-  }
-
-  &__stats {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10px 28px;
-
-    span {
-      display: block;
-      font-size: 11px;
-      color: #64748b;
-    }
-
-    strong {
-      font-size: 14px;
-      font-weight: 600;
-      color: #0f172a;
-    }
-  }
-
-  &--none {
-    background: #fffbeb;
-    border-color: #fcd34d;
-    border-left-color: #d97706;
-
-    mat-icon {
-      color: #d97706;
-    }
-
-    .cx-cashier__label {
-      font-weight: 500;
-      letter-spacing: 0;
-      text-transform: none;
-      color: #92400e;
-    }
-  }
-}
-
-.cx-kyc {
-  display: inline-flex;
-  align-items: center;
   gap: 4px;
-  padding: 2px 8px;
+  font-size: 12px;
-  border-radius: 999px;
+  color: #64748b;
-  font-size: 11px;
-  font-weight: 600;
 
   mat-icon {
-    font-size: 14px;
+    font-size: 16px;
-    width: 14px;
+    height: 16px;
-    height: 14px;
+    width: 16px;
-  }
-
-  &--ok {
-    background: #dcfce7;
-    color: #166534;
-  }
-
-  &--warn {
-    background: #fef3c7;
-    color: #92400e;
-  }
-
-  &--sm {
-    margin-left: 6px;
-    padding: 1px 6px;
-    font-size: 10px;
   }
 }
 
-.cx-chip-tag {
+.cx-pan-required {
-  padding: 2px 8px;
+  display: flex;
-  border-radius: 6px;
-  background: #eef2ff;
-  font-size: 11px;
-  font-weight: 600;
-  color: #3730a3;
-}
-
-.cx-link-btn {
-  display: inline-flex;
   align-items: center;
-  gap: 4px;
+  gap: 6px;
-  height: 30px;
+  padding: 4px 10px;
-  padding: 0 10px;
+  background: #fffbeb;
-  border: 0;
+  border: 1px solid #fcd34d;
-  border-radius: 8px;
+  border-radius: 6px;
-  background: transparent;
   font-size: 12px;
   font-weight: 600;
-  color: #1e40af;
+  color: #92400e;
-  cursor: pointer;
 
   mat-icon {
     font-size: 16px;
-    width: 16px;
     height: 16px;
-  }
+    width: 16px;
-
+    color: #d97706;
-  &:hover {
-    background: #eff6ff;
-  }
-
-  &--danger {
-    color: #b91c1c;
-
-    &:hover {
-      background: #fef2f2;
-    }
   }
 }
 
-/* PAN: neutral until needed, amber when required and missing, red when malformed, green when valid */
+.cx-field--inline {
-.cx-pan {
+  flex-direction: row;
-  display: flex;
+  align-items: center;
-  flex-direction: column;
-  align-self: start;
   gap: 8px;
-  padding: 14px;
-  background: #f8fafc;
-  border: 1px solid #e2e8f0;
-  border-radius: 12px;
 
-  &__head {
+  span {
-    display: flex;
+    white-space: nowrap;
-    align-items: center;
-    gap: 8px;
-
-    mat-icon {
-      font-size: 20px;
-      width: 20px;
-      height: 20px;
-      color: #475569;
-    }
   }
 
-  &__label {
+  input {
-    font-size: 13px;
+    width: 180px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__tag {
-    margin-left: auto;
-    padding: 2px 8px;
-    border-radius: 999px;
-    background: #e2e8f0;
-    font-size: 11px;
-    font-weight: 600;
-    color: #475569;
-
-    &--on {
-      background: #fef3c7;
-      color: #92400e;
-    }
-  }
-
-  &__input {
-    position: relative;
-
-    input {
-      width: 100%;
-      height: 44px;
-      box-sizing: border-box;
-      padding: 0 40px 0 12px;
-      background: #fff;
-      border: 1.5px solid #cbd5e1;
-      border-radius: 10px;
-      font-family: ui-monospace, sfmono-regular, menlo, consolas, monospace;
-      font-size: 18px;
-      font-weight: 600;
-      letter-spacing: 0.18em;
-      text-transform: uppercase;
-      color: #0f172a;
-
-      &::placeholder {
-        font-weight: 500;
-        color: #cbd5e1;
-      }
-
-      &:focus {
-        outline: none;
-        border-color: #1f7a4d;
-        box-shadow: 0 0 0 3px rgb(31 122 77 / 15%);
-      }
-    }
-  }
-
-  &__state {
-    position: absolute;
-    top: 50%;
-    right: 10px;
-    transform: translateY(-50%);
-    font-size: 22px;
-    width: 22px;
-    height: 22px;
-
-    &--ok {
-      color: #16a34a;
-    }
-
-    &--bad {
-      color: #dc2626;
-    }
-  }
-
-  &__hint {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-    font-size: 12px;
-    color: #64748b;
-
-    mat-icon {
-      font-size: 14px;
-      width: 14px;
-      height: 14px;
-    }
-  }
-
-  &--required {
-    background: #fffbeb;
-    border-color: #fcd34d;
-
-    .cx-pan__input input {
-      border-color: #f59e0b;
-    }
-
-    .cx-pan__hint {
-      font-weight: 600;
-      color: #92400e;
-    }
-  }
-
-  &--invalid {
-    background: #fef2f2;
-    border-color: #fecaca;
-
-    .cx-pan__input input {
-      border-color: #ef4444;
-    }
-
-    .cx-pan__hint {
-      font-weight: 600;
-      color: #b91c1c;
-    }
-  }
-
-  &--valid {
-    background: #f0fdf4;
-    border-color: #bbf7d0;
-
-    .cx-pan__input input {
-      border-color: #22c55e;
-    }
-
-    .cx-pan__hint {
-      color: #166534;
-    }
   }
 }
 
-.cx-spin {
+.cx-field--pan input {
-  animation: cx-spin 1s linear infinite;
+  width: 160px;
-}
+  border-color: #fcd34d;
 
-@keyframes cx-spin {
+  &:focus {
-  to {
+    outline: none;
-    transform: rotate(360deg);
+    border-color: #d97706;
-  }
-}
-
-@media (width <= 900px) {
-  .cx-cust__body {
-    grid-template-columns: 1fr;
-  }
-}
-
-@media (width <= 600px) {
-  .cx-cust__walkin {
-    grid-template-columns: 1fr;
   }
 }
 
@@ -830,129 +345,6 @@
   border-bottom: 1px dotted #eef2f7;
 }
 
-/* Both sides: the cashier's count of each denomination sits between the counter and the amount. */
-.cx-row--stock {
-  grid-template-columns: 64px 120px 1fr 96px;
-}
-
-.cx-row--over {
-  background: #fef2f2;
-}
-
-.cx-avail {
-  padding-left: 6px;
-  font-size: 12px;
-  color: #64748b;
-
-  strong {
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  /* the count after this exchange: green when it goes up, red when it goes down */
-  .cx-after {
-    display: inline-flex;
-    align-items: center;
-    gap: 3px;
-    margin-left: 6px;
-    font-weight: 600;
-
-    mat-icon {
-      font-size: 16px;
-      width: 16px;
-      height: 16px;
-    }
-
-    small {
-      font-size: 11px;
-    }
-  }
-
-  &--up .cx-after,
-  &--up .cx-after strong {
-    color: #15803d;
-  }
-
-  &--down .cx-after,
-  &--down .cx-after strong {
-    color: #b45309;
-  }
-
-  &--over,
-  &--over strong,
-  &--over .cx-after,
-  &--over .cx-after strong {
-    color: #b91c1c;
-  }
-}
-
-/* The drawer after the whole exchange, one chip per denomination it changes */
-.cx-impact {
-  padding: 12px 14px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 12px;
-
-  &__title {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    margin-bottom: 8px;
-    font-size: 13px;
-    font-weight: 700;
-    color: #0f172a;
-
-    mat-icon {
-      font-size: 18px;
-      width: 18px;
-      height: 18px;
-      color: #475569;
-    }
-  }
-
-  &__chips {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-  }
-
-  &__chip {
-    display: inline-flex;
-    align-items: center;
-    gap: 6px;
-    padding: 5px 10px;
-    border-radius: 8px;
-    background: #f1f5f9;
-    font-size: 12px;
-    color: #334155;
-
-    b {
-      font-weight: 700;
-    }
-
-    em {
-      font-style: normal;
-      font-weight: 700;
-    }
-
-    &--up {
-      background: #dcfce7;
-      color: #166534;
-    }
-
-    &--down {
-      background: #fef3c7;
-      color: #92400e;
-    }
-  }
-
-  &__note {
-    margin-top: 8px;
-    font-size: 11px;
-    color: #64748b;
-  }
-}
-
 .cx-chip {
   display: inline-flex;
   align-items: center;

src/app/cashier/cash-exchange-entry/cash-exchange-entry.component.ts

@@ -11,16 +11,7 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
-import { MatDialog, MatDialogModule } from '@angular/material/dialog';
-import { forkJoin, of } from 'rxjs';
-import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { ClientsService } from 'app/clients/clients.service';
-import {
-  CustomerSearchDialogComponent,
-  CustomerSearchResult
-} from 'app/shared/customer-search-dialog/customer-search-dialog.component';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface Denom {
   id: number;
@@ -29,47 +20,6 @@ interface Denom {
   label: string;
 }
 
-/** An existing client picked through Customer Search, with what the counter needs to identify them. */
-interface SelectedCustomer {
-  clientId: number;
-  displayName: string;
-  cifNumber: string | null;
-  mobileNo: string | null;
-  officeName: string | null;
-  accountNo: string | null;
-  accountType: string | null;
-  /** PAN on the client's KYC record, if any. */
-  kycPan: string | null;
-  panVerified: boolean;
-  kycStatus: string;
-}
-
-/** The cashier at the counter: the one who takes the customer's notes and hands over the change. */
-interface CashierInfo {
-  cashierId: number;
-  name: string;
-  tellerName: string | null;
-  officeName: string | null;
-  /** Cash the vault allocated to them for the day, once known. */
-  allocatedAmount: number | null;
-  /** Cash they hold now. */
-  totalAmount: number;
-}
-
-/** Same rule as ClientKycApiConstants.PAN_REGEX on the server: 5 letters, 4 digits, 1 letter. */
-const PAN_PATTERN = /^[A-Z]{5}[0-9]{4}[A-Z]$/;
-
-/** Income Tax Rule 114B / RBI: a cash exchange above this needs the customer's PAN. */
-const PAN_MANDATORY_ABOVE = 50000;
-
-const KYC_STATUS: Record<number, string> = {
-  100: 'Pending',
-  200: 'In Progress',
-  300: 'Verified',
-  400: 'Rejected',
-  500: 'Expired'
-};
-
 /** Cashier cash-exchange entry: customer gives some denominations and takes equal-value change (net 0). */
 @Component({
   selector: 'mifosx-cash-exchange-entry',
@@ -80,14 +30,11 @@ const KYC_STATUS: Record<number, string> = {
     CommonModule,
     FormsModule,
     MatIconModule,
-    MatSnackBarModule,
+    MatSnackBarModule
-    MatDialogModule
   ]
 })
 export class CashExchangeEntryComponent implements OnInit {
   private service = inject(CashierService);
-  private clientsService = inject(ClientsService);
-  private dialog = inject(MatDialog);
   private snackBar = inject(MatSnackBar);
 
   notes: Denom[] = [];
@@ -99,17 +46,11 @@ export class CashExchangeEntryComponent implements OnInit {
   saving = false;
 
   // ── Customer info ──
-  /** An existing client found through Customer Search, or a walk-in identified at the counter. */
+  isAccountHolder = false;
-  customerMode: 'existing' | 'walkin' = 'walkin';
+  accountNo = '';
-  selectedCustomer: SelectedCustomer | null = null;
+  customerIdProof = '';
-  loadingCustomer = false;
-  walkInName = '';
-  walkInMobile = '';
-  panNumber = '';
 
-  // ── Cashier at the counter, and their position (for the denomination overdraft check) ──
+  // ── Cashier position (for denomination overdraft check) ──
-  /** The cashier linked to the logged-in user; null when the login is not a cashier's. */
-  cashier: CashierInfo | null = null;
   private availableMap = new Map<number, number>();
   positionLoaded = false;
 
@@ -122,7 +63,7 @@ export class CashExchangeEntryComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.exchangeDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service.getActiveDenominations().subscribe({
       next: (list) => {
@@ -146,19 +87,7 @@ export class CashExchangeEntryComponent implements OnInit {
         ((res?.denominations || []) as any[]).forEach((d: any) => {
           if (d.denominationId) this.availableMap.set(Number(d.denominationId), Number(d.count ?? 0));
         });
-        const cashierId = res?.cashierId ? Number(res.cashierId) : null;
-        this.cashier = cashierId
-          ? {
-              cashierId,
-              name: res.cashierName || '',
-              tellerName: null,
-              officeName: null,
-              allocatedAmount: null,
-              totalAmount: Number(res.totalAmount ?? 0)
-            }
-          : null;
         this.positionLoaded = true;
-        if (cashierId) this.loadCashierDetails(cashierId);
       },
       error: () => {
         this.positionLoaded = true;
@@ -166,31 +95,6 @@ export class CashExchangeEntryComponent implements OnInit {
     });
   }
 
-  /** The counter, branch and today's allocation; the card still shows name and cash in hand without them. */
-  private loadCashierDetails(cashierId: number): void {
-    this.service
-      .getInterCashierCashierSummary(cashierId, this.exchangeDate)
-      .pipe(catchError(() => of(null)))
-      .subscribe((r: any) => {
-        if (!r || this.cashier?.cashierId !== cashierId) return;
-        this.cashier = {
-          ...this.cashier,
-          tellerName: r.tellerName || null,
-          officeName: r.officeName || null,
-          allocatedAmount: Number(r.allocatedAmount ?? 0)
-        };
-      });
-  }
-
-  /** Up to two letters for the cashier's avatar. */
-  get cashierInitials(): string {
-    const words = (this.cashier?.name || '').trim().split(/\s+/).filter(Boolean);
-    if (words.length === 0) return '?';
-    const first = words[0].charAt(0);
-    const last = words.length > 1 ? words[words.length - 1].charAt(0) : '';
-    return (first + last).toUpperCase();
-  }
-
   countFor(side: 'r' | 'g', d: Denom): number {
     return (side === 'r' ? this.receivedCounts : this.givenCounts)[d.id] || 0;
   }
@@ -224,102 +128,14 @@ export class CashExchangeEntryComponent implements OnInit {
     return this.receivedTotal > 0 && this.receivedTotal === this.givenTotal;
   }
 
-  /** Above ₹50,000 the customer's PAN is mandatory (Income Tax Rule 114B, followed under RBI guidelines). */
+  /** Above ₹50,000 PAN/ID is mandatory per RBI guideline */
-  get needsPan(): boolean {
+  get needsIdProof(): boolean {
-    return this.receivedTotal > PAN_MANDATORY_ABOVE;
+    return this.receivedTotal >= 50000;
-  }
-
-  /** Up to two letters for the avatar: first and last word of the customer's name. */
-  get customerInitials(): string {
-    const words = (this.selectedCustomer?.displayName || '').trim().split(/\s+/).filter(Boolean);
-    if (words.length === 0) return '?';
-    const first = words[0].charAt(0);
-    const last = words.length > 1 ? words[words.length - 1].charAt(0) : '';
-    return (first + last).toUpperCase();
-  }
-
-  get panValue(): string {
-    return this.panNumber.trim().toUpperCase();
-  }
-
-  /** A PAN that is entered must be well-formed, required or not. */
-  get panFormatInvalid(): boolean {
-    return !!this.panValue && !PAN_PATTERN.test(this.panValue);
-  }
-
-  get panMissing(): boolean {
-    return this.needsPan && !this.panValue;
-  }
-
-  /** The PAN comes from the client's KYC record, so the cashier confirms it rather than types it. */
-  get panFromKyc(): boolean {
-    return !!this.selectedCustomer?.kycPan && this.panValue === this.selectedCustomer.kycPan.toUpperCase();
-  }
-
-  /** Who the customer is has to be known: a picked client, or a walk-in's name once PAN is required. */
-  get customerIdentified(): boolean {
-    if (this.customerMode === 'existing') return !!this.selectedCustomer;
-    return !this.needsPan || this.walkInName.trim().length > 0;
-  }
-
-  /** A login with no cashier behind it has no drawer to take notes into or give change from. */
-  get noCashier(): boolean {
-    return this.positionLoaded && !this.cashier;
-  }
-
-  /** How many of the denomination the cashier holds, or null while that is not known (loading, or no cashier). */
-  availableFor(d: Denom): number | null {
-    if (!this.positionLoaded || !this.cashier) return null;
-    return this.availableMap.get(d.id) ?? 0;
-  }
-
-  /** The cashier is giving more of this denomination than they hold. */
-  exceedsAvailable(d: Denom): boolean {
-    const available = this.availableFor(d);
-    return available !== null && this.countFor('g', d) > available;
-  }
-
-  /** The + on the given side stops at what the cashier holds; a larger typed number is still caught and shown. */
-  canGiveMore(d: Denom): boolean {
-    const available = this.availableFor(d);
-    return available === null || this.countFor('g', d) < available;
-  }
-
-  /** What this exchange does to the cashier's count of the denomination: notes taken in less notes given out. */
-  netFor(d: Denom): number {
-    return this.countFor('r', d) - this.countFor('g', d);
-  }
-
-  /** The cashier's count of the denomination once this exchange is recorded, or null while it is not known. */
-  drawerAfter(d: Denom): number | null {
-    const available = this.availableFor(d);
-    return available === null ? null : available + this.netFor(d);
-  }
-
-  /**
-   * The denominations this exchange changes, with the drawer's count before and after, so the effect shows
-   * while the counts are being typed. The branch's total for each denomination moves by the same amount, as
-   * the customer's notes go into the drawer and the change comes out of it; the vault is not involved.
-   */
-  get impactRows(): Array<{ id: number; label: string; kind: string; net: number; before: number; after: number }> {
-    if (!this.positionLoaded || !this.cashier) return [];
-    return this.denoms
-      .filter((d) => this.netFor(d) !== 0)
-      .map((d) => ({
-        id: d.id,
-        label: d.label,
-        kind: d.kind,
-        net: this.netFor(d),
-        before: this.availableFor(d) ?? 0,
-        after: this.drawerAfter(d) ?? 0
-      }));
   }
 
   /** Denominations where cashier is giving more than currently available. */
   get givenOverdraftItems(): Array<{ label: string; available: number; requested: number }> {
-    // Without a cashier every denomination would read as "0 available"; the missing cashier is the
+    if (!this.positionLoaded) return [];
-    // thing to tell the user, not a stock shortage.
-    if (!this.positionLoaded || !this.cashier) return [];
     return this.denoms
       .map((d) => ({ label: d.label, available: this.availableMap.get(d.id) ?? 0, requested: this.countFor('g', d) }))
       .filter((item) => item.requested > 0 && item.requested > item.available);
@@ -330,77 +146,21 @@ export class CashExchangeEntryComponent implements OnInit {
   }
 
   get valid(): boolean {
-    return (
+    return this.matches && (!this.needsIdProof || this.customerIdProof.trim().length > 0) && !this.hasGivenOverdraft;
-      this.matches &&
-      !!this.cashier &&
-      !this.hasGivenOverdraft &&
-      !this.panFormatInvalid &&
-      !this.panMissing &&
-      this.customerIdentified &&
-      !this.loadingCustomer
-    );
   }
 
-  setCustomerMode(mode: 'existing' | 'walkin'): void {
+  toggleAccountHolder(): void {
-    if (this.customerMode === mode) return;
+    this.isAccountHolder = !this.isAccountHolder;
-    this.customerMode = mode;
+    if (!this.isAccountHolder) this.accountNo = '';
-    this.selectedCustomer = null;
-    this.walkInName = '';
-    this.walkInMobile = '';
-    this.panNumber = '';
-  }
-
-  /** Pick an existing client through Customer Search, then load their details and KYC (PAN). */
-  openCustomerSearch(): void {
-    this.dialog
-      // An existing customer without an account is still a known customer, so the account is not required.
-      .open(CustomerSearchDialogComponent, { width: '960px', maxWidth: '95vw', data: { requireAccount: false } })
-      .afterClosed()
-      .subscribe((result: CustomerSearchResult | undefined) => {
-        if (!result?.clientId) return;
-        this.loadCustomer(result);
-      });
-  }
-
-  private loadCustomer(result: CustomerSearchResult): void {
-    this.loadingCustomer = true;
-    const id = String(result.clientId);
-    forkJoin({
-      client: this.clientsService.getClientData(id, true).pipe(catchError(() => of(null))),
-      kyc: this.clientsService.getClientKyc(id, true).pipe(catchError(() => of(null)))
-    }).subscribe(({ client, kyc }: { client: any; kyc: any }) => {
-      const kycPan: string | null = kyc?.panNumber || result.panNumber || null;
-      this.selectedCustomer = {
-        clientId: result.clientId,
-        displayName: client?.displayName || result.displayName,
-        cifNumber: client?.cifNumber || null,
-        mobileNo: client?.mobileNo || result.mobileNo || null,
-        officeName: client?.officeName || result.officeName || null,
-        accountNo: result.accountNo || null,
-        accountType: result.accountType || null,
-        kycPan,
-        panVerified: !!kyc?.panVerified,
-        kycStatus: KYC_STATUS[Number(kyc?.kycStatus?.id ?? kyc?.kycStatus)] || 'Not on record'
-      };
-      this.panNumber = kycPan ? kycPan.toUpperCase() : '';
-      this.loadingCustomer = false;
-    });
-  }
-
-  clearCustomer(): void {
-    this.selectedCustomer = null;
-    this.panNumber = '';
   }
 
   clear(): void {
     this.receivedCounts = {};
     this.givenCounts = {};
     this.note = '';
-    this.customerMode = 'walkin';
+    this.accountNo = '';
-    this.selectedCustomer = null;
+    this.customerIdProof = '';
-    this.walkInName = '';
+    this.isAccountHolder = false;
-    this.walkInMobile = '';
-    this.panNumber = '';
   }
 
   submit(): void {
@@ -410,17 +170,11 @@ export class CashExchangeEntryComponent implements OnInit {
       this.denoms
         .filter((d) => this.countFor(side, d) > 0)
         .map((d) => ({ denominationId: d.id, denominationValue: d.value, count: this.countFor(side, d) }));
-    const customer = this.customerMode === 'existing' ? this.selectedCustomer : null;
-    const pan = this.panValue || null;
     const payload: any = {
       exchangeDate: this.exchangeDate,
       note: this.note || null,
-      clientId: customer?.clientId ?? null,
+      customerIdProof: this.customerIdProof.trim() || null,
-      accountNo: customer?.accountNo ?? null,
+      accountNo: this.isAccountHolder && this.accountNo.trim() ? this.accountNo.trim() : null,
-      customerName: customer ? customer.displayName : this.walkInName.trim() || null,
-      customerMobile: customer ? customer.mobileNo : this.walkInMobile.trim() || null,
-      panNumber: pan,
-      customerIdProof: pan,
       received: build('r'),
       given: build('g')
     };

src/app/cashier/cash-history/cash-history.component.html

@@ -11,11 +11,25 @@
     <div>
       <div class="pg-eyebrow">CASHIER · HISTORY</div>
       <h1 class="pg-title">Cash Movement History</h1>
-      <p class="pg-sub">All transfers, settlements, inter-cashier movements and cash exchanges.</p>
+      <p class="pg-sub">All transfers, settlements, and inter-cashier movements. Reverse any active transaction.</p>
     </div>
     <button type="button" class="pg-btn pg-btn--ghost" (click)="load()"><mat-icon>refresh</mat-icon> Refresh</button>
   </header>
 
+  <!-- Reversal confirm panel -->
+  @if (reversingId !== null) {
+    <div class="reverse-panel">
+      <mat-icon class="reverse-icon">warning</mat-icon>
+      <span
+        >Reverse <strong>#{{ reversingId }}</strong
+        >? This cannot be undone.</span
+      >
+      <input class="reverse-reason" type="text" [(ngModel)]="reverseReason" placeholder="Reason (optional)" />
+      <button type="button" class="pg-btn pg-btn--danger" (click)="confirmReverse()">Confirm Reversal</button>
+      <button type="button" class="pg-btn pg-btn--ghost" (click)="cancelReverse()">Cancel</button>
+    </div>
+  }
+
   @if (loading) {
     <div class="pg-empty">Loading…</div>
   }
@@ -120,6 +134,11 @@
                   >
                     <mat-icon>visibility</mat-icon>
                   </button>
+                  @if (!r.isReversed) {
+                    <button type="button" class="pg-btn pg-btn--ghost btn-sm" title="Reverse" (click)="startReverse(r)">
+                      <mat-icon>undo</mat-icon>
+                    </button>
+                  }
                 </div>
               </td>
             </tr>
@@ -168,12 +187,6 @@
           <span class="detail-meta__label">Date</span>
           <span class="detail-meta__val">{{ detail.row.date }}</span>
         </div>
-        @if (detail.row.type === 'exchange') {
-          <div class="detail-meta__item">
-            <span class="detail-meta__label">Customer PAN</span>
-            <span class="detail-meta__val">{{ detail.row.panNumber || '—' }}</span>
-          </div>
-        }
         <div class="detail-meta__item">
           <span class="detail-meta__label">Total Amount</span>
           <span class="detail-meta__val detail-meta__val--amount">₹{{ detail.row.amount | number: '1.2-2' }}</span>

src/app/cashier/cash-history/cash-history.component.scss

@@ -47,6 +47,38 @@
   }
 }
 
+.reverse-panel {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 12px 16px;
+  background: #fffbeb;
+  border: 1px solid #fcd34d;
+  border-radius: 10px;
+  flex-wrap: wrap;
+  font-size: 13px;
+  color: #92400e;
+
+  .reverse-icon {
+    color: #f59e0b;
+    font-size: 20px;
+    height: 20px;
+    width: 20px;
+  }
+
+  .reverse-reason {
+    flex: 1 1 200px;
+    height: 34px;
+    padding: 0 10px;
+    border: 1px solid #fcd34d;
+    border-radius: 7px;
+    font-size: 13px;
+    font-family: inherit;
+    background: #fff;
+    color: #1a1a1a;
+  }
+}
+
 /* ── Action buttons cell ── */
 .action-btns {
   display: flex;

src/app/cashier/cash-history/cash-history.component.ts

@@ -8,7 +8,9 @@
 
 import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
 import { forkJoin, of } from 'rxjs';
@@ -29,8 +31,6 @@ interface TxnRow {
   reversedBy: number | null;
   reversedAt: string | null;
   reverseReason: string | null;
-  /** Customer PAN recorded on a cash exchange. */
-  panNumber?: string | null;
   type: 'transfer' | 'settlement' | 'inter' | 'exchange';
 }
 
@@ -52,10 +52,7 @@ interface DetailView {
   loading: boolean;
 }
 
-/**
+/** Unified history of all cash movements with reversal and detail view support. */
- * Unified history of all cash movements with a detail view. Read-only: cash movements cannot be reversed
- * from here (an earlier reversal still shows as Reversed, with who, when and why).
- */
 @Component({
   selector: 'mifosx-cash-history',
   templateUrl: './cash-history.component.html',
@@ -66,13 +63,16 @@ interface DetailView {
   standalone: true,
   imports: [
     CommonModule,
+    FormsModule,
     MatIconModule,
+    MatSnackBarModule,
     MatTabsModule,
     MatPaginatorModule
   ]
 })
 export class CashHistoryComponent implements OnInit {
   private service = inject(CashierService);
+  private snackBar = inject(MatSnackBar);
 
   transfers: TxnRow[] = [];
   settlements: TxnRow[] = [];
@@ -99,6 +99,10 @@ export class CashHistoryComponent implements OnInit {
 
   private denomKindMap = new Map<number, 'note' | 'coin'>();
 
+  reversingId: number | null = null;
+  reversingType: string | null = null;
+  reverseReason = '';
+
   detail: DetailView | null = null;
 
   ngOnInit(): void {
@@ -208,8 +212,7 @@ export class CashHistoryComponent implements OnInit {
       this.exchanges = (exchangeItems as any[]).map((e) => ({
         id: e.id,
         date: e.exchangeDate,
-        fromParty: this.exchangeParty(e),
+        fromParty: e.accountNo ? `Account ${e.accountNo}` : 'Walk-in Customer',
-        panNumber: e.panNumber ?? null,
         toParty: e.performedByUsername || '—',
         amount: e.exchangeAmount,
         note: e.note,
@@ -307,8 +310,7 @@ export class CashHistoryComponent implements OnInit {
         this.exchanges = (res.pageItems ?? []).map((e: any) => ({
           id: e.id,
           date: e.exchangeDate,
-          fromParty: this.exchangeParty(e),
+          fromParty: e.accountNo ? `Account ${e.accountNo}` : 'Walk-in Customer',
-          panNumber: e.panNumber ?? null,
           toParty: e.performedByUsername || '—',
           amount: e.exchangeAmount,
           note: e.note,
@@ -390,12 +392,39 @@ export class CashHistoryComponent implements OnInit {
     this.detail = null;
   }
 
-  /** Who the exchange was with: the customer's name (and account, if one), else the account, else a walk-in. */
+  startReverse(row: TxnRow): void {
-  private exchangeParty(e: any): string {
+    this.reversingId = row.id;
-    if (e.customerName) {
+    this.reversingType = row.type;
-      return e.accountNo ? `${e.customerName} (A/C ${e.accountNo})` : e.customerName;
+    this.reverseReason = '';
-    }
+  }
-    return e.accountNo ? `Account ${e.accountNo}` : 'Walk-in Customer';
+
+  cancelReverse(): void {
+    this.reversingId = null;
+    this.reversingType = null;
+    this.reverseReason = '';
+  }
+
+  confirmReverse(): void {
+    if (!this.reversingId || !this.reversingType) return;
+    const id = this.reversingId;
+    const type = this.reversingType;
+    const reason = this.reverseReason;
+    this.cancelReverse();
+
+    let obs$;
+    if (type === 'transfer') obs$ = this.service.reverseCashTransfer(id, reason);
+    else if (type === 'settlement') obs$ = this.service.reverseCashSettlement(id, reason);
+    else if (type === 'exchange') obs$ = this.service.reverseCashExchange(id, reason);
+    else obs$ = this.service.reverseInterCashierTransfer(id, reason);
+
+    obs$.pipe(catchError(() => of(null))).subscribe((res: any) => {
+      if (res?.reversed) {
+        this.snackBar.open('Transaction reversed successfully', 'Close', { duration: 3000 });
+        this.load();
+      } else {
+        this.snackBar.open('Reversal failed', 'Close', { duration: 3000 });
+      }
+    });
   }
 
   typeLabel(type: string): string {

src/app/cashier/cash-settlement/cash-settlement.component.ts

@@ -18,7 +18,6 @@ import { MatInputModule } from '@angular/material/input';
 import { forkJoin, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 type PageState = 'loading' | 'no-cashier' | 'needs-reconciliation' | 'already-settled' | 'form';
 
@@ -91,7 +90,7 @@ export class CashSettlementComponent implements OnInit {
   saving = false;
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.settlementDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service
       .getTellers()

src/app/cashier/cash-transfer-approvals/cash-transfer-approvals.component.html

@@ -1,229 +0,0 @@
-<!--
-  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="cv-tab-content cta-tab">
-  <!-- ── TITLE BAR ── -->
-  <div class="cta-action-bar">
-    <div class="cta-action-bar__left">
-      <mat-icon class="cta-action-bar__icon">swap_horiz</mat-icon>
-      <div>
-        <div class="cta-action-bar__title">Cash Transfers</div>
-        <div class="cta-action-bar__sub">
-          Approve or reject an allocation of cash from the vault to a cashier. The cash leaves the vault only when it is
-          approved.
-        </div>
-      </div>
-    </div>
-    <div class="cta-counts">
-      <span class="cta-count"
-        ><strong>{{ all.length }}</strong> waiting</span
-      >
-    </div>
-  </div>
-
-  <!-- ── FILTER BAR ── -->
-  <div class="cta-filter-bar">
-    <div class="cta-search-box">
-      <mat-icon>search</mat-icon>
-      <input type="text" placeholder="Search by cashier, vault, user or note" [(ngModel)]="searchTerm" />
-      @if (searchTerm) {
-        <button type="button" class="cta-search-box__clear" (click)="searchTerm = ''">
-          <mat-icon>close</mat-icon>
-        </button>
-      }
-    </div>
-    <button type="button" class="cta-btn cta-btn--refresh" (click)="load()" [disabled]="loading">
-      <mat-icon>refresh</mat-icon>
-    </button>
-  </div>
-
-  <!-- ── TABLE ── -->
-  @if (loading && !loaded) {
-    <div class="cta-empty"><p class="cta-empty__title">Loading…</p></div>
-  } @else if (rows.length === 0) {
-    <div class="cta-empty">
-      <mat-icon class="cta-empty__icon">inbox</mat-icon>
-      <p class="cta-empty__title">No cash transfer waiting</p>
-      <p class="cta-empty__text">There is no cash allocation waiting for approval.</p>
-    </div>
-  } @else {
-    <div class="cta-table-wrap">
-      <table class="cta-table">
-        <thead>
-          <tr>
-            <th>Date</th>
-            <th>From</th>
-            <th>To (Cashier)</th>
-            <th class="num">Amount</th>
-            <th>Note</th>
-            <th>Raised By</th>
-            <th>Raised At</th>
-            <th class="cta-th-action">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (r of rows; track r.id) {
-            <tr class="cta-row">
-              <td class="cta-dt">{{ r.transfer_date || '—' }}</td>
-              <td>{{ r.from_party || '—' }}</td>
-              <td class="cta-strong">{{ r.to_party || '—' }}</td>
-              <td class="num cta-amount">₹{{ r.total_amount | number: '1.2-2' }}</td>
-              <td class="cta-reason" [title]="r.note || ''">{{ r.note || '—' }}</td>
-              <td>{{ r.maker_name || '—' }}</td>
-              <td class="cta-dt">{{ formatDateTime(r.maker_at) }}</td>
-              <td class="cta-action-cell">
-                <button type="button" class="cta-btn cta-btn--approve" (click)="review(r)">
-                  <mat-icon>rate_review</mat-icon> Review
-                </button>
-              </td>
-            </tr>
-          }
-        </tbody>
-      </table>
-    </div>
-  }
-</div>
-
-<!-- ─── Popup: review a request, every note and coin it asks for ───────────── -->
-<ng-template #reviewDialog>
-  @if (reviewing) {
-    <div class="cta-dlg">
-      <header class="cta-dlg__head">
-        <mat-icon class="cta-dlg__ico cta-dlg__ico--ok">swap_horiz</mat-icon>
-        <div class="cta-dlg__titles">
-          <div class="cta-dlg__title">Review cash transfer</div>
-          <div class="cta-dlg__sub">
-            Raised by {{ reviewing.maker_name || '—' }} · {{ formatDateTime(reviewing.maker_at) }}
-          </div>
-        </div>
-        <button type="button" class="cta-dlg__x" aria-label="Close" (click)="closeReview()">
-          <mat-icon>close</mat-icon>
-        </button>
-      </header>
-
-      <div class="cta-dlg__body">
-        <div class="cta-total">
-          <span>Amount to release</span>
-          <strong>₹{{ reviewing.total_amount | number: '1.2-2' }}</strong>
-        </div>
-
-        <div class="cta-grid">
-          <div class="cta-cell">
-            <div class="cta-label">Transfer date</div>
-            <div class="cta-value">{{ reviewing.transfer_date || '—' }}</div>
-          </div>
-          <div class="cta-cell">
-            <div class="cta-label">From</div>
-            <div class="cta-value">{{ reviewing.from_party || '—' }}</div>
-          </div>
-          <div class="cta-cell">
-            <div class="cta-label">To (cashier)</div>
-            <div class="cta-value">{{ reviewing.to_party || '—' }}</div>
-          </div>
-          <div class="cta-cell">
-            <div class="cta-label">Notes and coins</div>
-            <div class="cta-value">
-              {{ piecesOf(reviewing) }} pieces · {{ linesOf(reviewing).length }} denominations
-            </div>
-          </div>
-          @if (reviewing.note) {
-            <div class="cta-cell cta-cell--wide">
-              <div class="cta-label">Note</div>
-              <div class="cta-value">{{ reviewing.note }}</div>
-            </div>
-          }
-        </div>
-
-        <div class="cta-label">Denomination breakdown</div>
-        <table class="cta-mini">
-          <thead>
-            <tr>
-              <th>Denomination</th>
-              <th class="num">Count</th>
-              <th class="num">Amount</th>
-            </tr>
-          </thead>
-          <tbody>
-            @for (l of linesOf(reviewing); track l.value) {
-              <tr>
-                <td>₹{{ l.value }}</td>
-                <td class="num">{{ l.count }}</td>
-                <td class="num">₹{{ l.amount | number: '1.2-2' }}</td>
-              </tr>
-            }
-          </tbody>
-          <tfoot>
-            <tr>
-              <td>Total</td>
-              <td class="num">{{ piecesOf(reviewing) }}</td>
-              <td class="num">₹{{ reviewing.total_amount | number: '1.2-2' }}</td>
-            </tr>
-          </tfoot>
-        </table>
-      </div>
-
-      <footer class="cta-dlg__foot">
-        <button type="button" class="cta-btn cta-btn--ghost" (click)="closeReview()">Close</button>
-        <button
-          type="button"
-          class="cta-btn cta-btn--reject"
-          [disabled]="busyId === reviewing.id"
-          (click)="rejectFromReview(reviewing)"
-        >
-          <mat-icon>close</mat-icon> Reject
-        </button>
-        <button
-          type="button"
-          class="cta-btn cta-btn--approve"
-          [disabled]="busyId === reviewing.id"
-          (click)="approve(reviewing)"
-        >
-          <mat-icon>check</mat-icon> Approve
-        </button>
-      </footer>
-    </div>
-  }
-</ng-template>
-
-<!-- ─── Popup: reject with a reason ───────────────────────────────────────── -->
-<ng-template #rejectDialog>
-  @if (rejecting) {
-    <div class="cta-dlg">
-      <header class="cta-dlg__head">
-        <mat-icon class="cta-dlg__ico">block</mat-icon>
-        <div class="cta-dlg__titles">
-          <div class="cta-dlg__title">Reject cash transfer</div>
-          <div class="cta-dlg__sub">₹{{ rejecting.total_amount | number: '1.2-2' }} to {{ rejecting.to_party }}</div>
-        </div>
-        <button type="button" class="cta-dlg__x" aria-label="Close" (click)="cancelReject()">
-          <mat-icon>close</mat-icon>
-        </button>
-      </header>
-      <div class="cta-dlg__body">
-        <label class="cta-label" for="cta-reason">Reason (required)</label>
-        <textarea
-          id="cta-reason"
-          rows="3"
-          placeholder="Why is this being rejected?"
-          [(ngModel)]="rejectReason"
-        ></textarea>
-      </div>
-      <footer class="cta-dlg__foot">
-        <button type="button" class="cta-btn cta-btn--ghost" (click)="cancelReject()">Cancel</button>
-        <button
-          type="button"
-          class="cta-btn cta-btn--reject-solid"
-          [disabled]="!rejectReason.trim() || busyId === rejecting.id"
-          (click)="confirmReject()"
-        >
-          Confirm reject
-        </button>
-      </footer>
-    </div>
-  }
-</ng-template>

src/app/cashier/cash-transfer-approvals/cash-transfer-approvals.component.scss

@@ -1,573 +0,0 @@
-/**
- * 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/.
- */
-
-// Laid out like the other approval tabs (Withdrawal Requests): title bar, filter bar, one table.
-:host {
-  display: block;
-}
-
-.cta-tab {
-  padding: 0;
-}
-
-.cta-action-bar {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 16px;
-  padding: 10px 16px;
-  background: #fff;
-  border-bottom: 1px solid #e2e8f0;
-
-  &__left {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-  }
-
-  &__icon {
-    font-size: 22px;
-    width: 22px;
-    height: 22px;
-    color: #0f4f3c;
-  }
-
-  &__title {
-    font-size: 13px;
-    font-weight: 700;
-    color: #0d1b2a;
-  }
-
-  &__sub {
-    max-width: 640px;
-    margin-top: 1px;
-    font-size: 11px;
-    color: #64748b;
-  }
-}
-
-.cta-counts {
-  display: flex;
-  gap: 8px;
-}
-
-.cta-count {
-  padding: 2px 10px;
-  border-radius: 999px;
-  background: #f1f5f9;
-  font-size: 11px;
-  color: #475569;
-
-  strong {
-    color: #0f4f3c;
-  }
-}
-
-.cta-filter-bar {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  flex-wrap: wrap;
-  padding: 6px 16px;
-  background: #f8fafc;
-  border-bottom: 1px solid #e2e8f0;
-}
-
-.cta-fb-sep {
-  flex-shrink: 0;
-  width: 1px;
-  height: 22px;
-  margin: 0 4px;
-  background: #e2e8f0;
-}
-
-.cta-search-box {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  height: 30px;
-  min-width: 240px;
-  padding: 0 10px;
-  border: 1px solid #e2e8f0;
-  border-radius: 8px;
-  background: #fff;
-
-  mat-icon {
-    flex-shrink: 0;
-    font-size: 17px;
-    width: 17px;
-    height: 17px;
-    color: #94a3b8;
-  }
-
-  &:hover {
-    border-color: #cbd5e1;
-  }
-
-  &:focus-within {
-    border-color: #0f4f3c;
-    box-shadow: 0 0 0 3px rgb(15 79 60 / 8%);
-  }
-
-  input {
-    flex: 1;
-    border: none;
-    outline: none;
-    background: transparent;
-    font-family: inherit;
-    font-size: 12px;
-    color: #0d1b2a;
-
-    &::placeholder {
-      color: #94a3b8;
-    }
-  }
-
-  &__clear {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    flex-shrink: 0;
-    width: 20px;
-    height: 20px;
-    padding: 0;
-    border: none;
-    border-radius: 50%;
-    background: none;
-    color: #94a3b8;
-    cursor: pointer;
-
-    mat-icon {
-      font-size: 15px;
-      width: 15px;
-      height: 15px;
-      color: inherit;
-    }
-
-    &:hover {
-      color: #dc2626;
-      background: #fef2f2;
-    }
-  }
-}
-
-.cta-filter-select {
-  height: 30px;
-  min-width: 140px;
-  padding: 0 10px;
-  border: 1px solid #e2e8f0;
-  border-radius: 7px;
-  background: #fff;
-  font-family: inherit;
-  font-size: 12px;
-  color: #0d1b2a;
-  cursor: pointer;
-
-  &:focus {
-    outline: none;
-    border-color: #0f4f3c;
-  }
-}
-
-// ── Buttons ─────────────────────────────────────────────────────────────────
-.cta-btn {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  height: 26px;
-  padding: 0 10px;
-  border: 1px solid transparent;
-  border-radius: 7px;
-  font-family: inherit;
-  font-size: 11px;
-  font-weight: 600;
-  white-space: nowrap;
-  cursor: pointer;
-
-  mat-icon {
-    font-size: 14px;
-    width: 14px;
-    height: 14px;
-  }
-
-  &:disabled {
-    opacity: 0.45;
-    cursor: not-allowed;
-  }
-
-  &--refresh {
-    height: 30px;
-    width: 30px;
-    justify-content: center;
-    padding: 0;
-    margin-left: auto;
-    border-color: #e2e8f0;
-    background: #fff;
-    color: #475569;
-  }
-
-  &--approve {
-    background: #0f4f3c;
-    color: #fff;
-
-    &:hover:not(:disabled) {
-      background: #0a3d2e;
-    }
-  }
-
-  &--reject {
-    border-color: #fecaca;
-    background: #fff;
-    color: #dc2626;
-
-    &:hover:not(:disabled) {
-      background: #fef2f2;
-    }
-  }
-
-  &--reject-solid {
-    background: #dc2626;
-    color: #fff;
-  }
-
-  &--ghost {
-    border-color: #e2e8f0;
-    background: #fff;
-    color: #475569;
-  }
-}
-
-// ── Table ───────────────────────────────────────────────────────────────────
-.cta-table-wrap {
-  overflow-x: auto;
-  background: #fff;
-}
-
-.cta-table {
-  width: 100%;
-  border-collapse: collapse;
-  font-size: 11px;
-
-  th {
-    padding: 7px 10px;
-    border-bottom: 1px solid #e2e8f0;
-    background: #f8fafc;
-    font-size: 9.5px;
-    font-weight: 800;
-    letter-spacing: 0.06em;
-    text-align: left;
-    text-transform: uppercase;
-    color: #94a3b8;
-    white-space: nowrap;
-  }
-
-  td {
-    padding: 5px 10px;
-    border-bottom: 1px solid #eef2f7;
-    vertical-align: middle;
-    color: #0d1b2a;
-  }
-
-  .num {
-    text-align: right;
-    font-variant-numeric: tabular-nums;
-  }
-
-  .cta-th-action {
-    text-align: right;
-  }
-}
-
-.cta-row:hover td {
-  background: #f8fafc;
-}
-
-.cta-mono {
-  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
-  letter-spacing: 0.02em;
-}
-
-.cta-voucher {
-  font-weight: 700;
-  color: #0f4f3c;
-}
-
-.cta-strong {
-  font-weight: 700;
-}
-
-.cta-sub {
-  margin-top: 1px;
-  font-size: 11px;
-  color: #64748b;
-}
-
-.cta-none {
-  color: #cbd5e1;
-}
-
-.cta-amount {
-  font-weight: 700;
-}
-
-.cta-reason {
-  max-width: 220px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.cta-dt {
-  white-space: nowrap;
-  color: #475569;
-}
-
-.cta-kind {
-  display: inline-block;
-  padding: 2px 10px;
-  border-radius: 999px;
-  font-size: 11px;
-  font-weight: 700;
-
-  &--unpass {
-    background: #fef3c7;
-    color: #92400e;
-  }
-
-  &--correction {
-    background: #dbeafe;
-    color: #1e40af;
-  }
-}
-
-.cta-action-cell {
-  display: flex;
-  justify-content: flex-end;
-  gap: 6px;
-  white-space: nowrap;
-}
-
-// ── Empty ───────────────────────────────────────────────────────────────────
-.cta-empty {
-  padding: 28px 16px;
-  text-align: center;
-  color: #94a3b8;
-
-  &__icon {
-    display: block;
-    margin: 0 auto 6px;
-    font-size: 30px;
-    width: 30px;
-    height: 30px;
-    opacity: 0.6;
-  }
-
-  &__title {
-    margin: 0;
-    font-size: 12px;
-    font-weight: 700;
-    color: #64748b;
-  }
-
-  &__text {
-    margin: 3px 0 0;
-    font-size: 11px;
-  }
-}
-
-// ── Reject popup ────────────────────────────────────────────────────────────
-.cta-dlg {
-  font-size: 12px;
-
-  &__head {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    padding: 10px 14px;
-    border-bottom: 1px solid #e2e8f0;
-    background: #f8fafc;
-  }
-
-  &__ico {
-    flex: 0 0 32px;
-    height: 32px;
-    width: 32px;
-    border-radius: 9px;
-    background: #fef2f2;
-    color: #dc2626;
-    font-size: 18px;
-    line-height: 32px;
-    text-align: center;
-  }
-
-  &__titles {
-    flex: 1;
-    min-width: 0;
-  }
-
-  &__title {
-    font-size: 14px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__sub {
-    font-size: 11px;
-    color: #64748b;
-  }
-
-  &__x {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    height: 28px;
-    width: 28px;
-    border: 0;
-    border-radius: 50%;
-    background: transparent;
-    color: #64748b;
-    cursor: pointer;
-
-    &:hover {
-      background: #e2e8f0;
-    }
-
-    mat-icon {
-      font-size: 18px;
-      height: 18px;
-      width: 18px;
-    }
-  }
-
-  &__body {
-    padding: 12px 14px;
-    max-height: 64vh;
-    overflow-y: auto;
-
-    textarea {
-      width: 100%;
-      padding: 7px 10px;
-      border: 1px solid #cbd5e1;
-      border-radius: 8px;
-      font: inherit;
-      font-size: 12px;
-      resize: vertical;
-
-      &:focus {
-        outline: 0;
-        border-color: #0f4f3c;
-        box-shadow: 0 0 0 3px rgb(15 79 60 / 8%);
-      }
-    }
-  }
-
-  &__foot {
-    display: flex;
-    justify-content: flex-end;
-    gap: 8px;
-    padding: 10px 14px;
-    border-top: 1px solid #e2e8f0;
-    background: #f8fafc;
-  }
-}
-
-.cta-label {
-  display: block;
-  margin-bottom: 4px;
-  font-size: 10px;
-  font-weight: 700;
-  letter-spacing: 0.05em;
-  text-transform: uppercase;
-  color: #94a3b8;
-}
-
-.cta-dlg__ico--ok {
-  background: #f0fdf4;
-  color: #1f7a4d;
-}
-
-.cta-total {
-  display: flex;
-  align-items: baseline;
-  justify-content: space-between;
-  margin-bottom: 10px;
-  padding: 8px 12px;
-  border-radius: 10px;
-  background: #ecfdf5;
-  border: 1px solid #a7f3d0;
-  color: #065f46;
-  font-size: 12px;
-  font-weight: 600;
-
-  strong {
-    font-size: 18px;
-    font-weight: 800;
-    font-variant-numeric: tabular-nums;
-  }
-}
-
-.cta-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
-  gap: 6px;
-  margin-bottom: 12px;
-}
-
-.cta-cell {
-  padding: 6px 10px;
-  border-radius: 8px;
-  background: #f8fafc;
-  border: 1px solid #eef2f7;
-
-  &--wide {
-    grid-column: 1 / -1;
-  }
-}
-
-.cta-value {
-  font-size: 12px;
-  font-weight: 600;
-  color: #0f172a;
-  word-break: break-word;
-}
-
-.cta-mini {
-  width: 100%;
-  margin-top: 4px;
-  border-collapse: collapse;
-  font-size: 12px;
-
-  th {
-    padding: 6px 10px;
-    border-bottom: 1px solid #e2e8f0;
-    background: #f8fafc;
-    font-size: 10px;
-    font-weight: 800;
-    letter-spacing: 0.05em;
-    text-align: left;
-    text-transform: uppercase;
-    color: #94a3b8;
-  }
-
-  td {
-    padding: 5px 10px;
-    border-bottom: 1px solid #eef2f7;
-  }
-
-  .num {
-    text-align: right;
-    font-variant-numeric: tabular-nums;
-  }
-
-  tfoot td {
-    border-top: 2px solid #e2e8f0;
-    border-bottom: 0;
-    font-weight: 800;
-    background: #f8fafc;
-  }
-}

src/app/cashier/cash-transfer-approvals/cash-transfer-approvals.component.ts

@@ -1,190 +0,0 @@
-/**
- * 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, TemplateRef, ViewChild, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { MatIconModule } from '@angular/material/icon';
-import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
-import { of } from 'rxjs';
-import { catchError } from 'rxjs/operators';
-import { CashierService } from '../cashier.service';
-
-/** A cash transfer request waiting for a checker, as the server keeps it (snake_case columns). */
-interface CashTransferRequest {
-  id: number;
-  transfer_date: string | null;
-  from_party: string | null;
-  to_party: string | null;
-  note: string | null;
-  total_amount: number;
-  maker_name: string | null;
-  maker_at: string | null;
-  denominations: { denominationValue: number; count: number }[];
-}
-
-/**
- * Checker side of Cash Transfer: approves or rejects an allocation of cash from the vault to a cashier. The cash
- * leaves the vault only when it is approved, by someone other than the person who raised it.
- */
-@Component({
-  selector: 'mifosx-cash-transfer-approvals',
-  templateUrl: './cash-transfer-approvals.component.html',
-  styleUrls: ['./cash-transfer-approvals.component.scss'],
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    MatDialogModule,
-    MatIconModule,
-    MatSnackBarModule
-  ]
-})
-export class CashTransferApprovalsComponent implements OnInit {
-  private service = inject(CashierService);
-  private snackBar = inject(MatSnackBar);
-  private dialog = inject(MatDialog);
-
-  @ViewChild('rejectDialog') rejectDialog!: TemplateRef<unknown>;
-  @ViewChild('reviewDialog') reviewDialog!: TemplateRef<unknown>;
-  private dialogRef: MatDialogRef<unknown> | null = null;
-  private reviewRef: MatDialogRef<unknown> | null = null;
-
-  /** The request open in the review popup, with every note and coin it asks for. */
-  reviewing: CashTransferRequest | null = null;
-
-  all: CashTransferRequest[] = [];
-  loading = false;
-  loaded = false;
-  busyId: number | null = null;
-  searchTerm = '';
-
-  rejecting: CashTransferRequest | null = null;
-  rejectReason = '';
-
-  ngOnInit(): void {
-    this.load();
-  }
-
-  load(): void {
-    this.loading = true;
-    this.service
-      .getCashTransferRequests('PENDING')
-      .pipe(catchError(() => of([] as CashTransferRequest[])))
-      .subscribe((rows) => {
-        this.all = rows as CashTransferRequest[];
-        this.loading = false;
-        this.loaded = true;
-      });
-  }
-
-  get rows(): CashTransferRequest[] {
-    const term = this.searchTerm.trim().toLowerCase();
-    if (!term) return this.all;
-    return this.all.filter((r) => [
-        r.from_party,
-        r.to_party,
-        r.maker_name,
-        r.note
-      ].some((v) => (v ?? '').toLowerCase().includes(term)));
-  }
-
-  /** One line per denomination asked for, largest first, with what each line adds up to. */
-  linesOf(r: CashTransferRequest): { value: number; count: number; amount: number }[] {
-    return [...(r.denominations ?? [])]
-      .filter((d) => d.count > 0)
-      .sort((a, b) => b.denominationValue - a.denominationValue)
-      .map((d) => ({ value: d.denominationValue, count: d.count, amount: d.denominationValue * d.count }));
-  }
-
-  /** How many notes and coins the request asks for in all. */
-  piecesOf(r: CashTransferRequest): number {
-    return this.linesOf(r).reduce((sum, l) => sum + l.count, 0);
-  }
-
-  review(r: CashTransferRequest): void {
-    this.reviewing = r;
-    this.reviewRef?.close();
-    this.reviewRef = this.dialog.open(this.reviewDialog, { width: '560px', maxWidth: '95vw', autoFocus: false });
-    this.reviewRef.afterClosed().subscribe(() => (this.reviewing = null));
-  }
-
-  closeReview(): void {
-    this.reviewRef?.close();
-  }
-
-  /** Rejecting from the review popup: the review closes, the reason popup opens for the same request. */
-  rejectFromReview(r: CashTransferRequest): void {
-    this.reviewRef?.close();
-    this.startReject(r);
-  }
-
-  formatDateTime(value: string | null): string {
-    if (!value) return '—';
-    const d = new Date(value);
-    return isNaN(d.getTime())
-      ? value
-      : d.toLocaleString('en-IN', { day: '2-digit', month: 'short', hour: '2-digit', minute: '2-digit' });
-  }
-
-  approve(r: CashTransferRequest): void {
-    if (this.busyId) return;
-    this.busyId = r.id;
-    this.service.approveCashTransferRequest(r.id).subscribe({
-      next: (res: any) => {
-        this.busyId = null;
-        this.reviewRef?.close();
-        this.snackBar.open(
-          res?.glWarning ? `Approved (GL warning: ${res.glWarning})` : 'Approved — cash allocated to the cashier',
-          'Close',
-          { duration: 6000 }
-        );
-        this.load();
-      },
-      error: (err) => {
-        this.busyId = null;
-        this.fail(err, 'Could not approve');
-      }
-    });
-  }
-
-  startReject(r: CashTransferRequest): void {
-    this.rejecting = r;
-    this.rejectReason = '';
-    this.dialogRef = this.dialog.open(this.rejectDialog, { width: '440px', maxWidth: '95vw', autoFocus: false });
-    this.dialogRef.afterClosed().subscribe(() => (this.rejecting = null));
-  }
-
-  cancelReject(): void {
-    this.dialogRef?.close();
-  }
-
-  confirmReject(): void {
-    if (!this.rejecting || !this.rejectReason.trim() || this.busyId) return;
-    const id = this.rejecting.id;
-    this.busyId = id;
-    this.service.rejectCashTransferRequest(id, this.rejectReason.trim()).subscribe({
-      next: () => {
-        this.busyId = null;
-        this.dialogRef?.close();
-        this.snackBar.open('Rejected', 'Close', { duration: 4000 });
-        this.load();
-      },
-      error: (err) => {
-        this.busyId = null;
-        this.fail(err, 'Could not reject');
-      }
-    });
-  }
-
-  private fail(err: any, fallback: string): void {
-    const msg = err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.defaultUserMessage ?? fallback;
-    this.snackBar.open(msg, 'Close', { duration: 8000 });
-  }
-}

src/app/cashier/cash-transfer/cash-transfer.component.html

@@ -13,15 +13,7 @@
       <h1 class="pg-title">Cash Transfer</h1>
       <p class="pg-sub">Move cash denomination-wise from one party to another (e.g. Vault → Cashier for opening).</p>
     </div>
-    <div class="ct-head-actions">
+    <button type="button" class="pg-btn pg-btn--ghost" (click)="clear()"><mat-icon>undo</mat-icon> Clear</button>
-      <button type="button" class="pg-btn pg-btn--ghost" (click)="openRequests()">
-        <mat-icon>pending_actions</mat-icon> My Requests
-        @if (pendingCount) {
-          <span class="ct-badge">{{ pendingCount }}</span>
-        }
-      </button>
-      <button type="button" class="pg-btn pg-btn--ghost" (click)="clear()"><mat-icon>undo</mat-icon> Clear</button>
-    </div>
   </header>
 
   <div class="pg-toolbar pg-toolbar--mat">
@@ -163,56 +155,7 @@
   <div class="pg-total-bar">
     Total to transfer: <strong>₹{{ total | number: '1.2-2' }}</strong>
     <button type="button" class="pg-btn pg-btn--primary" [disabled]="!valid || saving" (click)="submit()">
-      <mat-icon>send</mat-icon> Send for approval
+      <mat-icon>swap_horiz</mat-icon> Record Transfer
     </button>
   </div>
 </div>
-
-<!-- Popup: this person's own cash transfer requests, and where each stands. The cash moves only once a manager approves. -->
-<ng-template #requestsDialog>
-  <div class="ct-dlg">
-    <header class="ct-dlg__head">
-      <mat-icon class="ct-dlg__ico">pending_actions</mat-icon>
-      <div class="ct-dlg__titles">
-        <div class="ct-dlg__title">My transfer requests</div>
-        <div class="ct-dlg__sub">Cash leaves the vault only after a manager approves</div>
-      </div>
-      <button type="button" class="ct-dlg__x" aria-label="Close" (click)="closeRequests()">
-        <mat-icon>close</mat-icon>
-      </button>
-    </header>
-    <div class="ct-dlg__body">
-      @if (myRequests.length) {
-        <table class="pg-table">
-          <thead>
-            <tr>
-              <th>Date</th>
-              <th>To</th>
-              <th class="num">Amount</th>
-              <th>Status</th>
-              <th>Approved by</th>
-            </tr>
-          </thead>
-          <tbody>
-            @for (r of myRequests; track r.id) {
-              <tr>
-                <td>{{ r.transfer_date || '—' }}</td>
-                <td>{{ r.to_party || '—' }}</td>
-                <td class="num">₹{{ r.total_amount | number: '1.2-2' }}</td>
-                <td>
-                  <span class="ct-status" [class]="'ct-status ct-status--' + r.status">{{ r.status }}</span>
-                  @if (r.rejection_reason) {
-                    <div class="ct-requests__note">{{ r.rejection_reason }}</div>
-                  }
-                </td>
-                <td>{{ r.checker_name || '—' }}</td>
-              </tr>
-            }
-          </tbody>
-        </table>
-      } @else {
-        <div class="pg-empty">You have not raised any cash transfer request yet.</div>
-      }
-    </div>
-  </div>
-</ng-template>

src/app/cashier/cash-transfer/cash-transfer.component.scss

@@ -49,131 +49,3 @@
   font-size: 12px;
   color: #991b1b;
 }
-
-.ct-requests {
-  padding: 0;
-
-  &__title {
-    padding: 10px 14px;
-    border-bottom: 1px solid #e2e8f0;
-    font-size: 13px;
-    font-weight: 700;
-    color: #0d1b2a;
-  }
-
-  &__note {
-    margin-top: 2px;
-    font-size: 11px;
-    color: #64748b;
-  }
-}
-
-.ct-status {
-  display: inline-block;
-  padding: 2px 10px;
-  border-radius: 999px;
-  background: #e2e8f0;
-  font-size: 11px;
-  font-weight: 700;
-
-  &--PENDING {
-    background: #fef3c7;
-    color: #92400e;
-  }
-
-  &--APPROVED {
-    background: #d1fae5;
-    color: #065f46;
-  }
-
-  &--REJECTED {
-    background: #fee2e2;
-    color: #991b1b;
-  }
-}
-
-.ct-head-actions {
-  display: flex;
-  gap: 8px;
-  flex-wrap: wrap;
-}
-
-.ct-badge {
-  min-width: 18px;
-  padding: 0 6px;
-  border-radius: 999px;
-  background: #f59e0b;
-  color: #fff;
-  font-size: 11px;
-  font-weight: 700;
-  text-align: center;
-}
-
-.ct-dlg {
-  font-size: 12px;
-
-  &__head {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    padding: 10px 14px;
-    border-bottom: 1px solid #e2e8f0;
-    background: #f8fafc;
-  }
-
-  &__ico {
-    flex: 0 0 32px;
-    height: 32px;
-    width: 32px;
-    border-radius: 9px;
-    background: #f0fdf4;
-    color: #1f7a4d;
-    font-size: 18px;
-    line-height: 32px;
-    text-align: center;
-  }
-
-  &__titles {
-    flex: 1;
-    min-width: 0;
-  }
-
-  &__title {
-    font-size: 14px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__sub {
-    font-size: 11px;
-    color: #64748b;
-  }
-
-  &__x {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    height: 28px;
-    width: 28px;
-    border: 0;
-    border-radius: 50%;
-    background: transparent;
-    color: #64748b;
-    cursor: pointer;
-
-    &:hover {
-      background: #e2e8f0;
-    }
-
-    mat-icon {
-      font-size: 18px;
-      height: 18px;
-      width: 18px;
-    }
-  }
-
-  &__body {
-    max-height: 60vh;
-    overflow-y: auto;
-  }
-}

src/app/cashier/cash-transfer/cash-transfer.component.ts

@@ -6,10 +6,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Component, OnInit, TemplateRef, ViewChild, inject } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
-import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -18,8 +17,6 @@ import { MatInputModule } from '@angular/material/input';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
-import { AuthenticationService } from '../../core/authentication/authentication.service';
 
 interface Denom {
   id: number;
@@ -41,7 +38,6 @@ interface Denom {
     CommonModule,
     FormsModule,
     MatIconModule,
-    MatDialogModule,
     MatSnackBarModule,
     MatFormFieldModule,
     MatSelectModule,
@@ -51,11 +47,6 @@ interface Denom {
 export class CashTransferComponent implements OnInit {
   private service = inject(CashierService);
   private snackBar = inject(MatSnackBar);
-  private dialog = inject(MatDialog);
-
-  @ViewChild('requestsDialog') requestsDialog!: TemplateRef<unknown>;
-  private requestsRef: MatDialogRef<unknown> | null = null;
-  private authenticationService = inject(AuthenticationService);
 
   notes: Denom[] = [];
   coins: Denom[] = [];
@@ -90,35 +81,8 @@ export class CashTransferComponent implements OnInit {
   vaultHasBreakdown = true;
   loadingVault = false;
 
-  /** The caller's own transfer requests, newest first, so a request can be followed to its approval. */
-  myRequests: any[] = [];
-
-  loadMyRequests(): void {
-    this.service
-      .getCashTransferRequests(undefined, true)
-      .pipe(catchError(() => of([] as any[])))
-      .subscribe((rows) => (this.myRequests = rows.slice(0, 20)));
-  }
-
-  /** How many of this person's requests are still waiting for a manager. */
-  get pendingCount(): number {
-    return this.myRequests.filter((r) => r.status === 'PENDING').length;
-  }
-
-  /** Opens the list of this person's requests, freshly read, so a request can be followed to its approval. */
-  openRequests(): void {
-    this.loadMyRequests();
-    this.requestsRef?.close();
-    this.requestsRef = this.dialog.open(this.requestsDialog, { width: '720px', maxWidth: '95vw', autoFocus: false });
-  }
-
-  closeRequests(): void {
-    this.requestsRef?.close();
-  }
-
   ngOnInit(): void {
-    this.loadMyRequests();
+    const d = new Date();
-    const d = businessToday();
     this.transferDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service.getActiveDenominations().subscribe({
       next: (list) => {
@@ -141,14 +105,7 @@ export class CashTransferComponent implements OnInit {
       .getTellers()
       .pipe(catchError(() => of([] as any[])))
       .subscribe((list) => {
-        // The vault and its cash are physical, so a branch moves cash only from its own tellers. The
+        this.tellers = (list || []).map((t: any) => ({ id: t.id, name: t.name }));
-        // backend lists every teller below the user's office (Head Office sees all branches), which is
-        // right for reports but wrong here.
-        const myOfficeId = this.authenticationService.getCredentials()?.officeId;
-        const own = (list || []).filter(
-          (t: any) => !myOfficeId || t.officeId == null || Number(t.officeId) === Number(myOfficeId)
-        );
-        this.tellers = own.map((t: any) => ({ id: t.id, name: t.name }));
         if (this.tellers.length === 1) {
           this.onTellerSelect(this.tellers[0].id);
         }
@@ -287,11 +244,16 @@ export class CashTransferComponent implements OnInit {
         .filter((d) => this.countFor(d) > 0)
         .map((d) => ({ denominationId: d.id, denominationValue: d.value, count: this.countFor(d) }))
     };
-    this.service.createCashTransferRequest(payload).subscribe({
+    this.service.createCashTransfer(payload).subscribe({
-      next: () => {
+      next: (res: any) => {
-        // Nothing has moved yet: a manager approves the allocation first, and only then does the cash leave the vault.
+        if (res?.glWarning) {
-        this.snackBar.open('Cash transfer sent for manager approval', 'Close', { duration: 5000 });
+          this.snackBar.open(`Transfer saved (GL warning: ${res.glWarning})`, 'Close', {
-        this.loadMyRequests();
+            duration: 8000,
+            panelClass: ['snack-warn']
+          });
+        } else {
+          this.snackBar.open('Cash transfer recorded', 'Close', { duration: 3000 });
+        }
         this.clear();
         this.note = '';
         this.fromParty = '';

src/app/cashier/cashier-position/cashier-position.component.ts

@@ -17,7 +17,6 @@ import { forkJoin, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
 import { AuthenticationService } from '../../core/authentication/authentication.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface DenomRow {
   denominationId: number;
@@ -72,7 +71,7 @@ export class CashierPositionComponent implements OnInit {
   isCashierMode = false;
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
 
     this.isCashierMode = this.authService.isCashierUser();

src/app/cashier/cashier-routing.module.ts

@@ -23,7 +23,6 @@ import { DayBookComponent } from './day-book/day-book.component';
 import { VoucherReportComponent } from './voucher-report/voucher-report.component';
 import { BranchDayComponent } from './branch-day/branch-day.component';
 import { VaultPositionComponent } from './vault-position/vault-position.component';
-import { BranchCashPositionComponent } from './branch-cash-position/branch-cash-position.component';
 import { AccountRegisterComponent } from './account-register/account-register.component';
 import { ClosingCashReportComponent } from './closing-cash-report/closing-cash-report.component';
 import { ExcessTransactionReportComponent } from './excess-transaction-report/excess-transaction-report.component';
@@ -83,13 +82,6 @@ const routes: Routes = [
             ),
           data: { title: 'My Share Requests', breadcrumb: 'My Share Requests' }
         },
-        {
-          // The same page as the cashier's, reached from the clerk dashboard: a clerk unpasses vouchers here.
-          path: 'voucher-correction',
-          loadComponent: () =>
-            import('./voucher-correction/voucher-correction.component').then((m) => m.VoucherCorrectionComponent),
-          data: { title: 'Voucher Correction', breadcrumb: 'Voucher Correction' }
-        },
         {
           path: 'closure-requests',
           loadComponent: () =>
@@ -233,13 +225,6 @@ const routes: Routes = [
           component: VaultPositionComponent,
           data: { title: 'Vault Position', breadcrumb: 'Vault Position' }
         },
-        {
-          // What the whole branch holds per denomination: the vault plus every cashier's drawer, so an
-          // exchange (which leaves the vault alone) is visible in the bank's total.
-          path: 'branch-position',
-          component: BranchCashPositionComponent,
-          data: { title: 'Branch Cash Position', breadcrumb: 'Branch Cash Position' }
-        },
         {
           // The same day book the clerk and cashier read, reached from where a principal officer
           // signing the day off actually looks. It carries the Officer Verification Sheet — each
@@ -298,12 +283,6 @@ const routes: Routes = [
           component: ReconciliationComponent,
           data: { title: 'Reconciliation', breadcrumb: 'Reconciliation' }
         },
-        {
-          path: 'voucher-correction',
-          loadComponent: () =>
-            import('./voucher-correction/voucher-correction.component').then((m) => m.VoucherCorrectionComponent),
-          data: { title: 'Voucher Correction', breadcrumb: 'Voucher Correction' }
-        },
         {
           path: 'cash-history',
           component: CashHistoryComponent,

src/app/cashier/cashier.service.ts

@@ -32,6 +32,9 @@ export class CashierService {
   getCashExchange(id: number): Observable<any> {
     return this.http.get(`/cashexchange/${id}`);
   }
+  reverseCashExchange(id: number, reason: string): Observable<any> {
+    return this.http.post(`/cashexchange/${id}/reverse`, { reason });
+  }
 
   // ── Tellers / Cashiers ──
   getTellers(officeId?: number): Observable<any[]> {
@@ -47,21 +50,8 @@ export class CashierService {
   }
 
   // ── Cash Transfer ──
-  /** Cash leaves the vault only when a different person approves, so the screen raises a request, not a transfer. */
+  createCashTransfer(data: any): Observable<any> {
-  createCashTransferRequest(data: any): Observable<any> {
+    return this.http.post('/cashtransfer', data);
-    return this.http.post('/cashtransfer/requests', data);
-  }
-  /** Requests by status (comma separated); mine narrows them to the ones the caller raised. */
-  getCashTransferRequests(status?: string, mine = false): Observable<any[]> {
-    let params = new HttpParams().set('mine', String(mine));
-    if (status) params = params.set('status', status);
-    return this.http.get<any[]>('/cashtransfer/requests', { params });
-  }
-  approveCashTransferRequest(id: number): Observable<any> {
-    return this.http.post(`/cashtransfer/requests/${id}/approve`, {});
-  }
-  rejectCashTransferRequest(id: number, reason: string): Observable<any> {
-    return this.http.post(`/cashtransfer/requests/${id}/reject`, { reason });
   }
   getCashTransfers(offset = 0, limit = 20): Observable<any> {
     const params = new HttpParams().set('offset', offset).set('limit', limit);
@@ -70,6 +60,9 @@ export class CashierService {
   getCashTransferById(id: number): Observable<any> {
     return this.http.get(`/cashtransfer/${id}`);
   }
+  reverseCashTransfer(id: number, reason: string): Observable<any> {
+    return this.http.post(`/cashtransfer/${id}/reverse`, { reason });
+  }
 
   // ── Cash Settlement ──
   createCashSettlement(data: any): Observable<any> {
@@ -82,6 +75,9 @@ export class CashierService {
   getCashSettlementById(id: number): Observable<any> {
     return this.http.get(`/cashsettlement/${id}`);
   }
+  reverseCashSettlement(id: number, reason: string): Observable<any> {
+    return this.http.post(`/cashsettlement/${id}/reverse`, { reason });
+  }
 
   // ── Inter-cashier Transfer ──
   createInterCashierTransfer(data: any): Observable<any> {
@@ -94,10 +90,8 @@ export class CashierService {
   getInterCashierById(id: number): Observable<any> {
     return this.http.get(`/cashintercashier/${id}`);
   }
-  /** One cashier's details, today's vault allocation and denomination-wise cash, for either side of a transfer. */
+  reverseInterCashierTransfer(id: number, reason: string): Observable<any> {
-  getInterCashierCashierSummary(cashierId: number, date: string): Observable<any> {
+    return this.http.post(`/cashintercashier/${id}/reverse`, { reason });
-    const params = new HttpParams().set('cashierId', cashierId).set('date', date);
-    return this.http.get<any>('/cashintercashier/cashier-summary', { params });
   }
 
   // ── Reconciliation ──
@@ -324,16 +318,6 @@ export class CashierService {
     if (asOfDate) params = params.set('asOfDate', asOfDate);
     return this.http.get('/cashreports/vault-position', { params });
   }
-  /**
-   * Denomination-wise cash the whole branch holds: its vault(s) plus every cashier's drawer, with the day's
-   * exchange movement beside it. Not for a cashier -- the server refuses it.
-   */
-  branchCashPosition(asOfDate?: string, officeId?: number): Observable<any> {
-    let params = new HttpParams();
-    if (asOfDate) params = params.set('asOfDate', asOfDate);
-    if (officeId) params = params.set('officeId', String(officeId));
-    return this.http.get('/cashreports/branch-position', { params });
-  }
   excessTransactionReport(threshold: number, fromDate?: string, toDate?: string): Observable<any[]> {
     let params = new HttpParams().set('threshold', String(threshold));
     if (fromDate) params = params.set('fromDate', fromDate);

src/app/cashier/clerk-share-withdrawal.service.ts

@@ -51,12 +51,6 @@ export class ClerkShareWithdrawalService {
     return this.http.post(`/clerk/share-withdrawal-requests/${id}/validate`, {});
   }
 
-  /** Runs the exact same checklist approve() will run, against a draft that hasn't been submitted
-   *  yet — so the clerk sees it in the confirm dialog, before committing to the request. */
-  previewValidate(data: any): Observable<any> {
-    return this.http.post('/clerk/share-withdrawal-requests/preview-validate', data);
-  }
-
   approve(id: number): Observable<any> {
     return this.http.post(`/clerk/share-withdrawal-requests/${id}/approve`, {});
   }

src/app/cashier/closing-cash-report/closing-cash-report.component.ts

@@ -12,7 +12,6 @@ import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 /** Day-wise denomination-wise closing cash collected from deposits. */
 @Component({
@@ -205,7 +204,7 @@ export class ClosingCashReportComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.date = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.load();
     this.service.getTellers().subscribe({ next: (t: any[]) => (this.tellers = t || []), error: () => {} });

src/app/cashier/day-book/day-book.component.html

@@ -202,7 +202,6 @@
               <th class="num">Amount</th>
               <th>Payment</th>
               <th>Status</th>
-              <th>Correction</th>
               <th>By</th>
               <th>Approved By</th>
               <th>Time</th>
@@ -232,18 +231,6 @@
                 <td>
                   <span [class]="statusClass(r.status)">{{ r.status }}</span>
                 </td>
-                <td>
-                  <!-- Where the voucher stands after a correction: unpassed, revoked, closed or corrected. -->
-                  <mifosx-voucher-status
-                    [status]="r.voucherStatus"
-                    [revokedBy]="r.revokedByVoucherNo"
-                    [replaces]="r.replacesVoucherNo"
-                    [note]="r.correctionNote"
-                  ></mifosx-voucher-status>
-                  @if (!r.voucherStatus || r.voucherStatus === 'ACTIVE') {
-                    <span class="db-muted">—</span>
-                  }
-                </td>
                 <td>{{ r.handledBy ?? '—' }}</td>
                 <td>
                   {{ r.approvedBy ?? '—' }}
@@ -269,7 +256,7 @@
                   —
                 }
               </td>
-              <td colspan="6"></td>
+              <td colspan="5"></td>
             </tr>
           </tfoot>
         </table>

src/app/cashier/day-book/day-book.component.ts

@@ -13,8 +13,6 @@ import { MatIconModule } from '@angular/material/icon';
 import { Router } from '@angular/router';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
-import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
 
 /**
  * Which part of the day's work a row came from. Set by the server, one per source register.
@@ -27,11 +25,6 @@ type DayBookSection = 'CASHIER' | 'CLERK' | 'SYSTEM';
 
 interface DayBookRow {
   voucherNo: string | null;
-  /** Where the voucher stands after a correction: active, revoked, under correction, or corrected. */
-  voucherStatus?: VoucherStatus;
-  revokedByVoucherNo?: string | null;
-  replacesVoucherNo?: string | null;
-  correctionNote?: string | null;
   section: DayBookSection;
   side: 'CR' | 'DR';
   kind: string;
@@ -64,8 +57,7 @@ interface DayBookRow {
   imports: [
     CommonModule,
     FormsModule,
-    MatIconModule,
+    MatIconModule
-    VoucherStatusComponent
   ]
 })
 export class DayBookComponent implements OnInit {
@@ -103,7 +95,7 @@ export class DayBookComponent implements OnInit {
 
   /** Local date as yyyy-MM-dd — toISOString() would shift the day in any timezone behind UTC. */
   private today(): string {
-    const d = businessToday();
+    const d = new Date();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 

src/app/cashier/inter-cashier-transfer/inter-cashier-transfer.component.html

@@ -11,29 +11,41 @@
     <div>
       <div class="pg-eyebrow">CASHIER · INTER-CASHIER TRANSFER</div>
       <h1 class="pg-title">Inter-Cashier Transfer</h1>
-      <p class="pg-sub">Hand over denomination-wise cash from your drawer to another cashier at your counter.</p>
+      <p class="pg-sub">Move denomination-wise cash between two cashiers within the same teller.</p>
     </div>
     <button type="button" class="pg-btn pg-btn--ghost" (click)="clear()"><mat-icon>undo</mat-icon> Clear</button>
   </header>
 
-  @if (ownCashierMissing) {
-    <div class="ict-alert">
-      <mat-icon>person_off</mat-icon>
-      Your login is not linked to a cashier. An inter-cashier transfer is made by the cashier handing the cash over, so
-      log in as that cashier.
-    </div>
-  }
-
   <div class="pg-toolbar pg-toolbar--mat">
-    <mat-form-field appearance="outline" subscriptSizing="dynamic">
+    @if (tellers.length === 1) {
-      <mat-label>Teller</mat-label>
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
-      <input matInput type="text" [value]="tellerName || '—'" readonly />
+        <mat-label>Teller</mat-label>
-    </mat-form-field>
+        <input matInput type="text" [value]="tellers[0].name" readonly />
+      </mat-form-field>
+    } @else {
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <mat-label>Teller</mat-label>
+        <mat-select [value]="selectedTellerId" (selectionChange)="onTellerSelect($event.value)">
+          @for (t of tellers; track t.id) {
+            <mat-option [value]="t.id">{{ t.name }}</mat-option>
+          }
+          @if (tellers.length === 0) {
+            <mat-option [value]="null" disabled>No tellers configured</mat-option>
+          }
+        </mat-select>
+      </mat-form-field>
+    }
 
-    <!-- The sender is always the cashier who is logged in; nothing to pick. -->
     <mat-form-field appearance="outline" subscriptSizing="dynamic">
-      <mat-label>From (You)</mat-label>
+      <mat-label>From (Cashier)</mat-label>
-      <input matInput type="text" [value]="fromParty || '—'" readonly />
+      <mat-select [value]="fromCashierId" (selectionChange)="onFromSelect($event.value)" [disabled]="!selectedTellerId">
+        @for (c of availableFrom; track c.id) {
+          <mat-option [value]="c.id">{{ c.label }}</mat-option>
+        }
+        @if (selectedTellerId && allCashiers.length === 0 && !loadingCashiers) {
+          <mat-option [value]="null" disabled>No cashiers</mat-option>
+        }
+      </mat-select>
     </mat-form-field>
 
     <mat-form-field appearance="outline" subscriptSizing="dynamic">
@@ -42,7 +54,7 @@
         @for (c of availableTo; track c.id) {
           <mat-option [value]="c.id">{{ c.label }}</mat-option>
         }
-        @if (fromCashierId && !loadingCashiers && availableTo.length === 0) {
+        @if (fromCashierId && availableTo.length === 0) {
           <mat-option [value]="null" disabled>No other cashiers</mat-option>
         }
       </mat-select>
@@ -50,7 +62,7 @@
 
     <mat-form-field appearance="outline" subscriptSizing="dynamic">
       <mat-label>Date</mat-label>
-      <input matInput type="date" [value]="transferDate" (change)="onDateChange($any($event.target).value)" />
+      <input matInput type="date" [value]="transferDate" (change)="transferDate = $any($event.target).value" />
     </mat-form-field>
 
     <mat-form-field appearance="outline" subscriptSizing="dynamic" class="pg-note-field">
@@ -59,102 +71,26 @@
     </mat-form-field>
   </div>
 
-  <!-- Both sides of the transfer: who they are, whether the vault has allocated them cash today,
-       and what they hold now. -->
-  @if (fromCashierId || toCashierId) {
-    <div class="ict-parties">
-      <ng-container
-        *ngTemplateOutlet="
-          partyCard;
-          context: { title: 'From (Sending Cashier)', s: fromSummary, loading: loadingFrom, picked: !!fromCashierId }
-        "
-      ></ng-container>
-      <mat-icon class="ict-parties__arrow">arrow_forward</mat-icon>
-      <ng-container
-        *ngTemplateOutlet="
-          partyCard;
-          context: { title: 'To (Receiving Cashier)', s: toSummary, loading: loadingTo, picked: !!toCashierId }
-        "
-      ></ng-container>
-    </div>
-  }
-
-  <ng-template #partyCard let-title="title" let-s="s" let-loading="loading" let-picked="picked">
-    <div class="ict-party" [class.ict-party--blocked]="s && !s.cashAllocated">
-      <div class="ict-party__title">{{ title }}</div>
-      @if (!picked) {
-        <div class="ict-party__empty">Select a cashier</div>
-      } @else if (loading) {
-        <div class="ict-party__empty">Loading…</div>
-      } @else if (!s) {
-        <div class="ict-party__empty">Could not load this cashier's details.</div>
-      } @else {
-        <div class="ict-party__name">{{ s.cashierName || '—' }}</div>
-        <div class="ict-party__meta">
-          <span><mat-icon>point_of_sale</mat-icon> {{ s.tellerName || '—' }}</span>
-          <span><mat-icon>account_balance</mat-icon> {{ s.officeName || '—' }}</span>
-        </div>
-        <div class="ict-party__figures">
-          <div>
-            <div class="ict-party__label">Allocated today</div>
-            <div class="ict-party__value">₹{{ s.allocatedAmount | number: '1.2-2' }}</div>
-          </div>
-          <div>
-            <div class="ict-party__label">Cash in hand</div>
-            <div class="ict-party__value">₹{{ s.totalAmount | number: '1.2-2' }}</div>
-          </div>
-        </div>
-        @if (!s.cashAllocated) {
-          <div class="ict-party__warn">
-            <mat-icon>block</mat-icon> No cash allocated from the vault for this date — inter-cashier transfer is not
-            allowed.
-          </div>
-        }
-      }
-    </div>
-  </ng-template>
-
-  @if (fromSummary && toSummary && !bothAllocated) {
-    <div class="ict-alert">
-      <mat-icon>block</mat-icon>
-      Both cashiers must first be allocated cash from the vault (Cash Transfer) for {{ transferDate }} before an
-      inter-cashier transfer.
-    </div>
-  }
-  @if (anyExceedsHeld) {
-    <div class="ict-alert">
-      <mat-icon>error_outline</mat-icon>
-      The sending cashier does not hold enough of the highlighted denominations.
-    </div>
-  }
-
   <div class="pg-card">
     <table class="pg-table">
       <thead>
         <tr>
           <th>Denomination</th>
-          <th class="num">From holds</th>
           <th style="text-align: center">Count</th>
           <th class="num">Amount</th>
-          <th class="num">To holds</th>
         </tr>
       </thead>
       <tbody>
         @if (notes.length) {
           <tr class="pg-section">
-            <td colspan="5">Bank Notes</td>
+            <td colspan="3">Bank Notes</td>
           </tr>
         }
         @for (d of notes; track d.id) {
-          <tr [class.ict-row--over]="exceedsHeld(d)">
+          <tr>
             <td>
               <span class="pg-chip">{{ d.label }}</span>
             </td>
-            <td class="num" [class.ict-held--over]="exceedsHeld(d)">
-              <ng-container
-                *ngTemplateOutlet="heldCell; context: { n: heldBy(fromSummary, d), delta: -countFor(d) }"
-              ></ng-container>
-            </td>
             <td style="display: flex; justify-content: center">
               <div class="pg-step">
                 <button type="button" (click)="bump(d, -1)" [disabled]="countFor(d) === 0">−</button>
@@ -163,28 +99,18 @@
               </div>
             </td>
             <td class="num">₹{{ subtotal(d) | number: '1.2-2' }}</td>
-            <td class="num">
-              <ng-container
-                *ngTemplateOutlet="heldCell; context: { n: heldBy(toSummary, d), delta: countFor(d) }"
-              ></ng-container>
-            </td>
           </tr>
         }
         @if (coins.length) {
           <tr class="pg-section">
-            <td colspan="5">Coins</td>
+            <td colspan="3">Coins</td>
           </tr>
         }
         @for (d of coins; track d.id) {
-          <tr [class.ict-row--over]="exceedsHeld(d)">
+          <tr>
             <td>
               <span class="pg-chip pg-chip--coin">{{ d.label }}</span>
             </td>
-            <td class="num" [class.ict-held--over]="exceedsHeld(d)">
-              <ng-container
-                *ngTemplateOutlet="heldCell; context: { n: heldBy(fromSummary, d), delta: -countFor(d) }"
-              ></ng-container>
-            </td>
             <td style="display: flex; justify-content: center">
               <div class="pg-step">
                 <button type="button" (click)="bump(d, -1)" [disabled]="countFor(d) === 0">−</button>
@@ -193,34 +119,17 @@
               </div>
             </td>
             <td class="num">₹{{ subtotal(d) | number: '1.2-2' }}</td>
-            <td class="num">
-              <ng-container
-                *ngTemplateOutlet="heldCell; context: { n: heldBy(toSummary, d), delta: countFor(d) }"
-              ></ng-container>
-            </td>
           </tr>
         }
         @if (denoms.length === 0) {
           <tr>
-            <td colspan="5" class="pg-empty">No active denominations. Add some in Cash Denomination.</td>
+            <td colspan="3" class="pg-empty">No active denominations. Add some in Cash Denomination.</td>
           </tr>
         }
       </tbody>
     </table>
   </div>
 
-  <!-- A held count, with what it becomes once this transfer is recorded. -->
-  <ng-template #heldCell let-n="n" let-delta="delta">
-    @if (n === null) {
-      —
-    } @else {
-      {{ n }}
-      @if (delta !== 0) {
-        <span class="ict-after">→ {{ n + delta }}</span>
-      }
-    }
-  </ng-template>
-
   <div class="pg-total-bar">
     Total to transfer: <strong>₹{{ total | number: '1.2-2' }}</strong>
     <button type="button" class="pg-btn pg-btn--primary" [disabled]="!valid || saving" (click)="submit()">

src/app/cashier/inter-cashier-transfer/inter-cashier-transfer.component.scss

@@ -1,150 +0,0 @@
-/**
- * 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/.
- */
-
-.ict-parties {
-  display: grid;
-  grid-template-columns: 1fr auto 1fr;
-  align-items: stretch;
-  gap: 12px;
-  margin-bottom: 12px;
-
-  &__arrow {
-    align-self: center;
-    color: #64748b;
-  }
-
-  @media (width <= 760px) {
-    grid-template-columns: 1fr;
-
-    &__arrow {
-      justify-self: center;
-      transform: rotate(90deg);
-    }
-  }
-}
-
-.ict-party {
-  padding: 12px 14px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 10px;
-
-  &--blocked {
-    background: #fef2f2;
-    border-color: #fecaca;
-  }
-
-  &__title {
-    font-size: 11px;
-    font-weight: 700;
-    letter-spacing: 0.04em;
-    text-transform: uppercase;
-    color: #64748b;
-  }
-
-  &__empty {
-    margin-top: 8px;
-    font-size: 13px;
-    color: #94a3b8;
-  }
-
-  &__name {
-    margin-top: 4px;
-    font-size: 16px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__meta {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 14px;
-    margin-top: 4px;
-    font-size: 12px;
-    color: #475569;
-
-    span {
-      display: inline-flex;
-      align-items: center;
-      gap: 4px;
-    }
-
-    mat-icon {
-      font-size: 14px;
-      width: 14px;
-      height: 14px;
-    }
-  }
-
-  &__figures {
-    display: flex;
-    gap: 24px;
-    margin-top: 10px;
-  }
-
-  &__label {
-    font-size: 11px;
-    color: #64748b;
-  }
-
-  &__value {
-    font-size: 15px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__warn {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    margin-top: 10px;
-    font-size: 12px;
-    font-weight: 600;
-    color: #991b1b;
-
-    mat-icon {
-      font-size: 16px;
-      width: 16px;
-      height: 16px;
-    }
-  }
-}
-
-.ict-alert {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  margin-bottom: 10px;
-  padding: 8px 14px;
-  background: #fef2f2;
-  border: 1px solid #fecaca;
-  border-radius: 8px;
-  font-size: 12px;
-  color: #991b1b;
-
-  mat-icon {
-    font-size: 16px;
-    width: 16px;
-    height: 16px;
-  }
-}
-
-.ict-row--over {
-  background: #fef2f2;
-}
-
-.ict-held--over {
-  color: #b91c1c;
-  font-weight: 700;
-}
-
-.ict-after {
-  margin-left: 4px;
-  font-size: 11px;
-  color: #64748b;
-}

src/app/cashier/inter-cashier-transfer/inter-cashier-transfer.component.ts

@@ -17,7 +17,6 @@ import { MatInputModule } from '@angular/material/input';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface Denom {
   id: number;
@@ -29,27 +28,12 @@ interface Cashier {
   id: number;
   label: string;
 }
-/** One side of the transfer, from GET /cashintercashier/cashier-summary. */
-interface CashierSummary {
-  cashierId: number;
-  cashierName: string;
-  tellerName: string;
-  officeName: string;
-  cashAllocated: boolean;
-  allocatedAmount: number;
-  totalAmount: number;
-  /** Count held per denomination id. */
-  held: Record<number, number>;
-}
 
 /** Move cash denomination-wise between two cashiers under the same teller. */
 @Component({
   selector: 'mifosx-inter-cashier-transfer',
   templateUrl: './inter-cashier-transfer.component.html',
-  styleUrls: [
+  styleUrls: ['../cashier-shared.scss'],
-    '../cashier-shared.scss',
-    './inter-cashier-transfer.component.scss'
-  ],
   standalone: true,
   imports: [
     CommonModule,
@@ -72,12 +56,7 @@ export class InterCashierTransferComponent implements OnInit {
   note = '';
   saving = false;
 
-  /**
+  tellers: { id: number; name: string }[] = [];
-   * The sending cashier is always the one logged in: cash is handed over from their own drawer, so there is
-   * no one else to pick on that side. Only the receiving cashier is chosen.
-   */
-  ownCashierMissing = false;
-  tellerName = '';
   allCashiers: Cashier[] = [];
   selectedTellerId: number | null = null;
   fromCashierId: number | null = null;
@@ -86,25 +65,21 @@ export class InterCashierTransferComponent implements OnInit {
   toParty = '';
   loadingCashiers = false;
 
-  /** Details and denomination-wise cash of each side, so both are seen before the transfer is recorded. */
-  fromSummary: CashierSummary | null = null;
-  toSummary: CashierSummary | null = null;
-  loadingFrom = false;
-  loadingTo = false;
-
   get denoms(): Denom[] {
     return [
       ...this.notes,
       ...this.coins
     ];
   }
-  /** Everyone under the same teller except the sender. */
+  get availableFrom(): Cashier[] {
+    return this.allCashiers;
+  }
   get availableTo(): Cashier[] {
     return this.allCashiers.filter((c) => c.id !== this.fromCashierId);
   }
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.transferDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service.getActiveDenominations().subscribe({
       next: (list) => {
@@ -122,20 +97,25 @@ export class InterCashierTransferComponent implements OnInit {
         this.coins = [];
       }
     });
-    // The sender is the cashier behind this login; their counter then gives the receivers to pick from.
+    this.service
-    this.service.getCurrentCashierInfo().subscribe((info) => {
+      .getTellers()
-      if (!info) {
+      .pipe(catchError(() => of([] as any[])))
-        this.ownCashierMissing = true;
+      .subscribe((list) => {
-        return;
+        this.tellers = (list || []).map((t: any) => ({ id: t.id, name: t.name }));
-      }
+        if (this.tellers.length === 1) {
-      this.fromCashierId = info.cashierId;
+          this.onTellerSelect(this.tellers[0].id);
-      this.fromParty = info.cashierName;
+        }
-      this.loadSummary('from');
+      });
-    });
   }
 
-  /** The other cashiers at this counter, one of whom receives the cash. */
+  onTellerSelect(tellerId: number): void {
-  private loadReceivers(tellerId: number): void {
+    this.selectedTellerId = tellerId;
+    this.fromCashierId = null;
+    this.toCashierId = null;
+    this.fromParty = '';
+    this.toParty = '';
+    this.allCashiers = [];
+    if (!tellerId) return;
     this.loadingCashiers = true;
     this.service
       .getCashiersForTeller(tellerId)
@@ -146,90 +126,20 @@ export class InterCashierTransferComponent implements OnInit {
       });
   }
 
+  onFromSelect(cashierId: number): void {
+    this.fromCashierId = cashierId;
+    const c = this.allCashiers.find((x) => x.id === cashierId);
+    this.fromParty = c ? c.label : '';
+    if (this.toCashierId === cashierId) {
+      this.toCashierId = null;
+      this.toParty = '';
+    }
+  }
+
   onToSelect(cashierId: number): void {
     this.toCashierId = cashierId;
     const c = this.allCashiers.find((x) => x.id === cashierId);
     this.toParty = c ? c.label : '';
-    this.loadSummary('to');
-  }
-
-  onDateChange(value: string): void {
-    this.transferDate = value;
-    this.loadSummary('from');
-    this.loadSummary('to');
-  }
-
-  /** Fetch one side's details, vault allocation and denomination-wise cash for the transfer date. */
-  private loadSummary(side: 'from' | 'to'): void {
-    const cashierId = side === 'from' ? this.fromCashierId : this.toCashierId;
-    if (side === 'from') {
-      this.fromSummary = null;
-    } else {
-      this.toSummary = null;
-    }
-    if (!cashierId || !this.transferDate) return;
-    this.setLoading(side, true);
-    this.service
-      .getInterCashierCashierSummary(cashierId, this.transferDate)
-      .pipe(catchError(() => of(null)))
-      .subscribe((r: any) => {
-        this.setLoading(side, false);
-        // A late answer for a cashier no longer selected on that side is dropped.
-        const current = side === 'from' ? this.fromCashierId : this.toCashierId;
-        if (!r || current !== cashierId) return;
-        // The sender's summary also tells which counter they are at, hence who they can hand cash to.
-        if (side === 'from' && r.tellerId && this.selectedTellerId !== Number(r.tellerId)) {
-          this.selectedTellerId = Number(r.tellerId);
-          this.tellerName = r.tellerName || '';
-          this.loadReceivers(this.selectedTellerId);
-        }
-        const held: Record<number, number> = {};
-        for (const d of r.denominations || []) {
-          held[d.denominationId] = (held[d.denominationId] || 0) + Number(d.count || 0);
-        }
-        const summary: CashierSummary = {
-          cashierId: r.cashierId,
-          cashierName: r.cashierName,
-          tellerName: r.tellerName,
-          officeName: r.officeName,
-          cashAllocated: !!r.cashAllocated,
-          allocatedAmount: Number(r.allocatedAmount || 0),
-          totalAmount: Number(r.totalAmount || 0),
-          held
-        };
-        if (side === 'from') {
-          this.fromSummary = summary;
-        } else {
-          this.toSummary = summary;
-        }
-      });
-  }
-
-  private setLoading(side: 'from' | 'to', loading: boolean): void {
-    if (side === 'from') {
-      this.loadingFrom = loading;
-    } else {
-      this.loadingTo = loading;
-    }
-  }
-
-  /** Count of the denomination the cashier holds, or null while their figures are not loaded. */
-  heldBy(summary: CashierSummary | null, d: Denom): number | null {
-    return summary ? summary.held[d.id] || 0 : null;
-  }
-
-  /** The sending cashier is asked to hand on more of this denomination than they hold. */
-  exceedsHeld(d: Denom): boolean {
-    return !!this.fromSummary && this.countFor(d) > (this.fromSummary.held[d.id] || 0);
-  }
-
-  get anyExceedsHeld(): boolean {
-    return this.denoms.some((d) => this.exceedsHeld(d));
-  }
-
-  /** Both sides must have been allocated cash from the vault for the day before they can transfer. */
-  get bothAllocated(): boolean {
-    return !!this.fromSummary?.cashAllocated && !!this.toSummary?.cashAllocated;
   }
 
   countFor(d: Denom): number {
@@ -249,14 +159,7 @@ export class InterCashierTransferComponent implements OnInit {
     return this.denoms.reduce((s, d) => s + this.subtotal(d), 0);
   }
   get valid(): boolean {
-    return (
+    return this.total > 0 && !!this.selectedTellerId && !!this.fromCashierId && !!this.toCashierId;
-      this.total > 0 &&
-      !!this.selectedTellerId &&
-      !!this.fromCashierId &&
-      !!this.toCashierId &&
-      this.bothAllocated &&
-      !this.anyExceedsHeld
-    );
   }
 
   clear(): void {
@@ -283,12 +186,10 @@ export class InterCashierTransferComponent implements OnInit {
         this.snackBar.open('Inter-cashier transfer recorded', 'Close', { duration: 3000 });
         this.clear();
         this.note = '';
-        // The sender stays the logged-in cashier; the receiver is picked afresh, and the sender's holdings
+        this.fromCashierId = null;
-        // are read again now that part of them has gone.
         this.toCashierId = null;
+        this.fromParty = '';
         this.toParty = '';
-        this.toSummary = null;
-        this.loadSummary('from');
         this.saving = false;
       },
       error: () => {

src/app/cashier/my-work/my-work.component.html

@@ -146,7 +146,6 @@
                   <th class="num">Amount</th>
                   <th>My part</th>
                   <th>Status</th>
-                  <th>Correction</th>
                   <th>Time</th>
                 </tr>
               </thead>
@@ -204,18 +203,6 @@
                         {{ statusLabel(r.verificationStatus) }}
                       </span>
                     </td>
-                    <td>
-                      <!-- Where the voucher stands after a correction: unpassed, revoked, closed or corrected. -->
-                      <mifosx-voucher-status
-                        [status]="r.voucherStatus"
-                        [revokedBy]="r.revokedByVoucherNo"
-                        [replaces]="r.replacesVoucherNo"
-                        [note]="r.correctionNote"
-                      ></mifosx-voucher-status>
-                      @if (!r.voucherStatus || r.voucherStatus === 'ACTIVE') {
-                        <span class="mw-acct">—</span>
-                      }
-                    </td>
                     <td class="mw-time">{{ r.createdAt | date: 'HH:mm' }}</td>
                   </tr>
                 }

src/app/cashier/my-work/my-work.component.ts

@@ -14,8 +14,6 @@ import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { catchError, finalize, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
 import { VoucherDetailDialogComponent } from './voucher-detail-dialog.component';
-import { businessToday } from 'app/core/utils/business-today';
-import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
 
 /** What the signed-in user's part in a voucher was. */
 export type MyRole = 'RAISED' | 'VERIFIED' | 'RAISED_AND_VERIFIED';
@@ -25,11 +23,6 @@ export type VoucherSide = 'CR' | 'DR' | 'JV';
 
 interface MyWorkRow {
   voucherNo: string;
-  /** Where the voucher stands after a correction: active, revoked, under correction, or corrected. */
-  voucherStatus?: VoucherStatus;
-  revokedByVoucherNo?: string | null;
-  replacesVoucherNo?: string | null;
-  correctionNote?: string | null;
   side: VoucherSide | null;
   voucherType: string | null;
   amount: number | null;
@@ -82,8 +75,7 @@ interface MyWorkReport {
     CommonModule,
     FormsModule,
     MatIconModule,
-    MatDialogModule,
+    MatDialogModule
-    VoucherStatusComponent
   ]
 })
 export class MyWorkComponent implements OnInit {
@@ -365,7 +357,7 @@ export class MyWorkComponent implements OnInit {
   }
 
   private todayIso(): string {
-    const d = businessToday();
+    const d = new Date();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 }

src/app/cashier/my-work/voucher-detail-dialog.component.ts

@@ -11,7 +11,6 @@ import { CommonModule } from '@angular/common';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
-import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
 
 export interface VoucherDetailDialogData {
   /** Already-loaded detail from CashierService.voucherDetail() — the caller fetches, this dialog
@@ -19,10 +18,6 @@ export interface VoucherDetailDialogData {
    *  duplicated inside every dialog that could ever show a voucher. */
   detail: {
     voucherNo: string;
-    voucherStatus?: VoucherStatus;
-    revokedByVoucherNo?: string | null;
-    replacesVoucherNo?: string | null;
-    correctionNote?: string | null;
     voucherType: string | null;
     amount: number | null;
     branchName: string | null;
@@ -63,8 +58,7 @@ export interface VoucherDetailDialogData {
     CommonModule,
     MatDialogModule,
     MatButtonModule,
-    MatIconModule,
+    MatIconModule
-    VoucherStatusComponent
   ],
   template: `
     <div class="vd-shell">
@@ -72,15 +66,7 @@ export interface VoucherDetailDialogData {
         <div class="vd-header__title">
           <mat-icon class="vd-icon">receipt_long</mat-icon>
           <div>
-            <h2>
+            <h2>{{ detail.voucherNo }}</h2>
-              {{ detail.voucherNo }}
-              <mifosx-voucher-status
-                [status]="detail.voucherStatus"
-                [revokedBy]="detail.revokedByVoucherNo"
-                [replaces]="detail.replacesVoucherNo"
-                [note]="detail.correctionNote"
-              ></mifosx-voucher-status>
-            </h2>
             <p>{{ detail.voucherType || 'Voucher' }} &middot; {{ detail.branchName || 'Head Office' }}</p>
           </div>
         </div>

src/app/cashier/reconciliation/reconciliation.component.html

@@ -19,21 +19,34 @@
     <!-- ── Entry Tab ── -->
     <mat-tab label="New Reconciliation">
       <div class="pg-tab-body">
-        @if (ownCashierMissing) {
-          <div class="pg-empty">
-            Your login is not linked to a cashier, so there is no cash drawer to reconcile. Ask an administrator to link
-            your user to a cashier.
-          </div>
-        }
         <div class="pg-toolbar pg-toolbar--mat">
-          <!-- A reconciliation is the cashier's own count of their own drawer: nothing to pick. -->
+          @if (tellers.length === 1) {
+            <mat-form-field appearance="outline" subscriptSizing="dynamic">
+              <mat-label>Teller</mat-label>
+              <input matInput type="text" [value]="tellers[0].name" readonly />
+            </mat-form-field>
+          } @else {
+            <mat-form-field appearance="outline" subscriptSizing="dynamic">
+              <mat-label>Teller</mat-label>
+              <mat-select [value]="selectedTellerId" (selectionChange)="onTellerSelect($event.value)">
+                @for (t of tellers; track t.id) {
+                  <mat-option [value]="t.id">{{ t.name }}</mat-option>
+                }
+              </mat-select>
+            </mat-form-field>
+          }
+
           <mat-form-field appearance="outline" subscriptSizing="dynamic">
-            <mat-label>Teller</mat-label>
+            <mat-label>Cashier</mat-label>
-            <input matInput type="text" [value]="ownTellerName || '—'" readonly />
+            <mat-select
-          </mat-form-field>
+              [value]="selectedCashierId"
-          <mat-form-field appearance="outline" subscriptSizing="dynamic">
+              (selectionChange)="onCashierSelect($event.value)"
-            <mat-label>Cashier (You)</mat-label>
+              [disabled]="!selectedTellerId"
-            <input matInput type="text" [value]="cashierName || '—'" readonly />
+            >
+              @for (c of cashiers; track c.id) {
+                <mat-option [value]="c.id">{{ c.label }}</mat-option>
+              }
+            </mat-select>
           </mat-form-field>
 
           <mat-form-field appearance="outline" subscriptSizing="dynamic">

src/app/cashier/reconciliation/reconciliation.component.ts

@@ -12,12 +12,12 @@ import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatSelectModule } from '@angular/material/select';
 import { MatInputModule } from '@angular/material/input';
 import { MatTabsModule } from '@angular/material/tabs';
 import { forkJoin, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface DenomRow {
   denominationId: number;
@@ -57,6 +57,7 @@ interface ReconRecord {
     MatIconModule,
     MatSnackBarModule,
     MatFormFieldModule,
+    MatSelectModule,
     MatInputModule,
     MatTabsModule
   ]
@@ -65,14 +66,9 @@ export class ReconciliationComponent implements OnInit {
   private service = inject(CashierService);
   private snackBar = inject(MatSnackBar);
 
-  /**
-   * A reconciliation is the cashier's own count of their own drawer, so nobody else makes one and there is
-   * no cashier to pick: the screen is fixed to the logged-in cashier. The server refuses anything else.
-   */
-  ownCashierMissing = false;
-  ownTellerName = '';
-
   // ── Entry form ──
+  tellers: { id: number; name: string }[] = [];
+  cashiers: { id: number; label: string }[] = [];
   selectedTellerId: number | null = null;
   selectedCashierId: number | null = null;
   cashierName = '';
@@ -89,30 +85,44 @@ export class ReconciliationComponent implements OnInit {
   loadingHistory = false;
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.reconDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
-    this.lockToOwnCashier();
+    this.service
+      .getTellers()
+      .pipe(catchError(() => of([] as any[])))
+      .subscribe((list) => {
+        this.tellers = (list || []).map((t: any) => ({ id: t.id, name: t.name }));
+        if (this.tellers.length === 1) {
+          this.onTellerSelect(this.tellers[0].id);
+        }
+      });
     this.loadHistory();
   }
 
-  /** Take the logged-in cashier as the one being reconciled, with their counter for the record. */
+  onTellerSelect(tellerId: number): void {
-  private lockToOwnCashier(): void {
+    this.selectedTellerId = tellerId;
-    this.service.getCurrentCashierInfo().subscribe((info) => {
+    this.selectedCashierId = null;
-      if (!info) {
+    this.cashierName = '';
-        this.ownCashierMissing = true;
+    this.cashiers = [];
-        return;
+    this.rows = [];
-      }
+    if (!tellerId) return;
-      this.selectedCashierId = info.cashierId;
+    this.service
-      this.cashierName = info.cashierName;
+      .getCashiersForTeller(tellerId)
-      this.service
+      .pipe(catchError(() => of({ cashiers: [] })))
-        .getInterCashierCashierSummary(info.cashierId, this.reconDate)
+      .subscribe((r: any) => {
-        .pipe(catchError(() => of(null)))
+        this.cashiers = (r?.cashiers || []).map((c: any) => ({ id: c.id, label: c.staffName }));
-        .subscribe((r: any) => {
+        if (this.cashiers.length === 1) {
-          this.selectedTellerId = r?.tellerId ?? null;
+          this.onCashierSelect(this.cashiers[0].id);
-          this.ownTellerName = r?.tellerName || '';
+        }
-        });
+      });
-      this.fetchExpected();
+  }
-    });
+
+  onCashierSelect(cashierId: number): void {
+    this.selectedCashierId = cashierId;
+    const c = this.cashiers.find((x) => x.id === cashierId);
+    this.cashierName = c ? c.label : '';
+    this.rows = [];
+    this.fetchExpected();
   }
 
   fetchExpected(): void {

src/app/cashier/transaction-entry/transaction-entry.component.html

@@ -117,8 +117,6 @@
                       <select
                         class="ws-f__ctl"
                         [(ngModel)]="row.typ"
-                        [disabled]="isTypLocked(row)"
-                        [title]="isTypLocked(row) ? 'Token withdrawal - TYPE is fixed to Payment' : ''"
                         (click)="$event.stopPropagation()"
                         (change)="onTypChange(row)"
                       >
@@ -129,16 +127,11 @@
                     </div>
                     <div class="ws-f ws-f--branch">
                       <label class="ws-f__lbl" title="Branch">BRANCH</label>
-                      <select
+                      <select class="ws-f__ctl" [(ngModel)]="row.br" (click)="$event.stopPropagation()">
-                        class="ws-f__ctl"
+                        <option [ngValue]="1">001 · Main</option>
-                        [(ngModel)]="row.br"
+                        <option [ngValue]="2">002 · M.G. Road</option>
-                        [disabled]="branches.length <= 1 && branchSelectOptions.length <= 1"
+                        <option [ngValue]="14">014 · Station Rd</option>
-                        [title]="branches.length <= 1 && branchSelectOptions.length <= 1 ? 'Your branch' : 'Branch'"
+                        <option [ngValue]="27">027 · Industrial</option>
-                        (click)="$event.stopPropagation()"
-                      >
-                        @for (b of branchSelectOptions; track b.id) {
-                          <option [ngValue]="b.id">{{ b.name }}</option>
-                        }
                       </select>
                     </div>
                     @if (row.typ === 'DD') {
@@ -184,7 +177,13 @@
                           class="ws-f__ctl"
                           [(ngModel)]="row.acTyp"
                           (click)="$event.stopPropagation()"
-                          (change)="isCreditOnly(row) && (row.dbCr = 'Cr')"
+                          (change)="
+                            row.acTyp === 'GL' &&
+                              row.typ !== 'Disbursement' &&
+                              row.typ !== 'Fund Transfer' &&
+                              row.typ !== 'Enter Bank Transfer' &&
+                              (row.dbCr = 'Cr')
+                          "
                         >
                           @for (a of acTypOptionsFor(row); track a) {
                             <option [value]="a">{{ a }}</option>
@@ -267,7 +266,12 @@
                           type="button"
                           class="ws-seg__btn ws-seg__btn--dr"
                           [class.ws-seg__btn--active-dr]="row.dbCr === 'Dr'"
-                          [disabled]="isCreditOnly(row)"
+                          [disabled]="
+                            row.acTyp === 'GL' &&
+                            row.typ !== 'Disbursement' &&
+                            row.typ !== 'Fund Transfer' &&
+                            row.typ !== 'Enter Bank Transfer'
+                          "
                           (click)="row.dbCr = 'Dr'"
                         >
                           DR
@@ -276,7 +280,6 @@
                           type="button"
                           class="ws-seg__btn ws-seg__btn--cr"
                           [class.ws-seg__btn--active-cr]="row.dbCr === 'Cr'"
-                          [disabled]="row.typ === 'Withdrawal Slip'"
                           (click)="row.dbCr = 'Cr'"
                         >
                           CR
@@ -708,98 +711,70 @@
                 <circle cx="12" cy="8" r="4" />
                 <path d="M4 20c0-4 3.6-7 8-7s8 3 8 7" />
               </svg>
-              {{ isGlAccount ? 'GL Account Information' : 'Personal Information' }}
+              Personal Information
             </div>
-            @if (isGlAccount) {
+            <div class="te-panel__body">
-              <div class="te-panel__body">
+              <div class="te-field">
-                @for (f of glInfo; track f.label) {
+                <span class="te-label">Branch</span><span class="te-value">{{ officeName }}</span>
-                  <div class="te-field">
-                    <span class="te-label">{{ f.label }}</span
-                    ><span class="te-value te-value-wrap" [class.te-mono]="f.mono">{{ f.value }}</span>
-                  </div>
-                }
               </div>
-            } @else {
+              <div class="te-field">
-              <div class="te-panel__body">
+                <span class="te-label">A/c No.</span
-                <div class="te-field">
+                ><span class="te-value te-mono">{{ accountDetails.accountNo }}</span>
-                  <span class="te-label">Branch</span
-                  ><span class="te-value">
-                    @if (isOwnBranchAccount !== null) {
-                      <span
-                        class="te-branch-chip"
-                        [class.te-branch-chip--mine]="isOwnBranchAccount"
-                        [class.te-branch-chip--other]="!isOwnBranchAccount"
-                        [title]="isOwnBranchAccount ? 'Held at your branch' : 'Held at another branch'"
-                      >
-                        <i class="fas fa-map-marker-alt"></i>{{ officeName }}
-                        @if (!isOwnBranchAccount) {
-                          <span class="te-branch-chip__tag">Other branch</span>
-                        }
-                      </span>
-                    } @else {
-                      {{ officeName }}
-                    }
-                  </span>
-                </div>
-                <div class="te-field">
-                  <span class="te-label">A/c No.</span
-                  ><span class="te-value te-mono">{{ accountDetails.accountNo }}</span>
-                </div>
-                <div class="te-field">
-                  <span class="te-label">Name</span><span class="te-value te-value-name">{{ clientName }}</span>
-                </div>
-                <div class="te-field">
-                  <span class="te-label">S/D/W/H/O</span><span class="te-value">{{ guardianName }}</span>
-                </div>
-                <div class="te-field">
-                  <span class="te-label">Address</span><span class="te-value te-value-wrap">{{ clientAddress }}</span>
-                </div>
-                <div class="te-field">
-                  <span class="te-label">Email</span><span class="te-value">{{ clientEmail }}</span>
-                </div>
-                <div class="te-field-row">
-                  <div class="te-field">
-                    <span class="te-label">Last Txn</span><span class="te-value">{{ lastTransactionDate }}</span>
-                  </div>
-                  <div class="te-field">
-                    <span class="te-label">Type</span
-                    ><span class="te-value">{{ accountDetails.depositType?.value ?? selectedRow?.acTyp ?? '—' }}</span>
-                  </div>
-                </div>
-                <div class="te-field-row">
-                  <div class="te-field">
-                    <span class="te-label">Opening Dt</span><span class="te-value">{{ openingDate }}</span>
-                  </div>
-                  <div class="te-field">
-                    <span class="te-label">Status</span
-                    ><span class="te-value">{{ accountDetails.status?.value ?? '—' }}</span>
-                  </div>
-                </div>
-                <div class="te-field">
-                  <span class="te-label">CIF No.</span><span class="te-value te-mono">{{ cifNumber }}</span>
-                </div>
-                @if (isNonIndividual) {
-                  <div class="te-field">
-                    <span class="te-label">Constitution</span>
-                    <span class="te-value">{{
-                      nonPersonDetails?.constitution?.name ?? nonPersonDetails?.constitutionType?.name ?? '—'
-                    }}</span>
-                  </div>
-                  <div class="te-field">
-                    <span class="te-label">Incorp. No.</span>
-                    <span class="te-value te-mono">{{
-                      nonPersonDetails?.incorpNo ?? nonPersonDetails?.incorporationNo ?? '—'
-                    }}</span>
-                  </div>
-                  <div class="te-field">
-                    <span class="te-label">Main Business</span>
-                    <span class="te-value">{{
-                      nonPersonDetails?.mainBusinessLine?.name ?? nonPersonDetails?.mainBusinessLineType?.name ?? '—'
-                    }}</span>
-                  </div>
-                }
               </div>
-            }
+              <div class="te-field">
+                <span class="te-label">Name</span><span class="te-value te-value-name">{{ clientName }}</span>
+              </div>
+              <div class="te-field">
+                <span class="te-label">S/D/W/H/O</span><span class="te-value">{{ guardianName }}</span>
+              </div>
+              <div class="te-field">
+                <span class="te-label">Address</span><span class="te-value te-value-wrap">{{ clientAddress }}</span>
+              </div>
+              <div class="te-field">
+                <span class="te-label">Email</span><span class="te-value">{{ clientEmail }}</span>
+              </div>
+              <div class="te-field-row">
+                <div class="te-field">
+                  <span class="te-label">Last Txn</span><span class="te-value">{{ lastTransactionDate }}</span>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">Type</span
+                  ><span class="te-value">{{ accountDetails.depositType?.value ?? selectedRow?.acTyp ?? '—' }}</span>
+                </div>
+              </div>
+              <div class="te-field-row">
+                <div class="te-field">
+                  <span class="te-label">Opening Dt</span><span class="te-value">{{ openingDate }}</span>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">Status</span
+                  ><span class="te-value">{{ accountDetails.status?.value ?? '—' }}</span>
+                </div>
+              </div>
+              <div class="te-field">
+                <span class="te-label">CIF No.</span><span class="te-value te-mono">{{ cifNumber }}</span>
+              </div>
+              @if (isNonIndividual) {
+                <div class="te-field">
+                  <span class="te-label">Constitution</span>
+                  <span class="te-value">{{
+                    nonPersonDetails?.constitution?.name ?? nonPersonDetails?.constitutionType?.name ?? '—'
+                  }}</span>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">Incorp. No.</span>
+                  <span class="te-value te-mono">{{
+                    nonPersonDetails?.incorpNo ?? nonPersonDetails?.incorporationNo ?? '—'
+                  }}</span>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">Main Business</span>
+                  <span class="te-value">{{
+                    nonPersonDetails?.mainBusinessLine?.name ?? nonPersonDetails?.mainBusinessLineType?.name ?? '—'
+                  }}</span>
+                </div>
+              }
+            </div>
           </div>
 
           <!-- Joint Holders + Nominees -->
@@ -954,78 +929,76 @@
 
           <!-- Other Info + KYC + Account Balances -->
           <div class="te-panel">
-            @if (!isGlAccount) {
+            <div class="te-panel__header">
-              <div class="te-panel__header">
+              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                <rect x="3" y="4" width="18" height="18" rx="2" />
-                  <rect x="3" y="4" width="18" height="18" rx="2" />
+                <line x1="16" y1="2" x2="16" y2="6" />
-                  <line x1="16" y1="2" x2="16" y2="6" />
+                <line x1="8" y1="2" x2="8" y2="6" />
-                  <line x1="8" y1="2" x2="8" y2="6" />
+                <line x1="3" y1="10" x2="21" y2="10" />
-                  <line x1="3" y1="10" x2="21" y2="10" />
+              </svg>
-                </svg>
+              Other Information
-                Other Information
+            </div>
+            <div class="te-panel__body">
+              <div class="te-field">
+                <span class="te-label">Phone No.</span><span class="te-value">{{ clientPhone }}</span>
               </div>
-              <div class="te-panel__body">
+              <div class="te-field">
+                <span class="te-label">Client ID</span
+                ><span class="te-value te-mono">{{ accountDetails.clientId }}</span>
+              </div>
+              <div class="te-field">
+                <span class="te-label">PAN</span><span class="te-value te-mono">{{ panNumber }}</span>
+              </div>
+              <div class="te-field">
+                <span class="te-label">KYC Status</span>
+                <span class="te-value" [style.color]="kycDetails?.kycStatus === 300 ? '#059669' : '#f59e0b'">{{
+                  kycStatus
+                }}</span>
+              </div>
+              <div class="te-field">
+                <span class="te-label">CKYC No.</span><span class="te-value te-mono">{{ ckycNumber }}</span>
+              </div>
+              <div class="te-field">
+                <span class="te-label">Aadhaar</span><span class="te-value te-mono">{{ aadhaarNumber }}</span>
+              </div>
+              <div class="te-field">
+                <span class="te-label">Product</span>
+                <span class="te-value">{{
+                  accountDetails.savingsProductName ||
+                    accountDetails.depositProductName ||
+                    accountDetails.productName ||
+                    '—'
+                }}</span>
+              </div>
+              @if (selectedRow?.acTyp === 'SHR') {
                 <div class="te-field">
-                  <span class="te-label">Phone No.</span><span class="te-value">{{ clientPhone }}</span>
+                  <span class="te-label">No. of Shares Held</span
+                  ><span class="te-value te-mono">{{ accountDetails.summary?.totalApprovedShares ?? 0 }}</span>
                 </div>
                 <div class="te-field">
-                  <span class="te-label">Client ID</span
+                  <span class="te-label">Market Price / Share</span
-                  ><span class="te-value te-mono">{{ accountDetails.clientId }}</span>
+                  ><span class="te-value te-mono"
+                    >{{ currencySymbol }}{{ accountDetails.currentMarketPrice | number: '1.2-2' }}</span
+                  >
                 </div>
                 <div class="te-field">
-                  <span class="te-label">PAN</span><span class="te-value te-mono">{{ panNumber }}</span>
+                  <span class="te-label">Resolution No.</span
+                  ><span class="te-value te-mono">{{ accountDetails.resolutionNumber || '—' }}</span>
                 </div>
                 <div class="te-field">
-                  <span class="te-label">KYC Status</span>
+                  <span class="te-label">Linked Savings A/C No.</span
-                  <span class="te-value" [style.color]="kycDetails?.kycStatus === 300 ? '#059669' : '#f59e0b'">{{
+                  ><span class="te-value te-mono">{{ accountDetails.savingsAccountNumber || '—' }}</span>
-                    kycStatus
-                  }}</span>
                 </div>
-                <div class="te-field">
+                @if (accountDetails.linkedLoanAccountNo) {
-                  <span class="te-label">CKYC No.</span><span class="te-value te-mono">{{ ckycNumber }}</span>
-                </div>
-                <div class="te-field">
-                  <span class="te-label">Aadhaar</span><span class="te-value te-mono">{{ aadhaarNumber }}</span>
-                </div>
-                <div class="te-field">
-                  <span class="te-label">Product</span>
-                  <span class="te-value">{{
-                    accountDetails.savingsProductName ||
-                      accountDetails.depositProductName ||
-                      accountDetails.productName ||
-                      '—'
-                  }}</span>
-                </div>
-                @if (selectedRow?.acTyp === 'SHR') {
                   <div class="te-field">
-                    <span class="te-label">No. of Shares Held</span
+                    <span class="te-label">Linked Loan A/C No.</span
-                    ><span class="te-value te-mono">{{ accountDetails.summary?.totalApprovedShares ?? 0 }}</span>
+                    ><span class="te-value te-mono">{{ accountDetails.linkedLoanAccountNo }}</span>
                   </div>
-                  <div class="te-field">
-                    <span class="te-label">Market Price / Share</span
-                    ><span class="te-value te-mono"
-                      >{{ currencySymbol }}{{ accountDetails.currentMarketPrice | number: '1.2-2' }}</span
-                    >
-                  </div>
-                  <div class="te-field">
-                    <span class="te-label">Resolution No.</span
-                    ><span class="te-value te-mono">{{ accountDetails.resolutionNumber || '—' }}</span>
-                  </div>
-                  <div class="te-field">
-                    <span class="te-label">Linked Savings A/C No.</span
-                    ><span class="te-value te-mono">{{ accountDetails.savingsAccountNumber || '—' }}</span>
-                  </div>
-                  @if (accountDetails.linkedLoanAccountNo) {
-                    <div class="te-field">
-                      <span class="te-label">Linked Loan A/C No.</span
-                      ><span class="te-value te-mono">{{ accountDetails.linkedLoanAccountNo }}</span>
-                    </div>
-                  }
                 }
-              </div>
+              }
-            }
+            </div>
 
-            <div class="te-panel__header" [class.te-panel__header--mt]="!isGlAccount">
+            <div class="te-panel__header te-panel__header--mt">
               <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                 <line x1="12" y1="1" x2="12" y2="23" />
                 <path d="M17 5H9.5a3.5 3.5 0 0 0 0 7h5a3.5 3.5 0 0 1 0 7H6" />
@@ -1218,24 +1191,7 @@
                                   : '—')
               }}</span
             >
-            <span class="te-acs-kv"
+            <span class="te-acs-kv"><b>Branch</b> {{ officeName ?? '—' }}</span>
-              ><b>Branch</b>
-              @if (isOwnBranchAccount !== null) {
-                <span
-                  class="te-branch-chip"
-                  [class.te-branch-chip--mine]="isOwnBranchAccount"
-                  [class.te-branch-chip--other]="!isOwnBranchAccount"
-                  [title]="isOwnBranchAccount ? 'Held at your branch' : 'Held at another branch'"
-                >
-                  <i class="fas fa-map-marker-alt"></i>{{ officeName }}
-                  @if (!isOwnBranchAccount) {
-                    <span class="te-branch-chip__tag">Other branch</span>
-                  }
-                </span>
-              } @else {
-                {{ officeName }}
-              }
-            </span>
             <span class="te-acs-kv"
               ><b>Product</b>
               {{
@@ -1611,8 +1567,6 @@
                           <select
                             class="ws-f__ctl"
                             [(ngModel)]="row.typ"
-                            [disabled]="isTypLocked(row)"
-                            [title]="isTypLocked(row) ? 'Token withdrawal - TYPE is fixed to Payment' : ''"
                             (click)="$event.stopPropagation()"
                             (change)="onTypChange(row)"
                           >
@@ -1623,16 +1577,11 @@
                         </div>
                         <div class="ws-f ws-f--branch">
                           <label class="ws-f__lbl">BRANCH</label>
-                          <select
+                          <select class="ws-f__ctl" [(ngModel)]="row.br" (click)="$event.stopPropagation()">
-                            class="ws-f__ctl"
+                            <option [ngValue]="1">001 · Main</option>
-                            [(ngModel)]="row.br"
+                            <option [ngValue]="2">002 · M.G. Road</option>
-                            [disabled]="branches.length <= 1 && branchSelectOptions.length <= 1"
+                            <option [ngValue]="14">014 · Station Rd</option>
-                            [title]="branches.length <= 1 && branchSelectOptions.length <= 1 ? 'Your branch' : 'Branch'"
+                            <option [ngValue]="27">027 · Industrial</option>
-                            (click)="$event.stopPropagation()"
-                          >
-                            @for (b of branchSelectOptions; track b.id) {
-                              <option [ngValue]="b.id">{{ b.name }}</option>
-                            }
                           </select>
                         </div>
                         @if (row.typ === 'DD') {
@@ -1678,7 +1627,13 @@
                               class="ws-f__ctl"
                               [(ngModel)]="row.acTyp"
                               (click)="$event.stopPropagation()"
-                              (change)="isCreditOnly(row) && (row.dbCr = 'Cr')"
+                              (change)="
+                                row.acTyp === 'GL' &&
+                                  row.typ !== 'Disbursement' &&
+                                  row.typ !== 'Fund Transfer' &&
+                                  row.typ !== 'Enter Bank Transfer' &&
+                                  (row.dbCr = 'Cr')
+                              "
                             >
                               @for (a of acTypOptionsFor(row); track a) {
                                 <option [value]="a">{{ a }}</option>
@@ -1749,7 +1704,12 @@
                               type="button"
                               class="ws-seg__btn ws-seg__btn--dr"
                               [class.ws-seg__btn--active-dr]="row.dbCr === 'Dr'"
-                              [disabled]="isCreditOnly(row)"
+                              [disabled]="
+                                row.acTyp === 'GL' &&
+                                row.typ !== 'Disbursement' &&
+                                row.typ !== 'Fund Transfer' &&
+                                row.typ !== 'Enter Bank Transfer'
+                              "
                               (click)="$event.stopPropagation(); row.dbCr = 'Dr'"
                             >
                               DR
@@ -1758,7 +1718,6 @@
                               type="button"
                               class="ws-seg__btn ws-seg__btn--cr"
                               [class.ws-seg__btn--active-cr]="row.dbCr === 'Cr'"
-                              [disabled]="row.typ === 'Withdrawal Slip'"
                               (click)="$event.stopPropagation(); row.dbCr = 'Cr'"
                             >
                               CR
@@ -2084,13 +2043,7 @@
               <button class="ws-btn ws-btn--ghost" type="button" (click)="onSearch()">Search</button>
               <button class="ws-btn ws-btn--mode" type="button">Change Tr.Mode</button>
               @if (isClerk) {
-                <button
+                <button class="ws-btn ws-btn--add" type="button" (click)="addRow()" title="Add another transaction row">
-                  class="ws-btn ws-btn--add"
-                  type="button"
-                  [disabled]="selectedRow?.typ === 'Withdrawal Slip'"
-                  (click)="addRow()"
-                  title="Add another transaction row"
-                >
                   <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5">
                     <line x1="12" y1="5" x2="12" y2="19" />
                     <line x1="5" y1="12" x2="19" y2="12" />

src/app/cashier/transaction-entry/transaction-entry.component.scss

@@ -3462,39 +3462,3 @@ select.te-cell {
     box-shadow: none;
   }
 }
-
-/* The branch an account is held at, coloured by where the signed-in user works: green for their own branch, red for any other. */
-.te-branch-chip {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  padding: 2px 10px;
-  border: 1px solid transparent;
-  border-radius: 999px;
-  font-size: 12px;
-  font-weight: 700;
-  white-space: nowrap;
-
-  &--mine {
-    background: #dcfce7;
-    border-color: #4ade80;
-    color: #166534;
-  }
-
-  &--other {
-    background: #fca5a5;
-    border-color: #f87171;
-    color: #7f1d1d;
-  }
-}
-
-.te-branch-chip__tag {
-  padding: 0 6px;
-  border-radius: 8px;
-  background: rgb(255 255 255 / 80%);
-  color: #7f1d1d;
-  font-size: 10px;
-  font-weight: 800;
-  letter-spacing: 0.04em;
-  text-transform: uppercase;
-}

src/app/cashier/transaction-entry/transaction-entry.component.ts

@@ -10,9 +10,8 @@ import { Component, OnInit, OnDestroy, inject, Input, ElementRef, ViewChild } fr
 import { CommonModule } from '@angular/common';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
-import { HttpClient, HttpContext, HttpParams } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
-import { SILENT_HTTP_ERROR } from 'app/core/http/silent-error.token';
+import { catchError, debounceTime, distinctUntilChanged, map } from 'rxjs/operators';
-import { catchError, debounceTime, distinctUntilChanged, map, timeout } from 'rxjs/operators';
 import { forkJoin, of, Subject } from 'rxjs';
 import { MatDialog, MatDialogModule, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
@@ -34,7 +33,6 @@ import {
 import { SponsorDDService } from '../../sponsor-dd/sponsor-dd.service';
 import { OrganizationService } from '../../organization/organization.service';
 import { CashierIssueDdDialogComponent } from './cashier-issue-dd-dialog.component';
-import { businessToday, businessTodayIso } from 'app/core/utils/business-today';
 
 interface TxnRow {
   typ: string;
@@ -623,7 +621,7 @@ export class AccountStatementDialogComponent implements OnInit {
 
   @ViewChild('statementContent') statementContent!: ElementRef;
 
-  today = businessTodayIso();
+  today = new Date().toISOString().slice(0, 10);
   fromDate = '';
   toDate = this.today;
 
@@ -1659,8 +1657,6 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
 
   // Full account + client data
   accountDetails: any = null;
-  /** Parent (header) GL of the selected GL account, shown in the GL Account Information panel. */
-  glParent: { glCode?: string; name?: string } | null = null;
   clientDetails: any = null;
   kycDetails: any = null;
   nominees: any[] = [];
@@ -1688,12 +1684,10 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   private searchToken = 0;
   private lastLoadedAcNo = '';
   private acNoInput$ = new Subject<{ row: TxnRow; index: number; value: string }>();
-  /** How many characters of the A/C NO. start the automatic account search. */
-  private static readonly AC_NO_AUTO_SEARCH_MIN_LENGTH = 6;
   cashVaultGlId: number | null = null;
   /** The Cash Vault GL account's own code and name — the denomination breakdown for a manual GL
    *  entry has to be filed against THIS account, not whichever account the teller typed in, since
-   *  that account is never the one physical notes actually moved through.
+   *  that account is never the one physical notes actually moved through (see submitGlJournalEntry).
    *  Both resolved dynamically off whatever this tenant's own financial-activity mapping names as
    *  its cash/vault account (see loadCashVaultGl) — never a literal account name or code. */
   cashVaultGlCode: string | null = null;
@@ -1876,11 +1870,9 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   saving = false;
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.today = `${String(d.getDate()).padStart(2, '0')}/${String(d.getMonth() + 1).padStart(2, '0')}/${d.getFullYear()}`;
-    this.loadBranches();
     this.addRow();
-    this.loadBranchOptions();
     this.loadDenominations();
     this.loadOpeningPosition();
     this.loadDayStatus();
@@ -1910,8 +1902,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         distinctUntilChanged((a, b) => a.value === b.value && a.row === b.row)
       )
       .subscribe(({ row, index, value }) => {
-        // Searches on its own once six characters are typed, for clerk and cashier alike.
+        if (value.trim().length >= 4) {
-        if (value.trim().length >= TransactionEntryComponent.AC_NO_AUTO_SEARCH_MIN_LENGTH) {
           this.selectedRow = row;
           this.loadAccountDetails(value.trim(), row.acTyp);
         }
@@ -2112,7 +2103,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   }
 
   private loadOpeningPosition(): void {
-    const d = businessToday();
+    const d = new Date();
     const asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.cashierService
       .getCashierPositionForMe(asOfDate)
@@ -2312,7 +2303,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     // anyway, just without the extra click to get there.
     const row: TxnRow = {
       typ: this.isClerk ? 'Withdrawal Slip' : 'Receipt',
-      br: this.defaultBranchId,
+      br: 1,
       trTp: '',
       acTyp: 'SD',
       acNo: '',
@@ -2331,54 +2322,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     this.rows.push(row);
   }
 
-  /**
-   * A GL row is credit-only (money received into the account) except on the transfer types, which pick
-   * either side, and on a Withdrawal Slip, which is always a debit: the GL is debited and the cash
-   * vault credited when cash is paid out against it (a clerk's request, approved, then paid by the cashier).
-   */
-  isGlCreditOnly(row: TxnRow): boolean {
-    return (
-      row.acTyp === 'GL' &&
-      row.typ !== 'Disbursement' &&
-      row.typ !== 'Fund Transfer' &&
-      row.typ !== 'Enter Bank Transfer' &&
-      row.typ !== 'Withdrawal Slip'
-    );
-  }
-
-  /**
-   * A Fixed Deposit row is credit-only on both the clerk and the cashier screens: an FD is funded once, with
-   * exactly its principal, and money leaves it only through its maturity or premature closure. The one
-   * exception is the clerk's own "Close this account" flow, which raises a closure request.
-   */
-  isFdCreditOnly(row: TxnRow): boolean {
-    return row.acTyp === 'FD' && !this.pendingClosure;
-  }
-
-  /** DR is not offered for this row (see isGlCreditOnly and isFdCreditOnly). */
-  isCreditOnly(row: TxnRow): boolean {
-    return this.isGlCreditOnly(row) || this.isFdCreditOnly(row);
-  }
-
   /** Called when the TYPE dropdown changes — sets sensible defaults for TXN TP and DR/CR */
-  /**
-   * A cashier row that was filled from an approved token (withdrawal / account-closure) is cash
-   * leaving the branch to the member, so its TYPE is fixed to Payment and cannot be changed.
-   * Never true for the clerk screen or for rows keyed in by hand.
-   */
-  isTypLocked(row: TxnRow): boolean {
-    return (
-      !this.isClerk &&
-      !!row.tokNo?.trim() &&
-      !!(this.activeWithdrawalRequest || this.activeDividendClaimRequest || this.activeClosureRequest)
-    );
-  }
-
   onTypChange(row: TxnRow): void {
-    if (this.isTypLocked(row)) {
-      row.typ = 'Payment';
-      return;
-    }
     switch (row.typ) {
       case 'Withdrawal Slip':
         row.dbCr = 'Dr';
@@ -2494,7 +2439,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    * such ambiguity — the account itself says what it's for.
    */
   showsEntryType(row: TxnRow): boolean {
-    return row.acTyp === 'GL';
+    return row.acTyp === 'GL' && row.dbCr === 'Cr';
   }
 
   /**
@@ -2672,49 +2617,14 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     return !!this.selectedRow && Math.abs(this.denominationTotal - this.ddTargetTotal) < 0.005;
   }
 
-  /**
-   * The branches an entry can be posted against: the real offices of this installation. Read from the offices
-   * themselves rather than from a fixed list, so a branch that is added or renamed shows up here without a code change.
-   */
-  branches: { id: number; label: string }[] = [];
-
-  private loadBranches(): void {
-    const own = this.authService.getCredentials();
-    const ownBranch = own?.officeId
-      ? [{ id: own.officeId, label: this.branchLabel(own.officeId, own.officeName) }]
-      : [];
-    // The office list is only asked for by a login allowed to read it. A cashier or clerk is not, and asking anyway
-    // makes the server refuse and the screen raise an "Unauthorized Request" popup; such a login works in its own
-    // office, which is the one branch it is offered.
-    const permissions = own?.permissions ?? [];
-    const mayReadOffices = permissions.includes('ALL_FUNCTIONS') || permissions.includes('READ_OFFICE');
-    if (!mayReadOffices) {
-      this.branches = ownBranch;
-      return;
-    }
-    this.http
-      .get('/offices')
-      .pipe(catchError(() => of([])))
-      .subscribe((list: any) => {
-        const offices: any[] = Array.isArray(list) ? list : [];
-        this.branches =
-          offices.length > 0 ? offices.map((o) => ({ id: o.id, label: this.branchLabel(o.id, o.name) })) : ownBranch;
-      });
-  }
-
-  private branchLabel(id: number, name: string | null | undefined): string {
-    return `${String(id).padStart(3, '0')} · ${name ?? 'Branch ' + id}`;
-  }
-
-  /** The office the signed-in user works in, which a new entry is posted against unless they pick another. */
-  get defaultBranchId(): number {
-    return this.authService.getCredentials()?.officeId ?? 1;
-  }
-
   branchNameFor(branchId: number): string {
-    const seen = this.seenBranches.find((b) => b.id === branchId);
+    const map: Record<number, string> = {
-    if (seen) return seen.name;
+      1: '001 · Main',
-    return this.branches.find((b) => b.id === branchId)?.label ?? `Branch ${branchId}`;
+      2: '002 · M.G. Road',
+      14: '014 · Station Rd',
+      27: '027 · Industrial'
+    };
+    return map[branchId] || `Branch ${branchId}`;
   }
 
   /**
@@ -2927,7 +2837,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     fundingAccountId: number,
     fundingClientId: number | null
   ): void {
-    const d = businessToday();
+    const d = new Date();
     const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     const isCurrent = row.acTyp === 'CA' || row.acTyp === 'CB';
     const isGl = row.acTyp === 'GL';
@@ -3059,7 +2969,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const d = businessToday();
+    const d = new Date();
     const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     const isCurrent = row.acTyp === 'CA' || row.acTyp === 'CB';
 
@@ -3158,7 +3068,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const d = businessToday();
+    const d = new Date();
     const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
 
     const payload = {
@@ -3481,7 +3391,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const today = businessToday();
+    const today = new Date();
     const requestedDate = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
 
     // Full snapshot of the CR (settlement) row exactly as the clerk filled it in — saved verbatim
@@ -3515,7 +3425,6 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       meetingDate: shareRow.meetingDate,
       description: shareRow.description || null,
       settlementPaymentTypeId: savingsRow.paymentTypeId,
-      settlementMode: 'SAVINGS',
       settlementRowSnapshot
     };
 
@@ -3546,60 +3455,11 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         ? 'Pending Manager approval — redemption, settlement and account closure all post together on approval.'
         : 'Pending Manager approval — redemption and settlement both post together on approval.'
     ];
-    this.showShareWithdrawalConfirm(payload, confirmLines, () =>
+    this.showConfirmAlert('info', 'Confirm Share Withdrawal Request', confirmLines, 'Submit for Approval', () =>
       this.doSubmitShareRedemptionTransfer(payload, shareRow, shares, linkedAcNo)
     );
   }
 
-  /**
-   * Shows the confirm dialog with the same checklist the Manager will see when approving this
-   * request — fetched live from the backend (`previewValidate`) rather than re-implemented here,
-   * so it can never show the clerk something different from what the approver actually sees. A
-   * failing check is shown, not blocked: approve() enforces its own hard rules separately (e.g.
-   * Share Advance Collection applied), this list is advisory so problems surface to whoever can
-   * still fix them, before a manager's time is spent on a request that was always going to fail.
-   */
-  private showShareWithdrawalConfirm(
-    payload: Record<string, unknown>,
-    baseLines: string[],
-    onConfirm: () => void
-  ): void {
-    this.clerkShareWithdrawalService
-      .previewValidate(payload)
-      .pipe(
-        // A request that never resolves (slow network, server busy) must not leave the Submit
-        // button looking dead — the dialog still has to open, just without the checklist.
-        timeout(5000),
-        catchError(() => of({ __previewFailed: true }))
-      )
-      .subscribe((res: any) => {
-        const checks: { label: string; pass: boolean; detail: string }[] = res?.checks ?? [];
-        // A failed call (most likely the backend not yet carrying the /preview-validate endpoint)
-        // says so explicitly rather than just omitting the section — a silently empty checklist
-        // looks identical to "everything passed, nothing to show", which is the one reading this
-        // must never give.
-        const checkLines = res?.__previewFailed ? [
-              '',
-              '⚠ Validation checklist unavailable right now — the request can still be submitted.'
-            ] : checks.length ? [
-                '',
-                'Validation Checks (same as Manager approval):',
-                ...checks.map((c) => `${c.pass ? '✓' : '⚠'} ${c.label}: ${c.detail}`)
-              ] : [];
-        // baseLines ends with a blank line followed by the "Pending Manager approval…" footer
-        // sentence, which must stay last so the modal renders it as a footnote rather than a
-        // key/value row — so the checklist is spliced in just before that pair, not appended after.
-        const footerStart =
-          baseLines.length >= 2 && baseLines[baseLines.length - 2] === '' ? baseLines.length - 2 : baseLines.length;
-        const lines = [
-          ...baseLines.slice(0, footerStart),
-          ...checkLines,
-          ...baseLines.slice(footerStart)
-        ];
-        this.showConfirmAlert('info', 'Confirm Share Withdrawal Request', lines, 'Submit for Approval', onConfirm);
-      });
-  }
-
   /**
    * Share redemption settled to a GL account the clerk picks on the CR row, instead of the
    * member's linked savings account — mirrors submitShareRedemptionTransfer() above, but the
@@ -3652,7 +3512,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const today = businessToday();
+    const today = new Date();
     const requestedDate = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
 
     // Full snapshot of the CR (settlement) row exactly as the clerk filled it in — saved verbatim
@@ -3711,7 +3571,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         ? 'Pending Manager approval — redemption, settlement and account closure all post together on approval.'
         : 'Pending Manager approval — redemption and settlement both post together on approval.'
     ];
-    this.showShareWithdrawalConfirm(payload, confirmLines, () =>
+    this.showConfirmAlert('info', 'Confirm Share Withdrawal Request', confirmLines, 'Submit for Approval', () =>
       this.doSubmitShareGlSettlementTransfer(payload, shareRow, shares, glRow.acNo)
     );
   }
@@ -4007,8 +3867,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     SAVINGS: 'SD',
     CURRENT: 'CA',
     FIXED_DEPOSIT: 'FD',
-    RECURRING_DEPOSIT: 'RD',
+    RECURRING_DEPOSIT: 'RD'
-    GL: 'GL'
   };
 
   openCustomerSearch(): void {
@@ -4314,7 +4173,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   ): void {
     const accountUrl = `${cfg.detail}/${accountId}${cfg.detailParams ?? '?associations=all'}`;
     const todayStr = (() => {
-      const d = businessToday();
+      const d = new Date();
       return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     })();
 
@@ -4332,19 +4191,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         return false;
       }
       this.accountDetails = acc;
-      this.resolveAccountBranch(acc, acTyp, token, this.selectedRow);
       this.jointHolders = acc.jointHolders ?? [];
-      // GL only: look up the parent (header) GL's name. Never runs for any other account type.
-      this.glParent = null;
-      if (acTyp?.toUpperCase() === 'GL' && acc.parentId) {
-        this.http
-          .get<any>(`/glaccounts/${acc.parentId}`)
-          .pipe(catchError(() => of(null)))
-          .subscribe((p: any) => {
-            if (token !== this.searchToken) return;
-            this.glParent = p ? { glCode: p.glCode, name: p.name } : null;
-          });
-      }
       // Cash Hold / Clearing Hold breakdown only exists for plain savings accounts (m_savings_account)
       // — FD/RD/Current/Share/GL have no such row, so there's nothing to ask for.
       if (acTyp?.toUpperCase() === 'SD' && acc.id) {
@@ -4702,7 +4549,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   }
 
   get todayIso(): string {
-    const d = businessToday();
+    const d = new Date();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 
@@ -4915,132 +4762,6 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     return this.accountDetails?.officeName ?? this.clientDetails?.officeName ?? '—';
   }
 
-  /** True when the loaded account is a General Ledger account (/glaccounts), which has no client behind it. */
-  get isGlAccount(): boolean {
-    return !!this.accountDetails?.glCode && this.selectedRow?.acTyp === 'GL';
-  }
-
-  /** The GL account's own details, shown in place of the client panels. */
-  get glInfo(): { label: string; value: string; mono?: boolean }[] {
-    const gl = this.accountDetails;
-    if (!gl) return [];
-    const type = gl.type?.value ?? '—';
-    const nature = [
-      'ASSET',
-      'EXPENSE'
-    ].includes(String(type).toUpperCase()) ? 'Debit' : 'Credit';
-    return [
-      { label: 'GL Code', value: gl.glCode ?? '—', mono: true },
-      { label: 'GL Name', value: gl.name ?? '—' },
-      { label: 'Account Type', value: type },
-      { label: 'Usage', value: gl.usage?.value ?? '—' },
-      { label: 'Normal Balance', value: nature },
-      {
-        label: 'Parent GL',
-        value: this.glParent?.name
-          ? `${this.glParent.glCode ? this.glParent.glCode.trim() + ' - ' : ''}${this.glParent.name.trim()}`
-          : gl.parentId != null
-            ? `ID ${gl.parentId}`
-            : '—'
-      },
-      { label: 'Manual Entries', value: gl.manualEntriesAllowed ? 'Allowed' : 'Not allowed' },
-      { label: 'Status', value: gl.disabled ? 'Disabled' : 'Enabled' },
-      { label: 'Description', value: gl.description || '—' }
-    ];
-  }
-
-  /**
-   * Whether the account on screen is held at the branch the signed-in user works at: true for their own branch, false for
-   * another branch's, null while either branch is not known (the branch is then shown plain, uncoloured).
-   */
-  get isOwnBranchAccount(): boolean | null {
-    const mine = this.authService.getCredentials()?.officeId;
-    const accountOffice = this.accountDetails?.officeId ?? this.clientDetails?.officeId;
-    if (mine == null || accountOffice == null) return null;
-    return Number(mine) === Number(accountOffice);
-  }
-
-  /** The bank's branches, for each row's BRANCH selector. Empty until /offices answers. */
-  branchOptions: { id: number; name: string }[] = [];
-
-  /** What the BRANCH selector offers: the real branches, or the old fixed list while they have not loaded. */
-  get branchSelectOptions(): { id: number; name: string }[] {
-    const base = this.branchOptions.length ? this.branchOptions : TransactionEntryComponent.LEGACY_BRANCHES;
-    const merged = base.map((branch) => this.seenBranches.find((seen) => seen.id === branch.id) ?? branch);
-    for (const seen of this.seenBranches) {
-      if (!merged.some((branch) => branch.id === seen.id)) merged.push(seen);
-    }
-    return merged;
-  }
-
-  /** Branches learned from the accounts picked on this screen; their names are real, whatever the office list says. */
-  private seenBranches: { id: number; name: string }[] = [];
-
-  private static readonly LEGACY_BRANCHES = [
-    { id: 1, name: '001 · Main' },
-    { id: 2, name: '002 · M.G. Road' },
-    { id: 14, name: '014 · Station Rd' },
-    { id: 27, name: '027 · Industrial' }
-  ];
-
-  /**
-   * The bank's branches for the BRANCH selector. Listing offices needs the READ offices permission, which a cashier or
-   * clerk may not hold, so a refusal must not raise an error popup: the selector then shows the branches this screen has
-   * learned from the accounts on it (and the old fixed list until then).
-   */
-  private loadBranchOptions(): void {
-    this.http
-      .get<any[]>('/offices', { context: new HttpContext().set(SILENT_HTTP_ERROR, true) })
-      .pipe(catchError(() => of([])))
-      .subscribe((offices) => {
-        this.branchOptions = (offices ?? []).map((o: any) => ({ id: o.id, name: o.name }));
-      });
-  }
-
-  /**
-   * The branch an account is held at. The savings, FD and RD detail responses carry no office, so the screen fell back
-   * to the client's own branch and an account opened at another branch read as the client's. The client's account list
-   * names each account's branch, so it is read from there. A current account's own response already carries it.
-   */
-  private resolveAccountBranch(acc: any, acTyp: string, token: number, row: TxnRow | null | undefined): void {
-    if (acc?.officeId != null && acc?.officeName) {
-      this.adoptAccountBranch({ id: Number(acc.officeId), name: String(acc.officeName) }, row);
-      return;
-    }
-    const type = (acTyp ?? '').toUpperCase();
-    if (!acc?.id || !acc?.clientId || ![
-        'SD',
-        'FD',
-        'RD',
-        'CA'
-      ].includes(type)) return;
-    this.http
-      .get<any>(`/clients/${acc.clientId}/accounts`, { context: new HttpContext().set(SILENT_HTTP_ERROR, true) })
-      .pipe(catchError(() => of(null)))
-      .subscribe((res) => {
-        // stale: another account was picked while this was loading
-        if (token !== this.searchToken || this.accountDetails?.id !== acc.id) return;
-        const list: any[] = (type === 'CA' ? res?.currentAccounts : res?.savingsAccounts) ?? [];
-        const match = list.find((a: any) => a.id === acc.id);
-        if (match?.officeId != null && match?.officeName) {
-          this.adoptAccountBranch({ id: Number(match.officeId), name: String(match.officeName) }, row);
-        }
-      });
-  }
-
-  private adoptAccountBranch(branch: { id: number; name: string }, row: TxnRow | null | undefined): void {
-    this.accountDetails = { ...this.accountDetails, officeId: branch.id, officeName: branch.name };
-    // /offices lists only the signed-in user's own branches, or nothing for a user who may not read offices; the account's
-    // branch must still be selectable, under its real name
-    if (!this.seenBranches.some((b) => b.id === branch.id)) {
-      this.seenBranches = [
-        ...this.seenBranches,
-        branch
-      ];
-    }
-    if (row) row.br = branch.id;
-  }
-
   get openingDate(): string {
     const raw =
       this.accountDetails?.timeline?.submittedOnDate ??
@@ -5350,7 +5071,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       this.sameDayChequeClearing = 0;
       return;
     }
-    const today = businessToday();
+    const today = new Date();
     const sameDay = (d: any) => {
       if (!d) return false;
       const t = Array.isArray(d) && d.length >= 3 ? new Date(d[0], d[1] - 1, d[2]) : new Date(d);
@@ -5383,20 +5104,6 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   }
 
   onSave(): void {
-    // Money never leaves a Fixed Deposit from this screen, clerk or cashier: no withdrawal slip, payment,
-    // collection or transfer debits an FD. It is paid out only through its maturity or premature closure
-    // (the clerk's "Close this account" flow). The DR button is already disabled for FD rows (isFdCreditOnly);
-    // this also catches a row set to DR by its TYPE, such as a Withdrawal Slip.
-    const fdDebitRows = this.rows.filter((r) => this.isFdCreditOnly(r) && r.dbCr === 'Dr');
-    if (fdDebitRows.length > 0) {
-      this.showAlert('error', 'Fixed Deposit Cannot Be Debited', [
-        `FD account(s) ${fdDebitRows.map((r) => r.acNo).join(', ')} cannot be debited or withdrawn from.`,
-        'Money leaves a Fixed Deposit only through its maturity or premature closure.',
-        'An FD can only be credited — once, with exactly its principal.'
-      ]);
-      return;
-    }
-
     // Demand drafts commit here like everything else on the worksheet. Checked first because a DD
     // row shares its shape with the ordinary entries below — without this it would fall through and
     // post as a plain transaction, with the draft never raised and the charges silently dropped.
@@ -5474,9 +5181,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         return;
       }
 
-      // Bank transfer: savings (SD) or current (CA/CB) accounts on either side, plus a Fixed Deposit (FD) on
+      // Bank transfer: only savings (SD) or current (CA/CB) accounts allowed
-      // the CR side only -- funding it from the customer's own account. The server checks the funding rules
-      // (first and only funding, exactly the principal, the source account's owner and available balance).
       const allowedTypes = new Set([
         'SD',
         'CA',
@@ -5484,14 +5189,13 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       ]);
       const invalidAccounts = [
         ...drRows,
-        ...crRows.filter((r) => r.acTyp !== 'FD')
+        ...crRows
       ].filter((r) => !allowedTypes.has(r.acTyp));
       if (invalidAccounts.length > 0) {
         this.showAlert('error', 'Invalid Account Type', [
           `Account type(s) not allowed in Bank Transfer: ${invalidAccounts.map((r) => r.acTyp + ' (' + r.acNo + ')').join(', ')}`,
-          'Debit side: only Savings (SD) and Current (CA) accounts. Credit side: SD, CA or a Fixed Deposit (FD).',
+          'Only Savings (SD) and Current (CA) accounts are permitted.',
-          'GL and SHR accounts are not allowed — use Disbursement/Collection instead.',
+          'GL, FD, RD, SHR accounts are not allowed — use Disbursement/Collection instead.'
-          'RD installments are paid through a cashier Receipt or Auto Debit.'
         ]);
         return;
       }
@@ -5545,19 +5249,6 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       this.rows.length >= 2 &&
       this.rows.every((r) => r.typ === 'Disbursement' || r.typ === 'Fund Transfer')
     ) {
-      // A Recurring Deposit is never paid this way: these requests post straight into the account, so the
-      // installment schedule never hears of the money -- installments stay unpaid, Auto Debit collects them
-      // again and the maturity amount comes out wrong. RD installments come in through the cashier's
-      // Receipt or the RD's own Auto Debit.
-      const rdRows = this.rows.filter((r) => r.acTyp === 'RD');
-      if (rdRows.length > 0) {
-        this.showAlert('error', 'Recurring Deposit Not Allowed', [
-          `RD account(s) ${rdRows.map((r) => r.acNo).join(', ')} cannot be used in a Disbursement, Collection or Fund Transfer.`,
-          'Pay RD installments through a cashier Receipt, or by Auto Debit from the linked savings account.'
-        ]);
-        return;
-      }
-
       const drRows = this.rows.filter((r) => r.dbCr === 'Dr');
       const crRows = this.rows.filter((r) => r.dbCr === 'Cr');
 
@@ -6091,14 +5782,10 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    // A GL withdrawal slip is raised by the clerk and paid by the cashier against its token, exactly like a
+    // GL withdrawal → direct journal entry (no maker-checker)
-    // savings withdrawal (the clerk branch and the token branch below). Nothing posts from this screen directly:
+    // GL deposit → falls through to maker-checker block below
-    // manual journal entries are switched off on the server.
+    if (row.acTyp === 'GL' && !isDeposit) {
-    if (row.acTyp === 'GL' && !isDeposit && !this.clerkMode && !this.activeWithdrawalRequest) {
+      this.submitGlJournalEntry(row, amount, isDeposit);
-      this.showAlert('error', 'GL Withdrawal', [
-        'A GL withdrawal is raised by a clerk and paid by the cashier against its token.',
-        'Enter the token number of the approved request to pay it.'
-      ]);
       return;
     }
 
@@ -6272,7 +5959,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const today = businessToday();
+    const today = new Date();
     const txnDate = `${String(today.getDate()).padStart(2, '0')}/${String(today.getMonth() + 1).padStart(2, '0')}/${today.getFullYear()}`;
 
     const payload: any = {
@@ -6467,38 +6154,21 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
 
   /** Build the withdrawal-request payload from the current row + loaded account. */
   private buildWithdrawalPayload(row: TxnRow, amount: number): any {
-    const today = businessToday();
+    const today = new Date();
     const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
     const selectedPt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
 
-    const isGl = row.acTyp === 'GL';
-    // The Entry Type picked for a GL slip has no column of its own on the request, so it rides on the narration.
-    const entryTypeName = isGl ? this.entryTypeOptions.find((e) => e.id === row.entryTypeCvId)?.name : undefined;
-    const description = [
-      row.description,
-      entryTypeName ? `[Entry Type: ${entryTypeName}]` : ''
-    ]
-      .filter(Boolean)
-      .join(' ');
-
     return {
-      accountNo: isGl ? (this.accountDetails.glCode ?? this.accountDetails.name) : this.accountDetails.accountNo,
+      accountNo: this.accountDetails.accountNo,
       accountType: this.creditEntryAccountType(row.acTyp),
-      savingsAccountId: isGl ? null : this.accountDetails.id,
+      savingsAccountId: this.accountDetails.id,
-      // GL-specific fields: the GL being paid out of and the cash GL it is paid from (null for other types)
+      clientId: this.accountDetails.clientId ?? this.clientDetails?.id ?? null,
-      glAccountId: isGl ? this.accountDetails.id : null,
+      clientName: this.clientDetails?.displayName ?? this.accountDetails?.clientName ?? null,
-      contraGlId: isGl ? this.cashVaultGlId : null,
-      officeId: isGl ? row.br || 1 : null,
-      currencyCode: isGl ? (this.accountDetails?.currency?.code ?? 'INR') : null,
-      clientId: isGl ? null : (this.accountDetails.clientId ?? this.clientDetails?.id ?? null),
-      clientName: isGl
-        ? (this.accountDetails?.name ?? null)
-        : (this.clientDetails?.displayName ?? this.accountDetails?.clientName ?? null),
       amount,
       txnDate: txnDateIso,
       paymentTypeId: row.paymentTypeId || null,
       paymentTypeName: selectedPt?.name ?? 'Cash',
-      description: description || null,
+      description: row.description || null,
       chequeNo: row.chequeNo || null,
       bankName: row.bankName || null,
       tokNo: row.tokNo?.trim() || null,
@@ -6589,7 +6259,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
 
   /** Build the deposit-request payload from the current row + loaded account. */
   private buildDepositPayload(row: TxnRow, amount: number): any {
-    const today = businessToday();
+    const today = new Date();
     const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
     const selectedPt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
     // Send denominations only for cash payments — stale counts on a cheque
@@ -6690,6 +6360,106 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     this.addRow();
   }
 
+  private submitGlJournalEntry(row: TxnRow, amount: number, isDeposit: boolean): void {
+    if (!this.cashVaultGlId) {
+      this.showAlert('error', 'Cash Vault GL Not Configured', [
+        'Financial Activity Account (CASH_AT_TELLER) is not configured.',
+        'Please configure it in System → Financial Activity Accounts.'
+      ]);
+      this.saving = false;
+      return;
+    }
+
+    const today = new Date();
+    const txnDate = `${String(today.getDate()).padStart(2, '0')}/${String(today.getMonth() + 1).padStart(2, '0')}/${today.getFullYear()}`;
+    const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
+
+    const selectedGlId = this.accountDetails.id;
+    const contraGlId = this.cashVaultGlId;
+
+    // isDeposit (CR button) = cashier receives cash → credit selected GL, debit contra (cash vault)
+    // isWithdrawal (DR button) = cashier pays out cash → debit selected GL, credit contra (cash vault)
+    const credits = isDeposit ? [{ glAccountId: selectedGlId, amount }] : [{ glAccountId: contraGlId, amount }];
+    const debits = isDeposit ? [{ glAccountId: contraGlId, amount }] : [{ glAccountId: selectedGlId, amount }];
+
+    const payload: any = {
+      officeId: row.br || 1,
+      transactionDate: txnDate,
+      dateFormat: 'dd/MM/yyyy',
+      locale: 'en',
+      currencyCode: this.accountDetails?.currency?.code ?? 'INR',
+      comments: row.description || null,
+      credits,
+      debits,
+      paymentTypeId: row.paymentTypeId
+    };
+
+    // Check if cash payment so we can record denomination after journal entry
+    const selectedPt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
+    const isCashPayment = !!selectedPt?.isCashPayment;
+
+    this.saving = true;
+    this.http
+      .post('/journalentries', payload)
+      .pipe(
+        catchError((err: any) => {
+          const msg =
+            err?.error?.errors?.[0]?.defaultUserMessage ??
+            err?.error?.developerMessage ??
+            'Journal entry failed. Please try again.';
+          this.showAlert('error', 'Transaction Failed', [msg]);
+          this.saving = false;
+          return of(null);
+        })
+      )
+      .subscribe((res: any) => {
+        this.saving = false;
+        if (res) {
+          // Record denomination so cashier position stays accurate
+          // Same condition as savings: cash + denom entered + denom matches posted amount
+          if (isCashPayment && this.denominationTotal > 0 && this.denominationTotal === amount) {
+            const denomBreakdown = [
+              ...this.notes,
+              ...this.coins
+            ]
+              .filter((d) => this.countFor(d) > 0)
+              .map((d) => ({
+                denominationId: d.id,
+                denominationValue: d.value,
+                kind: d.kind,
+                count: this.countFor(d),
+                subtotal: this.subtotalFor(d)
+              }));
+            // Filed against the Cash Vault GL, not the account the teller selected on screen: that
+            // selected account (e.g. Sundry Creditors) is the other leg of the journal entry, and
+            // never the one whose physical notes actually changed hands. Tagging the breakdown to it
+            // instead of the vault is why this cash never reached the cashier/vault position.
+            this.http
+              .post('/cashier/gl-denomination', {
+                txnId: res.transactionId ?? res.resourceId,
+                accountNo: this.cashVaultGlCode ?? row.acNo,
+                accountName: this.cashVaultGlName ?? 'Cash at Vault',
+                txnType: isDeposit ? 'DEPOSIT' : 'WITHDRAWAL',
+                txnDate: txnDateIso,
+                paymentTypeName: selectedPt?.name ?? 'Cash',
+                denominationBreakdown: denomBreakdown
+              })
+              .pipe(catchError(() => of(null)))
+              .subscribe();
+          }
+
+          const ref = res.transactionId ?? res.resourceId ?? 'N/A';
+          this.showAlert('success', 'GL Transaction Posted', [
+            `Journal entry of ₹${amount.toLocaleString('en-IN', { minimumFractionDigits: 2 })} posted successfully.`,
+            `Transaction ID: ${ref}`
+          ]);
+          this.clearDenominations();
+          this.loadOpeningPosition();
+          this.loadAccountDetails(row.acNo.trim(), row.acTyp);
+        }
+      });
+  }
+
   onSearch(): void {
     if (this.selectedRow?.acNo.trim()) {
       this.loadAccountDetails(this.selectedRow.acNo.trim(), this.selectedRow.acTyp);

src/app/cashier/vault-position/vault-position.component.ts

@@ -16,7 +16,6 @@ import { MatInputModule } from '@angular/material/input';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface DenomRow {
   denominationId: number;
@@ -68,7 +67,7 @@ export class VaultPositionComponent implements OnInit {
   errorMsg = '';
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
 
     this.service

src/app/cashier/voucher-correction-approvals/voucher-correction-approvals.component.html

@@ -1,170 +0,0 @@
-<!--
-  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="cv-tab-content vca-tab">
-  <!-- ── TITLE BAR ── -->
-  <div class="vca-action-bar">
-    <div class="vca-action-bar__left">
-      <mat-icon class="vca-action-bar__icon">undo</mat-icon>
-      <div>
-        <div class="vca-action-bar__title">Voucher Corrections</div>
-        <div class="vca-action-bar__sub">
-          Approve or reject a voucher unpass, and the correction entry that follows it. Only the correction approval
-          moves money.
-        </div>
-      </div>
-    </div>
-    <div class="vca-counts">
-      <span class="vca-count"
-        ><strong>{{ unpassCount }}</strong> unpass</span
-      >
-      <span class="vca-count"
-        ><strong>{{ correctionCount }}</strong> correction</span
-      >
-    </div>
-  </div>
-
-  <!-- ── FILTER BAR ── -->
-  <div class="vca-filter-bar">
-    <div class="vca-search-box">
-      <mat-icon>search</mat-icon>
-      <input type="text" placeholder="Search by voucher, account, customer or user" [(ngModel)]="searchTerm" />
-      @if (searchTerm) {
-        <button type="button" class="vca-search-box__clear" (click)="searchTerm = ''">
-          <mat-icon>close</mat-icon>
-        </button>
-      }
-    </div>
-
-    <span class="vca-fb-sep"></span>
-
-    <select class="vca-filter-select" [(ngModel)]="kindFilter">
-      @for (opt of kindOptions; track opt.value) {
-        <option [value]="opt.value">{{ opt.label }}</option>
-      }
-    </select>
-
-    <button type="button" class="vca-btn vca-btn--refresh" (click)="load()" [disabled]="loading">
-      <mat-icon>refresh</mat-icon>
-    </button>
-  </div>
-
-  <!-- ── TABLE ── -->
-  @if (loading && !loaded) {
-    <div class="vca-empty"><p class="vca-empty__title">Loading…</p></div>
-  } @else if (rows.length === 0) {
-    <div class="vca-empty">
-      <mat-icon class="vca-empty__icon">inbox</mat-icon>
-      <p class="vca-empty__title">No voucher correction waiting</p>
-      <p class="vca-empty__text">There is no unpass request or correction entry waiting for review.</p>
-    </div>
-  } @else {
-    <div class="vca-table-wrap">
-      <table class="vca-table">
-        <thead>
-          <tr>
-            <th>Voucher No</th>
-            <th>Request</th>
-            <th>Posted To (Wrong)</th>
-            <th>Correct Account</th>
-            <th class="num">Amount</th>
-            <th>Reason</th>
-            <th>Raised By</th>
-            <th>Raised At</th>
-            <th class="vca-th-action">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (r of rows; track r.request.id) {
-            <tr class="vca-row">
-              <td class="vca-mono vca-voucher">{{ r.request.original_voucher_no }}</td>
-              <td>
-                <span class="vca-kind" [class]="'vca-kind vca-kind--' + r.kind">{{ kindLabel(r.kind) }}</span>
-              </td>
-              <td>
-                <div class="vca-mono">{{ r.request.wrong_account_no }}</div>
-                <div class="vca-sub">{{ r.request.wrong_client_name || '—' }}</div>
-              </td>
-              <td>
-                @if (r.kind === 'correction') {
-                  <div class="vca-mono vca-strong">{{ r.request.correct_account_no }}</div>
-                  <div class="vca-sub">{{ r.request.correct_client_name || '—' }}</div>
-                } @else {
-                  <span class="vca-none">—</span>
-                }
-              </td>
-              <td class="num vca-amount">₹{{ r.request.amount | number: '1.2-2' }}</td>
-              <td class="vca-reason" [title]="r.request.reason || ''">{{ r.request.reason || '—' }}</td>
-              <td>{{ r.raisedBy || '—' }}</td>
-              <td class="vca-dt">{{ formatDateTime(r.raisedAt) }}</td>
-              <td class="vca-action-cell">
-                <button
-                  type="button"
-                  class="vca-btn vca-btn--reject"
-                  [disabled]="busyId === r.request.id"
-                  (click)="startReject(r)"
-                >
-                  <mat-icon>close</mat-icon> Reject
-                </button>
-                <button
-                  type="button"
-                  class="vca-btn vca-btn--approve"
-                  [disabled]="busyId === r.request.id"
-                  (click)="approve(r)"
-                >
-                  <mat-icon>check</mat-icon>
-                  {{ r.kind === 'unpass' ? 'Approve unpass' : 'Approve correction' }}
-                </button>
-              </td>
-            </tr>
-          }
-        </tbody>
-      </table>
-    </div>
-  }
-</div>
-
-<!-- ─── Popup: reject with a reason ───────────────────────────────────────── -->
-<ng-template #rejectDialog>
-  @if (rejecting) {
-    <div class="vca-dlg">
-      <header class="vca-dlg__head">
-        <mat-icon class="vca-dlg__ico">block</mat-icon>
-        <div class="vca-dlg__titles">
-          <div class="vca-dlg__title">
-            Reject {{ rejecting.kind === 'unpass' ? 'unpass request' : 'correction entry' }}
-          </div>
-          <div class="vca-dlg__sub vca-mono">{{ rejecting.request.original_voucher_no }}</div>
-        </div>
-        <button type="button" class="vca-dlg__x" aria-label="Close" (click)="cancelReject()">
-          <mat-icon>close</mat-icon>
-        </button>
-      </header>
-      <div class="vca-dlg__body">
-        <label class="vca-label" for="vca-reason">Reason (required)</label>
-        <textarea
-          id="vca-reason"
-          rows="3"
-          placeholder="Why is this being rejected?"
-          [(ngModel)]="rejectReason"
-        ></textarea>
-      </div>
-      <footer class="vca-dlg__foot">
-        <button type="button" class="vca-btn vca-btn--ghost" (click)="cancelReject()">Cancel</button>
-        <button
-          type="button"
-          class="vca-btn vca-btn--reject-solid"
-          [disabled]="!rejectReason.trim() || busyId === rejecting.request.id"
-          (click)="confirmReject()"
-        >
-          Confirm reject
-        </button>
-      </footer>
-    </div>
-  }
-</ng-template>

src/app/cashier/voucher-correction-approvals/voucher-correction-approvals.component.scss

@@ -1,485 +0,0 @@
-/**
- * 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/.
- */
-
-// Laid out like the other approval tabs (Withdrawal Requests): title bar, filter bar, one table.
-:host {
-  display: block;
-}
-
-.vca-tab {
-  padding: 0;
-}
-
-.vca-action-bar {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 16px;
-  padding: 10px 16px;
-  background: #fff;
-  border-bottom: 1px solid #e2e8f0;
-
-  &__left {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-  }
-
-  &__icon {
-    font-size: 22px;
-    width: 22px;
-    height: 22px;
-    color: #0f4f3c;
-  }
-
-  &__title {
-    font-size: 13px;
-    font-weight: 700;
-    color: #0d1b2a;
-  }
-
-  &__sub {
-    max-width: 640px;
-    margin-top: 1px;
-    font-size: 11px;
-    color: #64748b;
-  }
-}
-
-.vca-counts {
-  display: flex;
-  gap: 8px;
-}
-
-.vca-count {
-  padding: 2px 10px;
-  border-radius: 999px;
-  background: #f1f5f9;
-  font-size: 11px;
-  color: #475569;
-
-  strong {
-    color: #0f4f3c;
-  }
-}
-
-.vca-filter-bar {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  flex-wrap: wrap;
-  padding: 6px 16px;
-  background: #f8fafc;
-  border-bottom: 1px solid #e2e8f0;
-}
-
-.vca-fb-sep {
-  flex-shrink: 0;
-  width: 1px;
-  height: 22px;
-  margin: 0 4px;
-  background: #e2e8f0;
-}
-
-.vca-search-box {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  height: 30px;
-  min-width: 240px;
-  padding: 0 10px;
-  border: 1px solid #e2e8f0;
-  border-radius: 8px;
-  background: #fff;
-
-  mat-icon {
-    flex-shrink: 0;
-    font-size: 17px;
-    width: 17px;
-    height: 17px;
-    color: #94a3b8;
-  }
-
-  &:hover {
-    border-color: #cbd5e1;
-  }
-
-  &:focus-within {
-    border-color: #0f4f3c;
-    box-shadow: 0 0 0 3px rgb(15 79 60 / 8%);
-  }
-
-  input {
-    flex: 1;
-    border: none;
-    outline: none;
-    background: transparent;
-    font-family: inherit;
-    font-size: 12px;
-    color: #0d1b2a;
-
-    &::placeholder {
-      color: #94a3b8;
-    }
-  }
-
-  &__clear {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    flex-shrink: 0;
-    width: 20px;
-    height: 20px;
-    padding: 0;
-    border: none;
-    border-radius: 50%;
-    background: none;
-    color: #94a3b8;
-    cursor: pointer;
-
-    mat-icon {
-      font-size: 15px;
-      width: 15px;
-      height: 15px;
-      color: inherit;
-    }
-
-    &:hover {
-      color: #dc2626;
-      background: #fef2f2;
-    }
-  }
-}
-
-.vca-filter-select {
-  height: 30px;
-  min-width: 140px;
-  padding: 0 10px;
-  border: 1px solid #e2e8f0;
-  border-radius: 7px;
-  background: #fff;
-  font-family: inherit;
-  font-size: 12px;
-  color: #0d1b2a;
-  cursor: pointer;
-
-  &:focus {
-    outline: none;
-    border-color: #0f4f3c;
-  }
-}
-
-// ── Buttons ─────────────────────────────────────────────────────────────────
-.vca-btn {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  height: 26px;
-  padding: 0 10px;
-  border: 1px solid transparent;
-  border-radius: 7px;
-  font-family: inherit;
-  font-size: 11px;
-  font-weight: 600;
-  white-space: nowrap;
-  cursor: pointer;
-
-  mat-icon {
-    font-size: 14px;
-    width: 14px;
-    height: 14px;
-  }
-
-  &:disabled {
-    opacity: 0.45;
-    cursor: not-allowed;
-  }
-
-  &--refresh {
-    height: 30px;
-    width: 30px;
-    justify-content: center;
-    padding: 0;
-    margin-left: auto;
-    border-color: #e2e8f0;
-    background: #fff;
-    color: #475569;
-  }
-
-  &--approve {
-    background: #0f4f3c;
-    color: #fff;
-
-    &:hover:not(:disabled) {
-      background: #0a3d2e;
-    }
-  }
-
-  &--reject {
-    border-color: #fecaca;
-    background: #fff;
-    color: #dc2626;
-
-    &:hover:not(:disabled) {
-      background: #fef2f2;
-    }
-  }
-
-  &--reject-solid {
-    background: #dc2626;
-    color: #fff;
-  }
-
-  &--ghost {
-    border-color: #e2e8f0;
-    background: #fff;
-    color: #475569;
-  }
-}
-
-// ── Table ───────────────────────────────────────────────────────────────────
-.vca-table-wrap {
-  overflow-x: auto;
-  background: #fff;
-}
-
-.vca-table {
-  width: 100%;
-  border-collapse: collapse;
-  font-size: 11px;
-
-  th {
-    padding: 7px 10px;
-    border-bottom: 1px solid #e2e8f0;
-    background: #f8fafc;
-    font-size: 9.5px;
-    font-weight: 800;
-    letter-spacing: 0.06em;
-    text-align: left;
-    text-transform: uppercase;
-    color: #94a3b8;
-    white-space: nowrap;
-  }
-
-  td {
-    padding: 5px 10px;
-    border-bottom: 1px solid #eef2f7;
-    vertical-align: middle;
-    color: #0d1b2a;
-  }
-
-  .num {
-    text-align: right;
-    font-variant-numeric: tabular-nums;
-  }
-
-  .vca-th-action {
-    text-align: right;
-  }
-}
-
-.vca-row:hover td {
-  background: #f8fafc;
-}
-
-.vca-mono {
-  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
-  letter-spacing: 0.02em;
-}
-
-.vca-voucher {
-  font-weight: 700;
-  color: #0f4f3c;
-}
-
-.vca-strong {
-  font-weight: 700;
-}
-
-.vca-sub {
-  margin-top: 1px;
-  font-size: 11px;
-  color: #64748b;
-}
-
-.vca-none {
-  color: #cbd5e1;
-}
-
-.vca-amount {
-  font-weight: 700;
-}
-
-.vca-reason {
-  max-width: 220px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.vca-dt {
-  white-space: nowrap;
-  color: #475569;
-}
-
-.vca-kind {
-  display: inline-block;
-  padding: 2px 10px;
-  border-radius: 999px;
-  font-size: 11px;
-  font-weight: 700;
-
-  &--unpass {
-    background: #fef3c7;
-    color: #92400e;
-  }
-
-  &--correction {
-    background: #dbeafe;
-    color: #1e40af;
-  }
-}
-
-.vca-action-cell {
-  display: flex;
-  justify-content: flex-end;
-  gap: 6px;
-  white-space: nowrap;
-}
-
-// ── Empty ───────────────────────────────────────────────────────────────────
-.vca-empty {
-  padding: 28px 16px;
-  text-align: center;
-  color: #94a3b8;
-
-  &__icon {
-    display: block;
-    margin: 0 auto 6px;
-    font-size: 30px;
-    width: 30px;
-    height: 30px;
-    opacity: 0.6;
-  }
-
-  &__title {
-    margin: 0;
-    font-size: 12px;
-    font-weight: 700;
-    color: #64748b;
-  }
-
-  &__text {
-    margin: 3px 0 0;
-    font-size: 11px;
-  }
-}
-
-// ── Reject popup ────────────────────────────────────────────────────────────
-.vca-dlg {
-  font-size: 12px;
-
-  &__head {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    padding: 10px 14px;
-    border-bottom: 1px solid #e2e8f0;
-    background: #f8fafc;
-  }
-
-  &__ico {
-    flex: 0 0 32px;
-    height: 32px;
-    width: 32px;
-    border-radius: 9px;
-    background: #fef2f2;
-    color: #dc2626;
-    font-size: 18px;
-    line-height: 32px;
-    text-align: center;
-  }
-
-  &__titles {
-    flex: 1;
-    min-width: 0;
-  }
-
-  &__title {
-    font-size: 14px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__sub {
-    font-size: 11px;
-    color: #64748b;
-  }
-
-  &__x {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    height: 28px;
-    width: 28px;
-    border: 0;
-    border-radius: 50%;
-    background: transparent;
-    color: #64748b;
-    cursor: pointer;
-
-    &:hover {
-      background: #e2e8f0;
-    }
-
-    mat-icon {
-      font-size: 18px;
-      height: 18px;
-      width: 18px;
-    }
-  }
-
-  &__body {
-    padding: 12px 14px;
-
-    textarea {
-      width: 100%;
-      padding: 7px 10px;
-      border: 1px solid #cbd5e1;
-      border-radius: 8px;
-      font: inherit;
-      font-size: 12px;
-      resize: vertical;
-
-      &:focus {
-        outline: 0;
-        border-color: #0f4f3c;
-        box-shadow: 0 0 0 3px rgb(15 79 60 / 8%);
-      }
-    }
-  }
-
-  &__foot {
-    display: flex;
-    justify-content: flex-end;
-    gap: 8px;
-    padding: 10px 14px;
-    border-top: 1px solid #e2e8f0;
-    background: #f8fafc;
-  }
-}
-
-.vca-label {
-  display: block;
-  margin-bottom: 4px;
-  font-size: 10px;
-  font-weight: 700;
-  letter-spacing: 0.05em;
-  text-transform: uppercase;
-  color: #94a3b8;
-}

src/app/cashier/voucher-correction-approvals/voucher-correction-approvals.component.ts

@@ -1,192 +0,0 @@
-/**
- * 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, TemplateRef, ViewChild, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { MatIconModule } from '@angular/material/icon';
-import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
-import { of } from 'rxjs';
-import { catchError } from 'rxjs/operators';
-import { VoucherCorrection, VoucherCorrectionService } from '../voucher-correction.service';
-
-type Kind = 'unpass' | 'correction';
-type KindFilter = 'ALL' | Kind;
-
-/** One row of the approvals table: a request, and which of the two steps it is waiting at. */
-interface ApprovalRow {
-  kind: Kind;
-  request: VoucherCorrection;
-  raisedBy: string | null;
-  raisedAt: string | null;
-}
-
-/**
- * Manager side of the voucher correction, laid out like the other approval tabs: approves or rejects the unpass of a
- * voucher, and later the correction entry the cashier made. Only the second approval moves money.
- */
-@Component({
-  selector: 'mifosx-voucher-correction-approvals',
-  templateUrl: './voucher-correction-approvals.component.html',
-  styleUrls: ['./voucher-correction-approvals.component.scss'],
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    MatDialogModule,
-    MatIconModule,
-    MatSnackBarModule
-  ]
-})
-export class VoucherCorrectionApprovalsComponent implements OnInit {
-  private service = inject(VoucherCorrectionService);
-  private snackBar = inject(MatSnackBar);
-  private dialog = inject(MatDialog);
-
-  @ViewChild('rejectDialog') rejectDialog!: TemplateRef<unknown>;
-  private dialogRef: MatDialogRef<unknown> | null = null;
-
-  all: ApprovalRow[] = [];
-  loading = false;
-  loaded = false;
-  busyId: number | null = null;
-
-  kindFilter: KindFilter = 'ALL';
-  searchTerm = '';
-
-  /** The row being rejected, and the reason typed for it. */
-  rejecting: ApprovalRow | null = null;
-  rejectReason = '';
-
-  readonly kindOptions: { value: KindFilter; label: string }[] = [
-    { value: 'ALL', label: 'All requests' },
-    { value: 'unpass', label: 'Unpass requests' },
-    { value: 'correction', label: 'Correction entries' }
-  ];
-
-  ngOnInit(): void {
-    this.load();
-  }
-
-  load(): void {
-    this.loading = true;
-    this.service
-      .list('UNPASS_PENDING,CORRECTION_PENDING')
-      .pipe(catchError(() => of([] as VoucherCorrection[])))
-      .subscribe((rows) => {
-        this.all = rows.map((r) =>
-          r.status === 'UNPASS_PENDING'
-            ? { kind: 'unpass', request: r, raisedBy: r.unpass_by_name, raisedAt: r.unpass_at }
-            : { kind: 'correction', request: r, raisedBy: r.correction_by_name, raisedAt: r.correction_at }
-        );
-        this.loading = false;
-        this.loaded = true;
-      });
-  }
-
-  /** The table: the kind picked, narrowed by whatever is typed in the search box. */
-  get rows(): ApprovalRow[] {
-    const term = this.searchTerm.trim().toLowerCase();
-    return this.all.filter((r) => {
-      if (this.kindFilter !== 'ALL' && r.kind !== this.kindFilter) return false;
-      if (!term) return true;
-      const q = r.request;
-      return [
-        q.original_voucher_no,
-        q.wrong_account_no,
-        q.wrong_client_name,
-        q.correct_account_no,
-        q.correct_client_name,
-        r.raisedBy
-      ].some((v) => (v ?? '').toLowerCase().includes(term));
-    });
-  }
-
-  get unpassCount(): number {
-    return this.all.filter((r) => r.kind === 'unpass').length;
-  }
-
-  get correctionCount(): number {
-    return this.all.filter((r) => r.kind === 'correction').length;
-  }
-
-  kindLabel(kind: Kind): string {
-    return kind === 'unpass' ? 'Unpass' : 'Correction';
-  }
-
-  formatDateTime(value: string | null): string {
-    if (!value) return '—';
-    const d = new Date(value);
-    return isNaN(d.getTime())
-      ? value
-      : d.toLocaleString('en-IN', { day: '2-digit', month: 'short', hour: '2-digit', minute: '2-digit' });
-  }
-
-  approve(row: ApprovalRow): void {
-    if (this.busyId) return;
-    const id = row.request.id;
-    this.busyId = id;
-    const call = row.kind === 'unpass' ? this.service.approveUnpass(id) : this.service.approveCorrection(id);
-    call.subscribe({
-      next: (res: any) => {
-        this.busyId = null;
-        this.snackBar.open(
-          row.kind === 'unpass'
-            ? `Voucher ${row.request.original_voucher_no} unpassed — the cashier can now enter the correct account`
-            : `Corrected. New voucher ${res?.newVoucherNo ?? ''}`,
-          'Close',
-          { duration: 6000 }
-        );
-        this.load();
-      },
-      error: (err) => {
-        this.busyId = null;
-        this.fail(err, 'Could not approve');
-      }
-    });
-  }
-
-  startReject(row: ApprovalRow): void {
-    this.rejecting = row;
-    this.rejectReason = '';
-    this.dialogRef = this.dialog.open(this.rejectDialog, { width: '440px', maxWidth: '95vw', autoFocus: false });
-    this.dialogRef.afterClosed().subscribe(() => (this.rejecting = null));
-  }
-
-  cancelReject(): void {
-    this.dialogRef?.close();
-  }
-
-  confirmReject(): void {
-    if (!this.rejecting || !this.rejectReason.trim() || this.busyId) return;
-    const row = this.rejecting;
-    const id = row.request.id;
-    this.busyId = id;
-    const reason = this.rejectReason.trim();
-    const call =
-      row.kind === 'unpass' ? this.service.rejectUnpass(id, reason) : this.service.rejectCorrection(id, reason);
-    call.subscribe({
-      next: () => {
-        this.busyId = null;
-        this.dialogRef?.close();
-        this.snackBar.open('Rejected', 'Close', { duration: 4000 });
-        this.load();
-      },
-      error: (err) => {
-        this.busyId = null;
-        this.fail(err, 'Could not reject');
-      }
-    });
-  }
-
-  private fail(err: any, fallback: string): void {
-    const msg = err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.defaultUserMessage ?? fallback;
-    this.snackBar.open(msg, 'Close', { duration: 8000 });
-  }
-}

src/app/cashier/voucher-correction.service.ts

@@ -1,120 +0,0 @@
-/**
- * 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';
-
-/** One row of a voucher correction, as the server keeps it (snake_case columns). */
-export interface VoucherCorrection {
-  id: number;
-  original_voucher_no: string;
-  original_txn_id: number;
-  wrong_savings_account_id: number;
-  wrong_account_no: string;
-  wrong_client_name: string | null;
-  amount: number;
-  txn_date: string | null;
-  status: 'UNPASS_PENDING' | 'UNPASSED' | 'UNPASS_REJECTED' | 'CORRECTION_PENDING' | 'COMPLETED' | 'CLOSED';
-  reason: string | null;
-  rejection_reason: string | null;
-  unpass_by_name: string | null;
-  unpass_at: string | null;
-  unpass_approved_by_name: string | null;
-  correct_account_no: string | null;
-  correct_client_name: string | null;
-  correction_by_name: string | null;
-  correction_at: string | null;
-  correction_approved_by_name: string | null;
-  new_voucher_no: string | null;
-}
-
-/** A cash deposit voucher of today that can still be unpassed. */
-export interface EligibleVoucher {
-  voucherNo: string;
-  amount: number;
-  createdAt: string;
-  cashier: string;
-  txnId: number;
-  savingsAccountId: number;
-  accountNo: string;
-  clientName: string | null;
-  paymentType: string;
-}
-
-/** What the server knows about a savings account typed in as the correct one. */
-export interface AccountLookup {
-  id: number;
-  accountNo: string;
-  clientId: number | null;
-  clientName: string | null;
-  balance: number;
-  currencyCode: string;
-  canReceive: boolean;
-}
-
-/** HTTP service for the voucher correction workflow: unpass, approve, re-enter, approve. */
-@Injectable({ providedIn: 'root' })
-export class VoucherCorrectionService {
-  private http = inject(HttpClient);
-  private readonly base = '/vouchers/corrections';
-
-  eligible(search?: string): Observable<EligibleVoucher[]> {
-    let params = new HttpParams();
-    if (search) params = params.set('search', search);
-    return this.http.get<EligibleVoucher[]>(`${this.base}/eligible`, { params });
-  }
-
-  unpass(voucherNo: string, reason: string): Observable<any> {
-    return this.http.post(`${this.base}/unpass`, { voucherNo, reason });
-  }
-
-  list(status?: string, mine = false): Observable<VoucherCorrection[]> {
-    let params = new HttpParams().set('mine', String(mine));
-    if (status) params = params.set('status', status);
-    return this.http.get<VoucherCorrection[]>(this.base, { params });
-  }
-
-  get(id: number): Observable<VoucherCorrection> {
-    return this.http.get<VoucherCorrection>(`${this.base}/${id}`);
-  }
-
-  accountLookup(accountNo: string): Observable<AccountLookup> {
-    return this.http.get<AccountLookup>(`${this.base}/account-lookup`, { params: { accountNo } });
-  }
-
-  submitCorrection(id: number, correctAccountNo: string): Observable<any> {
-    return this.http.post(`${this.base}/${id}/correction`, { correctAccountNo });
-  }
-
-  /** The cashier gives up the correction, e.g. when the wrong account no longer holds the money. */
-  close(id: number, reason: string): Observable<any> {
-    return this.http.post(`${this.base}/${id}/close`, { reason });
-  }
-
-  approveUnpass(id: number): Observable<any> {
-    return this.http.post(`${this.base}/${id}/unpass/approve`, {});
-  }
-
-  rejectUnpass(id: number, reason: string): Observable<any> {
-    return this.http.post(`${this.base}/${id}/unpass/reject`, { reason });
-  }
-
-  approveCorrection(id: number): Observable<any> {
-    return this.http.post(`${this.base}/${id}/correction/approve`, {});
-  }
-
-  rejectCorrection(id: number, reason: string): Observable<any> {
-    return this.http.post(`${this.base}/${id}/correction/reject`, { reason });
-  }
-
-  /** Ids of the transactions of this account that a completed correction removed. */
-  voidedTransactions(savingsAccountId: number): Observable<number[]> {
-    return this.http.get<number[]>(`${this.base}/voided-transactions`, { params: { savingsAccountId } });
-  }
-}

src/app/cashier/voucher-correction/voucher-correction.component.html

@@ -1,446 +0,0 @@
-<!--
-  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="pg">
-  <header class="pg-head">
-    <div>
-      <div class="pg-eyebrow">CASHIER · VOUCHER CORRECTION</div>
-      <h1 class="pg-title">Voucher Correction</h1>
-      <p class="pg-sub">
-        Move a cash deposit that was posted to the wrong account. Nothing changes on any account until the final
-        approval.
-      </p>
-    </div>
-  </header>
-
-  <!-- The four steps, so it is always clear where a voucher is. -->
-  <ol class="vc-steps">
-    <li class="vc-step" [class.vc-step--on]="tab === 'today'">
-      <span class="vc-step__no">1</span>
-      <span class="vc-step__txt"><strong>Unpass</strong> the voucher</span>
-    </li>
-    <li class="vc-step">
-      <span class="vc-step__no">2</span>
-      <span class="vc-step__txt"><strong>Manager</strong> approves</span>
-    </li>
-    <li class="vc-step" [class.vc-step--on]="tab === 'unpassed'">
-      <span class="vc-step__no">3</span>
-      <span class="vc-step__txt">Enter the <strong>correct account</strong></span>
-    </li>
-    <li class="vc-step">
-      <span class="vc-step__no">4</span>
-      <span class="vc-step__txt"><strong>Manager</strong> approves, deposit moves</span>
-    </li>
-  </ol>
-
-  <nav class="vc-tabs">
-    @if (mayUnpass) {
-      <button type="button" class="vc-tab" [class.vc-tab--on]="tab === 'today'" (click)="setTab('today')">
-        <mat-icon>receipt_long</mat-icon> Today's Vouchers
-      </button>
-    }
-    @if (mayCorrect) {
-      <button type="button" class="vc-tab" [class.vc-tab--on]="tab === 'unpassed'" (click)="setTab('unpassed')">
-        <mat-icon>edit_note</mat-icon> Unpassed — Correct Entry
-        @if (unpassed.length) {
-          <span class="vc-count">{{ unpassed.length }}</span>
-        }
-      </button>
-    }
-    <button type="button" class="vc-tab" [class.vc-tab--on]="tab === 'mine'" (click)="setTab('mine')">
-      <mat-icon>history</mat-icon> My Requests
-    </button>
-  </nav>
-
-  <!-- ─── Today's vouchers ─────────────────────────────────────────────── -->
-  @if (tab === 'today') {
-    <div class="vc-toolbar">
-      <div class="vc-search">
-        <mat-icon>search</mat-icon>
-        <input
-          type="text"
-          placeholder="Search by voucher, account or customer name"
-          [(ngModel)]="search"
-          (keyup.enter)="loadVouchers()"
-        />
-      </div>
-      <button type="button" class="pg-btn pg-btn--primary" (click)="loadVouchers()">
-        <mat-icon>search</mat-icon> Search
-      </button>
-      <button type="button" class="pg-btn pg-btn--ghost" (click)="search = ''; loadVouchers()">
-        <mat-icon>refresh</mat-icon> Refresh
-      </button>
-    </div>
-
-    <div class="pg-card">
-      <table class="pg-table vc-table">
-        <thead>
-          <tr>
-            <th>Voucher</th>
-            <th>Account</th>
-            <th>Customer</th>
-            <th>Mode</th>
-            <th>Cashier</th>
-            <th class="num">Amount</th>
-            <th class="vc-col-action"></th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (v of vouchers; track v.voucherNo) {
-            <tr [class.vc-row--on]="selectedVoucher?.voucherNo === v.voucherNo" (click)="pick(v)">
-              <td>
-                <span class="pg-chip">{{ v.voucherNo }}</span>
-              </td>
-              <td class="vc-mono">{{ v.accountNo }}</td>
-              <td>{{ v.clientName || '—' }}</td>
-              <td>{{ v.paymentType }}</td>
-              <td>{{ v.cashier }}</td>
-              <td class="num">₹{{ v.amount | number: '1.2-2' }}</td>
-              <td class="vc-col-action">
-                <button
-                  type="button"
-                  class="pg-btn pg-btn--ghost vc-btn-sm"
-                  (click)="pick(v); $event.stopPropagation()"
-                >
-                  <mat-icon>undo</mat-icon> Unpass
-                </button>
-              </td>
-            </tr>
-          }
-          @if (!vouchers.length) {
-            <tr>
-              <td colspan="7" class="vc-empty">
-                <mat-icon>{{ loadingVouchers ? 'hourglass_empty' : 'inbox' }}</mat-icon>
-                <div>{{ loadingVouchers ? 'Loading…' : 'No cash deposit voucher of today can be unpassed.' }}</div>
-              </td>
-            </tr>
-          }
-        </tbody>
-      </table>
-    </div>
-  }
-
-  <!-- ─── Unpassed: enter the correct account ──────────────────────────── -->
-  @if (tab === 'unpassed') {
-    <div class="pg-card">
-      <table class="pg-table vc-table">
-        <thead>
-          <tr>
-            <th>Voucher</th>
-            <th>Posted to</th>
-            <th>Customer</th>
-            <th>Reason</th>
-            <th class="num">Amount</th>
-            <th class="vc-col-action"></th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (u of unpassed; track u.id) {
-            <tr [class.vc-row--on]="active?.id === u.id" (click)="open(u)">
-              <td>
-                <span class="pg-chip">{{ u.original_voucher_no }}</span>
-              </td>
-              <td class="vc-mono">{{ u.wrong_account_no }}</td>
-              <td>{{ u.wrong_client_name || '—' }}</td>
-              <td class="vc-clip">{{ u.reason }}</td>
-              <td class="num">₹{{ u.amount | number: '1.2-2' }}</td>
-              <td class="vc-col-action">
-                <button
-                  type="button"
-                  class="pg-btn pg-btn--primary vc-btn-sm"
-                  (click)="open(u); $event.stopPropagation()"
-                >
-                  <mat-icon>edit</mat-icon> Correct
-                </button>
-              </td>
-            </tr>
-          }
-          @if (!unpassed.length) {
-            <tr>
-              <td colspan="6" class="vc-empty">
-                <mat-icon>{{ loadingUnpassed ? 'hourglass_empty' : 'task_alt' }}</mat-icon>
-                <div>
-                  {{ loadingUnpassed ? 'Loading…' : 'No unpassed voucher is waiting for its correct account.' }}
-                </div>
-              </td>
-            </tr>
-          }
-        </tbody>
-      </table>
-    </div>
-  }
-
-  <!-- ─── My requests ──────────────────────────────────────────────────── -->
-  @if (tab === 'mine') {
-    <div class="pg-card">
-      <table class="pg-table vc-table">
-        <thead>
-          <tr>
-            <th>Voucher</th>
-            <th>Posted to</th>
-            <th>Corrected to</th>
-            <th class="num">Amount</th>
-            <th>Status</th>
-            <th>New voucher</th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (m of mine; track m.id) {
-            <tr>
-              <td>
-                <span class="pg-chip">{{ m.original_voucher_no }}</span>
-              </td>
-              <td class="vc-mono">{{ m.wrong_account_no }}</td>
-              <td class="vc-mono">{{ m.correct_account_no || '—' }}</td>
-              <td class="num">₹{{ m.amount | number: '1.2-2' }}</td>
-              <td>
-                <span class="vc-status vc-status--{{ m.status }}">{{ statusLabel[m.status] }}</span>
-                @if (m.rejection_reason) {
-                  <div class="vc-note">{{ m.rejection_reason }}</div>
-                }
-              </td>
-              <td>{{ m.new_voucher_no || '—' }}</td>
-            </tr>
-          }
-          @if (!mine.length) {
-            <tr>
-              <td colspan="6" class="vc-empty">
-                <mat-icon>{{ loadingMine ? 'hourglass_empty' : 'history' }}</mat-icon>
-                <div>{{ loadingMine ? 'Loading…' : 'You have no voucher corrections yet.' }}</div>
-              </td>
-            </tr>
-          }
-        </tbody>
-      </table>
-    </div>
-  }
-</div>
-
-<!-- ─── Popup: unpass a voucher ──────────────────────────────────────────── -->
-<ng-template #unpassDialog>
-  @if (selectedVoucher) {
-    <div class="vc-dlg">
-      <header class="vc-dlg__head">
-        <mat-icon class="vc-dlg__ico">undo</mat-icon>
-        <div class="vc-dlg__titles">
-          <div class="vc-dlg__title">Unpass voucher</div>
-          <div class="vc-dlg__sub vc-mono">{{ selectedVoucher.voucherNo }}</div>
-        </div>
-        <button type="button" class="vc-dlg__x" aria-label="Close" (click)="closeUnpass()">
-          <mat-icon>close</mat-icon>
-        </button>
-      </header>
-
-      <div class="vc-dlg__body">
-        <div class="vc-dlg__amount">
-          <span>Deposit amount</span>
-          <strong>₹{{ selectedVoucher.amount | number: '1.2-2' }}</strong>
-        </div>
-
-        <div class="vc-grid">
-          <div class="vc-cell">
-            <div class="vc-label">Voucher</div>
-            <div class="vc-value vc-mono">{{ selectedVoucher.voucherNo }}</div>
-          </div>
-          <div class="vc-cell">
-            <div class="vc-label">Created</div>
-            <div class="vc-value">{{ selectedVoucher.createdAt | date: 'dd MMM yyyy, hh:mm a' }}</div>
-          </div>
-          <div class="vc-cell">
-            <div class="vc-label">Cashier</div>
-            <div class="vc-value">{{ selectedVoucher.cashier }}</div>
-          </div>
-          <div class="vc-cell">
-            <div class="vc-label">Mode</div>
-            <div class="vc-value">{{ selectedVoucher.paymentType }}</div>
-          </div>
-          <div class="vc-cell">
-            <div class="vc-label">Account</div>
-            <div class="vc-value vc-mono">{{ selectedVoucher.accountNo }}</div>
-          </div>
-          <div class="vc-cell">
-            <div class="vc-label">Customer</div>
-            <div class="vc-value">{{ selectedVoucher.clientName || '—' }}</div>
-          </div>
-          <div class="vc-cell">
-            <div class="vc-label">Account balance now</div>
-            <div class="vc-value">
-              @if (voucherAccount) {
-                ₹{{ voucherAccount.balance | number: '1.2-2' }}
-              } @else {
-                —
-              }
-            </div>
-          </div>
-          <div class="vc-cell">
-            <div class="vc-label">Account status</div>
-            <div class="vc-value">
-              @if (voucherAccount) {
-                {{ voucherAccount.canReceive ? 'Active' : 'Not active' }} · {{ voucherAccount.currencyCode }}
-              } @else {
-                —
-              }
-            </div>
-          </div>
-        </div>
-
-        <label class="vc-label" for="vc-reason">Reason for unpassing</label>
-        <textarea
-          id="vc-reason"
-          class="vc-reason"
-          rows="2"
-          placeholder="Why is this voucher wrong? e.g. deposited in the wrong account (required)"
-          [(ngModel)]="unpassReason"
-        ></textarea>
-
-        <div class="vc-info">
-          <mat-icon>info</mat-icon>
-          A manager approves the unpass first. Nothing changes on any account until the corrected entry is approved: the
-          deposit stays on {{ selectedVoucher.accountNo }} till then.
-        </div>
-      </div>
-
-      <footer class="vc-dlg__foot">
-        <button type="button" class="pg-btn pg-btn--ghost" (click)="closeUnpass()">Cancel</button>
-        <button type="button" class="pg-btn pg-btn--primary" [disabled]="!canUnpass" (click)="unpass()">
-          <mat-icon>send</mat-icon> Send for approval
-        </button>
-      </footer>
-    </div>
-  }
-</ng-template>
-
-<!-- ─── Popup: enter the correct account ─────────────────────────────────── -->
-<ng-template #correctionDialog>
-  @if (active) {
-    <div class="vc-dlg">
-      <header class="vc-dlg__head">
-        <mat-icon class="vc-dlg__ico">edit_note</mat-icon>
-        <div class="vc-dlg__titles">
-          <div class="vc-dlg__title">Correction entry</div>
-          <div class="vc-dlg__sub vc-mono">{{ active.original_voucher_no }}</div>
-        </div>
-        <button type="button" class="vc-dlg__x" aria-label="Close" (click)="closeActive()">
-          <mat-icon>close</mat-icon>
-        </button>
-      </header>
-
-      <div class="vc-dlg__body">
-        <div class="vc-dlg__amount">
-          <span>Amount to move</span>
-          <strong>₹{{ active.amount | number: '1.2-2' }}</strong>
-        </div>
-
-        <!-- Everything but the account number is fixed. -->
-        <div class="vc-grid">
-          <div class="vc-cell">
-            <div class="vc-label">Transaction date</div>
-            <div class="vc-value">{{ active.txn_date || '—' }}</div>
-          </div>
-          <div class="vc-cell">
-            <div class="vc-label">Mode</div>
-            <div class="vc-value">Cash</div>
-          </div>
-          <div class="vc-cell">
-            <div class="vc-label">Unpassed by</div>
-            <div class="vc-value">{{ active.unpass_by_name || '—' }}</div>
-          </div>
-          <div class="vc-cell">
-            <div class="vc-label">Approved by</div>
-            <div class="vc-value">{{ active.unpass_approved_by_name || '—' }}</div>
-          </div>
-          <div class="vc-cell vc-cell--wide">
-            <div class="vc-label">Reason</div>
-            <div class="vc-value">{{ active.reason }}</div>
-          </div>
-        </div>
-
-        <div class="vc-compare">
-          <!-- The account the deposit went to -->
-          <div class="vc-acct vc-acct--wrong">
-            <div class="vc-acct__tag">Posted to (wrong)</div>
-            <div class="vc-acct__no vc-mono">{{ active.wrong_account_no }}</div>
-            <div class="vc-acct__name">{{ active.wrong_client_name || '—' }}</div>
-            <div class="vc-acct__bal">
-              Balance:
-              @if (wrongAccount) {
-                <strong>₹{{ wrongAccount.balance | number: '1.2-2' }}</strong>
-                @if (wrongHasBalance) {
-                  <span class="vc-ok"><mat-icon>check_circle</mat-icon> covers the deposit</span>
-                } @else {
-                  <span class="vc-bad"
-                    ><mat-icon>cancel</mat-icon> does not cover ₹{{ active.amount | number: '1.2-2' }}</span
-                  >
-                }
-              } @else {
-                —
-              }
-            </div>
-          </div>
-
-          <mat-icon class="vc-arrow">arrow_forward</mat-icon>
-
-          <!-- The account it should have gone to -->
-          <div class="vc-acct" [class.vc-acct--ok]="correctOk" [class.vc-acct--wrong]="!!lookupError">
-            <div class="vc-acct__tag">Correct account</div>
-            <input
-              id="vc-correct"
-              class="vc-acct__input vc-mono"
-              type="text"
-              placeholder="Type the account number"
-              [ngModel]="correctAccountNo"
-              (ngModelChange)="onAccountInput($event)"
-              (blur)="lookup()"
-            />
-            @if (lookingUp) {
-              <div class="vc-acct__bal">Looking up…</div>
-            }
-            @if (correctAccount) {
-              <div class="vc-acct__name">{{ correctAccount.clientName || '—' }}</div>
-              <div class="vc-acct__bal">
-                Balance: <strong>₹{{ correctAccount.balance | number: '1.2-2' }}</strong>
-                @if (correctOk) {
-                  <span class="vc-ok"><mat-icon>check_circle</mat-icon> active, can receive</span>
-                }
-              </div>
-            }
-            @if (lookupError) {
-              <div class="vc-bad vc-acct__err"><mat-icon>error</mat-icon> {{ lookupError }}</div>
-            }
-          </div>
-        </div>
-
-        @if (wrongAccount && !wrongHasBalance) {
-          <div class="vc-warn">
-            <mat-icon>warning</mat-icon>
-            <div>
-              <strong>The customer has already used this money,</strong> so it cannot be taken back from
-              {{ active.wrong_account_no }}. Deposit ₹{{ active.amount | number: '1.2-2' }} into the correct account
-              from your own pocket as a fresh deposit (Transaction Entry), then press <strong>Close request</strong>.
-            </div>
-          </div>
-        }
-      </div>
-
-      <footer class="vc-dlg__foot">
-        <button
-          type="button"
-          class="pg-btn pg-btn--ghost vc-dlg__close-req"
-          [disabled]="sending"
-          (click)="closeRequest()"
-        >
-          <mat-icon>block</mat-icon> Close request
-        </button>
-        <button type="button" class="pg-btn pg-btn--ghost" (click)="closeActive()">Cancel</button>
-        <button type="button" class="pg-btn pg-btn--primary" [disabled]="!canSave" (click)="save()">
-          <mat-icon>check</mat-icon> Save &amp; send for approval
-        </button>
-      </footer>
-    </div>
-  }
-</ng-template>

src/app/cashier/voucher-correction/voucher-correction.component.scss

@@ -1,599 +0,0 @@
-/**
- * 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/.
- */
-
-// Compact sizing: the page has to fit a 100% browser window without scrolling for the common case.
-.pg {
-  padding: 14px 20px;
-  gap: 12px;
-}
-
-.pg-title {
-  font-size: 20px;
-  margin: 2px 0;
-}
-
-.pg-sub {
-  font-size: 12px;
-}
-
-.pg-btn {
-  height: 30px;
-  padding: 0 12px;
-  font-size: 12px;
-
-  mat-icon {
-    font-size: 16px;
-    height: 16px;
-    width: 16px;
-  }
-
-  &:disabled {
-    opacity: 0.45;
-    cursor: not-allowed;
-  }
-}
-
-.pg-table {
-  font-size: 12px;
-
-  th {
-    padding: 8px 12px;
-    font-size: 10px;
-  }
-
-  td {
-    padding: 7px 12px;
-  }
-}
-
-// ── Steps ───────────────────────────────────────────────────────────────────
-.vc-steps {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(170px, 1fr));
-  gap: 8px;
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-
-.vc-step {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 6px 10px;
-  border: 1px solid #e2e8f0;
-  border-radius: 10px;
-  background: #fff;
-  font-size: 12px;
-  color: #64748b;
-
-  &__no {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    flex: 0 0 20px;
-    height: 20px;
-    border-radius: 50%;
-    background: #e2e8f0;
-    font-size: 11px;
-    font-weight: 700;
-    color: #475569;
-  }
-
-  &--on {
-    border-color: #1f7a4d;
-    background: #f0fdf4;
-    color: #0f4f3c;
-
-    .vc-step__no {
-      background: #1f7a4d;
-      color: #fff;
-    }
-  }
-}
-
-// ── Tabs ────────────────────────────────────────────────────────────────────
-.vc-tabs {
-  display: flex;
-  gap: 2px;
-  border-bottom: 1px solid #e2e8f0;
-  flex-wrap: wrap;
-}
-
-.vc-tab {
-  display: inline-flex;
-  align-items: center;
-  gap: 5px;
-  padding: 7px 12px;
-  margin-bottom: -1px;
-  border: 0;
-  border-bottom: 2px solid transparent;
-  background: transparent;
-  font: inherit;
-  font-size: 12px;
-  font-weight: 600;
-  color: #64748b;
-  cursor: pointer;
-
-  mat-icon {
-    font-size: 16px;
-    height: 16px;
-    width: 16px;
-  }
-
-  &:hover {
-    color: #0f4f3c;
-  }
-
-  &--on {
-    color: #0f4f3c;
-    border-bottom-color: #1f7a4d;
-  }
-}
-
-.vc-count {
-  padding: 0 7px;
-  border-radius: 999px;
-  background: #f59e0b;
-  color: #fff;
-  font-size: 10px;
-  font-weight: 700;
-}
-
-// ── Search ──────────────────────────────────────────────────────────────────
-.vc-toolbar {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  flex-wrap: wrap;
-}
-
-.vc-search {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  flex: 1 1 280px;
-  max-width: 420px;
-  height: 30px;
-  padding: 0 10px;
-  border: 1px solid #cbd5e1;
-  border-radius: 999px;
-  background: #fff;
-
-  &:focus-within {
-    border-color: #1f7a4d;
-    box-shadow: 0 0 0 3px rgb(31 122 77 / 12%);
-  }
-
-  mat-icon {
-    font-size: 16px;
-    height: 16px;
-    width: 16px;
-    color: #94a3b8;
-  }
-
-  input {
-    flex: 1;
-    min-width: 0;
-    border: 0;
-    outline: 0;
-    background: transparent;
-    font: inherit;
-    font-size: 12px;
-  }
-}
-
-// ── Table ───────────────────────────────────────────────────────────────────
-.vc-table {
-  tbody tr {
-    cursor: pointer;
-  }
-
-  tr.vc-row--on td {
-    background: #f0fdf4;
-
-    &:first-child {
-      box-shadow: inset 3px 0 0 #1f7a4d;
-    }
-  }
-
-  .vc-col-action {
-    width: 1%;
-    text-align: right;
-    white-space: nowrap;
-  }
-
-  .vc-clip {
-    max-width: 240px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .pg-chip {
-    font-size: 11px;
-    padding: 2px 8px;
-  }
-}
-
-.vc-btn-sm {
-  height: 26px;
-  padding: 0 10px;
-  font-size: 11px;
-}
-
-.vc-mono {
-  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
-  letter-spacing: 0.02em;
-}
-
-.vc-empty {
-  padding: 24px 12px;
-  text-align: center;
-  color: #94a3b8;
-  font-size: 12px;
-
-  mat-icon {
-    display: block;
-    margin: 0 auto 4px;
-    font-size: 28px;
-    height: 28px;
-    width: 28px;
-    opacity: 0.6;
-  }
-}
-
-// ── Popups ──────────────────────────────────────────────────────────────────
-.vc-dlg {
-  display: flex;
-  flex-direction: column;
-  max-height: 86vh;
-  font-size: 12px;
-
-  &__head {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    padding: 10px 14px;
-    border-bottom: 1px solid #e2e8f0;
-    background: #f8fafc;
-  }
-
-  &__ico {
-    flex: 0 0 32px;
-    height: 32px;
-    width: 32px;
-    border-radius: 9px;
-    background: #f0fdf4;
-    color: #1f7a4d;
-    font-size: 18px;
-    line-height: 32px;
-    text-align: center;
-  }
-
-  &__titles {
-    flex: 1;
-    min-width: 0;
-  }
-
-  &__title {
-    font-size: 14px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__sub {
-    font-size: 11px;
-    color: #64748b;
-  }
-
-  &__x {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    height: 28px;
-    width: 28px;
-    border: 0;
-    border-radius: 50%;
-    background: transparent;
-    color: #64748b;
-    cursor: pointer;
-
-    mat-icon {
-      font-size: 18px;
-      height: 18px;
-      width: 18px;
-    }
-
-    &:hover {
-      background: #e2e8f0;
-    }
-  }
-
-  &__body {
-    padding: 12px 14px;
-    overflow-y: auto;
-  }
-
-  &__amount {
-    display: flex;
-    align-items: baseline;
-    justify-content: space-between;
-    margin-bottom: 10px;
-    padding: 8px 12px;
-    border-radius: 10px;
-    background: #ecfdf5;
-    border: 1px solid #a7f3d0;
-    color: #065f46;
-    font-size: 12px;
-    font-weight: 600;
-
-    strong {
-      font-size: 18px;
-      font-weight: 800;
-      font-variant-numeric: tabular-nums;
-    }
-  }
-
-  &__foot {
-    display: flex;
-    justify-content: flex-end;
-    gap: 8px;
-    padding: 10px 14px;
-    border-top: 1px solid #e2e8f0;
-    background: #f8fafc;
-  }
-}
-
-.vc-warn {
-  display: flex;
-  align-items: flex-start;
-  gap: 8px;
-  margin-top: 10px;
-  padding: 8px 12px;
-  border-radius: 8px;
-  background: #fffbeb;
-  border: 1px solid #fde68a;
-  color: #92400e;
-  font-size: 11px;
-
-  mat-icon {
-    flex: 0 0 18px;
-    height: 18px;
-    width: 18px;
-    font-size: 18px;
-  }
-}
-
-.vc-dlg__close-req {
-  margin-right: auto;
-  color: #b45309;
-}
-
-.vc-label {
-  display: block;
-  margin-bottom: 3px;
-  font-size: 10px;
-  font-weight: 700;
-  letter-spacing: 0.05em;
-  text-transform: uppercase;
-  color: #94a3b8;
-}
-
-.vc-reason {
-  width: 100%;
-  padding: 7px 10px;
-  border: 1px solid #cbd5e1;
-  border-radius: 8px;
-  font: inherit;
-  font-size: 12px;
-  resize: vertical;
-
-  &:focus {
-    outline: 0;
-    border-color: #1f7a4d;
-    box-shadow: 0 0 0 3px rgb(31 122 77 / 12%);
-  }
-}
-
-.vc-info {
-  display: flex;
-  align-items: flex-start;
-  gap: 6px;
-  margin-top: 8px;
-  padding: 7px 10px;
-  border-radius: 8px;
-  background: #eff6ff;
-  color: #1e40af;
-  font-size: 11px;
-
-  mat-icon {
-    flex: 0 0 16px;
-    height: 16px;
-    width: 16px;
-    font-size: 16px;
-  }
-}
-
-.vc-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(130px, 1fr));
-  gap: 6px;
-  margin-bottom: 10px;
-}
-
-.vc-cell {
-  padding: 6px 10px;
-  border-radius: 8px;
-  background: #f8fafc;
-  border: 1px solid #eef2f7;
-}
-
-.vc-cell--wide {
-  grid-column: 1 / -1;
-}
-
-.vc-value {
-  font-size: 12px;
-  font-weight: 600;
-  color: #0f172a;
-  word-break: break-word;
-}
-
-// ── Wrong → Correct ─────────────────────────────────────────────────────────
-.vc-compare {
-  display: grid;
-  grid-template-columns: 1fr auto 1fr;
-  align-items: stretch;
-  gap: 8px;
-
-  @media (width <= 640px) {
-    grid-template-columns: 1fr;
-  }
-}
-
-.vc-arrow {
-  align-self: center;
-  color: #94a3b8;
-
-  @media (width <= 640px) {
-    transform: rotate(90deg);
-    justify-self: center;
-  }
-}
-
-.vc-acct {
-  padding: 10px 12px;
-  border: 1px solid #e2e8f0;
-  border-radius: 10px;
-  background: #fff;
-
-  &--wrong {
-    border-color: #fecaca;
-    background: #fef2f2;
-  }
-
-  &--ok {
-    border-color: #a7f3d0;
-    background: #ecfdf5;
-  }
-
-  &__tag {
-    margin-bottom: 4px;
-    font-size: 10px;
-    font-weight: 700;
-    letter-spacing: 0.05em;
-    text-transform: uppercase;
-    color: #64748b;
-  }
-
-  &__no {
-    font-size: 14px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__input {
-    width: 100%;
-    height: 32px;
-    padding: 0 10px;
-    border: 1px solid #cbd5e1;
-    border-radius: 8px;
-    background: #fff;
-    font-size: 13px;
-    font-weight: 600;
-
-    &:focus {
-      outline: 0;
-      border-color: #1f7a4d;
-      box-shadow: 0 0 0 3px rgb(31 122 77 / 12%);
-    }
-  }
-
-  &__name {
-    margin-top: 4px;
-    font-size: 12px;
-    font-weight: 600;
-    color: #1e293b;
-  }
-
-  &__bal {
-    margin-top: 3px;
-    font-size: 11px;
-    color: #475569;
-  }
-
-  &__err {
-    margin-top: 6px;
-  }
-}
-
-.vc-ok,
-.vc-bad {
-  display: inline-flex;
-  align-items: center;
-  gap: 3px;
-  margin-left: 6px;
-  font-weight: 700;
-
-  mat-icon {
-    font-size: 14px;
-    height: 14px;
-    width: 14px;
-  }
-}
-
-.vc-ok {
-  color: #059669;
-}
-
-.vc-bad {
-  color: #dc2626;
-}
-
-.vc-note {
-  margin-top: 3px;
-  font-size: 11px;
-  color: #64748b;
-}
-
-// ── Status ──────────────────────────────────────────────────────────────────
-.vc-status {
-  display: inline-block;
-  padding: 2px 8px;
-  border-radius: 999px;
-  background: #e2e8f0;
-  font-size: 11px;
-  font-weight: 700;
-
-  &--UNPASS_PENDING,
-  &--CORRECTION_PENDING {
-    background: #fef3c7;
-    color: #92400e;
-  }
-
-  &--UNPASSED {
-    background: #dbeafe;
-    color: #1e40af;
-  }
-
-  &--COMPLETED {
-    background: #d1fae5;
-    color: #065f46;
-  }
-
-  &--CLOSED {
-    background: #f1f5f9;
-    color: #475569;
-  }
-
-  &--UNPASS_REJECTED {
-    background: #fee2e2;
-    color: #991b1b;
-  }
-}

src/app/cashier/voucher-correction/voucher-correction.component.ts

@@ -1,307 +0,0 @@
-/**
- * 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, TemplateRef, ViewChild, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { MatIconModule } from '@angular/material/icon';
-import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
-import { of } from 'rxjs';
-import { catchError } from 'rxjs/operators';
-import { AuthenticationService } from '../../core/authentication/authentication.service';
-import {
-  AccountLookup,
-  EligibleVoucher,
-  VoucherCorrection,
-  VoucherCorrectionService
-} from '../voucher-correction.service';
-
-type Tab = 'today' | 'unpassed' | 'mine';
-
-/**
- * Cashier side of correcting a cash deposit that went to the wrong account.
- *
- * Today vouchers: pick the voucher and unpass it (needs a manager approval; nothing moves).
- * Unpassed: open the approved voucher, whose details are fixed, change only the account number and save
- * (needs a manager approval again; only then do the accounts change).
- */
-@Component({
-  selector: 'mifosx-voucher-correction',
-  templateUrl: './voucher-correction.component.html',
-  styleUrls: [
-    '../cashier-shared.scss',
-    './voucher-correction.component.scss'
-  ],
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    MatIconModule,
-    MatDialogModule,
-    MatSnackBarModule
-  ]
-})
-export class VoucherCorrectionComponent implements OnInit {
-  private service = inject(VoucherCorrectionService);
-  private snackBar = inject(MatSnackBar);
-  private dialog = inject(MatDialog);
-  private auth = inject(AuthenticationService);
-
-  /** Unpassing is for the back office (an administrator or a clerk); re-entering the account is the cashier only. */
-  readonly mayUnpass = this.auth.isClerkUser() || !!this.auth.getCredentials()?.permissions?.includes('ALL_FUNCTIONS');
-  readonly mayCorrect = this.auth.isCashierUser();
-
-  @ViewChild('unpassDialog') unpassDialog!: TemplateRef<unknown>;
-  @ViewChild('correctionDialog') correctionDialog!: TemplateRef<unknown>;
-  private dialogRef: MatDialogRef<unknown> | null = null;
-
-  tab: Tab = this.mayUnpass ? 'today' : this.mayCorrect ? 'unpassed' : 'mine';
-
-  // Today vouchers
-  search = '';
-  vouchers: EligibleVoucher[] = [];
-  loadingVouchers = false;
-  selectedVoucher: EligibleVoucher | null = null;
-  /** The account the voucher was posted to, for the balance and status shown in the popup. */
-  voucherAccount: AccountLookup | null = null;
-  unpassReason = '';
-  sending = false;
-
-  // Unpassed vouchers waiting for the correct account
-  unpassed: VoucherCorrection[] = [];
-  loadingUnpassed = false;
-  active: VoucherCorrection | null = null;
-  wrongAccount: AccountLookup | null = null;
-  correctAccountNo = '';
-  correctAccount: AccountLookup | null = null;
-  lookupError = '';
-  lookingUp = false;
-
-  // The cashier own requests
-  mine: VoucherCorrection[] = [];
-  loadingMine = false;
-
-  readonly statusLabel: Record<string, string> = {
-    UNPASS_PENDING: 'Unpass awaiting approval',
-    UNPASSED: 'Unpassed — enter correct account',
-    UNPASS_REJECTED: 'Unpass rejected',
-    CORRECTION_PENDING: 'Correction awaiting approval',
-    COMPLETED: 'Corrected',
-    CLOSED: 'Closed — cashier deposits separately'
-  };
-
-  ngOnInit(): void {
-    if (this.mayUnpass) this.loadVouchers();
-    if (this.mayCorrect) this.loadUnpassed();
-    if (this.tab === 'mine') this.loadMine();
-  }
-
-  setTab(tab: Tab): void {
-    this.tab = tab;
-    if (tab === 'today') this.loadVouchers();
-    if (tab === 'unpassed') this.loadUnpassed();
-    if (tab === 'mine') this.loadMine();
-  }
-
-  // ── Today vouchers ─────────────────────────────────────────────────────────
-
-  loadVouchers(): void {
-    this.loadingVouchers = true;
-    this.service
-      .eligible(this.search.trim())
-      .pipe(catchError(() => of([] as EligibleVoucher[])))
-      .subscribe((rows) => {
-        this.vouchers = rows;
-        this.loadingVouchers = false;
-        if (this.selectedVoucher && !rows.some((r) => r.voucherNo === this.selectedVoucher?.voucherNo)) {
-          this.selectedVoucher = null;
-        }
-      });
-  }
-
-  pick(v: EligibleVoucher): void {
-    this.selectedVoucher = v;
-    this.unpassReason = '';
-    this.voucherAccount = null;
-    this.service
-      .accountLookup(v.accountNo)
-      .pipe(catchError(() => of(null)))
-      .subscribe((a) => (this.voucherAccount = a));
-    this.showDialog(this.unpassDialog, () => (this.selectedVoucher = null));
-  }
-
-  closeUnpass(): void {
-    this.dialogRef?.close();
-  }
-
-  get canUnpass(): boolean {
-    return !!this.selectedVoucher && this.unpassReason.trim().length > 0 && !this.sending;
-  }
-
-  unpass(): void {
-    if (!this.selectedVoucher || !this.canUnpass) return;
-    this.sending = true;
-    this.service.unpass(this.selectedVoucher.voucherNo, this.unpassReason.trim()).subscribe({
-      next: () => {
-        this.sending = false;
-        this.snackBar.open(`Voucher ${this.selectedVoucher?.voucherNo} sent for unpass approval`, 'Close', {
-          duration: 4000
-        });
-        this.dialogRef?.close();
-        this.unpassReason = '';
-        this.loadVouchers();
-      },
-      error: (err) => {
-        this.sending = false;
-        this.fail(err, 'Could not unpass the voucher');
-      }
-    });
-  }
-
-  // ── Unpassed vouchers: enter the correct account ───────────────────────────
-
-  loadUnpassed(): void {
-    this.loadingUnpassed = true;
-    this.service
-      .list('UNPASSED')
-      .pipe(catchError(() => of([] as VoucherCorrection[])))
-      .subscribe((rows) => {
-        this.unpassed = rows;
-        this.loadingUnpassed = false;
-      });
-  }
-
-  open(row: VoucherCorrection): void {
-    this.active = row;
-    this.correctAccountNo = '';
-    this.correctAccount = null;
-    this.lookupError = '';
-    this.wrongAccount = null;
-    // The account the deposit went to: its balance is what the "can this be taken back" check reads.
-    this.service
-      .accountLookup(row.wrong_account_no)
-      .pipe(catchError(() => of(null)))
-      .subscribe((a) => (this.wrongAccount = a));
-    this.showDialog(this.correctionDialog, () => (this.active = null));
-  }
-
-  closeActive(): void {
-    this.dialogRef?.close();
-  }
-
-  onAccountInput(value: string): void {
-    this.correctAccountNo = value;
-    this.correctAccount = null;
-    this.lookupError = '';
-    // Same rule as the Transaction Entry screen: searches on its own once six characters are typed.
-    if (value.trim().length >= 6) this.lookup();
-  }
-
-  lookup(): void {
-    const accountNo = this.correctAccountNo.trim();
-    if (!accountNo || this.lookingUp) return;
-    this.lookingUp = true;
-    this.service.accountLookup(accountNo).subscribe({
-      next: (a) => {
-        this.lookingUp = false;
-        // A late answer for a number no longer typed is dropped.
-        if (accountNo !== this.correctAccountNo.trim()) return;
-        this.correctAccount = a;
-        if (this.active && a.id === this.active.wrong_savings_account_id) {
-          this.lookupError = 'This is the account the deposit was already posted to.';
-        } else if (!a.canReceive) {
-          this.lookupError = 'This account is not active, so it cannot receive the deposit.';
-        }
-      },
-      error: (err) => {
-        this.lookingUp = false;
-        this.lookupError = err?.error?.errors?.[0]?.defaultUserMessage ?? 'Account not found.';
-      }
-    });
-  }
-
-  /** The wrong account still holds the deposit, so it can be taken back without overdrawing it. */
-  get wrongHasBalance(): boolean {
-    return !!this.wrongAccount && !!this.active && this.wrongAccount.balance >= this.active.amount;
-  }
-
-  get correctOk(): boolean {
-    return !!this.correctAccount && this.correctAccount.canReceive && !this.lookupError;
-  }
-
-  get canSave(): boolean {
-    return !!this.active && this.correctOk && this.wrongHasBalance && !this.sending;
-  }
-
-  save(): void {
-    if (!this.active || !this.canSave) return;
-    this.sending = true;
-    this.service.submitCorrection(this.active.id, this.correctAccountNo.trim()).subscribe({
-      next: () => {
-        this.sending = false;
-        this.snackBar.open('Correction sent for approval', 'Close', { duration: 4000 });
-        this.dialogRef?.close();
-        this.loadUnpassed();
-      },
-      error: (err) => {
-        this.sending = false;
-        this.fail(err, 'Could not save the correction');
-      }
-    });
-  }
-
-  /**
-   * Gives up this correction. The usual reason is that the wrong account no longer holds the money, so the cashier
-   * puts the amount into the right account from their own pocket as a fresh deposit instead.
-   */
-  closeRequest(): void {
-    if (!this.active || this.sending) return;
-    const reason = this.wrongHasBalance
-      ? 'Closed by the cashier'
-      : 'Wrong account no longer holds the amount; cashier deposits it into the correct account separately';
-    this.sending = true;
-    this.service.close(this.active.id, reason).subscribe({
-      next: () => {
-        this.sending = false;
-        this.snackBar.open('Request closed', 'Close', { duration: 4000 });
-        this.dialogRef?.close();
-        this.loadUnpassed();
-      },
-      error: (err) => {
-        this.sending = false;
-        this.fail(err, 'Could not close the request');
-      }
-    });
-  }
-
-  // ── My requests ────────────────────────────────────────────────────────────
-
-  loadMine(): void {
-    this.loadingMine = true;
-    this.service
-      .list(undefined, true)
-      .pipe(catchError(() => of([] as VoucherCorrection[])))
-      .subscribe((rows) => {
-        this.mine = rows;
-        this.loadingMine = false;
-      });
-  }
-
-  /** Opens one of the two popups; onClose runs however it is dismissed (button, backdrop or Esc). */
-  private showDialog(template: TemplateRef<unknown>, onClose: () => void): void {
-    this.dialogRef?.close();
-    this.dialogRef = this.dialog.open(template, { width: '600px', maxWidth: '95vw', autoFocus: false });
-    this.dialogRef.afterClosed().subscribe(onClose);
-  }
-
-  private fail(err: any, fallback: string): void {
-    const msg = err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.defaultUserMessage ?? fallback;
-    this.snackBar.open(msg, 'Close', { duration: 6000 });
-  }
-}

src/app/cashier/voucher-report/voucher-report.component.html

@@ -169,7 +169,6 @@
               <th>Debit</th>
               <th>Credit</th>
               <th class="num">Amount</th>
-              <th>Correction</th>
               <th>User</th>
               <!-- Two dates, not one, on the system register.
                    A voucher's timestamp is the minute it was written; the posting behind it carries
@@ -218,18 +217,6 @@
                   </td>
                 }
                 <td class="num">{{ row.amount | number: '1.2-2' }}</td>
-                <!-- Where the voucher stands after a correction: unpassed, revoked, closed or corrected. -->
-                <td>
-                  <mifosx-voucher-status
-                    [status]="row.voucherStatus"
-                    [revokedBy]="row.revokedByVoucherNo"
-                    [replaces]="row.replacesVoucherNo"
-                    [note]="row.correctionNote"
-                  ></mifosx-voucher-status>
-                  @if (!row.voucherStatus || row.voucherStatus === 'ACTIVE') {
-                    <span class="vr-active">—</span>
-                  }
-                </td>
                 <td>{{ row.username || '—' }}</td>
                 @if (systemOnly) {
                   <td class="vr-ledgerdate" [class.vr-ledgerdate--prior]="row.postedAfterClose">

src/app/cashier/voucher-report/voucher-report.component.scss

@@ -92,8 +92,3 @@
   text-transform: uppercase;
   color: #7c3aed;
 }
-
-.vr-active {
-  font-size: 11px;
-  color: #94a3b8;
-}

src/app/cashier/voucher-report/voucher-report.component.ts

@@ -13,8 +13,6 @@ import { ActivatedRoute } from '@angular/router';
 import { MatIconModule } from '@angular/material/icon';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
-import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
 
 /**
  * Which side of the register a screen shows.
@@ -27,11 +25,6 @@ export type VoucherSide = 'CR' | 'DR' | 'ALL';
 /** One voucher as the register shows it: the number, the two sides, and who raised it. */
 interface VoucherRow {
   voucherNo: string;
-  /** Where the voucher stands after a correction: active, revoked, under correction, or corrected. */
-  voucherStatus?: VoucherStatus;
-  revokedByVoucherNo?: string | null;
-  replacesVoucherNo?: string | null;
-  correctionNote?: string | null;
   voucherType: string | null;
   amount: number | null;
   createdAt: string | null;
@@ -88,8 +81,7 @@ interface VoucherReport {
   imports: [
     CommonModule,
     FormsModule,
-    MatIconModule,
+    MatIconModule
-    VoucherStatusComponent
   ]
 })
 export class VoucherReportComponent implements OnInit {
@@ -235,7 +227,7 @@ export class VoucherReportComponent implements OnInit {
   }
 
   private todayIso(): string {
-    const now = businessToday();
+    const now = new Date();
     return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`;
   }
 

src/app/cashier/voucher-status/voucher-status.component.ts

@@ -1,137 +0,0 @@
-/**
- * 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, Input } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-/** Where a voucher stands after a voucher correction. */
-export type VoucherStatus =
-  | 'ACTIVE'
-  | 'REVOKED'
-  | 'UNPASS_PENDING'
-  | 'UNPASSED'
-  | 'CORRECTION_PENDING'
-  | 'CORRECTED'
-  | 'CLOSED'
-  | null
-  | undefined;
-
-/**
- * A small badge saying whether a voucher was revoked, is under correction, or replaced another one.
- * Nothing is shown for an ordinary (active) voucher, so the registers read as before.
- */
-@Component({
-  selector: 'mifosx-voucher-status',
-  standalone: true,
-  imports: [CommonModule],
-  template: `
-    @if (label) {
-      <span class="vs" [class]="'vs vs--' + status" [title]="hint">{{ label }}</span>
-      @if (note) {
-        <div class="vs-note">{{ note }}</div>
-      }
-    }
-  `,
-  styles: [
-    `
-      .vs {
-        display: inline-block;
-        margin-left: 6px;
-        padding: 1px 8px;
-        border-radius: 999px;
-        background: #e2e8f0;
-        color: #334155;
-        font-size: 10px;
-        font-weight: 700;
-        white-space: nowrap;
-        vertical-align: middle;
-      }
-
-      .vs-note {
-        margin-top: 2px;
-        max-width: 280px;
-        font-size: 11px;
-        line-height: 1.3;
-        color: #64748b;
-      }
-
-      .vs--REVOKED {
-        background: #fee2e2;
-        color: #991b1b;
-      }
-
-      .vs--UNPASS_PENDING,
-      .vs--CORRECTION_PENDING {
-        background: #fef3c7;
-        color: #92400e;
-      }
-
-      .vs--UNPASSED {
-        background: #dbeafe;
-        color: #1e40af;
-      }
-
-      .vs--CLOSED {
-        background: #f1f5f9;
-        color: #475569;
-      }
-
-      .vs--CORRECTED {
-        background: #d1fae5;
-        color: #065f46;
-      }
-    `
-  ]
-})
-export class VoucherStatusComponent {
-  @Input() status: VoucherStatus;
-  /** The voucher that replaced this one, when it is revoked. */
-  @Input() revokedBy: string | null | undefined;
-  /** The voucher this one replaced, when it is the corrected one. */
-  @Input() replaces: string | null | undefined;
-  /** Why: the reason the voucher was unpassed, or why the correction was closed. */
-  @Input() note: string | null | undefined;
-
-  get label(): string {
-    switch (this.status) {
-      case 'REVOKED':
-        return this.revokedBy ? `Revoked → ${this.revokedBy}` : 'Revoked';
-      case 'UNPASS_PENDING':
-        return 'Unpass pending';
-      case 'UNPASSED':
-        return 'Unpassed';
-      case 'CORRECTION_PENDING':
-        return 'Correction pending';
-      case 'CLOSED':
-        return 'Closed — cashier deposits separately';
-      case 'CORRECTED':
-        return this.replaces ? `Corrected (replaces ${this.replaces})` : 'Corrected';
-      default:
-        return '';
-    }
-  }
-
-  get hint(): string {
-    switch (this.status) {
-      case 'REVOKED':
-        return 'This voucher was revoked: its deposit was moved to another account and a new voucher replaced it.';
-      case 'UNPASS_PENDING':
-        return 'A manager has not yet approved unpassing this voucher.';
-      case 'UNPASSED':
-        return 'Unpassed: waiting for the cashier to enter the correct account.';
-      case 'CORRECTION_PENDING':
-        return 'The correct account is entered; waiting for a manager to approve.';
-      case 'CLOSED':
-        return 'The correction was closed by the cashier; the voucher stays as it was.';
-      case 'CORRECTED':
-        return 'This voucher was raised by a correction and replaces the earlier one.';
-      default:
-        return '';
-    }
-  }
-}

src/app/clerk/disbursement-review/disbursement-review.component.html

@@ -102,27 +102,6 @@
         </div>
       }
 
-      <!-- Money moving between branches: the approver must see it before approving -->
-      @if (isInterBranch) {
-        <div class="dri-interbranch">
-          <mat-icon>alt_route</mat-icon>
-          <div>
-            <div class="dri-interbranch__title">Inter-branch transfer</div>
-            <div class="dri-interbranch__text">
-              @if (branchNames(drEntries) && branchNames(crEntries)) {
-                Money moves from <strong>{{ branchNames(drEntries) }}</strong> to
-                <strong>{{ branchNames(crEntries) }}</strong
-                >.
-              } @else {
-                These accounts are held at different branches: <strong>{{ branchNames(creditEntries) }}</strong
-                >.
-              }
-              Each account is posted in its own branch's books. Check the accounts before approving.
-            </div>
-          </div>
-        </div>
-      }
-
       <!-- Bank Transfer summary card (replaces GL card) -->
       @if (isBankTransferMode) {
         <div class="dri-card">
@@ -175,7 +154,6 @@
                 <th>Account No</th>
                 <th>Account Name</th>
                 <th>Type</th>
-                <th>Branch</th>
                 <th class="num">{{ isCollectionMode ? 'Amount (DR)' : 'Amount (CR)' }}</th>
               </tr>
             </thead>
@@ -188,16 +166,11 @@
                   <td>
                     <span class="dri-type-badge">{{ accountTypeLabel(entry.accountType) }}</span>
                   </td>
-                  <td>
-                    <span class="dri-branch-badge" [class.dri-branch-badge--cross]="isInterBranch">{{
-                      entry.officeName || '—'
-                    }}</span>
-                  </td>
                   <td class="num dri-cr-amount">₹{{ entry.amount | number: '1.2-2' }}</td>
                 </tr>
               }
               <tr class="dri-cr-total-row">
-                <td colspan="5" class="dri-cr-total-label">{{ isCollectionMode ? 'Total Debit' : 'Total Credit' }}</td>
+                <td colspan="4" class="dri-cr-total-label">{{ isCollectionMode ? 'Total Debit' : 'Total Credit' }}</td>
                 <td class="num dri-cr-total-amount">₹{{ totalCreditAmount() | number: '1.2-2' }}</td>
               </tr>
             </tbody>
@@ -219,7 +192,6 @@
                 <th>Account No</th>
                 <th>Account Name</th>
                 <th>Type</th>
-                <th>Branch</th>
                 <th class="num">Amount (DR)</th>
               </tr>
             </thead>
@@ -232,16 +204,11 @@
                   <td>
                     <span class="dri-type-badge">{{ accountTypeLabel(entry.accountType) }}</span>
                   </td>
-                  <td>
-                    <span class="dri-branch-badge" [class.dri-branch-badge--cross]="isInterBranch">{{
-                      entry.officeName || '—'
-                    }}</span>
-                  </td>
                   <td class="num dri-cr-amount">₹{{ entry.amount | number: '1.2-2' }}</td>
                 </tr>
               }
               <tr class="dri-cr-total-row">
-                <td colspan="5" class="dri-cr-total-label">Total Debit</td>
+                <td colspan="4" class="dri-cr-total-label">Total Debit</td>
                 <td class="num dri-cr-total-amount">₹{{ totalDebitAmount() | number: '1.2-2' }}</td>
               </tr>
             </tbody>
@@ -261,7 +228,6 @@
                 <th>Account No</th>
                 <th>Account Name</th>
                 <th>Type</th>
-                <th>Branch</th>
                 <th class="num">Amount (CR)</th>
               </tr>
             </thead>
@@ -274,16 +240,11 @@
                   <td>
                     <span class="dri-type-badge">{{ accountTypeLabel(entry.accountType) }}</span>
                   </td>
-                  <td>
-                    <span class="dri-branch-badge" [class.dri-branch-badge--cross]="isInterBranch">{{
-                      entry.officeName || '—'
-                    }}</span>
-                  </td>
                   <td class="num dri-cr-amount">₹{{ entry.amount | number: '1.2-2' }}</td>
                 </tr>
               }
               <tr class="dri-cr-total-row">
-                <td colspan="5" class="dri-cr-total-label">Total Credit</td>
+                <td colspan="4" class="dri-cr-total-label">Total Credit</td>
                 <td class="num dri-cr-total-amount">₹{{ totalCreditAmount() | number: '1.2-2' }}</td>
               </tr>
             </tbody>

src/app/clerk/disbursement-review/disbursement-review.component.scss

@@ -534,54 +534,3 @@ $shadow-md: 0 4px 16px rgb(0 0 0 / 9%);
   font-family: 'Courier New', monospace;
   letter-spacing: 0.02em;
 }
-
-/* A leg's branch. Amber on every leg when the request moves money between branches, neutral otherwise. */
-.dri-branch-badge {
-  display: inline-flex;
-  align-items: center;
-  padding: 3px 10px;
-  border-radius: 20px;
-  background: #f1f5f9;
-  border: 1px solid #cbd5e1;
-  font-size: 11px;
-  font-weight: 700;
-  color: #475569;
-
-  &--cross {
-    background: #fffbeb;
-    border-color: #fcd34d;
-    color: #92400e;
-  }
-}
-
-/* Shown above the summary when the accounts are at different branches. */
-.dri-interbranch {
-  display: flex;
-  align-items: flex-start;
-  gap: 12px;
-  margin: 0 0 12px;
-  padding: 12px 16px;
-  border: 1px solid #fcd34d;
-  border-left: 4px solid #f59e0b;
-  border-radius: 8px;
-  background: #fffbeb;
-  color: #78350f;
-
-  mat-icon {
-    flex-shrink: 0;
-    color: #d97706;
-  }
-
-  &__title {
-    font-size: 13px;
-    font-weight: 800;
-    letter-spacing: 0.02em;
-    text-transform: uppercase;
-  }
-
-  &__text {
-    margin-top: 2px;
-    font-size: 13px;
-    line-height: 1.5;
-  }
-}

src/app/clerk/disbursement-review/disbursement-review.component.ts

@@ -25,9 +25,6 @@ interface CreditEntry {
   accountType: string;
   amount: number;
   dbCr?: string;
-  /** The branch the account is held at; absent for a GL leg or when the server could not resolve it. */
-  officeId?: number | null;
-  officeName?: string | null;
 }
 
 @Component({
@@ -170,19 +167,6 @@ export class DisbursementReviewComponent implements OnInit {
     return this.creditEntries.filter((e) => e.dbCr !== 'Dr');
   }
 
-  /**
-   * True when the accounts in this request are held at more than one branch, so money moves between branches. The
-   * approver has to see that before approving: it is booked in each branch's own books.
-   */
-  get isInterBranch(): boolean {
-    return new Set(this.creditEntries.filter((e) => e.officeId != null).map((e) => e.officeId)).size > 1;
-  }
-
-  /** Distinct branch names among the given legs, in order, e.g. for "Head Office" or "Head Office, bhopal". */
-  branchNames(entries: CreditEntry[]): string {
-    return [...new Set(entries.map((e) => e.officeName).filter((name): name is string => !!name))].join(', ');
-  }
-
   totalCreditAmount(): number {
     const entries = this.isCollectionMode ? this.drEntries : this.crEntries;
     return entries.reduce((sum, e) => sum + (e.amount ?? 0), 0);

src/app/clerk/share-withdrawal-request/share-withdrawal-request.component.html

@@ -129,31 +129,6 @@
           <span>* Date of Meeting</span>
           <input type="date" [(ngModel)]="meetingDate" [disabled]="isReview" />
         </label>
-        <label class="inv-form-field">
-          <span>* Settlement Destination</span>
-          @if (!isReview) {
-            <select [ngModel]="settlementMode" (ngModelChange)="onSettlementModeChange($event)">
-              <option value="SAVINGS">Member's Linked Savings Account</option>
-              <option value="GL">GL Account</option>
-            </select>
-          } @else {
-            <input
-              type="text"
-              [value]="reviewRequest?.settlement_mode === 'GL' ? 'GL Account' : 'Linked Savings Account'"
-              readonly
-            />
-          }
-        </label>
-        @if (!isReview && settlementMode === 'GL') {
-          <label class="inv-form-field">
-            <span>* Settlement GL Account</span>
-            <mifosx-gl-account-selector
-              [inputFormControl]="toGlAccountControl"
-              [glAccountList]="glAccountsData"
-              [required]="true"
-            ></mifosx-gl-account-selector>
-          </label>
-        }
         <label class="inv-form-field">
           <span>* Settlement Payment Type</span>
           @if (!isReview) {
@@ -411,25 +386,14 @@
               <td>Date of Meeting</td>
               <td>{{ meetingDate }}</td>
             </tr>
-            <tr>
-              <td>Settlement Destination</td>
-              <td>{{ settlementMode === 'GL' ? 'GL Account' : 'Linked Savings Account' }}</td>
-            </tr>
-            @if (settlementMode === 'GL') {
-              <tr>
-                <td>Settlement GL Account</td>
-                <td>{{ selectedSettlementGlName }}</td>
-              </tr>
-            } @else {
-              <tr>
-                <td>Linked Savings Account</td>
-                <td>{{ account?.savingsAccountNumber || 'None — settlement will not run automatically' }}</td>
-              </tr>
-            }
             <tr>
               <td>Settlement Payment Type</td>
               <td>{{ settlementPaymentTypeName }}</td>
             </tr>
+            <tr>
+              <td>Linked Savings Account</td>
+              <td>{{ account?.savingsAccountNumber || 'None — settlement will not run automatically' }}</td>
+            </tr>
           </tbody>
         </table>
 

src/app/clerk/share-withdrawal-request/share-withdrawal-request.component.ts

@@ -8,7 +8,7 @@
 
 import { Component, EventEmitter, Input, OnInit, Output, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule, UntypedFormControl } from '@angular/forms';
+import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router, RouterModule } from '@angular/router';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
@@ -19,9 +19,6 @@ import { SharesService } from '../../shares/shares.service';
 import { ClerkShareWithdrawalService } from '../../cashier/clerk-share-withdrawal.service';
 import { CashierService } from '../../cashier/cashier.service';
 import { SearchSelectComponent, SearchSelectOption } from '../../shared/search-select/search-select.component';
-import { GlAccountSelectorComponent } from '../../shared/accounting/gl-account-selector/gl-account-selector.component';
-import { AccountingService } from '../../accounting/accounting.service';
-import { GLAccount } from '../../shared/models/general.model';
 
 export type ShareWdMode = 'create' | 'review';
 
@@ -54,8 +51,7 @@ interface ActivityEntry {
     RouterModule,
     MatIconModule,
     MatSnackBarModule,
-    SearchSelectComponent,
+    SearchSelectComponent
-    GlAccountSelectorComponent
   ]
 })
 export class ShareWithdrawalRequestComponent implements OnInit {
@@ -64,7 +60,6 @@ export class ShareWithdrawalRequestComponent implements OnInit {
   private sharesService = inject(SharesService);
   private wdService = inject(ClerkShareWithdrawalService);
   private cashierService = inject(CashierService);
-  private accountingService = inject(AccountingService);
   private snackBar = inject(MatSnackBar);
 
   /** When embedded (e.g. opened as a popup from a list screen instead of routed to directly), mode
@@ -96,17 +91,6 @@ export class ShareWithdrawalRequestComponent implements OnInit {
   paymentTypes: any[] = [];
   settlementPaymentTypeId: number | null = null;
 
-  /** Where the redeemed value goes. 'SAVINGS' (the long-standing default) credits the member's
-   *  linked savings account. 'GL' lets the clerk pick any postable GL account directly — same
-   *  option the Cashier's Transaction Entry screen already offers on its CR row, now available
-   *  here too so both entry points behave the same way. Naming the product's own Share Sundry GL
-   *  here is still fine: the backend recognises it and books straight to Sundry with no further
-   *  settlement leg (see ClerkShareWithdrawalRequestApiResource#submit). */
-  settlementMode: 'SAVINGS' | 'GL' = 'SAVINGS';
-  settlementGlAccountId: number | null = null;
-  glAccountsData: GLAccount[] = [];
-  toGlAccountControl = new UntypedFormControl('');
-
   activityLog: ActivityEntry[] = [];
   reviewRequest: any = null;
   showRejectDialog = false;
@@ -148,17 +132,6 @@ export class ShareWithdrawalRequestComponent implements OnInit {
     return this.selectedSettlementPaymentType?.name || '—';
   }
 
-  /** The chosen GL account's display name, for the confirm dialog and the checklist. Falls back to
-   *  the raw id while the GL account list is still loading. */
-  get selectedSettlementGlName(): string {
-    if (!this.settlementGlAccountId) {
-      return '—';
-    }
-    return (
-      this.glAccountsData.find((g) => g.id === this.settlementGlAccountId)?.name || `GL #${this.settlementGlAccountId}`
-    );
-  }
-
   get isFormValid(): boolean {
     if (!this.account) return false;
     if (!this.requestedShares || this.requestedShares <= 0) return false;
@@ -168,7 +141,6 @@ export class ShareWithdrawalRequestComponent implements OnInit {
     if (!this.resolutionNumber.trim()) return false;
     if (!this.meetingDate) return false;
     if (!this.settlementPaymentTypeId) return false;
-    if (this.settlementMode === 'GL' && !this.settlementGlAccountId) return false;
     return true;
   }
 
@@ -188,18 +160,11 @@ export class ShareWithdrawalRequestComponent implements OnInit {
         pass: shares > 0 && shares <= held,
         detail: `${shares} of ${held} shares held`
       },
-      this.settlementMode === 'GL'
+      {
-        ? {
+        label: 'Linked savings account confirmed',
-            label: 'Settlement GL Account selected',
+        pass: !!this.account?.savingsAccountNumber,
-            pass: !!this.settlementGlAccountId,
+        detail: this.account?.savingsAccountNumber || 'No linked savings account — settlement cannot run automatically'
-            detail: this.settlementGlAccountId ? this.selectedSettlementGlName : 'Missing'
+      },
-          }
-        : {
-            label: 'Linked savings account confirmed',
-            pass: !!this.account?.savingsAccountNumber,
-            detail:
-              this.account?.savingsAccountNumber || 'No linked savings account — settlement cannot run automatically'
-          },
       {
         label: 'Settlement Payment Type selected (non-cash)',
         pass: this.settlementPaymentTypeName !== '—',
@@ -249,37 +214,11 @@ export class ShareWithdrawalRequestComponent implements OnInit {
       .pipe(catchError(() => of([])))
       .subscribe((types: any[]) => (this.paymentTypes = types ?? []));
 
-    this.toGlAccountControl.valueChanges.subscribe((id: any) => {
-      this.settlementGlAccountId = id ? Number(id) : null;
-    });
-
     if (this.requestId && this.mode === 'review') {
       this.loadReviewRequest(this.requestId);
     }
   }
 
-  /** Flips the settlement destination. Switching away from GL clears whatever was picked so a
-   *  stale GL id can never ride along on a SAVINGS submission. */
-  onSettlementModeChange(mode: 'SAVINGS' | 'GL'): void {
-    this.settlementMode = mode;
-    if (mode === 'GL') {
-      this.loadGlAccounts();
-    } else {
-      this.settlementGlAccountId = null;
-      this.toGlAccountControl.setValue('');
-    }
-  }
-
-  /** Fetched on first use rather than with the page, since most withdrawals settle to savings. */
-  private loadGlAccounts(): void {
-    if (this.glAccountsData.length) {
-      return;
-    }
-    this.accountingService.getGlAccounts().subscribe((accounts: GLAccount[]) => {
-      this.glAccountsData = accounts ?? [];
-    });
-  }
-
   onAccountSelected(accountId: string): void {
     this.selectedAccountId = accountId;
     if (!accountId) {
@@ -307,11 +246,6 @@ export class ShareWithdrawalRequestComponent implements OnInit {
         this.resolutionNumber = req.resolution_number ?? '';
         this.meetingDate = req.meeting_date ? String(req.meeting_date).split('T')[0].split(' ')[0] : this.meetingDate;
         this.description = req.description ?? '';
-        this.settlementMode = req.settlement_mode === 'GL' ? 'GL' : 'SAVINGS';
-        this.settlementGlAccountId = req.settlement_gl_account_id ? Number(req.settlement_gl_account_id) : null;
-        if (this.settlementMode === 'GL') {
-          this.loadGlAccounts();
-        }
 
         if (req.activity_log) {
           try {
@@ -355,9 +289,7 @@ export class ShareWithdrawalRequestComponent implements OnInit {
       resolutionNumber: this.resolutionNumber.trim(),
       meetingDate: this.meetingDate,
       description: this.description,
-      settlementPaymentTypeId: this.settlementPaymentTypeId,
+      settlementPaymentTypeId: this.settlementPaymentTypeId
-      settlementMode: this.settlementMode,
-      ...(this.settlementMode === 'GL' ? { settlementGlAccountId: this.settlementGlAccountId } : {})
     };
     this.wdService.submit(payload).subscribe({
       next: () => {

src/app/clients/client-stepper/client-general-step/client-general-step.component.html

@@ -930,10 +930,6 @@
           createClientForm.get('mobileNo')?.hasError('pattern') && createClientForm.get('mobileNo')?.touched
         ) {
           <mat-error>Enter valid 10-digit number (starts with 6-9)</mat-error>
-        } @else if (createClientForm.get('mobileNo')?.hasError('contactTaken')) {
-          <mat-error
-            >This mobile number already belongs to another customer. Please enter a different number.</mat-error
-          >
         }
       </mat-form-field>
 
@@ -944,11 +940,7 @@
             color="primary"
             type="button"
             class="verify-btn"
-            [disabled]="
+            [disabled]="readOnly || createClientForm.get('mobileNo')?.value?.length !== 10"
-              readOnly ||
-              createClientForm.get('mobileNo')?.value?.length !== 10 ||
-              createClientForm.get('mobileNo')?.hasError('contactTaken')
-            "
             (click)="verifyWithDIP()"
           >
             <fa-icon icon="shield-alt" class="m-r-10"></fa-icon>
@@ -1016,8 +1008,6 @@
           createClientForm.get('emailAddress')?.hasError('required') && createClientForm.get('emailAddress')?.touched
         ) {
           <mat-error>Email is <strong>required</strong></mat-error>
-        } @else if (createClientForm.get('emailAddress')?.hasError('contactTaken')) {
-          <mat-error>This email already belongs to another customer. Please enter a different email.</mat-error>
         } @else if (createClientForm.get('emailAddress')?.invalid && createClientForm.get('emailAddress')?.touched) {
           <mat-error>Enter a valid email (e.g. name&#64;example.com)</mat-error>
         }

src/app/clients/client-stepper/client-general-step/client-general-step.component.ts

@@ -27,16 +27,15 @@ import {
   UntypedFormControl,
   ReactiveFormsModule,
   ValidatorFn,
-  AsyncValidatorFn,
   AbstractControl,
   ValidationErrors
 } from '@angular/forms';
-import { Subject, Subscription, merge, of, timer } from 'rxjs';
+import { Subject, Subscription, merge } from 'rxjs';
-import { catchError, filter, map, switchMap, takeUntil } from 'rxjs/operators';
+import { filter, switchMap, takeUntil } from 'rxjs/operators';
 import { ClientsService } from 'app/clients/clients.service';
 import { Dates } from 'app/core/utils/dates';
 import { LegalFormId } from 'app/clients/models/legal-form.enum';
-import { toPersonNameCase, toProperNameCase } from 'app/clients/utils/name-case.util';
+import { toProperNameCase } from 'app/clients/utils/name-case.util';
 import { ExternalNationalIdService } from 'app/clients/services/external-national-id.service';
 
 /** Custom Services */
@@ -937,29 +936,6 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
     };
   }
 
-  /**
-   * A mobile number or email that already belongs to another customer. This is a different person using a contact
-   * that is taken (a PAN or Aadhaar match is what means the same customer), so the answer is to enter another one.
-   * Runs only once the format validators pass, and a new keystroke cancels the previous call, which is what
-   * debounces it. The client being edited is excluded so its own number is not flagged.
-   */
-  private contactTakenValidator(field: 'mobileNo' | 'emailAddress'): AsyncValidatorFn {
-    return (control: AbstractControl) => {
-      const value = (control.value ?? '').toString().trim();
-      if (!value) {
-        return of(null);
-      }
-      return timer(400).pipe(
-        switchMap(() =>
-          this.clientService.lookupClientIdentity({ [field]: value, excludeClientId: this.clientData?.id ?? null })
-        ),
-        map((result) => (result?.contactConflicts?.[field] ? { contactTaken: true } : null)),
-        // A failed lookup must not block the form: the server still refuses a duplicate when the client is saved.
-        catchError(() => of(null))
-      );
-    };
-  }
-
   /**
    * Creates the client form.
    */
@@ -993,8 +969,7 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
           Validators.required,
           Validators.pattern(/^[6-9]\d{9}$/),
           Validators.maxLength(10)
-        ],
+        ]
-        this.contactTakenValidator('mobileNo')
       ],
       alternateMobileNo: [
         '',
@@ -1011,8 +986,7 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
           Validators.email,
           Validators.pattern(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/),
           Validators.maxLength(100)
-        ],
+        ]
-        this.contactTakenValidator('emailAddress')
       ],
       dateOfBirth: [
         '',
@@ -1482,10 +1456,7 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
     const control = this.createClientForm.get(controlName);
     if (control && control.value) {
       const originalValue = control.value;
-      // An entity's full name keeps its typed spelling (matched against the PAN name); a person's
+      const capitalized = toProperNameCase(originalValue);
-      // name parts are title-cased, the same as the Full Name line shows them.
-      const capitalized =
-        controlName === 'fullname' ? toProperNameCase(originalValue) : toPersonNameCase(originalValue);
       if (originalValue !== capitalized) {
         control.setValue(capitalized);
       }
@@ -1954,11 +1925,12 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
 
   /** Returns capitalized full name preview from first + middle + last */
   get fullNamePreview(): string {
+    const capitalize = (s: string) => (s ? s.charAt(0).toUpperCase() + s.slice(1).toLowerCase() : '');
     const salutationId = this.createClientForm?.get('salutationId')?.value;
     const salutation = this.salutationOptions?.find((s: any) => s.id === salutationId)?.name || '';
-    const first = toPersonNameCase(this.createClientForm?.get('firstname')?.value);
+    const first = capitalize(this.createClientForm?.get('firstname')?.value || '');
-    const middle = toPersonNameCase(this.createClientForm?.get('middlename')?.value);
+    const middle = capitalize(this.createClientForm?.get('middlename')?.value || '');
-    const last = toPersonNameCase(this.createClientForm?.get('lastname')?.value);
+    const last = capitalize(this.createClientForm?.get('lastname')?.value || '');
     const full = [
       first,
       middle,
@@ -2388,15 +2360,6 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
     if (generalDetails.fullname) {
       generalDetails.fullname = toProperNameCase(generalDetails.fullname);
     }
-    for (const part of [
-      'firstname',
-      'middlename',
-      'lastname'
-    ]) {
-      if (generalDetails[part]) {
-        generalDetails[part] = toPersonNameCase(generalDetails[part]);
-      }
-    }
 
     if (generalDetails.submittedOnDate instanceof Date) {
       generalDetails.submittedOnDate = this.dateUtils.formatDate(generalDetails.submittedOnDate, dateFormat);

src/app/clients/client-stepper/client-identity-check/client-identity-check.component.html

@@ -1,211 +0,0 @@
-<!--
-  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/.
--->
-
-<section class="identity-check" [class.identity-check--blocking]="status === 'matched' || status === 'conflict'">
-  <header class="identity-check__header">
-    <mat-icon class="identity-check__icon">fingerprint</mat-icon>
-    <div>
-      <h3 class="identity-check__title">Existing customer check</h3>
-      <p class="identity-check__hint">
-        @if (isEntity) {
-          Enter the company's GSTIN or PAN. If either is already on file in any branch, it is the same customer and a
-          new one is not created.
-        } @else {
-          Enter PAN or Aadhaar. If either is already on file in any branch, it is the same customer and a new one is not
-          created. Nothing found? What you enter here is filled into the KYC step for you.
-        }
-      </p>
-    </div>
-  </header>
-
-  @if (form) {
-    <form [formGroup]="form" class="identity-check__fields">
-      @if (isEntity) {
-        <mat-form-field appearance="outline" class="identity-check__field">
-          <mat-label>GSTIN</mat-label>
-          <input
-            matInput
-            formControlName="gstin"
-            class="identity-check__upper"
-            maxlength="15"
-            mifosxRestrictInput="gstin"
-            [errorStateMatcher]="errorMatcher"
-            placeholder="e.g. 22AAAAA0000A1Z5"
-            (input)="capitalise('gstin', $event)"
-          />
-          @if (form.get('gstin')?.hasError('pattern')) {
-            <mat-error>Invalid GSTIN. It has 15 characters, like 22AAAAA0000A1Z5</mat-error>
-          }
-        </mat-form-field>
-      }
-
-      <mat-form-field appearance="outline" class="identity-check__field">
-        <mat-label>{{ isEntity ? 'Company PAN' : 'PAN' }}</mat-label>
-        <input
-          matInput
-          formControlName="pan"
-          class="identity-check__upper"
-          maxlength="10"
-          mifosxRestrictInput="pan"
-          [errorStateMatcher]="errorMatcher"
-          placeholder="e.g. ABCDE1234F"
-          (input)="capitalise('pan', $event)"
-        />
-        @if (form.get('pan')?.hasError('pattern')) {
-          <mat-error>Invalid PAN. Use 5 letters, 4 digits, 1 letter, like ABCDE1234F</mat-error>
-        }
-      </mat-form-field>
-
-      @if (!isEntity) {
-        <mat-form-field appearance="outline" class="identity-check__field">
-          <mat-label>Aadhaar</mat-label>
-          <input
-            matInput
-            formControlName="aadhaar"
-            maxlength="12"
-            inputmode="numeric"
-            mifosxRestrictInput="digits"
-            [errorStateMatcher]="errorMatcher"
-            placeholder="12 digits"
-          />
-          @if (form.get('aadhaar')?.hasError('pattern')) {
-            <mat-error>Invalid Aadhaar. It must be exactly 12 digits</mat-error>
-          } @else {
-            <mat-hint>Only a fingerprint of this number is sent, never the number</mat-hint>
-          }
-        </mat-form-field>
-      }
-    </form>
-  }
-
-  @switch (status) {
-    @case ('checking') {
-      <div class="identity-check__status identity-check__status--info">
-        <mat-progress-spinner mode="indeterminate" diameter="18"></mat-progress-spinner>
-        Checking all branches…
-      </div>
-    }
-    @case ('not-found') {
-      <div class="identity-check__status identity-check__status--ok">
-        <mat-icon>check_circle</mat-icon>
-        <span>
-          No existing customer found. You can continue; these details will be filled into the KYC step so you do not
-          type them again.
-        </span>
-      </div>
-    }
-    @case ('error') {
-      <div class="identity-check__status identity-check__status--warn">
-        <mat-icon>warning</mat-icon>
-        <span>
-          Could not check right now. You can continue; the PAN, Aadhaar and GSTIN are checked again when the KYC is
-          saved.
-        </span>
-        <button mat-button type="button" (click)="recheck()">Check again</button>
-      </div>
-    }
-    @case ('conflict') {
-      <div class="identity-check__status identity-check__status--error">
-        <mat-icon>report</mat-icon>
-        <span>
-          These details belong to <strong>different customers</strong>. Check what was typed. If they are correct, ask a
-          manager to review before continuing.
-        </span>
-      </div>
-      @for (m of matches; track m.clientId) {
-        <div class="identity-check__card">
-          <strong>{{ m.displayName }}</strong>
-          <span class="identity-check__meta">CIF {{ m.cifNumber }} · {{ m.officeName }}</span>
-          <span class="identity-check__chips">
-            @for (by of m.matchedBy; track by) {
-              <span class="identity-check__chip">{{ matchedByLabel(by) }} matches</span>
-            }
-          </span>
-        </div>
-      }
-    }
-    @case ('matched') {
-      @if (match; as m) {
-        <div class="identity-check__status identity-check__status--error">
-          <mat-icon>person_search</mat-icon>
-          <span> This is an <strong>existing customer</strong>. A new client is not created for the same person. </span>
-        </div>
-        <div class="identity-check__card">
-          <div class="identity-check__card-head">
-            <strong>{{ m.displayName }}</strong>
-            <span class="identity-check__chips">
-              @for (by of m.matchedBy; track by) {
-                <span class="identity-check__chip">{{ matchedByLabel(by) }} matches</span>
-              }
-            </span>
-          </div>
-          <dl class="identity-check__facts">
-            <div>
-              <dt>CIF</dt>
-              <dd>{{ m.cifNumber }}</dd>
-            </div>
-            <div>
-              <dt>Home branch</dt>
-              <dd>{{ m.officeName }}</dd>
-            </div>
-            <div>
-              <dt>Type</dt>
-              <dd>{{ legalFormLabel(m) }}</dd>
-            </div>
-            @if (m.panMasked) {
-              <div>
-                <dt>PAN</dt>
-                <dd>{{ m.panMasked }}</dd>
-              </div>
-            }
-            @if (m.aadhaarMasked) {
-              <div>
-                <dt>Aadhaar</dt>
-                <dd>{{ m.aadhaarMasked }}</dd>
-              </div>
-            }
-            @if (m.gstinMasked) {
-              <div>
-                <dt>GSTIN</dt>
-                <dd>{{ m.gstinMasked }}</dd>
-              </div>
-            }
-          </dl>
-
-          @if (m.visibleToCaller) {
-            <button
-              mat-flat-button
-              color="primary"
-              type="button"
-              class="identity-check__action"
-              [routerLink]="['/clients', m.clientId, 'general']"
-            >
-              Open this customer
-            </button>
-          } @else {
-            <p class="identity-check__note">
-              This customer is registered at <strong>{{ m.officeName }}</strong
-              >. They stay a single customer (one CIF). Open their page, then choose which account to open for them at
-              this branch. They are listed under this branch once an account is opened here.
-            </p>
-            <button
-              mat-flat-button
-              color="primary"
-              type="button"
-              class="identity-check__action"
-              [disabled]="linking"
-              (click)="openAccountHere(m)"
-            >
-              {{ linking ? 'Please wait…' : 'Open account for this customer' }}
-            </button>
-          }
-        </div>
-      }
-    }
-  }
-</section>

src/app/clients/client-stepper/client-identity-check/client-identity-check.component.scss

@@ -1,157 +0,0 @@
-/**
- * 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 {
-  display: block;
-}
-
-.identity-check {
-  margin-bottom: 16px;
-  padding: 16px 20px;
-  background: #f9fafb;
-  border: 1px solid #e5e7eb;
-  border-radius: 12px;
-
-  &--blocking {
-    border-color: #fecaca;
-    background: #fffafa;
-  }
-
-  &__header {
-    display: flex;
-    gap: 12px;
-    align-items: flex-start;
-    margin-bottom: 12px;
-  }
-
-  &__icon {
-    flex: none;
-    color: var(--md-sys-color-primary, #1074b9);
-  }
-
-  &__title {
-    margin: 0;
-    font-size: 15px;
-    font-weight: 600;
-  }
-
-  &__hint {
-    margin: 2px 0 0;
-    font-size: 13px;
-    color: #6b7280;
-  }
-
-  // PAN and GSTIN read in capitals even before the value is rewritten.
-  &__upper {
-    text-transform: uppercase;
-  }
-
-  &__fields {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 0 16px;
-  }
-
-  &__field {
-    flex: 1 1 220px;
-    min-width: 200px;
-  }
-
-  &__status {
-    display: flex;
-    gap: 10px;
-    align-items: center;
-    padding: 10px 12px;
-    font-size: 13px;
-    border-radius: 8px;
-
-    &--info {
-      background: #eff6ff;
-      color: #1e40af;
-    }
-
-    &--ok {
-      background: #ecfdf5;
-      color: #047857;
-    }
-
-    &--warn {
-      background: #fffbeb;
-      color: #92400e;
-    }
-
-    &--error {
-      background: #fef2f2;
-      color: #991b1b;
-    }
-  }
-
-  &__card {
-    margin-top: 10px;
-    padding: 12px 14px;
-    background: #fff;
-    border: 1px solid #fecaca;
-    border-radius: 10px;
-  }
-
-  &__card-head {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px 12px;
-    align-items: center;
-    justify-content: space-between;
-  }
-
-  &__meta {
-    margin-left: 8px;
-    font-size: 13px;
-    color: #6b7280;
-  }
-
-  &__chips {
-    display: inline-flex;
-    flex-wrap: wrap;
-    gap: 6px;
-  }
-
-  &__chip {
-    padding: 2px 8px;
-    font-size: 12px;
-    color: #991b1b;
-    background: #fee2e2;
-    border-radius: 999px;
-  }
-
-  &__facts {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
-    gap: 8px 16px;
-    margin: 10px 0 0;
-
-    dt {
-      font-size: 12px;
-      color: #6b7280;
-    }
-
-    dd {
-      margin: 0;
-      font-size: 14px;
-      font-weight: 500;
-    }
-  }
-
-  &__action {
-    margin-top: 12px;
-  }
-
-  &__note {
-    margin: 12px 0 0;
-    font-size: 13px;
-    color: #374151;
-  }
-}

src/app/clients/client-stepper/client-identity-check/client-identity-check.component.ts

@@ -1,308 +0,0 @@
-/**
- * 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,
-  EventEmitter,
-  Input,
-  OnChanges,
-  OnDestroy,
-  OnInit,
-  Output,
-  SimpleChanges,
-  inject
-} from '@angular/core';
-import {
-  AbstractControl,
-  FormGroupDirective,
-  NgForm,
-  UntypedFormBuilder,
-  UntypedFormGroup,
-  Validators
-} from '@angular/forms';
-import { ErrorStateMatcher } from '@angular/material/core';
-import { Router } from '@angular/router';
-import { MatIcon } from '@angular/material/icon';
-import { MatProgressSpinner } from '@angular/material/progress-spinner';
-import { Observable, Subject, merge, of } from 'rxjs';
-import { catchError, debounceTime, map, switchMap, takeUntil, tap } from 'rxjs/operators';
-import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { AuthenticationService } from 'app/core/authentication/authentication.service';
-import { RestrictInputDirective } from '../../../directives/restrict-input.directive';
-import { ClientsService } from '../../clients.service';
-import { ClientIdentityLookupResult, ClientIdentityMatch } from '../../models/client-identity.model';
-import { aadhaarHash } from '../../utils/aadhaar-hash.util';
-
-export type ClientIdentityStatus = 'idle' | 'checking' | 'not-found' | 'matched' | 'conflict' | 'error';
-
-/**
- * What the parent needs from the identity check: whether creation must stop, and the identifiers the officer entered
- * so the KYC step can be filled in without typing them again.
- */
-export interface ClientIdentityState {
-  status: ClientIdentityStatus;
-  /** Individual: the person's PAN. Entity: the company's PAN. */
-  pan: string | null;
-  /** The 12 digits, held in memory only to pre-fill the KYC step. Never sent: only its hash is. */
-  aadhaar: string | null;
-  gstin: string | null;
-  /** True when the customer already exists (or the identifiers disagree), so a new client must not be created. */
-  blocking: boolean;
-}
-
-/**
- * Shows a field's error as soon as something has been typed in it, not only after the field is left: a PAN that is
- * wrong should say so while it is being typed, and the form should not look fine in the meantime.
- */
-class ShowErrorWhenDirty implements ErrorStateMatcher {
-  isErrorState(control: AbstractControl | null, _form: FormGroupDirective | NgForm | null): boolean {
-    return !!control && control.invalid && (control.dirty || control.touched);
-  }
-}
-
-const PAN_PATTERN = /^[A-Za-z]{5}\d{4}[A-Za-z]$/;
-const AADHAAR_PATTERN = /^\d{12}$/;
-const GSTIN_PATTERN = /^\d{2}[A-Za-z]{5}\d{4}[A-Za-z][1-9A-Za-z]Z[0-9A-Za-z]$/;
-
-/**
- * "Is this person already a customer of the bank?" — asked at the top of the General step, before anything is saved.
- *
- * Any ONE of PAN / Aadhaar (individual) or PAN / GSTIN (entity) matching an existing customer, in any branch, means
- * the same customer, so a second client must not be created. When nothing matches, what was entered is carried to the
- * KYC step so it does not have to be typed again.
- */
-@Component({
-  selector: 'mifosx-client-identity-check',
-  templateUrl: './client-identity-check.component.html',
-  styleUrls: ['./client-identity-check.component.scss'],
-  imports: [
-    ...STANDALONE_SHARED_IMPORTS,
-    MatIcon,
-    MatProgressSpinner,
-    RestrictInputDirective
-  ]
-})
-export class ClientIdentityCheckComponent implements OnInit, OnChanges, OnDestroy {
-  private formBuilder = inject(UntypedFormBuilder);
-  private clientsService = inject(ClientsService);
-  private router = inject(Router);
-  private authenticationService = inject(AuthenticationService);
-
-  /** 1 = individual, 2 = entity (non-individual). */
-  @Input() legalFormType = 1;
-  @Output() identityChange = new EventEmitter<ClientIdentityState>();
-
-  form: UntypedFormGroup;
-  readonly errorMatcher = new ShowErrorWhenDirty();
-  status: ClientIdentityStatus = 'idle';
-  matches: ClientIdentityMatch[] = [];
-  /** True while the customer is being introduced to this branch. */
-  linking = false;
-
-  private destroy$ = new Subject<void>();
-  private recheck$ = new Subject<void>();
-
-  get isEntity(): boolean {
-    return this.legalFormType === 2;
-  }
-
-  /** The first (and normally only) existing customer found. */
-  get match(): ClientIdentityMatch | null {
-    return this.matches[0] ?? null;
-  }
-
-  /**
-   * True while a field holds something that is not a valid PAN / Aadhaar / GSTIN. Such a value is never looked up or
-   * carried to the KYC step, so the parent must not let the officer carry on past it as if the check had passed.
-   */
-  get hasInvalidInput(): boolean {
-    return !!this.form?.invalid;
-  }
-
-  markAllAsTouched(): void {
-    this.form?.markAllAsTouched();
-  }
-
-  get state(): ClientIdentityState {
-    const v = this.normalized();
-    return {
-      status: this.status,
-      pan: v.pan,
-      aadhaar: v.aadhaar,
-      gstin: v.gstin,
-      blocking: this.status === 'matched' || this.status === 'conflict'
-    };
-  }
-
-  ngOnInit(): void {
-    this.form = this.formBuilder.group({
-      pan: [
-        '',
-        Validators.pattern(PAN_PATTERN)
-      ],
-      aadhaar: [
-        '',
-        Validators.pattern(AADHAAR_PATTERN)
-      ],
-      gstin: [
-        '',
-        Validators.pattern(GSTIN_PATTERN)
-      ]
-    });
-
-    // A pause in typing (or a manual re-check) runs one lookup; typing again cancels the one in flight.
-    merge(this.form.valueChanges, this.recheck$)
-      .pipe(
-        debounceTime(400),
-        tap(() => this.startChecking()),
-        switchMap(() => this.lookup()),
-        takeUntil(this.destroy$)
-      )
-      .subscribe((result) => this.applyResult(result));
-  }
-
-  ngOnChanges(changes: SimpleChanges): void {
-    // Switching individual <-> entity swaps which identifiers apply; what was typed for the other kind is stale.
-    if (changes['legalFormType'] && !changes['legalFormType'].firstChange) {
-      this.reset();
-    }
-  }
-
-  ngOnDestroy(): void {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
-
-  /** Clears the fields and the result, e.g. when a new client creation session starts. */
-  reset(): void {
-    this.form?.reset({ pan: '', aadhaar: '', gstin: '' }, { emitEvent: false });
-    this.status = 'idle';
-    this.matches = [];
-    this.identityChange.emit(this.state);
-  }
-
-  recheck(): void {
-    this.recheck$.next();
-  }
-
-  /**
-   * PAN and GSTIN are always written in capitals, so what is typed is capitalised as it is typed. The caret is put
-   * back where it was, otherwise editing the middle of a PAN would throw it to the end. The shared restrict-input
-   * directive only capitalises when the field is left, which let lower-case show while typing.
-   */
-  capitalise(controlName: 'pan' | 'gstin', event: Event): void {
-    const input = event.target as HTMLInputElement;
-    const upper = input.value.toUpperCase();
-    if (upper !== input.value) {
-      const { selectionStart, selectionEnd } = input;
-      input.value = upper;
-      input.setSelectionRange(selectionStart, selectionEnd);
-    }
-    this.form.get(controlName)?.setValue(upper, { emitEvent: false });
-  }
-
-  /** Identifiers that are complete and well formed; anything half-typed is ignored rather than looked up. */
-  private normalized(): { pan: string | null; aadhaar: string | null; gstin: string | null } {
-    const raw = this.form?.getRawValue() ?? { pan: '', aadhaar: '', gstin: '' };
-    const pan = String(raw.pan ?? '')
-      .replace(/\s+/g, '')
-      .toUpperCase();
-    const aadhaar = String(raw.aadhaar ?? '').replace(/[\s-]/g, '');
-    const gstin = String(raw.gstin ?? '')
-      .replace(/\s+/g, '')
-      .toUpperCase();
-    return {
-      pan: PAN_PATTERN.test(pan) ? pan : null,
-      aadhaar: !this.isEntity && AADHAAR_PATTERN.test(aadhaar) ? aadhaar : null,
-      gstin: this.isEntity && GSTIN_PATTERN.test(gstin) ? gstin : null
-    };
-  }
-
-  private startChecking(): void {
-    const v = this.normalized();
-    if (!v.pan && !v.aadhaar && !v.gstin) {
-      this.status = 'idle';
-      this.matches = [];
-      this.identityChange.emit(this.state);
-      return;
-    }
-    this.status = 'checking';
-    this.matches = [];
-    this.identityChange.emit(this.state);
-  }
-
-  private lookup(): Observable<ClientIdentityLookupResult | 'error' | null> {
-    const v = this.normalized();
-    if (!v.pan && !v.aadhaar && !v.gstin) {
-      return of(null);
-    }
-    return this.clientsService
-      .lookupClientIdentity({ panNumber: v.pan, aadhaarHash: aadhaarHash(v.aadhaar), gstinNumber: v.gstin })
-      .pipe(
-        map((result): ClientIdentityLookupResult | 'error' => result),
-        catchError(() => of('error' as const))
-      );
-  }
-
-  private applyResult(result: ClientIdentityLookupResult | 'error' | null): void {
-    if (result === null) {
-      // Nothing complete to look up; startChecking() already reset to idle.
-      return;
-    }
-    if (result === 'error') {
-      // Not blocking: the server checks again when the KYC is saved, so a failed lookup must not stop onboarding.
-      this.status = 'error';
-      this.matches = [];
-    } else if (result.conflict) {
-      this.status = 'conflict';
-      this.matches = result.matches;
-    } else if (result.matched) {
-      this.status = 'matched';
-      this.matches = result.matches;
-    } else {
-      this.status = 'not-found';
-      this.matches = [];
-    }
-    this.identityChange.emit(this.state);
-  }
-
-  /**
-   * Starts opening an account at THIS branch for a customer registered at another one. The customer stays at the home
-   * branch (one CIF). This branch is introduced to them, which only lets it open their page; they are listed under
-   * this branch once an account is actually opened here. An account opened for a customer of another branch is held
-   * at the branch that opens it.
-   */
-  openAccountHere(match: ClientIdentityMatch): void {
-    const officeId = this.authenticationService.getCredentials()?.officeId;
-    if (this.linking || officeId == null) {
-      return;
-    }
-    this.linking = true;
-    this.clientsService.linkClientToMyBranch(match.clientId).subscribe({
-      next: () => {
-        this.linking = false;
-        this.router.navigate([
-          '/clients',
-          match.clientId,
-          'general'
-        ]);
-      },
-      // The failure is shown by the global error handler.
-      error: () => (this.linking = false)
-    });
-  }
-
-  /** Legal form of the existing customer, for the card. */
-  legalFormLabel(match: ClientIdentityMatch): string {
-    return match.legalFormEnum === 2 ? 'Non-Individual' : 'Individual';
-  }
-
-  matchedByLabel(by: string): string {
-    return by === 'AADHAAR' ? 'Aadhaar' : by;
-  }
-}

src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.ts

@@ -43,8 +43,6 @@ import { KycUploadHelperService } from '../../shared/kyc-upload-helper.service';
 import { CaptureImageDialogComponent } from '../../clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component';
 import { DrawSignatureDialogComponent } from '../../clients-view/custom-dialogs/draw-signature-dialog/draw-signature-dialog.component';
 import { dataUrlToFile } from 'app/shared/utils/data-url.util';
-import { aadhaarHash } from '../../utils/aadhaar-hash.util';
-import { ClientIdentityState } from '../client-identity-check/client-identity-check.component';
 import { DocumentPreviewDialogComponent } from '../../shared/document-preview-dialog/document-preview-dialog.component';
 import {
   PanDeclarationDialogComponent,
@@ -110,32 +108,6 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
   @Input() verificationDateOfBirth: Date | null = null;
   /** Read-only mode — disables form editing until user clicks edit icon */
   @Input() readOnly = false;
-
-  /**
-   * The identifiers the officer already typed into the existing-customer check on the General step. They are filled
-   * in here so they are not typed twice, but only into fields that are still empty: whatever was entered on this
-   * step wins. Ignored while the check says the customer already exists, since no client is created then.
-   */
-  @Input() set identityPrefill(identity: ClientIdentityState | null) {
-    if (!identity || identity.blocking) {
-      return;
-    }
-    const isEmpty = (name: string) => !String(this.kycForm?.get(name)?.value ?? '').trim();
-    const patch: Record<string, unknown> = {};
-    if (this.isNonIndividual) {
-      if (identity.gstin && isEmpty('gstinNumber')) patch['gstinNumber'] = identity.gstin;
-      if (identity.pan && isEmpty('enterprisePan')) patch['enterprisePan'] = identity.pan;
-    } else {
-      if (identity.pan && isEmpty('panNumber')) {
-        patch['panNumber'] = identity.pan;
-        patch['hasPan'] = true;
-      }
-      if (identity.aadhaar && isEmpty('aadhaarNumber')) patch['aadhaarNumber'] = identity.aadhaar;
-    }
-    if (Object.keys(patch).length) {
-      this.kycForm.patchValue(patch);
-    }
-  }
   @Input() calculatedRisk: {
     category: number;
     reason: string;
@@ -1784,8 +1756,7 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
       kycType: this.kycTypeValue,
       riskCategory: this.currentRiskCategory,
       panNumber: pan,
-      aadhaarNumberMasked: aadhaarRaw.length === 12 ? 'XXXXXXXX' + aadhaarRaw.slice(-4) : 'XXXXXXXX0000',
+      aadhaarNumberMasked: aadhaarRaw.length === 12 ? 'XXXXXXXX' + aadhaarRaw.slice(-4) : 'XXXXXXXX0000'
-      ...this.aadhaarHashField(aadhaarRaw)
     };
 
     // A proprietorship reaches this method (it verifies the proprietor's individual PAN) but is
@@ -2387,8 +2358,7 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
       locale: 'en',
       kycType: this.kycTypeValue,
       riskCategory: this.currentRiskCategory,
-      aadhaarNumberMasked: aadhaarMasked,
+      aadhaarNumberMasked: aadhaarMasked
-      ...this.aadhaarHashField(aadhaar)
     };
     const panVal = this.kycForm.value.panNumber;
     if (panVal) {
@@ -2709,15 +2679,6 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
     }
   }
 
-  /**
-   * `{ aadhaarHash }` for a full 12-digit Aadhaar, `{}` otherwise. The number itself is never sent: KYC calls are
-   * recorded server-side, so only its SHA-256 goes.
-   */
-  private aadhaarHashField(aadhaar: string | null | undefined): { aadhaarHash?: string } {
-    const hash = aadhaarHash(aadhaar);
-    return hash ? { aadhaarHash: hash } : {};
-  }
-
   get kycData(): any {
     const formVal = this.kycForm.getRawValue();
     const aadhaarRaw = formVal.aadhaarNumber || '';
@@ -2746,9 +2707,6 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
       // For non-individual: Company PAN is used as panNumber for verification
       panNumber: this.isNonIndividual ? enterprisePanNorm : v.hasPan ? panNorm : null,
       aadhaarNumberMasked: this.isNonIndividual ? 'XXXXXXXX0000' : aadhaarMasked,
-      // The fingerprint of the full number, so the server can tell two Aadhaar numbers apart (the masked form keeps
-      // only the last four digits). Absent when the field holds a masked value reloaded from the server.
-      ...(this.isNonIndividual ? {} : this.aadhaarHashField(aadhaarRaw)),
       // Only ever sent when this screen actually holds a value. The seeding status is derived by
       // the provider during PAN verification and written straight to the record, so sending an
       // empty one back would blank a field the server filled in — which reads as an officer

src/app/clients/clients-view/clients-view.component.html

@@ -356,15 +356,6 @@
     <button mat-menu-item *mifosxHasPermission="'CREATE_CURRENTACCOUNT'" [routerLink]="['current-accounts', 'create']">
       {{ 'labels.buttons.New Current Account' | translate }}
     </button>
-    <!-- A Cash Credit account is a current account on a product that allows an overdraft against a sanctioned limit. -->
-    <button
-      mat-menu-item
-      *mifosxHasPermission="'CREATE_CURRENTACCOUNT'"
-      [routerLink]="['current-accounts', 'create']"
-      [queryParams]="{ cc: 1 }"
-    >
-      New CC Account
-    </button>
   </mat-menu>
 
   <mat-menu #Actions="matMenu">

src/app/clients/clients-view/form121-tab/form121-tab.component.html

@@ -116,8 +116,8 @@
         <div class="f121__note f121__note--warn">
           <mat-icon>warning_amber</mat-icon>
           <div>
-            A declaration is on record for this year, but one or more deposits still carry a tax group. Those accounts
+            A Form 121 declaration is on record for this year, but withholding is still switched on for one or more
-            deduct on their own and ignore the declaration — remove the tax group from them.
+            deposits. Turn it off on those accounts, or tax will keep being deducted.
           </div>
         </div>
       }
@@ -192,90 +192,20 @@
               }
             </span>
           </div>
-          @if (declarationRecord; as d) {
+          @if (declarationOnRecord && declarationFy) {
             <div class="f121__kv-row">
               <span>Declared for</span>
-              <span>FY {{ d.fy }} · Form {{ d.formType }}</span>
+              <span>FY {{ declarationFy }}</span>
             </div>
-            <div class="f121__kv-row">
-              <span>Accepted on</span>
-              <span>
-                {{ d.acceptedOn | date: 'd MMM y' }} — no TDS on interest credited from this day to 31 March. Interest
-                credited before it is taxed as usual.
-              </span>
-            </div>
-            @if (d.uin) {
-              <div class="f121__kv-row">
-                <span>UIN</span>
-                <span class="f121__mono">{{ d.uin }}</span>
-              </div>
-            }
-            <div class="f121__kv-row">
-              <span></span>
-              <span>
-                <button type="button" class="f121__btn f121__btn--warn" (click)="revokeDeclaration()">
-                  Withdraw declaration
-                </button>
-              </span>
-            </div>
-          } @else if (fy && !configMissing) {
-            <div class="f121__kv-row">
-              <span></span>
-              <span>
-                @if (!showDeclarationForm) {
-                  <button type="button" class="f121__btn" (click)="openDeclarationForm()" [disabled]="!panWellFormed">
-                    Record {{ formLabel }} for FY {{ fy }}
-                  </button>
-                  @if (!panWellFormed) {
-                    <div class="muted">A valid PAN must be on the KYC first — a declaration without one is void.</div>
-                  }
-                }
-              </span>
-            </div>
-            @if (showDeclarationForm) {
-              <div class="f121__decl-form">
-                <label>
-                  <span>Accepted on *</span>
-                  <input type="date" [(ngModel)]="newDeclaration.acceptedOn" />
-                </label>
-                <label>
-                  <span>UIN</span>
-                  <input type="text" [(ngModel)]="newDeclaration.uin" placeholder="Allotted on acceptance" />
-                </label>
-                <label>
-                  <span>Estimated income for the year (₹)</span>
-                  <input type="number" min="0" [(ngModel)]="newDeclaration.estimatedIncome" />
-                </label>
-                @if (declarationError) {
-                  <div class="f121__note f121__note--warn">
-                    <mat-icon>error_outline</mat-icon>
-                    <div>{{ declarationError }}</div>
-                  </div>
-                }
-                <div class="f121__decl-actions">
-                  <button type="button" class="f121__btn" (click)="showDeclarationForm = false">Cancel</button>
-                  <button
-                    type="button"
-                    class="f121__btn f121__btn--primary"
-                    (click)="saveDeclaration()"
-                    [disabled]="savingDeclaration"
-                  >
-                    {{ savingDeclaration ? 'Saving…' : 'Save declaration' }}
-                  </button>
-                </div>
-              </div>
-            }
           }
-          @for (old of declarations; track old.id) {
+          @if (declarationOnRecord && !acceptanceDateKnown) {
-            @if (old.revoked && old.fy === fy) {
+            <div class="f121__kv-row f121__kv-row--muted">
-              <div class="f121__kv-row f121__kv-row--muted">
+              <span>Acceptance date</span>
-                <span>Withdrawn</span>
+              <span>
-                <span>
+                Not captured — the declaration is treated as covering the whole year. A mid-year acceptance would change
-                  Form {{ old.formType }} accepted {{ old.acceptedOn | date: 'd MMM y' }}, withdrawn
+                the figures below.
-                  {{ old.revokedOn | date: 'd MMM y' }} — {{ old.revokeReason }}
+              </span>
-                </span>
+            </div>
-              </div>
-            }
           }
           @if (eligibility) {
             @for (reason of eligibility.reasons; track reason) {

src/app/clients/clients-view/form121-tab/form121-tab.component.scss

@@ -332,61 +332,3 @@
   font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
   font-weight: 600;
 }
-
-/* ── Recording a declaration ── */
-.f121__btn {
-  padding: 6px 14px;
-  border: 1px solid #d1d5db;
-  border-radius: 6px;
-  background: #fff;
-  font: inherit;
-  font-size: 12.5px;
-  font-weight: 600;
-  cursor: pointer;
-
-  &:disabled {
-    opacity: 0.55;
-    cursor: not-allowed;
-  }
-
-  &--primary {
-    border-color: #1d4ed8;
-    background: #1d4ed8;
-    color: #fff;
-  }
-
-  &--warn {
-    border-color: #b45309;
-    color: #b45309;
-  }
-}
-
-.f121__decl-form {
-  display: grid;
-  gap: 10px;
-  padding: 12px 16px;
-
-  label {
-    display: grid;
-    gap: 4px;
-    font-size: 12px;
-
-    span {
-      color: #6b7280;
-      font-weight: 600;
-    }
-
-    input {
-      max-width: 280px;
-      padding: 6px 8px;
-      border: 1px solid #d1d5db;
-      border-radius: 6px;
-      font: inherit;
-    }
-  }
-}
-
-.f121__decl-actions {
-  display: flex;
-  gap: 8px;
-}

src/app/clients/clients-view/form121-tab/form121-tab.component.ts

@@ -23,8 +23,6 @@ import { SavingsService } from 'app/savings/savings.service';
 import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service';
 import { RecurringDepositsService } from 'app/deposits/recurring-deposits/recurring-deposits.service';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { TdsDeclarationRecord, TdsReportsService } from 'app/tds-reports/tds-reports.service';
-import { TdsDeductee } from 'app/tds-reports/tds-reports-data';
 
 /** Domain logic */
 import {
@@ -113,7 +111,6 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   private savingsService = inject(SavingsService);
   private fixedDepositsService = inject(FixedDepositsService);
   private recurringDepositsService = inject(RecurringDepositsService);
-  private tdsService = inject(TdsReportsService);
 
   private destroy$ = new Subject<void>();
 
@@ -127,25 +124,23 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   pan = '';
   panWellFormed = false;
 
-  // ── Declarations on record ──
+  // ── Declaration on record ──
-  /**
+  declarationOnRecord = false;
-   * Every declaration the customer has given, each for one year and from the day the branch
-   * accepted it. The KYC record only ever held a type and a year, which made a September
-   * declaration shield interest back to April and let last year's form run on.
-   */
-  declarations: TdsDeclarationRecord[] = [];
   /**
    * The form actually in force for the selected year. From FY 2026-27 a single
    * Form 121 replaced the 15G/15H split, so this is derived from the year rather
    * than from the payee's age.
    */
   declarationForm: DeclarationForm = '121';
-
+  /** Kind recorded at KYC, meaningful only for a pre-2026 year. */
-  // ── Recording a declaration ──
+  declarationKind: '15G' | '15H' = '15G';
-  showDeclarationForm = false;
+  declarationFy = '';
-  savingDeclaration = false;
+  /**
-  declarationError = '';
+   * The KYC step records only the year, not the date the branch accepted the
-  newDeclaration = { acceptedOn: '', uin: '', estimatedIncome: null as number | null };
+   * declaration, so it has to be treated as covering the whole year. Surfaced on
+   * screen rather than hidden — a mid-year acceptance would change the figures.
+   */
+  acceptanceDateKnown = false;
 
   eligibility: EligibilityResult | null = null;
 
@@ -162,9 +157,9 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   configMissing = false;
 
   /** Raw account inputs, kept so the year selector can recompute cheaply. */
-  private accountInputs: (TdsAccountInput & { meta: Form121AccountRow; taxLines: InterestCredit[] })[] = [];
+  private accountInputs: (TdsAccountInput & { meta: Form121AccountRow })[] = [];
-  /** This customer's FD/RD interest received in savings, and TDS taken there, per year. */
+  /** Withheld-tax postings by FY, from the ledger. */
-  private platformByFy = new Map<string, TdsDeductee | null>();
+  private actualTdsByFy = new Map<string, number>();
 
   ngOnInit(): void {
     this.route.parent.params.pipe(takeUntil(this.destroy$)).subscribe((params: any) => {
@@ -187,15 +182,13 @@ export class Form121TabComponent implements OnInit, OnDestroy {
     forkJoin({
       client: this.clientsService.getClientData(this.clientId, true).pipe(catchError(() => of(null))),
       kyc: this.clientsService.getClientKyc(this.clientId, true).pipe(catchError(() => of(null))),
-      accounts: this.clientsService.getClientAccountData(this.clientId).pipe(catchError(() => of(null))),
+      accounts: this.clientsService.getClientAccountData(this.clientId).pipe(catchError(() => of(null)))
-      declarations: this.tdsService.getDeclarations(Number(this.clientId)).pipe(catchError(() => of([])))
     })
       .pipe(
         takeUntil(this.destroy$),
-        switchMap(({ client, kyc, accounts, declarations }) => {
+        switchMap(({ client, kyc, accounts }) => {
           this.applyClient(client);
           this.applyKyc(kyc);
-          this.declarations = declarations || [];
           const deposits = this.depositAccountsOf(accounts);
           return deposits.length ? forkJoin(deposits.map((a) => this.fetchAccount(a))) : of([] as any[]);
         }),
@@ -219,8 +212,12 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   private applyKyc(kyc: any): void {
     this.pan = (kyc?.panNumber ?? '').toUpperCase();
     this.panWellFormed = isWellFormedPan(this.pan);
+    this.declarationOnRecord = !!kyc?.form15Applicable;
+    this.declarationKind = kyc?.form15Type === '15H' ? '15H' : '15G';
     this.declarationForm =
       this.fy && FY_TAX_CONFIG[normaliseFy(this.fy)] ? declarationFormFor(this.fy, this.dateOfBirth) : '121';
+    this.declarationFy = kyc?.form15FY ?? '';
+    this.acceptanceDateKnown = false;
   }
 
   /** Savings, FD and RD accounts — everything that can credit interest. */
@@ -254,7 +251,7 @@ export class Form121TabComponent implements OnInit, OnDestroy {
    */
   private ingest(details: any[]): void {
     this.accountInputs = [];
-    this.platformByFy = new Map<string, TdsDeductee | null>();
+    this.actualTdsByFy = new Map<string, number>();
     const fys = new Set<string>();
     const clientIdNum = Number(this.clientId);
 
@@ -275,7 +272,6 @@ export class Form121TabComponent implements OnInit, OnDestroy {
       };
 
       const credits: InterestCredit[] = [];
-      const taxLines: InterestCredit[] = [];
       let tdsDeducted = 0;
 
       for (const t of d.transactions ?? []) {
@@ -293,7 +289,8 @@ export class Form121TabComponent implements OnInit, OnDestroy {
         } else if (t.transactionType?.withholdTax) {
           const amount = t.amount ?? 0;
           tdsDeducted += amount;
-          taxLines.push({ date: iso, amount, accountNo: ref.accountNo });
+          const txnFy = fyOf(iso);
+          this.actualTdsByFy.set(txnFy, (this.actualTdsByFy.get(txnFy) ?? 0) + amount);
         }
       }
 
@@ -316,13 +313,12 @@ export class Form121TabComponent implements OnInit, OnDestroy {
         deducteeClientId: deductee
       };
 
-      this.accountInputs.push({ ...ref, credits, taxLines, meta });
+      this.accountInputs.push({ ...ref, credits, meta });
     }
 
     this.availableFys = [...fys].sort().reverse();
     if (!this.availableFys.includes(this.fy)) {
-      this.fy =
+      this.fy = this.availableFys[0] ?? (this.declarationFy ? normaliseFy(this.declarationFy) : '');
-        this.availableFys[0] ?? this.declarations[0]?.fy ?? Object.keys(FY_TAX_CONFIG).sort().reverse()[0] ?? '';
     }
   }
 
@@ -342,33 +338,11 @@ export class Form121TabComponent implements OnInit, OnDestroy {
     const year = normaliseFy(this.fy);
     this.configMissing = !FY_TAX_CONFIG[year];
 
-    // TDS is tracked on FD/RD interest once it reaches savings, and deducted there. Those figures live
-    // on the platform, not in the deposit's own transactions, so they are fetched once per year and
-    // the computation waits for them.
-    if (!this.platformByFy.has(year)) {
-      this.loadPlatformYear(year);
-      return;
-    }
-    const platform = this.platformByFy.get(year);
-    for (const a of this.accountInputs) {
-      if (!a.meta.tdsApplicable) {
-        continue;
-      }
-      const match = platform?.accounts.find((p) => p.accountNo === a.accountNo);
-      a.credits = match?.credits ?? [];
-      a.taxLines = match?.deductions ?? [];
-    }
-
     // Per-account interest for the selected year, for the three lists.
     for (const a of this.accountInputs) {
       a.meta.interest = a.credits.filter((c) => fyOf(c.date) === year).reduce((s, c) => s + c.amount, 0);
-      // The selected year only - this used to total every year the account had ever been taxed in.
-      a.meta.tdsDeducted = a.meta.tdsApplicable
-        ? a.taxLines.filter((c) => fyOf(c.date) === year).reduce((s, c) => s + c.amount, 0)
-        : 0;
     }
-    // What was actually debited for this customer as deductee, wherever the savings account sits.
+    this.actualTds = this.actualTdsByFy.get(year) ?? 0;
-    this.actualTds = this.accountInputs.filter((a) => a.meta.tdsApplicable).reduce((s, a) => s + a.meta.tdsDeducted, 0);
 
     if (!this.dateOfBirth || this.configMissing) {
       return;
@@ -408,95 +382,21 @@ export class Form121TabComponent implements OnInit, OnDestroy {
     return applicable.some((a) => a.meta.mode === 'QUARTERLY') ? 'QUARTERLY' : 'ANNUAL';
   }
 
-  private loadPlatformYear(year: string): void {
+  /** The declaration, but only when it was filed for the year being shown. */
-    this.tdsService
+  private declarationForSelectedFy(): Declaration | null {
-      .getDepositInterest(Number(year.slice(0, 4)), Number(this.clientId))
+    if (!this.declarationOnRecord || !this.fy) {
-      .pipe(
-        catchError(() => of([])),
-        takeUntil(this.destroy$)
-      )
-      .subscribe((rows) => {
-        this.platformByFy.set(year, rows.find((r) => `${r.clientId}` === `${this.clientId}`) ?? null);
-        this.recompute();
-      });
-  }
-
-  /** The live declaration recorded for the year being shown, if any. */
-  get declarationRecord(): TdsDeclarationRecord | null {
-    if (!this.fy) {
       return null;
     }
     const year = normaliseFy(this.fy);
-    return this.declarations.find((d) => d.fy === year && !d.revoked) ?? null;
+    if (this.declarationFy && normaliseFy(this.declarationFy) !== year) {
-  }
-
-  get declarationOnRecord(): boolean {
-    return !!this.declarationRecord;
-  }
-
-  /** The declaration as the engine takes it — operative from the day it was accepted. */
-  private declarationForSelectedFy(): Declaration | null {
-    const d = this.declarationRecord;
-    if (!d) {
       return null;
     }
-    const kind = d.formType === '15H' ? '15H' : d.formType === '15G' ? '15G' : formKindFor(this.dateOfBirth, d.fy);
+    return {
-    return { kind, acceptedOn: d.acceptedOn, fy: d.fy, uin: d.uin || undefined };
+      kind: this.declarationKind,
-  }
+      // No acceptance date on record — treated as covering the whole year.
-
+      acceptedOn: `${year.slice(0, 4)}-04-01`,
-  openDeclarationForm(): void {
+      fy: year
-    this.newDeclaration = { acceptedOn: new Date().toISOString().slice(0, 10), uin: '', estimatedIncome: null };
+    };
-    this.declarationError = '';
-    this.showDeclarationForm = true;
-  }
-
-  saveDeclaration(): void {
-    if (!this.newDeclaration.acceptedOn) {
-      this.declarationError = 'Enter the date the branch accepted the form.';
-      return;
-    }
-    this.savingDeclaration = true;
-    this.declarationError = '';
-    this.tdsService
-      .createDeclaration({
-        clientId: Number(this.clientId),
-        fy: normaliseFy(this.fy),
-        formType: declarationFormFor(this.fy, this.dateOfBirth),
-        acceptedOn: this.newDeclaration.acceptedOn,
-        uin: this.newDeclaration.uin || undefined,
-        estimatedIncome: this.newDeclaration.estimatedIncome
-      })
-      .subscribe({
-        next: (rows) => {
-          this.savingDeclaration = false;
-          this.showDeclarationForm = false;
-          this.declarations = rows || [];
-          this.recompute();
-        },
-        error: (err: any) => {
-          this.savingDeclaration = false;
-          this.declarationError =
-            err?.error?.errors?.[0]?.defaultUserMessage || err?.error?.defaultUserMessage || 'Could not save.';
-        }
-      });
-  }
-
-  revokeDeclaration(): void {
-    const d = this.declarationRecord;
-    if (!d) {
-      return;
-    }
-    const reason = prompt('Why is this declaration being withdrawn? From today, TDS will be deducted again.');
-    if (!reason) {
-      return;
-    }
-    this.tdsService.revokeDeclaration(d.id, reason).subscribe({
-      next: (rows) => {
-        this.declarations = rows || [];
-        this.recompute();
-      },
-      error: (err: any) => alert(err?.error?.defaultUserMessage || 'Could not revoke the declaration.')
-    });
   }
 
   // ───────────────────────── Template helpers ─────────────────────────
@@ -574,12 +474,11 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * A declaration is on record but a deposit still carries a stock Fineract tax group. Those
+   * A declaration is on record but deposit accounts are still set to withhold —
-   * accounts withhold on their own rules and never consult the declaration record, so the form
+   * the branch has not switched them off.
-   * does not stop their deduction until the tax group is removed.
    */
   get declarationNotAppliedToAccounts(): boolean {
-    return !!this.declarationForSelectedFy() && this.liableAccounts.some((a) => !!a.taxGroup);
+    return !!this.declarationForSelectedFy() && this.liableAccounts.some((a) => a.withHoldTax);
   }
 
   /**

src/app/clients/clients-view/general-tab/general-tab.component.html

@@ -90,21 +90,6 @@
               <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
             </td>
           </ng-container>
-          <ng-container matColumnDef="Branch">
-            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
-            <td mat-cell *matCellDef="let element">
-              @if (element.officeName) {
-                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
-                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
-                  @if (isHomeBranch(element)) {
-                    <span class="branch-chip__home">Home</span>
-                  }
-                </span>
-              } @else {
-                —
-              }
-            </td>
-          </ng-container>
           <ng-container matColumnDef="Last Active">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Last Active' | translate }}</th>
             <td mat-cell *matCellDef="let element">{{ element.lastActiveTransactionDate | dateFormat }}</td>
@@ -218,21 +203,6 @@
               <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
             </td>
           </ng-container>
-          <ng-container matColumnDef="Branch">
-            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
-            <td mat-cell *matCellDef="let element">
-              @if (element.officeName) {
-                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
-                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
-                  @if (isHomeBranch(element)) {
-                    <span class="branch-chip__home">Home</span>
-                  }
-                </span>
-              } @else {
-                —
-              }
-            </td>
-          </ng-container>
           <ng-container matColumnDef="Closed Date">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Closed Date' | translate }}</th>
             <td mat-cell *matCellDef="let element">{{ element.timeline.closedOnDate | dateFormat }}</td>
@@ -292,21 +262,6 @@
               <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
             </td>
           </ng-container>
-          <ng-container matColumnDef="Branch">
-            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
-            <td mat-cell *matCellDef="let element">
-              @if (element.officeName) {
-                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
-                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
-                  @if (isHomeBranch(element)) {
-                    <span class="branch-chip__home">Home</span>
-                  }
-                </span>
-              } @else {
-                —
-              }
-            </td>
-          </ng-container>
           <ng-container matColumnDef="Last Active">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Last Active' | translate }}</th>
             <td mat-cell *matCellDef="let element">{{ element.lastActiveTransactionDate | dateFormat }}</td>
@@ -497,21 +452,6 @@
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Fixed Deposit Product' | translate }}</th>
             <td mat-cell *matCellDef="let element">{{ element.productName }}</td>
           </ng-container>
-          <ng-container matColumnDef="Branch">
-            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
-            <td mat-cell *matCellDef="let element">
-              @if (element.officeName) {
-                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
-                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
-                  @if (isHomeBranch(element)) {
-                    <span class="branch-chip__home">Home</span>
-                  }
-                </span>
-              } @else {
-                —
-              }
-            </td>
-          </ng-container>
           <ng-container matColumnDef="Last Active">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Last Active' | translate }}</th>
             <td mat-cell *matCellDef="let element">{{ element.lastActiveTransactionDate | dateFormat }}</td>
@@ -611,21 +551,6 @@
               <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
             </td>
           </ng-container>
-          <ng-container matColumnDef="Branch">
-            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
-            <td mat-cell *matCellDef="let element">
-              @if (element.officeName) {
-                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
-                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
-                  @if (isHomeBranch(element)) {
-                    <span class="branch-chip__home">Home</span>
-                  }
-                </span>
-              } @else {
-                —
-              }
-            </td>
-          </ng-container>
           <ng-container matColumnDef="Closed Date">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Closed Date' | translate }}</th>
             <td mat-cell *matCellDef="let element">{{ element.timeline.closedOnDate | dateFormat }}</td>
@@ -666,13 +591,16 @@
         <i class="fa fa-calendar section-header__icon"></i>
         <h3 class="section-header__title">{{ 'labels.heading.Recurring Deposit Accounts' | translate }}</h3>
       </div>
+      <div class="section-header__right">
+        <button mat-raised-button color="primary" (click)="toggleRecurringAccountsOverview()">
+          {{ viewAccountsLabel(showClosedRecurringAccounts) | translate }}
+        </button>
+      </div>
     </div>
 
-    <!-- Active and ended recurring deposits share one table; the Status column says how each one ended (matured or
+    @if (!showClosedRecurringAccounts) {
-         closed early), so the client's RD history stays visible without switching views. -->
-    @if (savingAccounts) {
       <div class="table-wrapper">
-        <table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'all' : 'isRecurring'">
+        <table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'open' : 'isRecurring'">
           <ng-container matColumnDef="Account No">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Account No' | translate }}</th>
             <td mat-cell *matCellDef="let element">
@@ -686,32 +614,6 @@
               <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
             </td>
           </ng-container>
-          <ng-container matColumnDef="Branch">
-            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
-            <td mat-cell *matCellDef="let element">
-              @if (element.officeName) {
-                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
-                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
-                  @if (isHomeBranch(element)) {
-                    <span class="branch-chip__home">Home</span>
-                  }
-                </span>
-              } @else {
-                —
-              }
-            </td>
-          </ng-container>
-          <ng-container matColumnDef="Status">
-            <th mat-header-cell *matHeaderCellDef>Status</th>
-            <td mat-cell *matCellDef="let element">
-              <span class="rd-status" [class.rd-status--ended]="element.timeline?.closedOnDate">{{
-                rdStatusLabel(element)
-              }}</span>
-              @if (element.timeline?.closedOnDate) {
-                <div class="rd-status__date">on {{ element.timeline.closedOnDate | dateFormat }}</div>
-              }
-            </td>
-          </ng-container>
           <ng-container matColumnDef="Last Active">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Last Active' | translate }}</th>
             <td mat-cell *matCellDef="let element">{{ element.lastActiveTransactionDate | dateFormat }}</td>
@@ -736,7 +638,7 @@
                   <i class="fa fa-check"></i>
                 </button>
               }
-              @if (element.status.approved) {
+              @if (!element.status.submittedAndPendingApproval && !element.status.active) {
                 <button
                   class="account-action-button"
                   mat-raised-button
@@ -762,7 +664,7 @@
           </ng-container>
 
           <ng-container matColumnDef="no-data">
-            <td mat-footer-cell *matFooterCellDef [attr.colspan]="recurringColumns.length">
+            <td mat-footer-cell *matFooterCellDef [attr.colspan]="openSavingsColumns.length">
               <div class="table-empty-state">
                 <i class="fa fa-folder-open-o table-empty-state__icon"></i>
                 <p class="table-empty-state__text">
@@ -772,17 +674,67 @@
             </td>
           </ng-container>
 
-          <tr mat-header-row *matHeaderRowDef="recurringColumns"></tr>
+          <tr mat-header-row *matHeaderRowDef="openSavingsColumns"></tr>
           <tr
             mat-row
-            *matRowDef="let row; columns: recurringColumns"
+            *matRowDef="let row; columns: openSavingsColumns"
             [routerLink]="['../', 'recurring-deposits-accounts', row.id, 'general']"
             class="select-row"
           ></tr>
           <tr
             mat-footer-row
             *matFooterRowDef="
-              (savingAccounts | accountsFilter: 'saving' : 'all' : 'isRecurring')?.length === 0 ? ['no-data'] : []
+              (savingAccounts | accountsFilter: 'saving' : 'open' : 'isRecurring')?.length === 0 ? ['no-data'] : []
+            "
+          ></tr>
+        </table>
+      </div>
+    }
+
+    <!-- Closed Recurring Deposit Accounts -->
+    @if (showClosedRecurringAccounts) {
+      <div class="table-wrapper">
+        <table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'closed' : 'isRecurring'">
+          <ng-container matColumnDef="Account No">
+            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Account No' | translate }}</th>
+            <td mat-cell *matCellDef="let element">
+              <i class="fa fa-stop" [ngClass]="element.status.code | statusLookup"></i>
+              <mifosx-account-number accountNo="{{ element.accountNo }}"></mifosx-account-number>
+            </td>
+          </ng-container>
+          <ng-container matColumnDef="Saving Account">
+            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Recurring Deposit Product' | translate }}</th>
+            <td mat-cell *matCellDef="let element">
+              <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
+            </td>
+          </ng-container>
+          <ng-container matColumnDef="Closed Date">
+            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Closed Date' | translate }}</th>
+            <td mat-cell *matCellDef="let element">{{ element.timeline.closedOnDate | dateFormat }}</td>
+          </ng-container>
+
+          <ng-container matColumnDef="no-data">
+            <td mat-footer-cell *matFooterCellDef [attr.colspan]="closedSavingsColumns.length">
+              <div class="table-empty-state">
+                <i class="fa fa-folder-open-o table-empty-state__icon"></i>
+                <p class="table-empty-state__text">
+                  {{ 'labels.messages.No Closed Recurring Deposit Accounts Available' | translate }}
+                </p>
+              </div>
+            </td>
+          </ng-container>
+
+          <tr mat-header-row *matHeaderRowDef="closedSavingsColumns"></tr>
+          <tr
+            mat-row
+            *matRowDef="let row; columns: closedSavingsColumns"
+            [routerLink]="['../', 'recurring-deposits-accounts', row.id, 'general']"
+            class="select-row"
+          ></tr>
+          <tr
+            mat-footer-row
+            *matFooterRowDef="
+              (savingAccounts | accountsFilter: 'saving' : 'closed' : 'isRecurring')?.length === 0 ? ['no-data'] : []
             "
           ></tr>
         </table>

src/app/clients/clients-view/general-tab/general-tab.component.scss

@@ -419,87 +419,3 @@ table[mat-table] {
   font-size: 24px;
   z-index: 1;
 }
-
-.rd-status {
-  display: inline-block;
-  padding: 2px 8px;
-  border-radius: 10px;
-  font-size: 12px;
-  font-weight: 600;
-  background: #dcfce7;
-  color: #166534;
-
-  &--ended {
-    background: #e2e8f0;
-    color: #475569;
-  }
-}
-
-.rd-status__date {
-  margin-top: 2px;
-  font-size: 11px;
-  color: #64748b;
-}
-
-/*
- * Branch an account is held at, as a pill coloured by where the signed-in user works: green for their own branch, red for
- * any other. When the customer banks at several other branches the reds run from light to dark, one shade per branch.
- */
-.branch-chip {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  padding: 3px 10px;
-  border-radius: 999px;
-  border: 1px solid transparent;
-  font-size: 12px;
-  font-weight: 600;
-  white-space: nowrap;
-
-  .fa {
-    font-size: 12px;
-  }
-
-  &--mine {
-    background: #dcfce7;
-    color: #166534;
-    border-color: #4ade80;
-  }
-
-  &--other-0 {
-    background: #fee2e2;
-    color: #991b1b;
-    border-color: #fca5a5;
-  }
-
-  &--other-1 {
-    background: #fca5a5;
-    color: #7f1d1d;
-    border-color: #f87171;
-  }
-
-  &--other-2 {
-    background: #dc2626;
-    color: #fff;
-    border-color: #b91c1c;
-  }
-
-  &--other-3 {
-    background: #991b1b;
-    color: #fff;
-    border-color: #7f1d1d;
-  }
-}
-
-.branch-chip__home {
-  padding: 0 6px;
-  border-radius: 8px;
-
-  /* fixed colours: the chip text turns white on the dark reds, which would vanish against this light tag */
-  background: rgb(255 255 255 / 85%);
-  color: #1f2937;
-  font-size: 10px;
-  font-weight: 700;
-  letter-spacing: 0.04em;
-  text-transform: uppercase;
-}

src/app/clients/clients-view/general-tab/general-tab.component.ts

@@ -39,7 +39,6 @@ import { DateFormatPipe } from '../../../pipes/date-format.pipe';
 import { FormatNumberPipe } from '../../../pipes/format-number.pipe';
 import { CurrencyPipe } from '@angular/common';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { AuthenticationService } from '../../../core/authentication/authentication.service';
 import { ReportsService } from 'app/reports/reports.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Subject } from 'rxjs';
@@ -152,7 +151,6 @@ export class GeneralTabComponent implements OnDestroy {
   private router = inject(Router);
   private reportsService = inject(ReportsService);
   private settingsService = inject(SettingsService);
-  private authenticationService = inject(AuthenticationService);
 
   /** Open Loan Accounts Columns */
   openLoansColumns: string[] = [
@@ -179,7 +177,6 @@ export class GeneralTabComponent implements OnDestroy {
   openSavingsColumns: string[] = [
     'Account No',
     'Saving Account',
-    'Branch',
     'Last Active',
     'Balance',
     'Actions'
@@ -188,19 +185,8 @@ export class GeneralTabComponent implements OnDestroy {
   closedSavingsColumns: string[] = [
     'Account No',
     'Saving Account',
-    'Branch',
     'Closed Date'
   ];
-  /** Closed Recurring Deposit Accounts Columns - with how each one ended, for tracking. */
-  recurringColumns: string[] = [
-    'Account No',
-    'Saving Account',
-    'Branch',
-    'Status',
-    'Last Active',
-    'Balance',
-    'Actions'
-  ];
   /** Open Shares Accounts Columns */
   openSharesColumns: string[] = [
     'Account No',
@@ -341,76 +327,12 @@ export class GeneralTabComponent implements OnDestroy {
   /** Client Id */
   clientid: any;
 
-  /** The customer's own (home) branch, to tell it from branches the customer banks at elsewhere. */
-  clientOfficeId: number | null = null;
-
-  /** How many red shades the branch chips have (general-tab.component.scss, .branch-chip--other-0 ... -3), light to dark. */
-  private static readonly OTHER_BRANCH_SHADES = 4;
-
-  /** The branch the signed-in user works at: accounts held here read green, every other branch red. */
-  private get myOfficeId(): number | null {
-    const officeId = this.authenticationService.getCredentials()?.officeId;
-    return officeId == null ? null : Number(officeId);
-  }
-
-  /**
-   * The other branches this customer banks at, lightest to darkest. Ordered by branch id so the shades stay put between
-   * visits; computed over every deposit account on the page so one branch has the same shade in every table.
-   */
-  private otherBranchIds(): number[] {
-    const mine = this.myOfficeId;
-    const ids = new Set<number>();
-    for (const account of [
-      ...this.savingAccounts,
-      ...this.currentAccounts
-    ]) {
-      const officeId = Number(account?.officeId);
-      if (Number.isFinite(officeId) && officeId !== mine) {
-        ids.add(officeId);
-      }
-    }
-    return [...ids].sort((a, b) => a - b);
-  }
-
-  /** Green for an account at the signed-in user's branch; red for any other branch, a different shade for each. */
-  branchChipClass(account: any): string {
-    const officeId = Number(account?.officeId);
-    if (officeId === this.myOfficeId) {
-      return 'branch-chip branch-chip--mine';
-    }
-    const others = this.otherBranchIds();
-    const rank = Math.max(others.indexOf(officeId), 0);
-    const last = GeneralTabComponent.OTHER_BRANCH_SHADES - 1;
-    // one other branch gets a mid red, several are spread from the lightest to the darkest
-    const shade = others.length <= 1 ? 1 : Math.round((rank * last) / (others.length - 1));
-    return `branch-chip branch-chip--other-${shade}`;
-  }
-
-  branchChipTitle(account: any): string {
-    const parts = [account?.officeName];
-    if (Number(account?.officeId) === this.myOfficeId) {
-      parts.push('your branch');
-    }
-    if (this.isHomeBranch(account)) {
-      parts.push('customer home branch');
-    }
-    return parts.join(' - ');
-  }
-
-  isHomeBranch(account: any): boolean {
-    return this.clientOfficeId != null && Number(account?.officeId) === this.clientOfficeId;
-  }
-
   /**
    * @param {ActivatedRoute} route Activated Route
    * @param {ClientsService} clientService Clients Service
    * @param {Router} router Router
    */
   constructor() {
-    // The customer's record is resolved on the parent route, not on this tab's own route data.
-    this.route.parent?.data.subscribe((data: any) => {
-      this.clientOfficeId = data?.clientViewData?.officeId ?? null;
-    });
     this.route.data.subscribe(
       (data: { clientAccountsData: any; clientChargesData: any; clientSummary: any; clientCollateralData: any }) => {
         this.clientAccountData = data.clientAccountsData;
@@ -553,30 +475,6 @@ export class GeneralTabComponent implements OnDestroy {
     );
   }
 
-  /** Where a recurring deposit stands - for one that has ended, how it ended. */
-  rdStatusLabel(account: any): string {
-    switch (account?.status?.code) {
-      case 'savingsAccountStatusType.active':
-        return 'Active';
-      case 'savingsAccountStatusType.matured':
-        return 'Matured (not closed)';
-      case 'savingsAccountStatusType.submitted.and.pending.approval':
-        return 'Pending Approval';
-      case 'savingsAccountStatusType.approved':
-        return 'Approved';
-      case 'savingsAccountStatusType.closed':
-        return 'Matured & Closed';
-      case 'savingsAccountStatusType.pre.mature.closure':
-        return 'Premature Closed';
-      case 'savingsAccountStatusType.rejected':
-        return 'Rejected';
-      case 'savingsAccountStatusType.withdrawn.by.applicant':
-        return 'Withdrawn by Client';
-      default:
-        return account?.status?.value ?? '';
-    }
-  }
-
   viewAccountsLabel(closed: boolean): string {
     if (closed) {
       return 'labels.buttons.View Active Accounts';

src/app/clients/clients.component.html

@@ -50,17 +50,6 @@
         />
       </mat-form-field>
 
-      @if (isHeadOffice) {
-        <mat-form-field class="table-filter" appearance="outline">
-          <mat-select [(value)]="officeFilter" (selectionChange)="officeChanged()" placeholder="Branch">
-            <mat-option [value]="null">All Branches</mat-option>
-            @for (office of offices; track office.id) {
-              <mat-option [value]="office.id">{{ office.name }}</mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-      }
-
       <mat-form-field class="table-filter" appearance="outline">
         <mat-select [(value)]="statusFilter" (selectionChange)="applyClientFilters()" placeholder="Status">
           <mat-option value="">All Status</mat-option>
@@ -103,11 +92,6 @@
             row.legalForm?.id === 2 ? 'business' : 'person'
           }}</mat-icon>
           {{ hideClientData ? maskName(row.displayName) : row.displayName }}
-          @if (!isHeadOffice && row.officeId && myOfficeId !== null && row.officeId !== myOfficeId) {
-            <span class="row-home-chip" matTooltip="Registered at another branch; linked to this branch">
-              Home: {{ row.officeName }}
-            </span>
-          }
           @if (row._ckycDone) {
             <mat-icon class="row-ckyc-icon" matTooltip="CKYC Done">verified</mat-icon>
           }
@@ -130,12 +114,6 @@
         </td>
       </ng-container>
 
-      <!-- Branch Column (Head Office only) -->
-      <ng-container matColumnDef="officeName">
-        <th mat-header-cell *matHeaderCellDef>Branch</th>
-        <td mat-cell *matCellDef="let row">{{ row.officeName }}</td>
-      </ng-container>
-
       <!-- Status Column -->
       <ng-container matColumnDef="status">
         <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Status' | translate }}</th>

src/app/clients/clients.component.scss

@@ -7,15 +7,3 @@
  */
 
 @use '../shared/styles/list-layout' as *;
-
-// A customer registered at another branch that has been linked to this one.
-.row-home-chip {
-  margin-left: 8px;
-  padding: 1px 8px;
-  font-size: 11px;
-  font-weight: 500;
-  color: #92400e;
-  background: #fef3c7;
-  border-radius: 999px;
-  white-space: nowrap;
-}

src/app/clients/clients.component.ts

@@ -38,8 +38,6 @@ import { MatIconButton, MatButton } from '@angular/material/button';
 import { MatIcon } from '@angular/material/icon';
 import { MatTooltip } from '@angular/material/tooltip';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { AuthenticationService } from '../core/authentication/authentication.service';
-import { OrganizationService } from '../organization/organization.service';
 
 @Component({
   selector: 'mifosx-clients',
@@ -73,15 +71,6 @@ import { OrganizationService } from '../organization/organization.service';
 })
 export class ClientsComponent implements OnInit {
   private clientService = inject(ClientsService);
-  private authenticationService = inject(AuthenticationService);
-  private organizationService = inject(OrganizationService);
-
-  /** Head Office sees every branch's clients, so it gets a Branch filter. A branch user only ever sees its own. */
-  isHeadOffice = this.authenticationService.isHeadOfficeUser();
-  offices: { id: number; name: string }[] = [];
-  officeFilter: number | null = null;
-  /** The caller's own branch, to tell a customer of another branch (linked here) from this branch's own. */
-  myOfficeId = this.authenticationService.getCredentials()?.officeId ?? null;
 
   /** Returns true if client data masking is enabled */
   get hideClientData(): boolean {
@@ -101,7 +90,6 @@ export class ClientsComponent implements OnInit {
     'displayName',
     'cifNumber',
     'legalForm',
-    'officeName',
     'status',
     'profileCompletion',
     'actions'
@@ -131,13 +119,6 @@ export class ClientsComponent implements OnInit {
   @ViewChild(MatSort) sort: MatSort;
 
   ngOnInit() {
-    if (!this.isHeadOffice) {
-      this.displayedColumns = this.displayedColumns.filter((c) => c !== 'officeName');
-    } else {
-      this.organizationService.getOffices().subscribe((offices: any[]) => {
-        this.offices = (offices || []).map((o) => ({ id: o.id, name: o.name }));
-      });
-    }
     if (environment.preloadClients) {
       this.getClients();
     }
@@ -163,8 +144,7 @@ export class ClientsComponent implements OnInit {
         this.sortDirection,
         false,
         '',
-        true,
+        true
-        this.isHeadOffice ? this.officeFilter : null
       )
       .subscribe(
         (data: any) => {
@@ -253,12 +233,6 @@ export class ClientsComponent implements OnInit {
     this.dataSource.data = filtered;
   }
 
-  /** Branch filter is applied by the server so paging and the record count stay correct. */
-  officeChanged() {
-    this.resetPaginator();
-    this.getClients();
-  }
-
   pageChanged(event: PageEvent) {
     this.pageSize = event.pageSize;
     this.currentPage = event.pageIndex;

src/app/clients/clients.service.ts

@@ -18,7 +18,6 @@ import { map, catchError } from 'rxjs/operators';
 
 import { environment } from '../../environments/environment';
 import { dataUrlToFile } from 'app/shared/utils/data-url.util';
-import { ClientIdentityLookupResult } from './models/client-identity.model';
 
 /**
  * Clients service.
@@ -743,14 +742,9 @@ export class ClientsService {
     sortDirection: string = '',
     activeOnly: boolean = false,
     legalFormType: string = '',
-    silent: boolean = false,
+    silent: boolean = false
-    officeId: number | null = null
   ) {
     const innerRequest: any = { text };
-    // Branch filter (Head Office list). The server still limits results to the caller's office hierarchy.
-    if (officeId != null) {
-      innerRequest.officeId = officeId;
-    }
     if (activeOnly) {
       innerRequest.activeOnly = true;
     }
@@ -846,11 +840,6 @@ export class ClientsService {
     return this.http.post('/kyc/risk-rules', rule);
   }
 
-  /** Ends the trial of a newly added rule; it stays in the catalog as a normal rule. */
-  markClientRiskRuleNormal(ruleId: number): Observable<any> {
-    return this.http.post(`/kyc/risk-rules/${ruleId}/mark-normal`, {});
-  }
-
   /** Fetch code values by code ID */
   getCodeValuesById(codeId: number): Observable<any[]> {
     return this.http.get<any[]>(`/codes/${codeId}/codevalues`).pipe(catchError(() => of([])));
@@ -879,39 +868,6 @@ export class ClientsService {
     return this.http.post(`/clients/${clientId}/kyc`, kycData);
   }
 
-  /**
-   * "Is this person already a customer of the bank?" — across every branch, by PAN, Aadhaar fingerprint or GSTIN.
-   * Any ONE of them matching means the same customer. `contactConflicts` reports a phone/email already used by another
-   * client, which is never the same customer. Only the Aadhaar's SHA-256 is sent, never the number.
-   */
-  /**
-   * Introduces a customer of another branch to the caller's branch, so the branch can see them and open an account
-   * for them there. The customer stays at the home branch. Safe to repeat.
-   */
-  linkClientToMyBranch(
-    clientId: number
-  ): Observable<{ clientId: number; linked: boolean; officeId: number; officeName: string }> {
-    return this.http.post<{ clientId: number; linked: boolean; officeId: number; officeName: string }>(
-      '/clientidentity/link',
-      {
-        clientId
-      }
-    );
-  }
-
-  lookupClientIdentity(identity: {
-    panNumber?: string | null;
-    aadhaarHash?: string | null;
-    gstinNumber?: string | null;
-    mobileNo?: string | null;
-    emailAddress?: string | null;
-    excludeClientId?: number | null;
-  }): Observable<ClientIdentityLookupResult> {
-    return this.http.post<ClientIdentityLookupResult>('/clientidentity/lookup', identity, {
-      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
-    });
-  }
-
   /**
    * Screen a client name against the UN Security Council consolidated sanctions list.
    * @param name The name to screen
@@ -1117,91 +1073,9 @@ export class ClientsService {
    */
   saveKycContactLog(
     clientId: string | number,
-    data: { channel: string; notes: string; officerName?: string; noticeType?: string },
+    data: { channel: string; notes: string; officerName?: string }
-    silent = false
   ): Observable<any> {
-    return this.http.post(
+    return this.http.post(`/kyc/exceptions/${clientId}/contact-log`, data);
-      `/kyc/exceptions/${clientId}/contact-log`,
-      data,
-      silent ? { context: new HttpContext().set(SILENT_HTTP_ERROR, true) } : {}
-    );
-  }
-
-  /**
-   * The subject and text a customer would receive for the stage they are at today.
-   * `type` is KYC or DORMANCY; the body comes back empty when they are at no such stage.
-   */
-  previewKycNotice(clientId: string | number, type: string): Observable<{ subject?: string; body?: string }> {
-    return this.http.get<{ subject?: string; body?: string }>(
-      `/kyc/exceptions/${clientId}/contact-log/preview?type=${type}`,
-      {
-        context: new HttpContext().set(SILENT_HTTP_ERROR, true)
-      }
-    );
-  }
-
-  /** Queues notices to be sent in the background by the queue job. */
-  enqueueKycNotices(body: {
-    items: { clientId: number; noticeType: string; channel: string; accountNo?: string; stageLabel?: string }[];
-    notes?: string;
-    officerName?: string;
-    sendAt?: string;
-  }): Observable<{ queued: number; skipped: number }> {
-    return this.http.post<{ queued: number; skipped: number }>('/kyc/notice-queue', body);
-  }
-
-  /** Queued notices, newest first; status narrows to PENDING, SENT, FAILED or CANCELLED. */
-  getKycNoticeQueue(status = ''): Observable<any[]> {
-    return this.http.get<any[]>(`/kyc/notice-queue${status ? `?status=${status}` : ''}`, {
-      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
-    });
-  }
-
-  actOnKycNotice(id: number, command: 'cancel' | 'retry'): Observable<any> {
-    return this.http.post(`/kyc/notice-queue/${id}?command=${command}`, {});
-  }
-
-  /** Notices per day (customers, notices, outcomes), newest day first. */
-  getKycContactAuditDays(
-    filter: { from?: string; to?: string; channel?: string; status?: string; search?: string } = {}
-  ): Observable<any[]> {
-    return this.http.get<any[]>('/kyc/contact-audit/days', {
-      params: this.auditParams(filter),
-      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
-    });
-  }
-
-  /** Customer notices on record, newest first, a page at a time. */
-  getKycContactAudit(
-    filter: {
-      from?: string;
-      to?: string;
-      channel?: string;
-      status?: string;
-      search?: string;
-      offset?: number;
-      limit?: number;
-    } = {}
-  ): Observable<{ total: number; rows: any[] }> {
-    return this.http.get<{ total: number; rows: any[] }>('/kyc/contact-audit', {
-      params: this.auditParams(filter),
-      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
-    });
-  }
-
-  private auditParams(filter: Record<string, string | number | undefined>): HttpParams {
-    let params = new HttpParams();
-    Object.entries(filter).forEach(
-      ([
-        k,
-        v
-      ]) => {
-        if (v !== undefined && v !== null && v !== '') {
-          params = params.set(k, String(v));
-        }
-      }
-    );
-    return params;
   }
 
   getKycContactLog(clientId: string | number): Observable<any[]> {
@@ -1218,14 +1092,6 @@ export class ClientsService {
     return this.http.get<any[]>('/kyc/exceptions/lapsed');
   }
 
-  /** Clients whose re-KYC falls due within the next `days` days (default 30), soonest first. */
-  getExpiringKyc(days = 30): Observable<any[]> {
-    // The caller reports a failure in its own banner, so the global popup is suppressed.
-    return this.http.get<any[]>(`/kyc/exceptions/expiring?days=${days}`, {
-      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
-    });
-  }
-
   /**
    * Savings accounts the dormancy job has marked.
    *