feat(api-management): set up each CIC bureau as an API vendor

CIBIL, Experian, Equifax and CRIF are vendors under API Management (active =
whitelisted) and the Credit Bureau dashboard reads them from there; the
separate CIC whitelist and API mapping screens are removed. Mapping tables show
the value each row finds in the sample payload, and bureau cards link to their
set-up.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

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

@@ -0,0 +1,778 @@
+/**
+ * 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

@@ -0,0 +1,61 @@
+<!--
+  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

@@ -0,0 +1,44 @@
+/**
+ * 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

@@ -0,0 +1,55 @@
+<!--
+  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

@@ -0,0 +1,25 @@
+/**
+ * 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

@@ -0,0 +1,122 @@
+<!--
+  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

@@ -0,0 +1,77 @@
+/**
+ * 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

@@ -0,0 +1,58 @@
+/**
+ * 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

@@ -0,0 +1,29 @@
+/**
+ * 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

@@ -0,0 +1,777 @@
+<!--
+  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

@@ -0,0 +1,600 @@
+/**
+ * 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

@@ -0,0 +1,172 @@
+<!--
+  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

@@ -0,0 +1,121 @@
+/**
+ * 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

@@ -73,10 +73,13 @@ 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';
@@ -189,10 +192,13 @@ export function HttpLoaderFactory(http: HttpClient) {
     NpaModule,
     ReconciliationModule,
     LoanOriginationModule,
+    CreditBureauModule,
+    ApiManagementModule,
     DigitalModule,
     LetterMgmtModule,
     AccountsModule,
     ElectionModule,
+    LoanEligibilityModule,
     SponsorDDModule,
     SponsorDDReconciliationModule,
     AppRoutingModule,

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

@@ -0,0 +1,229 @@
+<!--
+  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

@@ -0,0 +1,573 @@
+/**
+ * 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

@@ -0,0 +1,190 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+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,7 +13,15 @@
       <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>
-    <button type="button" class="pg-btn pg-btn--ghost" (click)="clear()"><mat-icon>undo</mat-icon> Clear</button>
+    <div class="ct-head-actions">
+      <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">
@@ -155,7 +163,56 @@
   <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>swap_horiz</mat-icon> Record Transfer
+      <mat-icon>send</mat-icon> Send for approval
     </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,3 +49,131 @@
   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,9 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Component, OnInit, inject } from '@angular/core';
+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 { MatFormFieldModule } from '@angular/material/form-field';
@@ -39,6 +40,7 @@ interface Denom {
     CommonModule,
     FormsModule,
     MatIconModule,
+    MatDialogModule,
     MatSnackBarModule,
     MatFormFieldModule,
     MatSelectModule,
@@ -48,6 +50,10 @@ 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;
 
   notes: Denom[] = [];
   coins: Denom[] = [];
@@ -82,7 +88,34 @@ 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 = businessToday();
     this.transferDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service.getActiveDenominations().subscribe({
@@ -245,16 +278,11 @@ 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.createCashTransfer(payload).subscribe({
-      next: (res: any) => {
-        if (res?.glWarning) {
-          this.snackBar.open(`Transfer saved (GL warning: ${res.glWarning})`, 'Close', {
-            duration: 8000,
-            panelClass: ['snack-warn']
-          });
-        } else {
-          this.snackBar.open('Cash transfer recorded', 'Close', { duration: 3000 });
-        }
+    this.service.createCashTransferRequest(payload).subscribe({
+      next: () => {
+        // Nothing has moved yet: a manager approves the allocation first, and only then does the cash leave the vault.
+        this.snackBar.open('Cash transfer sent for manager approval', 'Close', { duration: 5000 });
+        this.loadMyRequests();
         this.clear();
         this.note = '';
         this.fromParty = '';

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

@@ -83,6 +83,13 @@ 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: () =>
@@ -291,6 +298,12 @@ 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

@@ -47,8 +47,21 @@ export class CashierService {
   }
 
   // ── Cash Transfer ──
-  createCashTransfer(data: any): Observable<any> {
-    return this.http.post('/cashtransfer', data);
+  /** Cash leaves the vault only when a different person approves, so the screen raises a request, not a transfer. */
+  createCashTransferRequest(data: any): Observable<any> {
+    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);

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

@@ -202,6 +202,7 @@
               <th class="num">Amount</th>
               <th>Payment</th>
               <th>Status</th>
+              <th>Correction</th>
               <th>By</th>
               <th>Approved By</th>
               <th>Time</th>
@@ -231,6 +232,18 @@
                 <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 ?? '—' }}
@@ -256,7 +269,7 @@
                   —
                 }
               </td>
-              <td colspan="5"></td>
+              <td colspan="6"></td>
             </tr>
           </tfoot>
         </table>

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

@@ -14,6 +14,7 @@ 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.
@@ -26,6 +27,11 @@ 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;
@@ -58,7 +64,8 @@ interface DayBookRow {
   imports: [
     CommonModule,
     FormsModule,
-    MatIconModule
+    MatIconModule,
+    VoucherStatusComponent
   ]
 })
 export class DayBookComponent implements OnInit {

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

@@ -146,6 +146,7 @@
                   <th class="num">Amount</th>
                   <th>My part</th>
                   <th>Status</th>
+                  <th>Correction</th>
                   <th>Time</th>
                 </tr>
               </thead>
@@ -203,6 +204,18 @@
                         {{ 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

@@ -15,6 +15,7 @@ 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';
@@ -24,6 +25,11 @@ 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;
@@ -76,7 +82,8 @@ interface MyWorkReport {
     CommonModule,
     FormsModule,
     MatIconModule,
-    MatDialogModule
+    MatDialogModule,
+    VoucherStatusComponent
   ]
 })
 export class MyWorkComponent implements OnInit {

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

@@ -11,6 +11,7 @@ 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
@@ -18,6 +19,10 @@ 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;
@@ -58,7 +63,8 @@ export interface VoucherDetailDialogData {
     CommonModule,
     MatDialogModule,
     MatButtonModule,
-    MatIconModule
+    MatIconModule,
+    VoucherStatusComponent
   ],
   template: `
     <div class="vd-shell">
@@ -66,7 +72,15 @@ export interface VoucherDetailDialogData {
         <div class="vd-header__title">
           <mat-icon class="vd-icon">receipt_long</mat-icon>
           <div>
-            <h2>{{ detail.voucherNo }}</h2>
+            <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/transaction-entry/transaction-entry.component.html

@@ -117,6 +117,8 @@
                       <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)"
                       >
@@ -127,11 +129,16 @@
                     </div>
                     <div class="ws-f ws-f--branch">
                       <label class="ws-f__lbl" title="Branch">BRANCH</label>
-                      <select class="ws-f__ctl" [(ngModel)]="row.br" (click)="$event.stopPropagation()">
-                        <option [ngValue]="1">001 · Main</option>
-                        <option [ngValue]="2">002 · M.G. Road</option>
-                        <option [ngValue]="14">014 · Station Rd</option>
-                        <option [ngValue]="27">027 · Industrial</option>
+                      <select
+                        class="ws-f__ctl"
+                        [(ngModel)]="row.br"
+                        [disabled]="branches.length <= 1"
+                        [title]="branches.length <= 1 ? 'Your branch' : 'Branch'"
+                        (click)="$event.stopPropagation()"
+                      >
+                        @for (b of branches; track b.id) {
+                          <option [ngValue]="b.id">{{ b.label }}</option>
+                        }
                       </select>
                     </div>
                     @if (row.typ === 'DD') {
@@ -177,13 +184,7 @@
                           class="ws-f__ctl"
                           [(ngModel)]="row.acTyp"
                           (click)="$event.stopPropagation()"
-                          (change)="
-                            row.acTyp === 'GL' &&
-                              row.typ !== 'Disbursement' &&
-                              row.typ !== 'Fund Transfer' &&
-                              row.typ !== 'Enter Bank Transfer' &&
-                              (row.dbCr = 'Cr')
-                          "
+                          (change)="isCreditOnly(row) && (row.dbCr = 'Cr')"
                         >
                           @for (a of acTypOptionsFor(row); track a) {
                             <option [value]="a">{{ a }}</option>
@@ -266,12 +267,7 @@
                           type="button"
                           class="ws-seg__btn ws-seg__btn--dr"
                           [class.ws-seg__btn--active-dr]="row.dbCr === 'Dr'"
-                          [disabled]="
-                            row.acTyp === 'GL' &&
-                            row.typ !== 'Disbursement' &&
-                            row.typ !== 'Fund Transfer' &&
-                            row.typ !== 'Enter Bank Transfer'
-                          "
+                          [disabled]="isCreditOnly(row)"
                           (click)="row.dbCr = 'Dr'"
                         >
                           DR
@@ -280,6 +276,7 @@
                           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
@@ -711,70 +708,81 @@
                 <circle cx="12" cy="8" r="4" />
                 <path d="M4 20c0-4 3.6-7 8-7s8 3 8 7" />
               </svg>
-              Personal Information
+              {{ isGlAccount ? 'GL Account Information' : 'Personal Information' }}
             </div>
-            <div class="te-panel__body">
-              <div class="te-field">
-                <span class="te-label">Branch</span><span class="te-value">{{ officeName }}</span>
+            @if (isGlAccount) {
+              <div class="te-panel__body">
+                @for (f of glInfo; track f.label) {
+                  <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>
-              <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">
+            } @else {
+              <div class="te-panel__body">
                 <div class="te-field">
-                  <span class="te-label">Last Txn</span><span class="te-value">{{ lastTransactionDate }}</span>
+                  <span class="te-label">Branch</span><span class="te-value">{{ officeName }}</span>
                 </div>
                 <div class="te-field">
-                  <span class="te-label">Type</span
-                  ><span class="te-value">{{ accountDetails.depositType?.value ?? selectedRow?.acTyp ?? '—' }}</span>
+                  <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-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 -->
@@ -929,76 +937,78 @@
 
           <!-- Other Info + KYC + Account Balances -->
           <div class="te-panel">
-            <div class="te-panel__header">
-              <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" />
-                <line x1="16" y1="2" x2="16" y2="6" />
-                <line x1="8" y1="2" x2="8" y2="6" />
-                <line x1="3" y1="10" x2="21" y2="10" />
-              </svg>
-              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>
+            @if (!isGlAccount) {
+              <div class="te-panel__header">
+                <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" />
+                  <line x1="16" y1="2" x2="16" y2="6" />
+                  <line x1="8" y1="2" x2="8" y2="6" />
+                  <line x1="3" y1="10" x2="21" y2="10" />
+                </svg>
+                Other Information
               </div>
-              <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-panel__body">
                 <div class="te-field">
-                  <span class="te-label">No. of Shares Held</span
-                  ><span class="te-value te-mono">{{ accountDetails.summary?.totalApprovedShares ?? 0 }}</span>
+                  <span class="te-label">Phone No.</span><span class="te-value">{{ clientPhone }}</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
-                  >
+                  <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">Resolution No.</span
-                  ><span class="te-value te-mono">{{ accountDetails.resolutionNumber || '—' }}</span>
+                  <span class="te-label">PAN</span><span class="te-value te-mono">{{ panNumber }}</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>
+                  <span class="te-label">KYC Status</span>
+                  <span class="te-value" [style.color]="kycDetails?.kycStatus === 300 ? '#059669' : '#f59e0b'">{{
+                    kycStatus
+                  }}</span>
                 </div>
-                @if (accountDetails.linkedLoanAccountNo) {
+                <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">Linked Loan A/C No.</span
-                    ><span class="te-value te-mono">{{ accountDetails.linkedLoanAccountNo }}</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">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 te-panel__header--mt">
+            <div class="te-panel__header" [class.te-panel__header--mt]="!isGlAccount">
               <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" />
@@ -1567,6 +1577,8 @@
                           <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)"
                           >
@@ -1577,11 +1589,16 @@
                         </div>
                         <div class="ws-f ws-f--branch">
                           <label class="ws-f__lbl">BRANCH</label>
-                          <select class="ws-f__ctl" [(ngModel)]="row.br" (click)="$event.stopPropagation()">
-                            <option [ngValue]="1">001 · Main</option>
-                            <option [ngValue]="2">002 · M.G. Road</option>
-                            <option [ngValue]="14">014 · Station Rd</option>
-                            <option [ngValue]="27">027 · Industrial</option>
+                          <select
+                            class="ws-f__ctl"
+                            [(ngModel)]="row.br"
+                            [disabled]="branches.length <= 1"
+                            [title]="branches.length <= 1 ? 'Your branch' : 'Branch'"
+                            (click)="$event.stopPropagation()"
+                          >
+                            @for (b of branches; track b.id) {
+                              <option [ngValue]="b.id">{{ b.label }}</option>
+                            }
                           </select>
                         </div>
                         @if (row.typ === 'DD') {
@@ -1627,13 +1644,7 @@
                               class="ws-f__ctl"
                               [(ngModel)]="row.acTyp"
                               (click)="$event.stopPropagation()"
-                              (change)="
-                                row.acTyp === 'GL' &&
-                                  row.typ !== 'Disbursement' &&
-                                  row.typ !== 'Fund Transfer' &&
-                                  row.typ !== 'Enter Bank Transfer' &&
-                                  (row.dbCr = 'Cr')
-                              "
+                              (change)="isCreditOnly(row) && (row.dbCr = 'Cr')"
                             >
                               @for (a of acTypOptionsFor(row); track a) {
                                 <option [value]="a">{{ a }}</option>
@@ -1704,12 +1715,7 @@
                               type="button"
                               class="ws-seg__btn ws-seg__btn--dr"
                               [class.ws-seg__btn--active-dr]="row.dbCr === 'Dr'"
-                              [disabled]="
-                                row.acTyp === 'GL' &&
-                                row.typ !== 'Disbursement' &&
-                                row.typ !== 'Fund Transfer' &&
-                                row.typ !== 'Enter Bank Transfer'
-                              "
+                              [disabled]="isCreditOnly(row)"
                               (click)="$event.stopPropagation(); row.dbCr = 'Dr'"
                             >
                               DR
@@ -1718,6 +1724,7 @@
                               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
@@ -2043,7 +2050,13 @@
               <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 class="ws-btn ws-btn--add" type="button" (click)="addRow()" title="Add another transaction row">
+                <button
+                  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.ts

@@ -1658,6 +1658,8 @@ 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[] = [];
@@ -1685,10 +1687,12 @@ 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 (see submitGlJournalEntry).
+   *  that account is never the one physical notes actually moved through.
    *  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;
@@ -1873,6 +1877,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     const d = businessToday();
     this.today = `${String(d.getDate()).padStart(2, '0')}/${String(d.getMonth() + 1).padStart(2, '0')}/${d.getFullYear()}`;
+    this.loadBranches();
     this.addRow();
     this.loadDenominations();
     this.loadOpeningPosition();
@@ -1903,7 +1908,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         distinctUntilChanged((a, b) => a.value === b.value && a.row === b.row)
       )
       .subscribe(({ row, index, value }) => {
-        if (value.trim().length >= 4) {
+        // Searches on its own once six characters are typed, for clerk and cashier alike.
+        if (value.trim().length >= TransactionEntryComponent.AC_NO_AUTO_SEARCH_MIN_LENGTH) {
           this.selectedRow = row;
           this.loadAccountDetails(value.trim(), row.acTyp);
         }
@@ -2304,7 +2310,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: 1,
+      br: this.defaultBranchId,
       trTp: '',
       acTyp: 'SD',
       acNo: '',
@@ -2323,8 +2329,54 @@ 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';
@@ -2440,7 +2492,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' && row.dbCr === 'Cr';
+    return row.acTyp === 'GL';
   }
 
   /**
@@ -2618,14 +2670,47 @@ 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 map: Record<number, string> = {
-      1: '001 · Main',
-      2: '002 · M.G. Road',
-      14: '014 · Station Rd',
-      27: '027 · Industrial'
-    };
-    return map[branchId] || `Branch ${branchId}`;
+    return this.branches.find((b) => b.id === branchId)?.label ?? `Branch ${branchId}`;
   }
 
   /**
@@ -3918,7 +4003,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     SAVINGS: 'SD',
     CURRENT: 'CA',
     FIXED_DEPOSIT: 'FD',
-    RECURRING_DEPOSIT: 'RD'
+    RECURRING_DEPOSIT: 'RD',
+    GL: 'GL'
   };
 
   openCustomerSearch(): void {
@@ -4243,6 +4329,17 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       }
       this.accountDetails = acc;
       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) {
@@ -4813,6 +4910,40 @@ 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 || '—' }
+    ];
+  }
+
   get openingDate(): string {
     const raw =
       this.accountDetails?.timeline?.submittedOnDate ??
@@ -5155,6 +5286,20 @@ 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.
@@ -5232,7 +5377,9 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         return;
       }
 
-      // Bank transfer: only savings (SD) or current (CA/CB) accounts allowed
+      // Bank transfer: savings (SD) or current (CA/CB) accounts on either side, plus a Fixed Deposit (FD) on
+      // 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',
@@ -5240,13 +5387,13 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       ]);
       const invalidAccounts = [
         ...drRows,
-        ...crRows
+        ...crRows.filter((r) => r.acTyp !== 'FD')
       ].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(', ')}`,
-          'Only Savings (SD) and Current (CA) accounts are permitted.',
-          'GL, FD and SHR accounts are not allowed — use Disbursement/Collection instead.',
+          'Debit side: only Savings (SD) and Current (CA) accounts. Credit side: SD, CA or a Fixed Deposit (FD).',
+          'GL and SHR accounts are not allowed — use Disbursement/Collection instead.',
           'RD installments are paid through a cashier Receipt or Auto Debit.'
         ]);
         return;
@@ -5847,10 +5994,14 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    // GL withdrawal → direct journal entry (no maker-checker)
-    // GL deposit → falls through to maker-checker block below
-    if (row.acTyp === 'GL' && !isDeposit) {
-      this.submitGlJournalEntry(row, amount, isDeposit);
+    // A GL withdrawal slip is raised by the clerk and paid by the cashier against its token, exactly like a
+    // savings withdrawal (the clerk branch and the token branch below). Nothing posts from this screen directly:
+    // manual journal entries are switched off on the server.
+    if (row.acTyp === 'GL' && !isDeposit && !this.clerkMode && !this.activeWithdrawalRequest) {
+      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;
     }
 
@@ -6223,17 +6374,34 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     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: this.accountDetails.accountNo,
+      accountNo: isGl ? (this.accountDetails.glCode ?? this.accountDetails.name) : this.accountDetails.accountNo,
       accountType: this.creditEntryAccountType(row.acTyp),
-      savingsAccountId: this.accountDetails.id,
-      clientId: this.accountDetails.clientId ?? this.clientDetails?.id ?? null,
-      clientName: this.clientDetails?.displayName ?? this.accountDetails?.clientName ?? null,
+      savingsAccountId: isGl ? null : this.accountDetails.id,
+      // GL-specific fields: the GL being paid out of and the cash GL it is paid from (null for other types)
+      glAccountId: isGl ? this.accountDetails.id : 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: row.description || null,
+      description: description || null,
       chequeNo: row.chequeNo || null,
       bankName: row.bankName || null,
       tokNo: row.tokNo?.trim() || null,
@@ -6425,106 +6593,6 @@ 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 = businessToday();
-    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/voucher-correction-approvals/voucher-correction-approvals.component.html

@@ -0,0 +1,170 @@
+<!--
+  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

@@ -0,0 +1,485 @@
+/**
+ * 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

@@ -0,0 +1,192 @@
+/**
+ * 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

@@ -0,0 +1,120 @@
+/**
+ * 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

@@ -0,0 +1,446 @@
+<!--
+  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

@@ -0,0 +1,599 @@
+/**
+ * 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

@@ -0,0 +1,307 @@
+/**
+ * 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,6 +169,7 @@
               <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
@@ -217,6 +218,18 @@
                   </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,3 +92,8 @@
   text-transform: uppercase;
   color: #7c3aed;
 }
+
+.vr-active {
+  font-size: 11px;
+  color: #94a3b8;
+}

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

@@ -14,6 +14,7 @@ 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.
@@ -26,6 +27,11 @@ 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;
@@ -82,7 +88,8 @@ interface VoucherReport {
   imports: [
     CommonModule,
     FormsModule,
-    MatIconModule
+    MatIconModule,
+    VoucherStatusComponent
   ]
 })
 export class VoucherReportComponent implements OnInit {

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

@@ -0,0 +1,137 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { 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/core/shell/shell.component.html

@@ -131,6 +131,14 @@
             </svg>
             My Closure Requests
           </a>
+          <a
+            class="cashier-nav__item cashier-nav__item--sec"
+            [class.cashier-nav__item--active]="currentUrl.includes('/clerk/voucher-correction')"
+            [routerLink]="['/clerk/voucher-correction']"
+          >
+            <fa-icon icon="undo"></fa-icon>
+            Voucher Correction
+          </a>
           @if (clerkAccountLoaded) {
             <div class="cashier-nav__item-wrap">
               <a
@@ -287,6 +295,13 @@
           <a class="cashier-nav__item" [routerLink]="['/cashier/my-work']" routerLinkActive="cashier-nav__item--active">
             <fa-icon icon="user-check"></fa-icon> My Vouchers
           </a>
+          <a
+            class="cashier-nav__item"
+            [routerLink]="['/cashier/voucher-correction']"
+            routerLinkActive="cashier-nav__item--active"
+          >
+            <fa-icon icon="undo"></fa-icon> Voucher Correction
+          </a>
           <a
             class="cashier-nav__item"
             [routerLink]="['/cashier/received-report']"
@@ -392,6 +407,15 @@
           <fa-icon icon="clipboard-check" class="ni-ico"></fa-icon>Loan Origination
           <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
         </a>
+        <a
+          class="ni"
+          tabindex="0"
+          routerLink="/credit-bureau/dashboard"
+          routerLinkActive="active"
+          *mifosxHasPermission="'MENU_CREDIT_BUREAU'"
+        >
+          <fa-icon icon="id-card" class="ni-ico"></fa-icon>Credit Bureau
+        </a>
         <a class="ni" tabindex="0" [matMenuTriggerFor]="advancesMenu" *mifosxHasPermission="'MENU_ADVANCES'">
           <fa-icon icon="hand-holding-usd" class="ni-ico"></fa-icon>Advances
           <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
@@ -493,6 +517,16 @@
             ><span class="ni-short">Loans</span>
             <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
           </a>
+          <a
+            class="ni"
+            tabindex="0"
+            routerLink="/credit-bureau/dashboard"
+            routerLinkActive="active"
+            *mifosxHasPermission="'MENU_CREDIT_BUREAU'"
+          >
+            <fa-icon icon="id-card" class="ni-ico"></fa-icon><span class="ni-full">Credit Bureau</span
+            ><span class="ni-short">CIC</span>
+          </a>
           <a
             class="ni"
             tabindex="0"
@@ -1164,6 +1198,9 @@
           <button mat-menu-item tabindex="0" [routerLink]="['/system/denomination-master']">
             <fa-icon icon="coins" class="menu-item-icon"></fa-icon> Cash Denomination
           </button>
+          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/voucher-correction']">
+            <fa-icon icon="undo" class="menu-item-icon"></fa-icon> Voucher Correction
+          </button>
         </div>
 
         <!-- Transfers & Settlement -->

src/app/core/shell/toolbar/toolbar.component.html

@@ -154,7 +154,7 @@
         <fa-icon icon="hand-holding-usd" class="ai-col-h-ic"></fa-icon>
         <span>Lending &amp; Risk</span>
       </div>
-      <button mat-menu-item class="ai-card" tabindex="0">
+      <button mat-menu-item class="ai-card" routerLink="/ai/loan-eligibility" tabindex="0">
         <span class="ai-card-ic"><fa-icon icon="hand-holding-usd"></fa-icon></span>
         <span class="ai-card-body">
           <span class="ai-card-t">Loan Eligibility</span>
@@ -239,6 +239,27 @@
         </span>
       </button>
     </div>
+
+    <div class="ai-col ai-col--blue">
+      <div class="ai-col-h">
+        <fa-icon icon="sitemap" class="ai-col-h-ic"></fa-icon>
+        <span>API Management</span>
+      </div>
+      <button mat-menu-item class="ai-card" routerLink="/api-management/vendors" tabindex="0">
+        <span class="ai-card-ic"><fa-icon icon="cogs"></fa-icon></span>
+        <span class="ai-card-body">
+          <span class="ai-card-t">API Vendors &amp; Setup</span>
+          <span class="ai-card-d">Vendor, work and API set — IN / OUT (CIC bureaus, SMS, WhatsApp …)</span>
+        </span>
+      </button>
+      <button mat-menu-item class="ai-card" routerLink="/api-management/logs" tabindex="0">
+        <span class="ai-card-ic"><fa-icon icon="history"></fa-icon></span>
+        <span class="ai-card-body">
+          <span class="ai-card-t">API Call Logs</span>
+          <span class="ai-card-d">Every IN and OUT call with request and response</span>
+        </span>
+      </button>
+    </div>
   </div>
 
   <div class="ai-menu-footer">

src/app/core/shell/toolbar/toolbar.component.scss

@@ -373,7 +373,7 @@ $icon-hover-border: rgb(255 255 255 / 28%);
 // ===== AI Mega Menu Panel =====
 ::ng-deep .ai-menu {
   &.mat-mdc-menu-panel {
-    min-width: 880px !important;
+    min-width: 1080px !important;
     max-width: 96vw !important;
     max-height: 80vh;
     border-radius: 14px !important;
@@ -520,7 +520,7 @@ $icon-hover-border: rgb(255 255 255 / 28%);
 // ===== Mega Layout — 4 colour-coded columns =====
 .ai-menu-cols {
   display: grid;
-  grid-template-columns: repeat(4, 1fr);
+  grid-template-columns: repeat(5, 1fr);
   gap: 0;
   padding: 14px 14px 6px;
   background: #f8fafc;
@@ -567,6 +567,12 @@ $icon-hover-border: rgb(255 255 255 / 28%);
   --c-hover: #be185d;
 }
 
+.ai-col--blue {
+  --c-color: #0369a1;
+  --c-bg: #e0f2fe;
+  --c-hover: #0369a1;
+}
+
 .ai-col-h {
   display: flex;
   align-items: center;
@@ -702,7 +708,7 @@ $icon-hover-border: rgb(255 255 255 / 28%);
 }
 
 // Responsive collapse
-@media (width <= 1100px) {
+@media (width <= 1300px) {
   ::ng-deep .ai-menu.mat-mdc-menu-panel {
     min-width: 680px !important;
   }

src/app/credit-bureau/cic-alert-detail/cic-alert-detail.component.html

@@ -0,0 +1,252 @@
+<!--
+  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-modal-backdrop" (click)="closed.emit()">
+  <div class="cic-modal" style="width: min(980px, 100%)" (click)="$event.stopPropagation()">
+    @if (loading && !alert) {
+      <div class="cic-empty">Loading…</div>
+    }
+    @if (alert) {
+      @if (history.length) {
+        <div class="cic-alert info" style="margin-bottom: 12px">
+          You are viewing another enquiry of this customer.
+          <button class="cic-btn sm" style="margin-left: 8px" (click)="back()">← Back to previous enquiry</button>
+        </div>
+      }
+      <div style="display: flex; justify-content: space-between; gap: 12px; align-items: flex-start">
+        <div>
+          <h3 style="margin-bottom: 4px">
+            {{ alert.clientName || alert.customerName || 'Unknown customer' }} applied for
+            {{ alert.loanType || 'a loan' }} elsewhere
+          </h3>
+          <div class="muted" style="font-size: 12px">
+            {{ alert.bureauCode }} alert · {{ alert.alertKey }} · received {{ alert.receivedOn | slice: 0 : 16 }} via
+            {{ alert.receivedVia }}
+          </div>
+        </div>
+        <div class="cic-actions">
+          <span class="cic-badge" [class]="'cic-badge ' + statusTone(alert.status)">{{ alert.status }}</span>
+          <button class="cic-btn sm" (click)="closed.emit()">Close</button>
+        </div>
+      </div>
+
+      @if (error) {
+        <div class="cic-alert error" style="margin-top: 12px">{{ error }}</div>
+      }
+      @if (info) {
+        <div class="cic-alert success" style="margin-top: 12px">{{ info }}</div>
+      }
+
+      <div class="cic-grid cols-3" style="margin-top: 14px">
+        <div class="cic-stat">
+          <div class="k">Loan applied for</div>
+          <div class="v" style="font-size: 17px">{{ alert.loanType || '—' }}</div>
+        </div>
+        <div class="cic-stat">
+          <div class="k">Amount</div>
+          <div class="v" style="font-size: 20px">
+            {{ alert.amount !== null && alert.amount !== undefined ? '₹' + (alert.amount | number: '1.0-0') : '—' }}
+          </div>
+        </div>
+        <div class="cic-stat">
+          <div class="k">Enquiry date</div>
+          <div class="v" style="font-size: 17px">{{ alert.enquiryDate | date: 'dd MMM yyyy' }}</div>
+        </div>
+      </div>
+
+      <div class="cic-split" style="margin-top: 14px">
+        <div class="cic-card" style="margin-bottom: 0">
+          <h2>
+            Enquiry elsewhere
+            <span class="cic-card-sub">the CIC does not name the lender</span>
+          </h2>
+          <dl class="cic-kv" style="grid-template-columns: 140px minmax(0, 1fr)">
+            <dt>Loan type</dt>
+            <dd>{{ alert.loanType || '—' }}</dd>
+            <dt>Amount</dt>
+            <dd>
+              {{ alert.amount !== null && alert.amount !== undefined ? '₹' + (alert.amount | number: '1.0-2') : '—' }}
+            </dd>
+            <dt>Purpose</dt>
+            <dd>{{ alert.purpose || '—' }}</dd>
+            <dt>Place</dt>
+            <dd>{{ alert.location || '—' }}</dd>
+            <dt>Enquiry date</dt>
+            <dd>{{ alert.enquiryDate | date: 'dd MMM yyyy' }}</dd>
+          </dl>
+        </div>
+        <div class="cic-card" style="margin-bottom: 0">
+          <h2>
+            Our customer
+            @if (!alert.clientId) {
+              <button
+                class="cic-btn sm primary"
+                (click)="linkCustomer()"
+                [disabled]="saving"
+                *mifosxHasPermission="'UPDATE_CICALERT'"
+              >
+                Link to customer
+              </button>
+            }
+          </h2>
+          <dl class="cic-kv" style="grid-template-columns: 140px minmax(0, 1fr)">
+            <dt>Customer</dt>
+            <dd>
+              @if (alert.clientId) {
+                <a [routerLink]="['/clients', alert.clientId, 'general']" (click)="closed.emit()">{{
+                  alert.clientName
+                }}</a>
+                <span class="muted"> · {{ alert.clientAccountNo }}</span>
+              } @else {
+                <span class="tone-bad">Not matched to any customer</span>
+              }
+            </dd>
+            <dt>Branch</dt>
+            <dd>{{ alert.officeName || '—' }}</dd>
+            <dt>Matched by</dt>
+            <dd>{{ matchLabels[alert.matchType] || alert.matchType }}</dd>
+            <dt>Name at bureau</dt>
+            <dd>{{ alert.customerName || '—' }}</dd>
+            <dt>PAN / Aadhaar</dt>
+            <dd class="cic-mono">{{ alert.panMasked || '—' }} / {{ alert.aadhaarMasked || '—' }}</dd>
+            @if (alert.customerRef) {
+              <dt>Reference</dt>
+              <dd class="cic-mono">{{ alert.customerRef }}</dd>
+            }
+          </dl>
+        </div>
+      </div>
+
+      @if (alert.clientId) {
+        <div class="cic-card" style="margin-top: 14px; margin-bottom: 0">
+          <h2>
+            Customer's loans with us
+            <span class="cic-card-sub">outstanding ₹{{ exposure | number: '1.0-0' }}</span>
+          </h2>
+          @if (alert.clientLoans?.length) {
+            <div class="cic-table-wrap">
+              <table class="cic-table">
+                <thead>
+                  <tr>
+                    <th>Account</th>
+                    <th>Product</th>
+                    <th>Status</th>
+                    <th class="num">Principal</th>
+                    <th class="num">Outstanding</th>
+                    <th>Disbursed</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (l of alert.clientLoans; track l.id) {
+                    <tr>
+                      <td class="cic-mono">{{ l.accountNo }}</td>
+                      <td>{{ l.productName }}</td>
+                      <td>{{ l.status }}</td>
+                      <td class="num">{{ l.principal | number: '1.0-0' }}</td>
+                      <td class="num">{{ l.outstanding | number: '1.0-0' }}</td>
+                      <td>{{ l.disbursedOn | date: 'dd MMM yyyy' }}</td>
+                    </tr>
+                  }
+                </tbody>
+              </table>
+            </div>
+          } @else {
+            <div class="muted" style="font-size: 13px">
+              No loan with us. A customer with deposits only who is borrowing elsewhere may be a cross-sell opportunity.
+            </div>
+          }
+        </div>
+      }
+
+      @if (alert.otherAlertsOfCustomer?.length) {
+        <div class="cic-card" style="margin-top: 14px; margin-bottom: 0">
+          <h2>
+            All enquiries on this customer
+            <span class="cic-card-sub">{{ customerEnquiries.length }} in total</span>
+          </h2>
+          <div class="cic-table-wrap">
+            <table class="cic-table">
+              <thead>
+                <tr>
+                  <th>Date</th>
+                  <th>Loan type</th>
+                  <th class="num">Amount</th>
+                  <th>Status</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (o of customerEnquiries; track o.id) {
+                  <tr
+                    class="clickable"
+                    [style.background]="o.id === alert.id ? '#eef4ff' : null"
+                    (click)="o.id !== alert.id && openOther(o.id)"
+                  >
+                    <td>{{ o.enquiryDate | date: 'dd MMM yyyy' }}</td>
+                    <td>
+                      {{ o.loanType }}
+                      @if (o.id === alert.id) {
+                        <b>(shown above)</b>
+                      }
+                    </td>
+                    <td class="num">{{ o.amount | number: '1.0-0' }}</td>
+                    <td>
+                      <span class="cic-badge" [class]="'cic-badge ' + statusTone(o.status)">{{ o.status }}</span>
+                    </td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </div>
+      }
+
+      @if (alert.remarks || alert.actionedByName) {
+        <div class="cic-alert info" style="margin-top: 14px">
+          <b>{{ alert.status }}</b> by {{ alert.actionedByName }} on {{ alert.actionedOn | slice: 0 : 16 }}
+          @if (alert.remarks) {
+            — {{ alert.remarks }}
+          }
+        </div>
+      }
+
+      <ng-container *mifosxHasPermission="'UPDATE_CICALERT'">
+        @if (action) {
+          <div class="cic-field" style="margin-top: 14px">
+            <label>{{ action === 'ACTIONED' ? 'What was done' : 'Reason for dismissing' }}</label>
+            <textarea rows="3" [(ngModel)]="remarks" maxlength="1000"></textarea>
+          </div>
+        }
+        <div class="foot">
+          @if (action) {
+            <button class="cic-btn" (click)="action = null">Cancel</button>
+            <button class="cic-btn primary" (click)="confirmAction()" [disabled]="saving">
+              {{ action === 'ACTIONED' ? 'Save as actioned' : 'Dismiss alert' }}
+            </button>
+          } @else {
+            @if (alert.status === 'ACTIONED' || alert.status === 'DISMISSED') {
+              <button class="cic-btn" (click)="setStatus('SEEN', null)" [disabled]="saving">Reopen</button>
+            }
+            @if (alert.status !== 'DISMISSED') {
+              <button class="cic-btn danger" (click)="action = 'DISMISSED'">Dismiss</button>
+            }
+            @if (alert.status !== 'ACTIONED') {
+              <button class="cic-btn primary" (click)="action = 'ACTIONED'">Mark actioned</button>
+            }
+          }
+        </div>
+      </ng-container>
+
+      <div style="margin-top: 12px">
+        <button class="cic-btn sm" (click)="showRaw = !showRaw">{{ showRaw ? 'Hide' : 'Show' }} bureau data</button>
+        @if (showRaw) {
+          <pre class="cic-code" style="margin-top: 8px">{{ rawText() }}</pre>
+        }
+      </div>
+    }
+  </div>
+</div>

src/app/credit-bureau/cic-alert-detail/cic-alert-detail.component.ts

@@ -0,0 +1,181 @@
+/**
+ * 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, OnChanges, Output, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { MatDialog, MatDialogModule } from '@angular/material/dialog';
+import { RouterModule } from '@angular/router';
+
+import { HasPermissionDirective } from 'app/directives/has-permission/has-permission.directive';
+import {
+  CustomerSearchDialogComponent,
+  CustomerSearchResult
+} from 'app/shared/customer-search-dialog/customer-search-dialog.component';
+import { CIC_MATCH_LABELS, CicAlert, CicService, cicError, cicStatusTone } from '../cic.service';
+
+/**
+ * One enquiry alert: which of our customers applied elsewhere (the CIC does not name the lender), for what loan and
+ * how much; the customer's
+ * loans with us and earlier alerts; and the follow-up (seen / actioned / dismissed, or linking an unmatched alert).
+ */
+@Component({
+  selector: 'mifosx-cic-alert-detail',
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    RouterModule,
+    MatDialogModule,
+    HasPermissionDirective
+  ],
+  templateUrl: './cic-alert-detail.component.html',
+  styleUrls: ['../cic-shared.scss']
+})
+export class CicAlertDetailComponent implements OnChanges {
+  private cic = inject(CicService);
+  private dialog = inject(MatDialog);
+
+  @Input() alertId: number | null = null;
+  @Output() closed = new EventEmitter<void>();
+  @Output() changed = new EventEmitter<CicAlert>();
+
+  alert: CicAlert | null = null;
+  loading = false;
+  saving = false;
+  error: string | null = null;
+  info: string | null = null;
+  showRaw = false;
+
+  /** Alerts visited before the current one, so the user can go back after opening another enquiry of the customer. */
+  history: number[] = [];
+  private autoSeen = true;
+
+  action: 'ACTIONED' | 'DISMISSED' | null = null;
+  remarks = '';
+
+  readonly matchLabels = CIC_MATCH_LABELS;
+  readonly statusTone = cicStatusTone;
+
+  ngOnChanges(): void {
+    this.history = [];
+    this.autoSeen = true;
+    if (this.alertId) this.load();
+  }
+
+  openOther(id: number): void {
+    if (this.alertId) this.history.push(this.alertId);
+    this.alertId = id;
+    // Only the alert opened from the dashboard counts as "seen"; browsing the customer's other enquiries changes nothing.
+    this.autoSeen = false;
+    this.load();
+  }
+
+  back(): void {
+    const id = this.history.pop();
+    if (!id) return;
+    this.alertId = id;
+    this.autoSeen = false;
+    this.load();
+  }
+
+  load(): void {
+    if (!this.alertId) return;
+    this.loading = true;
+    this.error = null;
+    this.info = null;
+    this.action = null;
+    this.remarks = '';
+    this.cic.alert(this.alertId).subscribe({
+      next: (a) => {
+        this.alert = a;
+        this.loading = false;
+        setTimeout(() => document.querySelector('.cic-modal')?.scrollTo({ top: 0 }));
+        // Opening a new alert is seeing it.
+        if (this.autoSeen && a.status === 'NEW' && a.clientId) this.setStatus('SEEN', null, true);
+      },
+      error: (e) => {
+        this.loading = false;
+        this.error = cicError(e, 'Could not load the alert.');
+      }
+    });
+  }
+
+  setStatus(status: string, remarks: string | null, quiet = false): void {
+    if (!this.alert) return;
+    this.saving = true;
+    this.error = null;
+    this.cic.updateStatus(this.alert.id, status, remarks).subscribe({
+      next: (a) => {
+        this.saving = false;
+        this.alert = a;
+        this.action = null;
+        this.remarks = '';
+        if (!quiet) this.info = `Alert marked ${status.toLowerCase()}.`;
+        this.changed.emit(a);
+      },
+      error: (e) => {
+        this.saving = false;
+        // A user without UPDATE_CICALERT can still read; the automatic "seen" is then simply skipped.
+        if (!quiet) this.error = cicError(e, 'Could not update the alert.');
+      }
+    });
+  }
+
+  confirmAction(): void {
+    if (!this.action) return;
+    if (!this.remarks.trim()) {
+      this.error =
+        this.action === 'ACTIONED'
+          ? 'Write what was done (customer contacted, retention offer made, limit reviewed ...).'
+          : 'Write why the alert is dismissed.';
+      return;
+    }
+    this.setStatus(this.action, this.remarks.trim());
+  }
+
+  linkCustomer(): void {
+    if (!this.alert) return;
+    this.dialog
+      .open(CustomerSearchDialogComponent, { width: '960px', maxWidth: '95vw', data: { requireAccount: false } })
+      .afterClosed()
+      .subscribe((r: CustomerSearchResult | undefined) => {
+        if (!r?.clientId || !this.alert) return;
+        this.saving = true;
+        this.cic.linkClient(this.alert.id, r.clientId).subscribe({
+          next: (a) => {
+            this.saving = false;
+            this.alert = a;
+            this.info = `Alert linked to ${a.clientName}.`;
+            this.changed.emit(a);
+          },
+          error: (e) => {
+            this.saving = false;
+            this.error = cicError(e, 'Could not link the customer.');
+          }
+        });
+      });
+  }
+
+  /** All of the customer's enquiries, this one included, in a fixed order so the list does not reshuffle when one is opened. */
+  get customerEnquiries(): CicAlert[] {
+    if (!this.alert) return [];
+    return [
+      this.alert,
+      ...(this.alert.otherAlertsOfCustomer ?? [])
+    ].sort((x, y) => (y.enquiryDate ?? '').localeCompare(x.enquiryDate ?? '') || y.id - x.id);
+  }
+
+  get exposure(): number {
+    return (this.alert?.clientLoans ?? []).reduce((s, l) => s + Number(l.outstanding ?? 0), 0);
+  }
+
+  rawText(): string {
+    return JSON.stringify(this.alert?.raw ?? {}, null, 2);
+  }
+}

src/app/credit-bureau/cic-dashboard/cic-dashboard.component.html

@@ -0,0 +1,262 @@
+<!--
+  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>Credit Bureau — Customer Enquiry Alerts</h1>
+      <p>
+        Our customers who applied for a loan at another bank or NBFC, as reported by the CIC (CIBIL, Experian, Equifax,
+        CRIF): what loan and how much. The CIC does not tell which bank or lender it was.
+      </p>
+    </div>
+    <div class="cic-actions">
+      <select [(ngModel)]="days" (ngModelChange)="load()" class="cic-btn" style="padding-right: 8px">
+        <option [ngValue]="7">Last 7 days</option>
+        <option [ngValue]="30">Last 30 days</option>
+        <option [ngValue]="90">Last 90 days</option>
+        <option [ngValue]="180">Last 180 days</option>
+      </select>
+      <a class="cic-btn" routerLink="/credit-bureau/fetch-log">Fetch log</a>
+      @if (whitelisted.length) {
+        <button
+          class="cic-btn primary"
+          (click)="fetchNow('ALL')"
+          [disabled]="fetching !== null"
+          *mifosxHasPermission="'FETCH_CICALERT'"
+        >
+          {{ fetching === 'ALL' ? 'Fetching…' : 'Fetch alerts now' }}
+        </button>
+      }
+    </div>
+  </div>
+
+  @if (error) {
+    <div class="cic-alert error">{{ error }}</div>
+  }
+  @if (info) {
+    <div class="cic-alert success">{{ info }}</div>
+  }
+  @if (data && !whitelisted.length) {
+    <div class="cic-alert warn">
+      No CIC is whitelisted yet, so no alerts are being received. Switch a bureau on (CIBIL, Experian, Equifax or CRIF)
+      under AI / Intelligence Modules → API Management → API Vendors &amp; Setup.
+    </div>
+  }
+  @if (loading && !data) {
+    <div class="cic-card cic-empty">Loading…</div>
+  }
+
+  @if (data) {
+    <div class="cic-grid cols-4" style="margin-bottom: 16px">
+      <div class="cic-stat">
+        <div class="k">New alerts</div>
+        <div class="v" [class.tone-bad]="data.newAlerts > 0">{{ data.newAlerts }}</div>
+        <div class="s">not yet looked at</div>
+      </div>
+      <div class="cic-stat">
+        <div class="k">Customers enquired elsewhere</div>
+        <div class="v">{{ data.customersInPeriod }}</div>
+        <div class="s">{{ data.alertsInPeriod }} enquiries · last {{ days }} days</div>
+      </div>
+      <div class="cic-stat">
+        <div class="k">Amount applied elsewhere</div>
+        <div class="v">₹{{ data.amountInPeriod | number: '1.0-0' }}</div>
+        <div class="s">in total · last {{ days }} days</div>
+      </div>
+      <div class="cic-stat">
+        <div class="k">Unmatched alerts</div>
+        <div class="v" [class.tone-warn]="data.unmatchedOpen > 0">{{ data.unmatchedOpen }}</div>
+        <div class="s">bureau sent, customer not found · {{ data.receivedToday }} received today</div>
+      </div>
+    </div>
+
+    <!-- Recent -->
+    <div class="cic-card">
+      <h2>Latest enquiries on our customers</h2>
+      @if (data.recent?.length) {
+        <div class="cic-table-wrap">
+          <table class="cic-table">
+            <thead>
+              <tr>
+                <th>Enquiry date</th>
+                <th>Our customer</th>
+                <th>Branch</th>
+                <th>Loan type</th>
+                <th class="num">Amount (₹)</th>
+                <th>Purpose</th>
+                <th>Bureau</th>
+                <th>Status</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (a of data.recent; track a.id) {
+                <tr class="clickable" (click)="openAlertId = a.id">
+                  <td>{{ a.enquiryDate | date: 'dd MMM yyyy' }}</td>
+                  <td>
+                    <b>{{ a.clientName }}</b>
+                    <div class="muted" style="font-size: 11px">{{ a.clientAccountNo }}</div>
+                  </td>
+                  <td>{{ a.officeName }}</td>
+                  <td>{{ a.loanType }}</td>
+                  <td class="num">{{ a.amount | number: '1.0-0' }}</td>
+                  <td>{{ a.purpose }}</td>
+                  <td>{{ a.bureauCode }}</td>
+                  <td>
+                    <span class="cic-badge" [class]="'cic-badge ' + statusTone(a.status)">{{ a.status }}</span>
+                  </td>
+                </tr>
+              }
+            </tbody>
+          </table>
+        </div>
+      } @else {
+        <div class="cic-empty">
+          No enquiry alerts yet. They appear here as soon as a CIC reports one of our customers.
+        </div>
+      }
+    </div>
+
+    <div class="cic-split">
+      <!-- Repeat customers -->
+      <div class="cic-card">
+        <h2>
+          Customers applying elsewhere repeatedly
+          <span class="cic-card-sub">2+ enquiries · last {{ days }} days</span>
+        </h2>
+        @if (data.repeatCustomers?.length) {
+          <div class="cic-table-wrap">
+            <table class="cic-table">
+              <thead>
+                <tr>
+                  <th>Customer</th>
+                  <th class="num">Enquiries</th>
+                  <th class="num">Total applied (₹)</th>
+                  <th>Last</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (c of data.repeatCustomers; track c.clientId) {
+                  <tr>
+                    <td>
+                      <b>{{ c.clientName }}</b>
+                      <div class="muted" style="font-size: 11px">{{ c.accountNo }}</div>
+                    </td>
+                    <td class="num tone-bad">
+                      <b>{{ c.alerts }}</b>
+                    </td>
+                    <td class="num">{{ c.amount | number: '1.0-0' }}</td>
+                    <td>{{ c.lastEnquiryDate | date: 'dd MMM' }}</td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        } @else {
+          <div class="cic-empty">No customer has more than one enquiry in this period.</div>
+        }
+      </div>
+
+      <!-- Trend -->
+      <div class="cic-card">
+        <h2>Enquiries per day <span class="cic-card-sub">last 14 days</span></h2>
+        <div class="cic-trend">
+          @for (p of data.trend14Days; track p.date) {
+            <div
+              class="col"
+              [title]="(p.date | date: 'dd MMM') + ': ' + p.count + ' enquiries, ₹' + (p.amount | number: '1.0-0')"
+            >
+              <span class="n">{{ p.count || '' }}</span>
+              <div class="bar" [style.height.%]="pct(p.count, data.trend14Days, 'count')"></div>
+              <span class="d">{{ p.date | date: 'dd' }}</span>
+            </div>
+          }
+        </div>
+      </div>
+    </div>
+
+    <div>
+      <div class="cic-card" style="margin-bottom: 0">
+        <h2>By loan type</h2>
+        @for (g of data.byLoanType; track g.label) {
+          <div style="margin-bottom: 10px">
+            <div style="display: flex; justify-content: space-between; font-size: 12px; margin-bottom: 4px">
+              <span>{{ g.label }}</span>
+              <span class="muted">{{ g.count }} · ₹{{ g.amount | number: '1.0-0' }}</span>
+            </div>
+            <div class="cic-bar"><div [style.width.%]="pct(g.count, data.byLoanType, 'count')"></div></div>
+          </div>
+        } @empty {
+          <div class="cic-empty">No data.</div>
+        }
+      </div>
+    </div>
+
+    <!-- Bureau fetch status -->
+    <div class="cic-card" style="margin-top: 16px">
+      <h2>
+        Alert feed from each CIC
+        <a class="cic-btn sm" routerLink="/credit-bureau/fetch-log">Fetch log</a>
+      </h2>
+      <div class="cic-grid cols-4">
+        @for (b of data.bureaus; track b.id) {
+          <div class="cic-stat">
+            <div style="display: flex; justify-content: space-between; align-items: center; gap: 6px">
+              <b>{{ b.code }}</b>
+              <span class="cic-badge" [class.good]="b.whitelisted">{{ b.whitelisted ? 'Whitelisted' : 'Off' }}</span>
+            </div>
+            <div class="s" style="margin-top: 6px">
+              {{ b.environment }} · {{ b.autoFetch ? 'auto every ' + b.intervalMin + ' min' : 'manual fetch only' }}
+            </div>
+            <div class="s">
+              Last fetch:
+              @if (b.lastFetchOn) {
+                <span class="cic-badge" [class]="'cic-badge ' + fetchTone(b.lastFetchStatus)">{{
+                  b.lastFetchStatus
+                }}</span>
+                {{ b.lastFetchOn | slice: 0 : 16 }}
+              } @else {
+                never
+              }
+            </div>
+            @if (b.lastFetchMessage) {
+              <div class="s" style="font-size: 11px">{{ b.lastFetchMessage }}</div>
+            }
+            <div class="s" style="font-size: 11px; margin-top: 4px">
+              @if (b.environment === 'SIMULATOR') {
+                Simulator: no call goes to {{ b.code }}; the alerts are made up by the CBS for testing.
+              } @else {
+                Calls {{ b.code }} {{ b.environment }} with the API set up under API Management.
+              }
+            </div>
+            @if (b.whitelisted) {
+              <button
+                class="cic-btn sm"
+                style="margin-top: 8px"
+                (click)="fetchNow(b.id)"
+                [disabled]="fetching !== null"
+                *mifosxHasPermission="'FETCH_CICALERT'"
+              >
+                {{ fetching === b.id ? 'Fetching…' : 'Fetch now' }}
+              </button>
+            }
+            <a class="cic-btn sm" style="margin-top: 8px; margin-left: 4px" [routerLink]="setupRoute(b.code)">Set up</a>
+          </div>
+        }
+      </div>
+    </div>
+  }
+</div>
+
+@if (openAlertId) {
+  <mifosx-cic-alert-detail
+    [alertId]="openAlertId"
+    (closed)="openAlertId = null"
+    (changed)="onChanged()"
+  ></mifosx-cic-alert-detail>
+}

src/app/credit-bureau/cic-dashboard/cic-dashboard.component.ts

@@ -0,0 +1,130 @@
+/**
+ * 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 { RouterModule } from '@angular/router';
+
+import { ApiManagementService } from 'app/api-management/api-management.service';
+import { HasPermissionDirective } from 'app/directives/has-permission/has-permission.directive';
+import { CicAlertDetailComponent } from '../cic-alert-detail/cic-alert-detail.component';
+import { CicService, cicError, cicStatusTone } from '../cic.service';
+
+/**
+ * Credit Bureau dashboard: our customers who applied for a loan at another bank / NBFC, as reported by the CICs -
+ * who, what loan and how much (the CIC does not name the lender) - with the customers applying elsewhere repeatedly,
+ * the loan types, the trend, and the fetch status of each bureau. Each bureau is set up under API Management → API
+ * Vendors & Setup.
+ */
+@Component({
+  selector: 'mifosx-cic-dashboard',
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    RouterModule,
+    HasPermissionDirective,
+    CicAlertDetailComponent
+  ],
+  templateUrl: './cic-dashboard.component.html',
+  styleUrls: ['../cic-shared.scss']
+})
+export class CicDashboardComponent implements OnInit {
+  private cic = inject(CicService);
+  private apis = inject(ApiManagementService);
+
+  /** Each bureau is set up as a vendor under API Management (connection, whitelist, request / response mapping). */
+  setupRoute(code: string): any[] {
+    const v = this.apis.vendorByCode(code);
+    return v ? [
+          '/api-management/vendors',
+          v.id
+        ] : ['/api-management/vendors'];
+  }
+
+  days = 30;
+  loading = false;
+  error: string | null = null;
+  info: string | null = null;
+  data: any = null;
+  fetching: number | 'ALL' | null = null;
+  openAlertId: number | null = null;
+
+  readonly statusTone = cicStatusTone;
+
+  ngOnInit(): void {
+    this.load();
+  }
+
+  load(): void {
+    this.loading = true;
+    this.error = null;
+    this.cic.dashboard(this.days).subscribe({
+      next: (d) => {
+        this.data = d;
+        this.loading = false;
+      },
+      error: (e) => {
+        this.error = cicError(e, 'Could not load the credit bureau dashboard.');
+        this.loading = false;
+      }
+    });
+  }
+
+  get whitelisted(): any[] {
+    return (this.data?.bureaus ?? []).filter((b: any) => b.whitelisted);
+  }
+
+  /** Fetch now from one bureau, or from every whitelisted bureau in turn. */
+  fetchNow(bureauId: number | 'ALL'): void {
+    const ids = bureauId === 'ALL' ? this.whitelisted.map((b) => b.id as number) : [bureauId];
+    if (!ids.length) return;
+    this.fetching = bureauId;
+    this.error = null;
+    this.info = null;
+    const messages: string[] = [];
+    const next = (i: number) => {
+      if (i >= ids.length) {
+        this.fetching = null;
+        this.info = messages.join(' · ');
+        this.load();
+        return;
+      }
+      this.cic.fetch(ids[i]).subscribe({
+        next: (run) => {
+          messages.push(
+            `${run.bureauCode}: ${run.status === 'SUCCESS' ? run.newAlerts + ' new alert(s)' : 'failed - ' + run.message}`
+          );
+          next(i + 1);
+        },
+        error: (e) => {
+          messages.push(cicError(e, 'Fetch failed.'));
+          next(i + 1);
+        }
+      });
+    };
+    next(0);
+  }
+
+  max(list: any[] | undefined, key: string): number {
+    return Math.max(1, ...(list ?? []).map((x) => Number(x[key] ?? 0)));
+  }
+
+  pct(value: any, list: any[] | undefined, key: string): number {
+    return Math.round((Number(value ?? 0) / this.max(list, key)) * 100);
+  }
+
+  onChanged(): void {
+    this.load();
+  }
+
+  fetchTone(status?: string): string {
+    return status === 'SUCCESS' ? 'good' : status === 'FAILED' ? 'bad' : '';
+  }
+}

src/app/credit-bureau/cic-fetch-log/cic-fetch-log.component.html

@@ -0,0 +1,126 @@
+<!--
+  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>Fetch Log</h1>
+      <p>Every time the CBS asked a CIC for enquiry alerts: when, how many came, how many were our customers.</p>
+    </div>
+    <div class="cic-actions">
+      <a class="cic-btn" routerLink="/credit-bureau/dashboard">← Dashboard</a>
+    </div>
+  </div>
+
+  @if (error) {
+    <div class="cic-alert error">{{ error }}</div>
+  }
+
+  <div class="cic-card">
+    <h2>
+      Fetches
+      <span class="cic-actions">
+        <select [(ngModel)]="bureauId" (ngModelChange)="filterChanged()" class="cic-btn sm">
+          <option value="">All bureaus</option>
+          @for (b of bureaus; track b.id) {
+            <option [value]="b.id">{{ b.code }}</option>
+          }
+        </select>
+        <button class="cic-btn sm" (click)="load()">Refresh</button>
+      </span>
+    </h2>
+    @if (loading && !runs.length) {
+      <div class="cic-empty">Loading…</div>
+    } @else if (!runs.length) {
+      <div class="cic-empty">No fetch has run yet.</div>
+    } @else {
+      <div class="cic-table-wrap">
+        <table class="cic-table">
+          <thead>
+            <tr>
+              <th>Run</th>
+              <th>Bureau</th>
+              <th>How</th>
+              <th>Window</th>
+              <th>Status</th>
+              <th class="num">Received</th>
+              <th class="num">New</th>
+              <th class="num">Matched</th>
+              <th class="num">Unmatched</th>
+              <th class="num">Already had</th>
+              <th class="num">Own bank</th>
+              <th>By</th>
+              <th>When</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (r of runs; track r.id) {
+              <tr class="clickable" (click)="view(r)">
+                <td class="cic-mono">{{ r.runRef }}</td>
+                <td>{{ r.bureauCode }}</td>
+                <td>{{ r.trigger }}</td>
+                <td>{{ r.fromDate | date: 'dd MMM' }} – {{ r.toDate | date: 'dd MMM yy' }}</td>
+                <td>
+                  <span class="cic-badge" [class]="'cic-badge ' + tone(r.status)">{{ r.status }}</span>
+                </td>
+                <td class="num">{{ r.received }}</td>
+                <td class="num">
+                  <b>{{ r.newAlerts }}</b>
+                </td>
+                <td class="num">{{ r.matched }}</td>
+                <td class="num">{{ r.unmatched }}</td>
+                <td class="num">{{ r.duplicates }}</td>
+                <td class="num">{{ r.ownBank }}</td>
+                <td>{{ r.triggeredByName }}</td>
+                <td>{{ r.startedOn | slice: 0 : 16 }}</td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+      <div class="cic-pager">
+        <span>{{ offset + 1 }}–{{ offset + runs.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>
+
+@if (viewing) {
+  <div class="cic-modal-backdrop" (click)="viewing = null">
+    <div class="cic-modal" style="width: min(1000px, 100%)" (click)="$event.stopPropagation()">
+      <h3>{{ viewing.runRef }} · {{ viewing.bureauCode }} · {{ viewing.status }}</h3>
+      <div
+        class="cic-alert"
+        [class.success]="viewing.status === 'SUCCESS'"
+        [class.error]="viewing.status !== 'SUCCESS'"
+      >
+        {{ viewing.message }}
+        @if (viewing.httpStatus) {
+          (HTTP {{ viewing.httpStatus }}, {{ viewing.durationMs }} ms)
+        }
+      </div>
+      <div class="cic-split">
+        <div>
+          <h4 style="margin: 0 0 6px; font-size: 13px">Request</h4>
+          <pre class="cic-code">{{ pretty(viewing.request) || '—' }}</pre>
+        </div>
+        <div>
+          <h4 style="margin: 0 0 6px; font-size: 13px">Response</h4>
+          <pre class="cic-code">{{ pretty(viewing.response) || '—' }}</pre>
+        </div>
+      </div>
+      <div class="foot">
+        <button class="cic-btn" (click)="viewing = null">Close</button>
+      </div>
+    </div>
+  </div>
+}

src/app/credit-bureau/cic-fetch-log/cic-fetch-log.component.ts

@@ -0,0 +1,91 @@
+/**
+ * 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 { RouterModule } from '@angular/router';
+
+import { CicBureau, CicFetchRun, CicService, cicError } from '../cic.service';
+
+/** Log of every alert fetch from the CICs: when, how many alerts, how many matched, and the request / response. */
+@Component({
+  selector: 'mifosx-cic-fetch-log',
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    RouterModule
+  ],
+  templateUrl: './cic-fetch-log.component.html',
+  styleUrls: ['../cic-shared.scss']
+})
+export class CicFetchLogComponent implements OnInit {
+  private cic = inject(CicService);
+
+  bureaus: CicBureau[] = [];
+  runs: CicFetchRun[] = [];
+  total = 0;
+  offset = 0;
+  readonly limit = 20;
+  bureauId = '';
+  viewing: CicFetchRun | null = null;
+  loading = false;
+  error: string | null = null;
+
+  ngOnInit(): void {
+    this.cic.bureaus().subscribe({ next: (b) => (this.bureaus = b), error: () => (this.bureaus = []) });
+    this.load();
+  }
+
+  load(): void {
+    this.loading = true;
+    this.error = null;
+    this.cic.fetchRuns({ bureauId: this.bureauId, offset: this.offset, limit: this.limit }).subscribe({
+      next: (p) => {
+        this.runs = p.pageItems;
+        this.total = p.totalFilteredRecords;
+        this.loading = false;
+      },
+      error: (e) => {
+        this.error = cicError(e, 'Could not load the fetch log.');
+        this.loading = false;
+      }
+    });
+  }
+
+  filterChanged(): void {
+    this.offset = 0;
+    this.load();
+  }
+
+  page(delta: number): void {
+    this.offset = Math.max(0, this.offset + delta * this.limit);
+    this.load();
+  }
+
+  view(r: CicFetchRun): void {
+    this.cic.fetchRun(r.id).subscribe({
+      next: (full) => (this.viewing = full),
+      error: (e) => (this.error = cicError(e))
+    });
+  }
+
+  pretty(text?: string | null): string {
+    if (!text) return '';
+    try {
+      return JSON.stringify(JSON.parse(text), null, 2);
+    } catch {
+      return text;
+    }
+  }
+
+  tone(status: string): string {
+    return status === 'SUCCESS' ? 'good' : status === 'FAILED' ? 'bad' : 'warn';
+  }
+}

src/app/credit-bureau/cic-shared.scss

@@ -0,0 +1,627 @@
+/**
+ * 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/.
+ */
+
+/* Shared look for the Credit Bureau (CIC) screens. */
+
+:host {
+  --cic-ink: #0f172a;
+  --cic-muted: #64748b;
+  --cic-line: #e2e8f0;
+  --cic-soft: #f8fafc;
+  --cic-brand: #1d4ed8;
+  --cic-brand-soft: #eff6ff;
+  --cic-good: #047857;
+  --cic-good-soft: #ecfdf5;
+  --cic-ok: #0369a1;
+  --cic-ok-soft: #f0f9ff;
+  --cic-warn: #b45309;
+  --cic-warn-soft: #fffbeb;
+  --cic-bad: #b91c1c;
+  --cic-bad-soft: #fef2f2;
+
+  display: block;
+  color: var(--cic-ink);
+}
+
+.cic-page {
+  padding: 20px 24px 40px;
+  max-width: 1440px;
+  margin: 0 auto;
+}
+
+.cic-head {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  margin-bottom: 18px;
+  flex-wrap: wrap;
+
+  h1 {
+    margin: 0;
+    font-size: 22px;
+    font-weight: 700;
+    letter-spacing: -0.01em;
+  }
+
+  p {
+    margin: 4px 0 0;
+    color: var(--cic-muted);
+    font-size: 13px;
+  }
+}
+
+.cic-actions {
+  display: flex;
+  gap: 8px;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.cic-card {
+  background: #fff;
+  border: 1px solid var(--cic-line);
+  border-radius: 12px;
+  padding: 18px 20px;
+  margin-bottom: 16px;
+  box-shadow: 0 1px 2px rgb(15 23 42 / 4%);
+
+  > h2,
+  .cic-card-title {
+    margin: 0 0 14px;
+    font-size: 15px;
+    font-weight: 700;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 10px;
+  }
+
+  .cic-card-sub {
+    color: var(--cic-muted);
+    font-size: 12px;
+    font-weight: 500;
+  }
+}
+
+.cic-grid {
+  display: grid;
+  gap: 14px;
+
+  &.cols-2 {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+
+  &.cols-3 {
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+  }
+
+  &.cols-4 {
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+  }
+
+  @media (width <= 960px) {
+    &.cols-3,
+    &.cols-4 {
+      grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+  }
+
+  @media (width <= 640px) {
+    &.cols-2,
+    &.cols-3,
+    &.cols-4 {
+      grid-template-columns: 1fr;
+    }
+  }
+}
+
+.cic-split {
+  display: grid;
+  grid-template-columns: minmax(0, 1.1fr) minmax(0, 0.9fr);
+  gap: 16px;
+
+  @media (width <= 1100px) {
+    grid-template-columns: 1fr;
+  }
+}
+
+.cic-stat {
+  background: #fff;
+  border: 1px solid var(--cic-line);
+  border-radius: 12px;
+  padding: 14px 16px;
+
+  .k {
+    font-size: 12px;
+    color: var(--cic-muted);
+    font-weight: 600;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+  }
+
+  .v {
+    font-size: 24px;
+    font-weight: 700;
+    margin-top: 6px;
+    font-variant-numeric: tabular-nums;
+  }
+
+  .s {
+    font-size: 12px;
+    color: var(--cic-muted);
+    margin-top: 2px;
+  }
+}
+
+.cic-field {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+  min-width: 0;
+
+  label {
+    font-size: 12px;
+    font-weight: 600;
+    color: #334155;
+  }
+
+  .hint {
+    font-size: 11px;
+    color: var(--cic-muted);
+  }
+
+  input,
+  select,
+  textarea {
+    width: 100%;
+    border: 1px solid #cbd5e1;
+    border-radius: 8px;
+    padding: 8px 10px;
+    font-size: 13px;
+    font-family: inherit;
+    background: #fff;
+    color: var(--cic-ink);
+    box-sizing: border-box;
+
+    &:focus {
+      outline: none;
+      border-color: var(--cic-brand);
+      box-shadow: 0 0 0 3px rgb(29 78 216 / 12%);
+    }
+
+    &:disabled {
+      background: var(--cic-soft);
+      color: var(--cic-muted);
+    }
+  }
+
+  textarea {
+    resize: vertical;
+    min-height: 90px;
+  }
+}
+
+.cic-mono,
+textarea.cic-mono {
+  font-family: 'JetBrains Mono', 'Fira Code', Consolas, monospace !important;
+  font-size: 12px !important;
+}
+
+.cic-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  border: 1px solid var(--cic-line);
+  background: #fff;
+  color: var(--cic-ink);
+  border-radius: 8px;
+  padding: 8px 14px;
+  font-size: 13px;
+  font-weight: 600;
+  cursor: pointer;
+  white-space: nowrap;
+
+  &:hover:not(:disabled) {
+    background: var(--cic-soft);
+  }
+
+  &:disabled {
+    opacity: 0.55;
+    cursor: not-allowed;
+  }
+
+  &.primary {
+    background: var(--cic-brand);
+    border-color: var(--cic-brand);
+    color: #fff;
+
+    &:hover:not(:disabled) {
+      background: #1e40af;
+    }
+  }
+
+  &.danger {
+    color: var(--cic-bad);
+    border-color: #fecaca;
+
+    &:hover:not(:disabled) {
+      background: var(--cic-bad-soft);
+    }
+  }
+
+  &.sm {
+    padding: 5px 10px;
+    font-size: 12px;
+  }
+}
+
+.cic-badge {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  padding: 2px 9px;
+  border-radius: 999px;
+  font-size: 11px;
+  font-weight: 700;
+  letter-spacing: 0.02em;
+  background: var(--cic-soft);
+  color: var(--cic-muted);
+  border: 1px solid var(--cic-line);
+  white-space: nowrap;
+
+  &.good {
+    background: var(--cic-good-soft);
+    color: var(--cic-good);
+    border-color: #a7f3d0;
+  }
+
+  &.ok {
+    background: var(--cic-ok-soft);
+    color: var(--cic-ok);
+    border-color: #bae6fd;
+  }
+
+  &.warn {
+    background: var(--cic-warn-soft);
+    color: var(--cic-warn);
+    border-color: #fde68a;
+  }
+
+  &.bad {
+    background: var(--cic-bad-soft);
+    color: var(--cic-bad);
+    border-color: #fecaca;
+  }
+
+  &.brand {
+    background: var(--cic-brand-soft);
+    color: var(--cic-brand);
+    border-color: #bfdbfe;
+  }
+}
+
+.cic-alert {
+  border-radius: 10px;
+  padding: 10px 14px;
+  font-size: 13px;
+  margin-bottom: 14px;
+  border: 1px solid;
+
+  &.error {
+    background: var(--cic-bad-soft);
+    border-color: #fecaca;
+    color: var(--cic-bad);
+  }
+
+  &.success {
+    background: var(--cic-good-soft);
+    border-color: #a7f3d0;
+    color: var(--cic-good);
+  }
+
+  &.info {
+    background: var(--cic-brand-soft);
+    border-color: #bfdbfe;
+    color: #1e3a8a;
+  }
+
+  &.warn {
+    background: var(--cic-warn-soft);
+    border-color: #fde68a;
+    color: var(--cic-warn);
+  }
+
+  ul {
+    margin: 6px 0 0;
+    padding-left: 18px;
+  }
+}
+
+.cic-table-wrap {
+  overflow-x: auto;
+  border: 1px solid var(--cic-line);
+  border-radius: 10px;
+}
+
+.cic-table {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 13px;
+
+  th {
+    text-align: left;
+    font-size: 11px;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    color: var(--cic-muted);
+    font-weight: 700;
+    background: var(--cic-soft);
+    padding: 9px 12px;
+    border-bottom: 1px solid var(--cic-line);
+    white-space: nowrap;
+  }
+
+  td {
+    padding: 9px 12px;
+    border-bottom: 1px solid #f1f5f9;
+    vertical-align: middle;
+  }
+
+  tr:last-child td {
+    border-bottom: none;
+  }
+
+  tr.clickable {
+    cursor: pointer;
+
+    &:hover td {
+      background: #f8fafc;
+    }
+  }
+
+  .num {
+    text-align: right;
+    font-variant-numeric: tabular-nums;
+  }
+
+  td input,
+  td select {
+    width: 100%;
+    border: 1px solid #cbd5e1;
+    border-radius: 6px;
+    padding: 5px 7px;
+    font-size: 12px;
+    box-sizing: border-box;
+    background: #fff;
+  }
+}
+
+.cic-empty {
+  text-align: center;
+  color: var(--cic-muted);
+  padding: 28px 12px;
+  font-size: 13px;
+}
+
+.cic-pager {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 12px;
+  font-size: 12px;
+  color: var(--cic-muted);
+}
+
+.cic-switch {
+  position: relative;
+  display: inline-block;
+  width: 40px;
+  height: 22px;
+  flex: none;
+
+  input {
+    opacity: 0;
+    width: 0;
+    height: 0;
+  }
+
+  span {
+    position: absolute;
+    inset: 0;
+    background: #cbd5e1;
+    border-radius: 999px;
+    transition: background 0.15s;
+    cursor: pointer;
+
+    &::before {
+      content: '';
+      position: absolute;
+      width: 16px;
+      height: 16px;
+      left: 3px;
+      top: 3px;
+      background: #fff;
+      border-radius: 50%;
+      transition: transform 0.15s;
+      box-shadow: 0 1px 2px rgb(0 0 0 / 20%);
+    }
+  }
+
+  input:checked + span {
+    background: var(--cic-good);
+  }
+
+  input:checked + span::before {
+    transform: translateX(18px);
+  }
+
+  input:disabled + span {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+}
+
+.cic-tabs {
+  display: flex;
+  gap: 4px;
+  border-bottom: 1px solid var(--cic-line);
+  margin-bottom: 14px;
+  flex-wrap: wrap;
+
+  button {
+    border: none;
+    background: none;
+    padding: 9px 14px;
+    font-size: 13px;
+    font-weight: 600;
+    color: var(--cic-muted);
+    cursor: pointer;
+    border-bottom: 2px solid transparent;
+    margin-bottom: -1px;
+
+    &.active {
+      color: var(--cic-brand);
+      border-bottom-color: var(--cic-brand);
+    }
+  }
+}
+
+.cic-kv {
+  display: grid;
+  grid-template-columns: 170px minmax(0, 1fr);
+  gap: 7px 12px;
+  font-size: 13px;
+
+  dt {
+    color: var(--cic-muted);
+  }
+
+  dd {
+    margin: 0;
+    font-weight: 600;
+    word-break: break-word;
+  }
+}
+
+.cic-code {
+  background: #0f172a;
+  color: #e2e8f0;
+  border-radius: 10px;
+  padding: 12px 14px;
+  font-family: 'JetBrains Mono', 'Fira Code', Consolas, monospace;
+  font-size: 12px;
+  white-space: pre-wrap;
+  word-break: break-all;
+  max-height: 420px;
+  overflow: auto;
+  margin: 0;
+}
+
+.cic-trend {
+  display: flex;
+  align-items: flex-end;
+  gap: 6px;
+  height: 180px;
+  padding-top: 6px;
+
+  .col {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-end;
+    height: 100%;
+    min-width: 0;
+  }
+
+  .bar {
+    width: 100%;
+    max-width: 28px;
+    min-height: 2px;
+    background: var(--cic-brand);
+    border-radius: 4px 4px 0 0;
+  }
+
+  .n {
+    font-size: 10px;
+    color: var(--cic-muted);
+    margin-bottom: 2px;
+  }
+
+  .d {
+    font-size: 10px;
+    color: var(--cic-muted);
+    margin-top: 4px;
+  }
+}
+
+.cic-modal-backdrop {
+  position: fixed;
+  inset: 0;
+  background: rgb(15 23 42 / 45%);
+  z-index: 1000;
+  display: grid;
+  place-items: center;
+  padding: 16px;
+}
+
+.cic-modal {
+  background: #fff;
+  border-radius: 14px;
+  width: min(640px, 100%);
+  max-height: 90vh;
+  overflow: auto;
+  padding: 20px 22px;
+  box-shadow: 0 20px 50px rgb(15 23 42 / 25%);
+
+  h3 {
+    margin: 0 0 12px;
+    font-size: 16px;
+  }
+
+  .foot {
+    display: flex;
+    justify-content: flex-end;
+    gap: 8px;
+    margin-top: 16px;
+  }
+}
+
+.cic-bar {
+  height: 8px;
+  border-radius: 999px;
+  background: #f1f5f9;
+  overflow: hidden;
+
+  > div {
+    height: 100%;
+    background: var(--cic-brand);
+    border-radius: 999px;
+  }
+}
+
+.muted {
+  color: var(--cic-muted);
+}
+
+.tone-good {
+  color: var(--cic-good);
+}
+
+.tone-ok {
+  color: var(--cic-ok);
+}
+
+.tone-warn {
+  color: var(--cic-warn);
+}
+
+.tone-bad {
+  color: var(--cic-bad);
+}

src/app/credit-bureau/cic.service.ts

@@ -0,0 +1,276 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { HttpClient, HttpContext, HttpParams } from '@angular/common/http';
+import { Injectable, inject } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { SILENT_HTTP_ERROR } from '../core/http/silent-error.token';
+
+/** A credit bureau (CIC) as configured for the bank. Never carries the secret itself. */
+export interface CicBureau {
+  id: number;
+  code: string;
+  name: string;
+  description?: string;
+  whitelisted: boolean;
+  isDefault: boolean;
+  environment: 'SIMULATOR' | 'UAT' | 'PRODUCTION';
+  baseUrl?: string;
+  memberCode?: string;
+  authType: string;
+  username?: string;
+  apiKeyHeader?: string;
+  hasSecret: boolean;
+  tokenUrl?: string;
+  clientId?: string;
+  timeoutMs: number;
+  alertAutoFetch: boolean;
+  alertFetchIntervalMin: number;
+  alertLookbackDays: number;
+  lastFetchOn?: string;
+  lastFetchStatus?: string;
+  lastFetchMessage?: string;
+  lastTestStatus?: string;
+  lastTestMessage?: string;
+  lastTestedOn?: string;
+  updatedOn?: string;
+  activeEndpoints: number;
+  alertsLast30Days: number;
+  newAlerts: number;
+}
+
+export interface CicMapping {
+  id?: number;
+  sourceField: string | null;
+  targetField: string;
+  transform: string;
+  defaultValue: string | null;
+  mandatory: boolean;
+  sortOrder?: number;
+}
+
+export interface CicEndpoint {
+  bureauId: number;
+  endpointType: string;
+  exists: boolean;
+  id?: number;
+  httpMethod: string;
+  path?: string;
+  contentType: string;
+  headersJson: string;
+  baseBody: string;
+  isActive: boolean;
+  requestMappings: CicMapping[];
+  responseMappings: CicMapping[];
+}
+
+export interface CicCatalog {
+  environments: string[];
+  authTypes: string[];
+  endpointTypes: string[];
+  httpMethods: string[];
+  cbsFields: Record<string, string>;
+  resultFields: Record<string, string>;
+  rootFields: string[];
+  transforms: Record<string, string>;
+  alertStatuses: string[];
+  matchTypes: string[];
+}
+
+/** One enquiry made on our customer at another lender, as reported by the CIC. */
+export interface CicAlert {
+  id: number;
+  bureauId: number;
+  bureauCode: string;
+  alertKey: string;
+  clientId?: number;
+  clientName?: string;
+  clientAccountNo?: string;
+  officeId?: number;
+  officeName?: string;
+  matchType: 'PAN' | 'AADHAAR' | 'CUSTOMER_REF' | 'MANUAL' | 'NONE';
+  customerName?: string;
+  panMasked?: string;
+  aadhaarMasked?: string;
+  customerRef?: string;
+  enquiryDate?: string;
+  loanType?: string;
+  amount?: number;
+  purpose?: string;
+  location?: string;
+  status: 'NEW' | 'SEEN' | 'ACTIONED' | 'DISMISSED';
+  remarks?: string;
+  actionedByName?: string;
+  actionedOn?: string;
+  receivedVia?: string;
+  receivedOn?: string;
+  raw?: any;
+  fetchRunId?: number;
+  otherAlertsOfCustomer?: CicAlert[];
+  clientLoans?: {
+    id: number;
+    accountNo: string;
+    productName: string;
+    status: string;
+    principal: number;
+    outstanding: number;
+    disbursedOn?: string;
+  }[];
+}
+
+export interface CicFetchRun {
+  id: number;
+  runRef: string;
+  bureauId: number;
+  bureauCode: string;
+  trigger: 'MANUAL' | 'SCHEDULED';
+  environment?: string;
+  fromDate?: string;
+  toDate?: string;
+  status: 'RUNNING' | 'SUCCESS' | 'FAILED';
+  httpStatus?: number;
+  received: number;
+  newAlerts: number;
+  matched: number;
+  unmatched: number;
+  duplicates: number;
+  ownBank: number;
+  message?: string;
+  durationMs?: number;
+  triggeredByName?: string;
+  startedOn: string;
+  request?: string;
+  response?: string;
+}
+
+export interface CicPage<T> {
+  totalFilteredRecords: number;
+  pageItems: T[];
+}
+
+export const CIC_MATCH_LABELS: Record<string, string> = {
+  PAN: 'PAN',
+  AADHAAR: 'Aadhaar',
+  CUSTOMER_REF: 'Customer ref',
+  MANUAL: 'Linked manually',
+  NONE: 'Not matched'
+};
+
+export function cicStatusTone(status: string): string {
+  return status === 'NEW' ? 'bad' : status === 'SEEN' ? 'warn' : status === 'ACTIONED' ? 'good' : '';
+}
+
+/** The server's own message for a failed call. */
+export function cicError(err: any, fallback = 'Something went wrong. Please try again.'): string {
+  return (
+    err?.error?.errors?.[0]?.defaultUserMessage ??
+    err?.error?.defaultUserMessage ??
+    err?.error?.message ??
+    err?.message ??
+    fallback
+  );
+}
+
+@Injectable({ providedIn: 'root' })
+export class CicService {
+  private http = inject(HttpClient);
+  private base = '/cic';
+  /** Errors are shown inline on these screens, so the global alert is suppressed. */
+  private silent = { context: new HttpContext().set(SILENT_HTTP_ERROR, true) };
+
+  catalog(): Observable<CicCatalog> {
+    return this.http.get<CicCatalog>(`${this.base}/catalog`, this.silent);
+  }
+
+  bureaus(whitelistedOnly = false): Observable<CicBureau[]> {
+    return this.http.get<CicBureau[]>(`${this.base}/bureaus`, {
+      ...this.silent,
+      params: new HttpParams().set('whitelistedOnly', String(whitelistedOnly))
+    });
+  }
+
+  updateBureau(id: number, body: any): Observable<CicBureau> {
+    return this.http.put<CicBureau>(`${this.base}/bureaus/${id}`, body, this.silent);
+  }
+
+  setWhitelisted(id: number, whitelisted: boolean): Observable<CicBureau> {
+    return this.http.put<CicBureau>(`${this.base}/bureaus/${id}/whitelist`, { whitelisted }, this.silent);
+  }
+
+  testConnection(id: number): Observable<{ status: string; message: string }> {
+    return this.http.post<{ status: string; message: string }>(
+      `${this.base}/bureaus/${id}/test-connection`,
+      {},
+      this.silent
+    );
+  }
+
+  endpoint(bureauId: number, type: string): Observable<CicEndpoint> {
+    return this.http.get<CicEndpoint>(`${this.base}/bureaus/${bureauId}/endpoints/${type}`, this.silent);
+  }
+
+  saveEndpoint(bureauId: number, type: string, body: any): Observable<CicEndpoint> {
+    return this.http.put<CicEndpoint>(`${this.base}/bureaus/${bureauId}/endpoints/${type}`, body, this.silent);
+  }
+
+  preview(bureauId: number, body: { fromDate?: string; toDate?: string }): Observable<any> {
+    return this.http.post<any>(`${this.base}/bureaus/${bureauId}/preview`, body, this.silent);
+  }
+
+  parseTest(bureauId: number, content: string | null): Observable<any> {
+    return this.http.post<any>(`${this.base}/bureaus/${bureauId}/parse-test`, { content }, this.silent);
+  }
+
+  fetch(bureauId: number, body: { fromDate?: string; toDate?: string } = {}): Observable<CicFetchRun> {
+    return this.http.post<CicFetchRun>(`${this.base}/bureaus/${bureauId}/fetch`, body, this.silent);
+  }
+
+  fetchRuns(filter: Record<string, any>): Observable<CicPage<CicFetchRun>> {
+    return this.http.get<CicPage<CicFetchRun>>(`${this.base}/fetch-runs`, {
+      ...this.silent,
+      params: this.params(filter)
+    });
+  }
+
+  fetchRun(id: number): Observable<CicFetchRun> {
+    return this.http.get<CicFetchRun>(`${this.base}/fetch-runs/${id}`, this.silent);
+  }
+
+  dashboard(days = 30): Observable<any> {
+    return this.http.get<any>(`${this.base}/dashboard`, {
+      ...this.silent,
+      params: new HttpParams().set('days', String(days))
+    });
+  }
+
+  alert(id: number): Observable<CicAlert> {
+    return this.http.get<CicAlert>(`${this.base}/alerts/${id}`, this.silent);
+  }
+
+  updateStatus(id: number, status: string, remarks?: string | null): Observable<CicAlert> {
+    return this.http.put<CicAlert>(`${this.base}/alerts/${id}/status`, { status, remarks }, this.silent);
+  }
+
+  linkClient(id: number, clientId: number): Observable<CicAlert> {
+    return this.http.put<CicAlert>(`${this.base}/alerts/${id}/client`, { clientId }, this.silent);
+  }
+
+  private params(filter: Record<string, any>): HttpParams {
+    let params = new HttpParams();
+    Object.entries(filter).forEach(
+      ([
+        k,
+        v
+      ]) => {
+        if (v !== null && v !== undefined && v !== '') params = params.set(k, String(v));
+      }
+    );
+    return params;
+  }
+}

src/app/credit-bureau/credit-bureau-routing.module.ts

@@ -0,0 +1,49 @@
+/**
+ * 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 { CicDashboardComponent } from './cic-dashboard/cic-dashboard.component';
+import { CicFetchLogComponent } from './cic-fetch-log/cic-fetch-log.component';
+
+const routes: Routes = [
+  Route.withShell([
+    {
+      path: 'credit-bureau',
+      data: { title: 'Credit Bureau', breadcrumb: 'Credit Bureau' },
+      children: [
+        {
+          path: '',
+          redirectTo: 'dashboard',
+          pathMatch: 'full'
+        },
+        {
+          path: 'dashboard',
+          component: CicDashboardComponent,
+          data: { title: 'Credit Bureau Dashboard', breadcrumb: 'Dashboard' }
+        },
+        {
+          path: 'fetch-log',
+          component: CicFetchLogComponent,
+          data: { title: 'Fetch Log', breadcrumb: 'Fetch Log' }
+        },
+        // The bureaus are set up, whitelisted and mapped under API Management like every other vendor.
+        { path: 'bureaus', redirectTo: '/api-management/vendors', pathMatch: 'full' },
+        { path: 'api-mapping', redirectTo: '/api-management/vendors', pathMatch: 'full' }
+      ]
+    }
+  ])
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class CreditBureauRoutingModule {}

src/app/credit-bureau/credit-bureau.module.ts

@@ -0,0 +1,36 @@
+/**
+ * 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 { CreditBureauRoutingModule } from './credit-bureau-routing.module';
+import { CicDashboardComponent } from './cic-dashboard/cic-dashboard.component';
+import { CicFetchLogComponent } from './cic-fetch-log/cic-fetch-log.component';
+import { CicAlertDetailComponent } from './cic-alert-detail/cic-alert-detail.component';
+import { CicService } from './cic.service';
+import { CicStaticService } from './cic-static.service';
+
+/**
+ * CIC / credit bureau (CIBIL, Experian, Equifax, CRIF) - its own top-level menu: enquiry alerts on our customers from
+ * other lenders and the fetch log. Each bureau's connection, whitelist and API mapping live under API Management.
+ */
+@NgModule({
+  imports: [
+    SharedModule,
+    CreditBureauRoutingModule,
+    CicDashboardComponent,
+    CicFetchLogComponent,
+    CicAlertDetailComponent
+  ],
+  providers: [
+    // Static demo data, no backend call. Remove this line to use the real /v1/cic API again.
+    { provide: CicService, useClass: CicStaticService }
+  ]
+})
+export class CreditBureauModule {}

src/app/loan-eligibility/loan-eligibility-routing.module.ts

@@ -0,0 +1,27 @@
+/**
+ * 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 { RouterModule, Routes } from '@angular/router';
+import { Route } from '../core/route/route.service';
+
+const routes: Routes = [
+  Route.withShell([
+    {
+      path: 'ai/loan-eligibility',
+      loadComponent: () => import('./loan-eligibility.component').then((m) => m.LoanEligibilityComponent),
+      data: { title: 'Loan Eligibility', breadcrumb: 'Loan Eligibility' }
+    }
+  ])
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class LoanEligibilityRoutingModule {}

src/app/loan-eligibility/loan-eligibility.component.html

@@ -0,0 +1,482 @@
+<!--
+  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">
+  @if (!loading) {
+    <header class="pg-head">
+      <div>
+        <div class="pg-eyebrow">AI / INTELLIGENCE · LENDING &amp; RISK</div>
+        <h1 class="pg-title">Loan Eligibility</h1>
+        <p class="pg-sub">
+          How our loans are running (RBI asset classification) and which loan products the good borrowers are eligible
+          for, using the eligibility rules set on each loan product.
+          @if (summary) {
+            As on {{ summary.asOnDate }}.
+          }
+        </p>
+      </div>
+    </header>
+  }
+
+  @if (error) {
+    <p class="pg-sub le-error">{{ error }}</p>
+  }
+  @if (loading) {
+    <div class="le-loader">
+      <div class="le-spinner"></div>
+      <div class="le-loader-title">Loading loan book…</div>
+      <ul class="le-loader-steps">
+        @for (st of loadingSteps; track $index) {
+          <li [class.le-done]="$index < loadingStep" [class.le-now]="$index === loadingStep">
+            {{ $index < loadingStep ? '✓' : $index === loadingStep ? '…' : '' }} {{ st }}
+          </li>
+        }
+      </ul>
+      <div class="le-progress"><span [style.width.%]="((loadingStep + 1) / loadingSteps.length) * 100"></span></div>
+    </div>
+  }
+
+  @if (summary; as s) {
+    <div class="le-kpis">
+      <div class="le-kpi">
+        <span class="le-kpi-l">Active loans</span>
+        <span class="le-kpi-v">{{ s.activeLoans }}</span>
+        <span class="le-kpi-s">₹{{ s.activeOutstanding | number: '1.0-0' }} outstanding</span>
+      </div>
+      <div class="le-kpi le-kpi--good">
+        <span class="le-kpi-l">Running well (Standard + SMA)</span>
+        <span class="le-kpi-v">{{ s.performingLoans }}</span>
+        <span class="le-kpi-s">₹{{ s.performingOutstanding | number: '1.0-0' }}</span>
+      </div>
+      <div class="le-kpi le-kpi--bad">
+        <span class="le-kpi-l">Gone bad (NPA)</span>
+        <span class="le-kpi-v">{{ s.npaLoans }}</span>
+        <span class="le-kpi-s">₹{{ s.npaOutstanding | number: '1.0-0' }} · Gross NPA {{ s.grossNpaPct }}%</span>
+      </div>
+      <div class="le-kpi">
+        <span class="le-kpi-l">Written off / Closed</span>
+        <span class="le-kpi-v">{{ s.writtenOffLoans }} / {{ s.closedLoans }}</span>
+        <span class="le-kpi-s">₹{{ s.writtenOffAmount | number: '1.0-0' }} written off</span>
+      </div>
+    </div>
+
+    <div class="cctr-tabs le-tabs le-views">
+      <button
+        type="button"
+        class="pg-btn pg-btn--ghost"
+        [class.pg-btn--active]="view === 'BOOK'"
+        (click)="view = 'BOOK'"
+      >
+        Loan book (RBI classes &amp; products)
+      </button>
+      <button
+        type="button"
+        class="pg-btn pg-btn--ghost"
+        [class.pg-btn--active]="view === 'BORROWERS'"
+        (click)="view = 'BORROWERS'"
+      >
+        Borrowers &amp; eligibility (Good {{ s.goodBorrowers }} · Watch {{ s.watchBorrowers }} · Bad
+        {{ s.badBorrowers }})
+      </button>
+    </div>
+
+    @if (view === 'BOOK') {
+      <div class="pg-card">
+        <div class="pos-section-label">Loans by RBI asset classification (days past due)</div>
+        <table class="pg-table">
+          <thead>
+            <tr>
+              <th>Class</th>
+              <th>Days past due</th>
+              <th class="num">Loans</th>
+              <th class="num">Outstanding</th>
+              <th class="num">Overdue</th>
+              <th>Share of book</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (st of performingStages; track st.stage) {
+              <tr>
+                <td>
+                  <span
+                    class="le-dot"
+                    [class.le-dot--good]="st.stage === 'STANDARD'"
+                    [class.le-dot--warn]="st.stage !== 'STANDARD'"
+                  ></span>
+                  {{ st.label }}
+                </td>
+                <td>{{ st.dpdRange }}</td>
+                <td class="num">{{ st.loans }}</td>
+                <td class="num">₹{{ st.outstanding | number: '1.2-2' }}</td>
+                <td class="num">₹{{ st.overdue | number: '1.2-2' }}</td>
+                <td>
+                  <span class="le-bar"><span [style.width.%]="share(st)"></span></span> {{ share(st) }}%
+                </td>
+              </tr>
+            }
+            @for (st of npaStages; track st.stage) {
+              <tr>
+                <td><span class="le-dot le-dot--bad"></span> {{ st.label }} (NPA)</td>
+                <td>{{ st.dpdRange }}</td>
+                <td class="num">{{ st.loans }}</td>
+                <td class="num">₹{{ st.outstanding | number: '1.2-2' }}</td>
+                <td class="num">₹{{ st.overdue | number: '1.2-2' }}</td>
+                <td>
+                  <span class="le-bar le-bar--bad"><span [style.width.%]="share(st)"></span></span> {{ share(st) }}%
+                </td>
+              </tr>
+            }
+            @for (st of closedStages; track st.stage) {
+              <tr class="le-muted">
+                <td>{{ st.label }}</td>
+                <td>{{ st.dpdRange }}</td>
+                <td class="num">{{ st.loans }}</td>
+                <td class="num">–</td>
+                <td class="num">–</td>
+                <td></td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+
+      <div class="pg-card">
+        <div class="pos-section-label">Active loans by product</div>
+        <table class="pg-table">
+          <thead>
+            <tr>
+              <th>Product</th>
+              <th class="num">Active</th>
+              <th class="num">Running well</th>
+              <th class="num">NPA</th>
+              <th class="num">Outstanding</th>
+              <th class="num">NPA outstanding</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (p of s.products; track p.productId) {
+              <tr>
+                <td>{{ p.productName }}</td>
+                <td class="num">{{ p.activeLoans }}</td>
+                <td class="num">{{ p.performingLoans }}</td>
+                <td class="num">{{ p.npaLoans }}</td>
+                <td class="num">₹{{ p.outstanding | number: '1.2-2' }}</td>
+                <td class="num">₹{{ p.npaOutstanding | number: '1.2-2' }}</td>
+              </tr>
+            } @empty {
+              <tr>
+                <td colspan="6" class="pg-empty">No active loans.</td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+
+      <div class="pg-card">
+        <div class="pos-section-label">Share linking to borrowing (5% unsecured · 2.5% secured)</div>
+        <div class="le-facts">
+          <span>Shares required on running loans: ₹{{ s.shareRequired | number: '1.0-0' }}</span>
+          <span>Shares held by these members: ₹{{ s.shareHeld | number: '1.0-0' }}</span>
+          <span [class.le-late]="s.shareShortMembers > 0"
+            >Members short: {{ s.shareShortMembers }} (₹{{ s.shareShortfall | number: '1.0-0' }} to collect)</span
+          >
+        </div>
+      </div>
+    }
+
+    @if (view === 'BORROWERS') {
+      <div class="pg-card">
+        <div class="pos-section-label">
+          Borrowers — Good {{ s.goodBorrowers }} · Watch {{ s.watchBorrowers }} · Bad {{ s.badBorrowers }}
+        </div>
+        <div class="cctr-tabs le-tabs">
+          @for (c of categories; track c.value) {
+            <button
+              type="button"
+              class="pg-btn pg-btn--ghost"
+              [class.pg-btn--active]="category === c.value"
+              (click)="setCategory(c.value)"
+            >
+              {{ c.label }}
+            </button>
+          }
+          <input
+            type="text"
+            class="le-search"
+            placeholder="Search name / account no"
+            [(ngModel)]="search"
+            (keyup.enter)="loadBorrowers()"
+          />
+          <button type="button" class="pg-btn pg-btn--ghost" (click)="loadBorrowers()">Search</button>
+        </div>
+        <p class="pg-sub le-help">
+          Good: every running loan is regular (0 days past due) and nothing was ever written off. Watch: a loan is
+          overdue up to 90 days (SMA). Bad: a loan is NPA or written off. Eligibility is worked out for good borrowers
+          only; a fresh loan also needs a clean EMI record (at most 2 EMIs ever paid late).
+        </p>
+        <table class="pg-table le-compact">
+          <thead>
+            <tr>
+              <th>Borrower</th>
+              <th>Category</th>
+              <th class="num">Running / Closed</th>
+              <th>EMI record</th>
+              <th class="num">Outstanding</th>
+              <th class="num">Max days overdue</th>
+              <th>Worst class</th>
+              <th>More loan?</th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody>
+            @if (borrowersLoading) {
+              <tr>
+                <td colspan="9" class="pg-empty">
+                  <span class="le-spinner le-spinner--sm"></span> Fetching borrowers…
+                </td>
+              </tr>
+            }
+            @for (b of borrowersLoading ? [] : pagedBorrowers; track b.clientId) {
+              <tr [class.le-selected]="selected?.clientId === b.clientId">
+                <td>
+                  {{ b.clientName }} <small>({{ b.clientAccountNo }})</small>
+                </td>
+                <td>
+                  <span class="le-chip" [ngClass]="'le-chip--' + b.category.toLowerCase()">{{
+                    categoryLabel(b.category)
+                  }}</span>
+                </td>
+                <td class="num">{{ b.activeLoans }} / {{ b.closedLoans }}</td>
+                <td>
+                  {{ b.emisPaid - b.emisLate }} / {{ b.emisPaid }} on time
+                  @if (b.emisLate) {
+                    <small class="le-late">({{ b.emisLate }} late)</small>
+                  }
+                </td>
+                <td class="num">₹{{ b.outstanding | number: '1.2-2' }}</td>
+                <td class="num">{{ b.maxDpd }}</td>
+                <td>{{ b.worstStage || '–' }}</td>
+                <td>
+                  @if (b.eligibleProducts > 0) {
+                    <span class="le-chip le-chip--good">Yes · {{ b.eligibleProducts }} products</span>
+                  } @else {
+                    <span class="le-chip le-chip--bad">No</span>
+                  }
+                </td>
+                <td>
+                  <button type="button" class="pg-btn pg-btn--ghost" [disabled]="openingId !== null" (click)="open(b)">
+                    {{ openingId === b.clientId ? 'Loading…' : 'View' }}
+                  </button>
+                </td>
+              </tr>
+            } @empty {
+              <tr>
+                <td colspan="9" class="pg-empty">No borrowers in this category.</td>
+              </tr>
+            }
+          </tbody>
+        </table>
+        @if (borrowers.length > pageSize) {
+          <div class="le-pager">
+            <span>Showing {{ page * pageSize + 1 }}–{{ pageEnd }} of {{ borrowers.length }}</span>
+            <button type="button" class="pg-btn pg-btn--ghost" [disabled]="page === 0" (click)="page = page - 1">
+              ‹ Prev
+            </button>
+            @for (p of pages; track p) {
+              <button type="button" class="pg-btn pg-btn--ghost" [class.pg-btn--active]="p === page" (click)="page = p">
+                {{ p + 1 }}
+              </button>
+            }
+            <button
+              type="button"
+              class="pg-btn pg-btn--ghost"
+              [disabled]="page >= pages.length - 1"
+              (click)="page = page + 1"
+            >
+              Next ›
+            </button>
+          </div>
+        }
+      </div>
+    }
+
+    @if (selected; as b) {
+      <div class="le-overlay" (click)="close()">
+        <div class="le-modal" role="dialog" aria-modal="true" (click)="$event.stopPropagation()">
+          <div class="le-modal-head">
+            <div class="pos-section-label">
+              {{ b.clientName }} ({{ b.clientAccountNo }}) — {{ categoryLabel(b.category) }} borrower
+            </div>
+            <button type="button" class="pg-btn pg-btn--ghost" (click)="close()">Close</button>
+          </div>
+          <div class="le-facts">
+            <span>Age: {{ b.age ?? 'not recorded' }}</span>
+            <span
+              >Monthly income: {{ b.monthlyIncome ? '₹' + (b.monthlyIncome | number: '1.0-0') : 'not recorded' }}</span
+            >
+            <span>Current EMIs: ₹{{ b.currentEmi | number: '1.0-0' }}</span>
+            <span>EMI record: {{ b.emisPaid - b.emisLate }} of {{ b.emisPaid }} paid on time</span>
+            <span>Deposits (savings / FD / RD): ₹{{ b.depositBalance | number: '1.0-0' }}</span>
+            <span [class.le-late]="b.shareHeld < b.shareRequired"
+              >Shares held: ₹{{ b.shareHeld | number: '1.0-0' }} (needed ₹{{ b.shareRequired | number: '1.0-0' }} incl.
+              membership)</span
+            >
+          </div>
+
+          @for (a of b.accounts ?? []; track a.accountNo) {
+            <div class="pos-section-label">
+              {{ a.type }} account {{ a.accountNo }} — last 6 months (money in, expenses, balance)
+            </div>
+            <table class="pg-table">
+              <thead>
+                <tr>
+                  <th>Month</th>
+                  <th class="num">Credits (in)</th>
+                  <th class="num">Debits (expenses + EMIs)</th>
+                  <th class="num">Left over</th>
+                  <th class="num">Average balance</th>
+                  <th class="num">Cheque / ECS returns</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (m of a.months; track m.month) {
+                  <tr>
+                    <td>{{ m.month }}</td>
+                    <td class="num">₹{{ m.credits | number: '1.0-0' }}</td>
+                    <td class="num">₹{{ m.debits | number: '1.0-0' }}</td>
+                    <td class="num" [class.le-late]="m.credits < m.debits">
+                      ₹{{ m.credits - m.debits | number: '1.0-0' }}
+                    </td>
+                    <td class="num">₹{{ m.avgBalance | number: '1.0-0' }}</td>
+                    <td class="num" [class.le-late]="m.returns > 0">{{ m.returns }}</td>
+                  </tr>
+                }
+                <tr class="le-total">
+                  <td>Monthly average</td>
+                  <td class="num">₹{{ b.avgCredits | number: '1.0-0' }}</td>
+                  <td class="num">₹{{ b.avgDebits | number: '1.0-0' }}</td>
+                  <td class="num" [class.le-late]="b.avgCredits < b.avgDebits">
+                    ₹{{ b.avgCredits - b.avgDebits | number: '1.0-0' }}
+                  </td>
+                  <td class="num">
+                    @if (b.avgCredits > 0) {
+                      Spends {{ (b.avgDebits / b.avgCredits) * 100 | number: '1.0-0' }}% of income
+                    }
+                  </td>
+                  <td class="num">{{ b.returns }}</td>
+                </tr>
+              </tbody>
+            </table>
+          }
+
+          <div class="pos-section-label">Loans</div>
+          <table class="pg-table">
+            <thead>
+              <tr>
+                <th>Loan</th>
+                <th>Product</th>
+                <th>Status</th>
+                <th>Class</th>
+                <th class="num">Days overdue</th>
+                <th class="num">EMIs on time</th>
+                <th class="num">Disbursed</th>
+                <th class="num">Outstanding</th>
+                <th class="num">Overdue</th>
+                <th class="num">Shares needed</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (l of b.loans ?? []; track l.loanId) {
+                <tr>
+                  <td>{{ l.accountNo }}</td>
+                  <td>{{ l.productName }}</td>
+                  <td>{{ l.status }}</td>
+                  <td>{{ l.stage }}</td>
+                  <td class="num">{{ l.dpd }}</td>
+                  <td class="num">{{ l.emisPaid - l.emisLate }} / {{ l.emisPaid }}</td>
+                  <td class="num">₹{{ l.disbursed | number: '1.2-2' }}</td>
+                  <td class="num">₹{{ l.outstanding | number: '1.2-2' }}</td>
+                  <td class="num">₹{{ l.overdue | number: '1.2-2' }}</td>
+                  <td class="num">
+                    @if (l.shareRequired) {
+                      ₹{{ l.shareRequired | number: '1.0-0' }} <small>({{ l.sharePct }}%)</small>
+                    } @else {
+                      –
+                    }
+                  </td>
+                </tr>
+              }
+            </tbody>
+          </table>
+
+          @if (b.category === 'GOOD') {
+            <div class="pos-section-label">Eligible loan products</div>
+            <table class="pg-table">
+              <thead>
+                <tr>
+                  <th>Product</th>
+                  <th>Eligible</th>
+                  <th class="num">Up to</th>
+                  <th class="num">Shares to take</th>
+                  <th class="num">In hand</th>
+                  <th>Why</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (e of b.eligibility ?? []; track e.productId) {
+                  <tr>
+                    <td>{{ e.productName }}</td>
+                    <td>
+                      <span class="le-chip" [ngClass]="e.eligible ? 'le-chip--good' : 'le-chip--bad'">{{
+                        e.eligible ? 'Yes' : 'No'
+                      }}</span>
+                    </td>
+                    <td class="num">{{ e.eligibleAmount ? '₹' + (e.eligibleAmount | number: '1.0-0') : '–' }}</td>
+                    <td class="num">
+                      @if (e.shareToBuy) {
+                        ₹{{ e.shareToBuy | number: '1.0-0' }} <small>({{ e.sharePct }}%)</small>
+                      } @else {
+                        –
+                      }
+                    </td>
+                    <td class="num">{{ e.netInHand ? '₹' + (e.netInHand | number: '1.0-0') : '–' }}</td>
+                    <td class="le-why">
+                      @for (f of e.failed; track $index) {
+                        <div class="le-fail">✗ {{ f }}</div>
+                      }
+                      @for (p of e.passed; track $index) {
+                        <div class="le-pass">✓ {{ p }}</div>
+                      }
+                      @for (n of e.notes; track $index) {
+                        <div class="le-note">• {{ n }}</div>
+                      }
+                    </td>
+                  </tr>
+                } @empty {
+                  <tr>
+                    <td colspan="6" class="pg-empty">No active loan products.</td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          } @else {
+            <p class="pg-sub le-help">
+              Eligibility is not worked out for this borrower because a loan is overdue, NPA or written off.
+            </p>
+          }
+        </div>
+      </div>
+    }
+
+    <ul class="le-notes">
+      @for (n of s.notes; track $index) {
+        <li>{{ n }}</li>
+      }
+    </ul>
+  }
+</div>

src/app/loan-eligibility/loan-eligibility.component.scss

@@ -0,0 +1,312 @@
+/**
+ * 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/.
+ */
+
+.le-kpis {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+  gap: 12px;
+  margin-bottom: 16px;
+}
+
+.le-kpi {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding: 14px 16px;
+  border: 1px solid #e4e7ec;
+  border-radius: 10px;
+  background: #fff;
+}
+
+.le-kpi--good {
+  border-left: 4px solid #12b76a;
+}
+
+.le-kpi--bad {
+  border-left: 4px solid #d92d20;
+}
+
+.le-kpi-l {
+  font-size: 12px;
+  color: #667085;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+}
+
+.le-kpi-v {
+  font-size: 26px;
+  font-weight: 700;
+}
+
+.le-kpi-s {
+  font-size: 13px;
+  color: #475467;
+}
+
+.le-dot {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  margin-right: 6px;
+  border-radius: 50%;
+}
+
+.le-dot--good {
+  background: #12b76a;
+}
+
+.le-dot--warn {
+  background: #f79009;
+}
+
+.le-dot--bad {
+  background: #d92d20;
+}
+
+.le-bar {
+  display: inline-block;
+  width: 120px;
+  height: 8px;
+  margin-right: 6px;
+  overflow: hidden;
+  border-radius: 4px;
+  background: #f2f4f7;
+  vertical-align: middle;
+
+  span {
+    display: block;
+    height: 100%;
+    background: #12b76a;
+  }
+}
+
+.le-bar--bad span {
+  background: #d92d20;
+}
+
+.le-muted {
+  color: #667085;
+}
+
+.le-tabs {
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+  padding: 12px 16px 0;
+}
+
+.le-search {
+  min-width: 220px;
+  padding: 8px 10px;
+  border: 1px solid #d0d5dd;
+  border-radius: 8px;
+}
+
+.le-help {
+  padding: 0 16px;
+}
+
+.le-chip {
+  padding: 2px 10px;
+  border-radius: 999px;
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.le-chip--good {
+  background: #ecfdf3;
+  color: #067647;
+}
+
+.le-chip--watch {
+  background: #fffaeb;
+  color: #b54708;
+}
+
+.le-chip--bad {
+  background: #fef3f2;
+  color: #b42318;
+}
+
+.le-selected {
+  background: #f5f8ff;
+}
+
+.le-facts {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 24px;
+  padding: 8px 16px 12px;
+  color: #344054;
+}
+
+.le-why div {
+  font-size: 13px;
+  line-height: 1.5;
+}
+
+.le-fail {
+  color: #b42318;
+}
+
+.le-pass {
+  color: #067647;
+}
+
+.le-note {
+  color: #667085;
+}
+
+.le-error {
+  color: #b42318;
+}
+
+.le-notes {
+  margin: 8px 0 24px;
+  color: #667085;
+  font-size: 13px;
+}
+
+.le-late {
+  color: #b42318;
+}
+
+.le-overlay {
+  position: fixed;
+  inset: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: flex-start;
+  justify-content: center;
+  padding: 48px 16px;
+  overflow-y: auto;
+  background: rgb(15 23 42 / 55%);
+}
+
+.le-modal {
+  width: min(1100px, 100%);
+  padding: 20px 24px;
+  border-radius: 12px;
+  background: #fff;
+  box-shadow: 0 20px 50px rgb(0 0 0 / 30%);
+}
+
+.le-modal-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+}
+
+.le-views {
+  margin-bottom: 16px;
+}
+
+.le-compact td {
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
+
+.le-compact .pg-btn {
+  padding: 4px 14px;
+}
+
+.le-pager {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 6px;
+  margin-top: 12px;
+
+  span {
+    margin-right: auto;
+    color: #667085;
+  }
+}
+
+.le-loader {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 14px;
+  margin: 32px auto;
+  padding: 36px 24px;
+  max-width: 520px;
+  border-radius: 12px;
+  background: #fff;
+  box-shadow: 0 4px 16px rgb(16 24 40 / 8%);
+}
+
+.le-loader-title {
+  font-weight: 600;
+  font-size: 16px;
+  color: #1d2939;
+}
+
+.le-loader-steps {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  font-size: 14px;
+  line-height: 1.9;
+  color: #98a2b3;
+
+  .le-done {
+    color: #067647;
+  }
+
+  .le-now {
+    color: #1d4ed8;
+    font-weight: 600;
+  }
+}
+
+.le-progress {
+  width: 100%;
+  height: 6px;
+  border-radius: 3px;
+  overflow: hidden;
+  background: #eaecf0;
+
+  span {
+    display: block;
+    height: 100%;
+    background: #1d4ed8;
+    transition: width 0.6s ease;
+  }
+}
+
+.le-spinner {
+  width: 44px;
+  height: 44px;
+  border: 4px solid #dbe4ff;
+  border-top-color: #1d4ed8;
+  border-radius: 50%;
+  animation: le-spin 0.8s linear infinite;
+}
+
+.le-spinner--sm {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  border-width: 2px;
+  margin-right: 6px;
+  vertical-align: middle;
+}
+
+@keyframes le-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.le-total td {
+  font-weight: 600;
+  border-top: 2px solid #d0d5dd;
+}

src/app/loan-eligibility/loan-eligibility.component.ts

@@ -0,0 +1,187 @@
+/**
+ * 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, HostListener, OnDestroy, OnInit, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { HttpErrorResponse } from '@angular/common/http';
+import {
+  Borrower,
+  BorrowerCategory,
+  LoanEligibilityService,
+  LoanEligibilitySummary,
+  LoanStageRow
+} from './loan-eligibility.service';
+
+/**
+ * Loan Eligibility – how the loan book is running (RBI asset classes) and which loan products the good borrowers
+ * qualify for, using their EMI record and the eligibility rules set on each loan product.
+ */
+@Component({
+  selector: 'mifosx-loan-eligibility',
+  templateUrl: './loan-eligibility.component.html',
+  styleUrls: [
+    '../cashier/cashier-shared.scss',
+    '../investment/investment-shared.scss',
+    './loan-eligibility.component.scss'
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule
+  ]
+})
+export class LoanEligibilityComponent implements OnInit, OnDestroy {
+  private readonly service = inject(LoanEligibilityService);
+
+  summary: LoanEligibilitySummary | null = null;
+  borrowers: Borrower[] = [];
+  category: BorrowerCategory | '' = 'GOOD';
+  search = '';
+  selected: Borrower | null = null;
+  /** Which part of the page is shown, so the user need not scroll past the loan book to reach borrowers. */
+  view: 'BOOK' | 'BORROWERS' = 'BOOK';
+  page = 0;
+  readonly pageSize = 10;
+  loading = false;
+  borrowersLoading = false;
+  /** Borrower whose detail is being fetched (View button shows it). */
+  openingId: number | null = null;
+  error = '';
+  /** Steps shown while the book is being read. */
+  readonly loadingSteps = [
+    'Fetching loan accounts…',
+    'Reading repayment schedules and overdues…',
+    'Classifying loans as per RBI IRAC norms…',
+    'Running product eligibility rules…'
+  ];
+  loadingStep = 0;
+  private stepTimer?: ReturnType<typeof setInterval>;
+
+  readonly categories: Array<{ value: BorrowerCategory | ''; label: string }> = [
+    { value: 'GOOD', label: 'Good borrowers' },
+    { value: 'WATCH', label: 'Watch (SMA)' },
+    { value: 'BAD', label: 'Bad (NPA / written off)' },
+    { value: '', label: 'All borrowers' }
+  ];
+
+  ngOnInit(): void {
+    this.loading = true;
+    this.loadingStep = 0;
+    this.stepTimer = setInterval(
+      () => (this.loadingStep = Math.min(this.loadingStep + 1, this.loadingSteps.length - 1)),
+      700
+    );
+    this.service.getSummary().subscribe({
+      next: (s) => {
+        this.summary = s;
+        this.stopLoading();
+      },
+      error: (err) => {
+        this.stopLoading();
+        this.error = this.message(err);
+      }
+    });
+    this.loadBorrowers();
+  }
+
+  loadBorrowers(): void {
+    this.selected = null;
+    this.borrowersLoading = true;
+    this.service.getBorrowers(this.category, this.search).subscribe({
+      next: (b) => {
+        this.borrowers = b;
+        this.page = 0;
+        this.borrowersLoading = false;
+      },
+      error: (err) => {
+        this.borrowersLoading = false;
+        this.error = this.message(err);
+      }
+    });
+  }
+
+  setCategory(c: BorrowerCategory | ''): void {
+    this.category = c;
+    this.loadBorrowers();
+  }
+
+  open(b: Borrower): void {
+    this.openingId = b.clientId;
+    this.service.getBorrower(b.clientId).subscribe({
+      next: (d) => {
+        this.openingId = null;
+        this.selected = d;
+      },
+      error: (err) => {
+        this.openingId = null;
+        this.error = this.message(err);
+      }
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.stopLoading();
+  }
+
+  private stopLoading(): void {
+    this.loading = false;
+    clearInterval(this.stepTimer);
+  }
+
+  get pagedBorrowers(): Borrower[] {
+    return this.borrowers.slice(this.page * this.pageSize, (this.page + 1) * this.pageSize);
+  }
+
+  get pageEnd(): number {
+    return Math.min((this.page + 1) * this.pageSize, this.borrowers.length);
+  }
+
+  get pages(): number[] {
+    return Array.from({ length: Math.ceil(this.borrowers.length / this.pageSize) }, (_, i) => i);
+  }
+
+  close(): void {
+    this.selected = null;
+  }
+
+  @HostListener('document:keydown.escape')
+  onEscape(): void {
+    this.close();
+  }
+
+  get performingStages(): LoanStageRow[] {
+    return (this.summary?.stages ?? []).filter((s) => s.group === 'PERFORMING');
+  }
+
+  get npaStages(): LoanStageRow[] {
+    return (this.summary?.stages ?? []).filter((s) => s.group === 'NPA');
+  }
+
+  get closedStages(): LoanStageRow[] {
+    return (this.summary?.stages ?? []).filter((s) => s.group === 'CLOSED');
+  }
+
+  /** Share of the active book in a stage, for the bar. */
+  share(s: LoanStageRow): number {
+    const total = this.summary?.activeOutstanding ?? 0;
+    return total > 0 ? Math.round((s.outstanding / total) * 1000) / 10 : 0;
+  }
+
+  categoryLabel(c: BorrowerCategory): string {
+    return c === 'GOOD' ? 'Good' : c === 'WATCH' ? 'Watch' : 'Bad';
+  }
+
+  private message(err: unknown): string {
+    if (err instanceof HttpErrorResponse) {
+      const e = err.error as { errors?: Array<{ defaultUserMessage?: string }>; defaultUserMessage?: string } | null;
+      return e?.errors?.[0]?.defaultUserMessage || e?.defaultUserMessage || err.message;
+    }
+    return String(err);
+  }
+}

src/app/loan-eligibility/loan-eligibility.mock.ts

@@ -0,0 +1,726 @@
+/**
+ * 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/.
+ */
+
+/**
+ * Demo data for Loan Eligibility. The bank's rules are applied to it: RBI asset classification on days past due, and
+ * product eligibility rules (age, age at maturity, income, FOIR, loans per customer, LTV on pledged deposits). The book is generated from a fixed seed, so the
+ * figures are the same on every load.
+ */
+import {
+  Borrower,
+  BorrowerCategory,
+  BorrowerLoan,
+  LoanEligibilitySummary,
+  LoanStageRow,
+  ProductEligibility
+} from './loan-eligibility.service';
+
+interface DemoProduct {
+  id: number;
+  name: string;
+  minAmount: number;
+  maxAmount: number;
+  annualRate: number;
+  tenureMonths: number;
+  minAge?: number;
+  maxAgeAtMaturity?: number;
+  minMonthlyIncome?: number;
+  maxFoir?: number;
+  maxLoansPerCustomer?: number;
+  /** Loan against deposits: % of the FD / RD balance that can be lent. */
+  ltvPct?: number;
+  /** Secured loans need shares of 2.5% of the loan, unsecured 5% (share linking to borrowing). */
+  secured: boolean;
+}
+
+interface DemoMonth {
+  month: string;
+  credits: number;
+  debits: number;
+  avgBalance: number;
+  returns: number;
+}
+
+interface DemoAccount {
+  type: 'Savings' | 'Current';
+  accountNo: string;
+  months: DemoMonth[];
+}
+
+interface DemoLoan {
+  id: number;
+  accountNo: string;
+  productId: number;
+  status: 'Active' | 'Closed' | 'Written off';
+  dpd: number;
+  disbursed: number;
+  outstanding: number;
+  overdue: number;
+  emi: number;
+  /** EMIs fallen due so far, and how many of them were paid after the due date. */
+  emisPaid: number;
+  emisLate: number;
+}
+
+interface DemoClient {
+  id: number;
+  name: string;
+  accountNo: string;
+  age: number;
+  monthlyIncome?: number;
+  fdBalance: number;
+  savingsBalance: number;
+  loans: DemoLoan[];
+  /** Paid-up share capital held as a member. */
+  shareHeld: number;
+  accounts: DemoAccount[];
+}
+
+export const DEMO_PRODUCTS: DemoProduct[] = [
+  {
+    id: 1,
+    name: 'Personal Loan',
+    minAmount: 25000,
+    maxAmount: 1000000,
+    annualRate: 11.5,
+    tenureMonths: 60,
+    minAge: 21,
+    maxAgeAtMaturity: 60,
+    minMonthlyIncome: 25000,
+    maxFoir: 50,
+    maxLoansPerCustomer: 1,
+    secured: false
+  },
+  {
+    id: 2,
+    name: 'Home Loan',
+    minAmount: 500000,
+    maxAmount: 5000000,
+    annualRate: 9,
+    tenureMonths: 240,
+    minAge: 23,
+    maxAgeAtMaturity: 70,
+    minMonthlyIncome: 40000,
+    maxFoir: 55,
+    maxLoansPerCustomer: 1,
+    secured: true
+  },
+  {
+    id: 3,
+    name: 'Vehicle Loan',
+    minAmount: 100000,
+    maxAmount: 1500000,
+    annualRate: 9.75,
+    tenureMonths: 84,
+    minAge: 21,
+    maxAgeAtMaturity: 65,
+    minMonthlyIncome: 20000,
+    maxFoir: 50,
+    maxLoansPerCustomer: 2,
+    secured: true
+  },
+  {
+    id: 4,
+    name: 'Gold Loan',
+    minAmount: 10000,
+    maxAmount: 1000000,
+    annualRate: 9,
+    tenureMonths: 12,
+    minAge: 18,
+    maxLoansPerCustomer: 3,
+    secured: true
+  },
+  {
+    id: 5,
+    name: 'Loan against FD',
+    minAmount: 5000,
+    maxAmount: 2500000,
+    annualRate: 8.5,
+    tenureMonths: 12,
+    minAge: 18,
+    ltvPct: 90,
+    secured: true
+  },
+  {
+    id: 6,
+    name: 'MSME / Business Loan',
+    minAmount: 200000,
+    maxAmount: 2500000,
+    annualRate: 12,
+    tenureMonths: 84,
+    minAge: 25,
+    maxAgeAtMaturity: 65,
+    minMonthlyIncome: 50000,
+    maxFoir: 60,
+    maxLoansPerCustomer: 1,
+    secured: true
+  }
+];
+
+/** Membership share every member holds, over and above the shares linked to loans. */
+const MEMBERSHIP_SHARE = 1000;
+const MONTHS = [
+  'Apr 2026',
+  'May 2026',
+  'Jun 2026',
+  'Jul 2026',
+  'Aug 2026',
+  'Sep 2026'
+];
+/** Late EMIs a borrower may have in their history and still get a fresh loan. */
+const MAX_LATE_EMIS = 2;
+/** Cheque / ECS returns allowed in the last six months for a fresh loan. */
+const MAX_RETURNS = 1;
+
+function sharePct(productId: number): number {
+  return DEMO_PRODUCTS.find((p) => p.id === productId)?.secured === false ? 5 : 2.5;
+}
+
+function ceil100(n: number): number {
+  return Math.ceil(n / 100) * 100;
+}
+
+const FIRST = [
+  'Ramesh',
+  'Sunita',
+  'Amit',
+  'Priya',
+  'Rajesh',
+  'Kavita',
+  'Suresh',
+  'Anjali',
+  'Mahesh',
+  'Pooja',
+  'Dinesh',
+  'Neha',
+  'Vijay',
+  'Rekha',
+  'Sanjay',
+  'Meena',
+  'Arvind',
+  'Geeta',
+  'Manoj',
+  'Seema',
+  'Rahul',
+  'Asha',
+  'Deepak',
+  'Nisha',
+  'Ashok',
+  'Lata',
+  'Prakash',
+  'Usha',
+  'Anil',
+  'Shobha'
+];
+const LAST = [
+  'Sharma',
+  'Verma',
+  'Patel',
+  'Gupta',
+  'Singh',
+  'Yadav',
+  'Jain',
+  'Agrawal',
+  'Choudhary',
+  'Mishra',
+  'Tiwari',
+  'Rathore',
+  'Soni',
+  'Malviya',
+  'Dubey',
+  'Saxena'
+];
+
+/** Small deterministic generator so the demo looks the same every time. */
+function rng(seed: number): () => number {
+  let s = seed;
+  return () => {
+    s = (s * 1664525 + 1013904223) % 4294967296;
+    return s / 4294967296;
+  };
+}
+
+function emiFor(principal: number, annualRate: number, months: number): number {
+  const r = annualRate / 1200;
+  return r === 0 ? principal / months : (principal * r) / (1 - Math.pow(1 + r, -months));
+}
+
+function principalForEmi(emi: number, annualRate: number, months: number): number {
+  const r = annualRate / 1200;
+  return r === 0 ? emi * months : (emi * (1 - Math.pow(1 + r, -months))) / r;
+}
+
+function round(n: number, step = 1): number {
+  return Math.round(n / step) * step;
+}
+
+function buildBook(): DemoClient[] {
+  const rand = rng(20261019);
+  const pick = <T>(a: T[]): T => a[Math.floor(rand() * a.length)];
+  const clients: DemoClient[] = [];
+  // Separate streams for the repayment record and the bank accounts, so the book above stays as it was.
+  const track = rng(7);
+  const bank = rng(11);
+  let loanId = 1;
+  for (let i = 0; i < 64; i++) {
+    const salaried = rand() < 0.85;
+    const client: DemoClient = {
+      id: 1001 + i,
+      name: `${FIRST[i % FIRST.length]} ${pick(LAST)}`,
+      accountNo: String(100010 + i).padStart(9, '0'),
+      age: 22 + Math.floor(rand() * 40),
+      monthlyIncome: salaried ? round(18000 + rand() * 132000, 500) : undefined,
+      fdBalance: rand() < 0.45 ? round(25000 + rand() * 775000, 1000) : 0,
+      savingsBalance: round(2000 + rand() * 148000, 100),
+      loans: [],
+      shareHeld: 0,
+      accounts: []
+    };
+    const count = 1 + Math.floor(rand() * 3);
+    // Behaviour of the borrower decides how all their loans run: most pay on time, some slip, a few go bad.
+    const behaviour = rand();
+    for (let k = 0; k < count; k++) {
+      // Stay within each product's age and loans-per-customer rules, as the bank would have at sanction.
+      const product = pick(
+        DEMO_PRODUCTS.filter(
+          (p) =>
+            (p.id !== 5 || client.fdBalance > 0) &&
+            client.age >= (p.minAge ?? 18) &&
+            client.loans.filter((l) => l.productId === p.id).length < (p.maxLoansPerCustomer ?? 3)
+        )
+      );
+      const disbursed = round(
+        product.minAmount + rand() * Math.min(product.maxAmount - product.minAmount, 1800000),
+        1000
+      );
+      const closed = rand() < 0.25;
+      let dpd = 0;
+      if (!closed) {
+        if (behaviour > 0.975) {
+          dpd = 91 + Math.floor(rand() * 900);
+        } else if (behaviour > 0.72) {
+          dpd = 1 + Math.floor(rand() * 89);
+        } else if (behaviour > 0.705) {
+          dpd = 91 + Math.floor(rand() * 300);
+        }
+      }
+      const writtenOff = !closed && dpd > 700 && rand() < 0.5;
+      const outstanding = closed || writtenOff ? 0 : round(disbursed * (0.25 + rand() * 0.7), 1);
+      const emi = round(emiFor(disbursed, product.annualRate, product.tenureMonths), 1);
+      const emisPaid = closed
+        ? Math.min(product.tenureMonths, 12 + Math.floor(track() * 24))
+        : writtenOff
+          ? Math.max(3, Math.round(product.tenureMonths * 0.3))
+          : Math.max(1, Math.round(product.tenureMonths * (1 - outstanding / disbursed)));
+      // Most good payers never miss a date; some were late once or a few times but are regular today.
+      let emisLate = 0;
+      if (behaviour > 0.705) {
+        emisLate = 2 + Math.floor(track() * 6);
+      } else if (behaviour > 0.55) {
+        emisLate = 1 + Math.floor(track() * 4);
+      }
+      emisLate = Math.min(emisLate, emisPaid);
+      client.loans.push({
+        id: loanId,
+        accountNo: String(500000 + loanId).padStart(9, '0'),
+        productId: product.id,
+        status: closed ? 'Closed' : writtenOff ? 'Written off' : 'Active',
+        dpd: closed || writtenOff ? 0 : dpd,
+        disbursed,
+        outstanding,
+        overdue: dpd > 0 && !writtenOff ? round(Math.min(outstanding, emi * Math.ceil(dpd / 30)), 1) : 0,
+        emi: closed || writtenOff ? 0 : emi,
+        emisPaid,
+        emisLate
+      });
+      loanId++;
+    }
+    addBanking(client, bank);
+    clients.push(client);
+  }
+  return clients;
+}
+
+/** Savings / current account statement for the last six months and the member's shareholding. */
+function addBanking(c: DemoClient, bank: () => number): void {
+  const active = c.loans.filter((l) => l.status === 'Active');
+  const emi = active.reduce((s, l) => s + l.emi, 0);
+  const overdue = active.some((l) => l.dpd > 0);
+  const late = c.loans.reduce((s, l) => s + l.emisLate, 0);
+  // Salaried members run a savings account; traders and businesses run a current account.
+  const business = !c.monthlyIncome;
+  const turnover = c.monthlyIncome ?? 150000 + bank() * 650000;
+  const spendRatio = business ? 0.82 + bank() * 0.12 : 0.3 + bank() * 0.3;
+  let returns = overdue ? 1 + Math.floor(bank() * 3) : late > MAX_LATE_EMIS ? 1 : bank() < 0.08 ? 1 : 0;
+  const months: DemoMonth[] = MONTHS.map((month, i) => {
+    const credits = round(turnover * (0.9 + bank() * 0.2) + (business ? 0 : bank() * 3000), 10);
+    // EMIs go out first; household or business spending is a share of what is left.
+    const debits = round(Math.max(0, credits - emi) * Math.min(0.97, spendRatio * (0.9 + bank() * 0.2)) + emi, 10);
+    const r = returns > 0 && (i >= MONTHS.length - returns || bank() < 0.2) ? 1 : 0;
+    returns -= r;
+    return {
+      month,
+      credits,
+      debits: overdue ? Math.max(debits, round(credits * 1.02, 10)) : debits,
+      avgBalance: round(c.savingsBalance * (0.7 + bank() * 0.6), 100),
+      returns: r
+    };
+  });
+  c.accounts.push({
+    type: business ? 'Current' : 'Savings',
+    accountNo: String((business ? 300000 : 200000) + c.id).padStart(9, '0'),
+    months
+  });
+  // Shares linked to borrowing: 2.5% of secured and 5% of unsecured loans. A few members are short.
+  const required = active.reduce((s, l) => s + (l.disbursed * sharePct(l.productId)) / 100, 0);
+  const short = required > 0 && bank() < 0.15;
+  c.shareHeld = MEMBERSHIP_SHARE + ceil100(short ? required * 0.5 : required);
+}
+
+const BOOK = buildBook();
+const AS_ON = '19-10-2026';
+
+const STAGES: Array<Omit<LoanStageRow, 'loans' | 'outstanding' | 'overdue'>> = [
+  { stage: 'STANDARD', label: 'Standard', dpdRange: '0', group: 'PERFORMING' },
+  { stage: 'SMA0', label: 'SMA-0', dpdRange: '1-30', group: 'PERFORMING' },
+  { stage: 'SMA1', label: 'SMA-1', dpdRange: '31-60', group: 'PERFORMING' },
+  { stage: 'SMA2', label: 'SMA-2', dpdRange: '61-90', group: 'PERFORMING' },
+  { stage: 'SUBSTANDARD', label: 'Sub-standard', dpdRange: '91-455', group: 'NPA' },
+  { stage: 'DOUBTFUL1', label: 'Doubtful D1', dpdRange: '456-820', group: 'NPA' },
+  { stage: 'DOUBTFUL2', label: 'Doubtful D2', dpdRange: '821-1550', group: 'NPA' },
+  { stage: 'DOUBTFUL3', label: 'Doubtful D3', dpdRange: 'above 1550', group: 'NPA' },
+  { stage: 'LOSS', label: 'Loss / written off', dpdRange: 'written off', group: 'CLOSED' },
+  { stage: 'CLOSED', label: 'Closed', dpdRange: 'repaid', group: 'CLOSED' }
+];
+
+/** RBI IRAC class of a loan on days past due. */
+function stageOf(l: DemoLoan): string {
+  if (l.status === 'Written off') {
+    return 'LOSS';
+  }
+  if (l.status === 'Closed') {
+    return 'CLOSED';
+  }
+  const d = l.dpd;
+  if (d <= 0) {
+    return 'STANDARD';
+  }
+  if (d <= 30) {
+    return 'SMA0';
+  }
+  if (d <= 60) {
+    return 'SMA1';
+  }
+  if (d <= 90) {
+    return 'SMA2';
+  }
+  if (d <= 455) {
+    return 'SUBSTANDARD';
+  }
+  if (d <= 820) {
+    return 'DOUBTFUL1';
+  }
+  return d <= 1550 ? 'DOUBTFUL2' : 'DOUBTFUL3';
+}
+
+function labelOf(stage: string): string {
+  return STAGES.find((s) => s.stage === stage)?.label ?? stage;
+}
+
+function isNpa(stage: string): boolean {
+  return STAGES.find((s) => s.stage === stage)?.group === 'NPA';
+}
+
+function categoryOf(c: DemoClient): BorrowerCategory {
+  let cat: BorrowerCategory = 'GOOD';
+  for (const l of c.loans) {
+    const st = stageOf(l);
+    if (st === 'LOSS' || isNpa(st)) {
+      return 'BAD';
+    }
+    if (l.status === 'Active' && st !== 'STANDARD') {
+      cat = 'WATCH';
+    }
+  }
+  return cat;
+}
+
+function productName(id: number): string {
+  return DEMO_PRODUCTS.find((p) => p.id === id)?.name ?? String(id);
+}
+
+/** Shares the member should hold against the running loans. */
+function shareRequired(c: DemoClient): number {
+  return c.loans
+    .filter((l) => l.status === 'Active')
+    .reduce((s, l) => s + (l.disbursed * sharePct(l.productId)) / 100, 0);
+}
+
+/** Six-month averages of the operative account. */
+function statement(c: DemoClient) {
+  const ms = c.accounts.flatMap((a) => a.months);
+  const n = MONTHS.length;
+  const credits = ms.reduce((s, m) => s + m.credits, 0) / n;
+  const debits = ms.reduce((s, m) => s + m.debits, 0) / n;
+  return {
+    type: c.accounts[0]?.type ?? 'Savings',
+    credits,
+    debits,
+    surplus: credits - debits,
+    avgBalance: ms.reduce((s, m) => s + m.avgBalance, 0) / n,
+    returns: ms.reduce((s, m) => s + m.returns, 0)
+  };
+}
+
+const inr = (n: number) => '₹' + Math.round(n).toLocaleString('en-IN');
+
+function eligibility(c: DemoClient, p: DemoProduct): ProductEligibility {
+  const passed: string[] = [];
+  const failed: string[] = [];
+  const notes: string[] = [];
+  const active = c.loans.filter((l) => l.status === 'Active');
+  const currentEmi = active.reduce((s, l) => s + l.emi, 0);
+  let limit = p.maxAmount;
+  const paid = c.loans.reduce((s, l) => s + l.emisPaid, 0);
+  const late = c.loans.reduce((s, l) => s + l.emisLate, 0);
+  if (late > MAX_LATE_EMIS) {
+    failed.push(`EMI record: ${late} of ${paid} EMIs paid late (allowed up to ${MAX_LATE_EMIS})`);
+  } else {
+    passed.push(`EMI record: ${paid - late} of ${paid} EMIs paid on time`);
+  }
+  const st = statement(c);
+  if (st.returns > MAX_RETURNS) {
+    failed.push(`${st.returns} cheque / ECS returns in the last 6 months (allowed up to ${MAX_RETURNS})`);
+  } else {
+    passed.push(`${st.returns} cheque / ECS return(s) in the last 6 months`);
+  }
+  if (st.surplus <= 0) {
+    failed.push(`Account spending ${inr(st.debits)} a month is more than the credits ${inr(st.credits)}`);
+  } else {
+    passed.push(
+      `${st.type} account: credits ${inr(st.credits)} − expenses ${inr(st.debits)} = ${inr(st.surplus)} left a month`
+    );
+    if (p.maxFoir !== undefined) {
+      limit = Math.min(limit, principalForEmi(st.surplus, p.annualRate, p.tenureMonths));
+    }
+  }
+  if (p.minAge !== undefined) {
+    if (c.age < p.minAge) {
+      failed.push(`Age ${c.age} is below the minimum ${p.minAge}`);
+    } else {
+      passed.push(`Age ${c.age} (minimum ${p.minAge})`);
+    }
+  }
+  if (p.maxAgeAtMaturity !== undefined) {
+    const atMaturity = c.age + Math.ceil(p.tenureMonths / 12);
+    if (atMaturity > p.maxAgeAtMaturity) {
+      failed.push(`Age at maturity ${atMaturity} exceeds ${p.maxAgeAtMaturity}`);
+    } else {
+      passed.push(`Age at maturity ${atMaturity} (maximum ${p.maxAgeAtMaturity})`);
+    }
+  }
+  if (p.minMonthlyIncome !== undefined) {
+    if (!c.monthlyIncome) {
+      failed.push(`Monthly income not recorded (minimum ${inr(p.minMonthlyIncome)})`);
+    } else if (c.monthlyIncome < p.minMonthlyIncome) {
+      failed.push(`Monthly income ${inr(c.monthlyIncome)} is below ${inr(p.minMonthlyIncome)}`);
+    } else {
+      passed.push(`Monthly income ${inr(c.monthlyIncome)} (minimum ${inr(p.minMonthlyIncome)})`);
+    }
+  }
+  if (p.maxLoansPerCustomer !== undefined) {
+    const running = active.filter((l) => l.productId === p.id).length;
+    if (running >= p.maxLoansPerCustomer) {
+      failed.push(`${running} loan(s) of this product already running (maximum ${p.maxLoansPerCustomer})`);
+    } else {
+      passed.push(`${running} loan(s) of this product running (maximum ${p.maxLoansPerCustomer})`);
+    }
+  }
+  if (p.maxFoir !== undefined && c.monthlyIncome) {
+    const room = (c.monthlyIncome * p.maxFoir) / 100 - currentEmi;
+    if (room <= 0) {
+      failed.push(`Current EMIs ${inr(currentEmi)} already use the FOIR limit of ${p.maxFoir}% of income`);
+    } else {
+      const byFoir = principalForEmi(room, p.annualRate, p.tenureMonths);
+      passed.push(`FOIR ${p.maxFoir}%: EMI room ${inr(room)} a month supports up to ${inr(byFoir)}`);
+      limit = Math.min(limit, byFoir);
+    }
+  }
+  if (p.ltvPct !== undefined) {
+    if (c.fdBalance <= 0) {
+      failed.push('No FD / RD to pledge');
+    } else {
+      const byDeposit = (c.fdBalance * p.ltvPct) / 100;
+      passed.push(`FD ${inr(c.fdBalance)} at ${p.ltvPct}% allows up to ${inr(byDeposit)}`);
+      limit = Math.min(limit, byDeposit);
+    }
+  }
+  if (p.id === 4) {
+    notes.push('Final amount depends on the gold valued at the branch');
+  }
+  let eligible = failed.length === 0;
+  if (eligible && limit < p.minAmount) {
+    failed.push(`Eligible amount ${inr(limit)} is below the product minimum ${inr(p.minAmount)}`);
+    eligible = false;
+  }
+  const amount = eligible ? round(limit, 1000) : undefined;
+  const pct = p.secured ? 2.5 : 5;
+  const shortfall = Math.max(0, shareRequired(c) - (c.shareHeld - MEMBERSHIP_SHARE));
+  const shareToBuy = amount ? ceil100((amount * pct) / 100 + shortfall) : undefined;
+  if (amount) {
+    notes.push(
+      `Shares of ${inr((amount * pct) / 100)} to be taken (${pct}% of the loan, ${p.secured ? 'secured' : 'unsecured'})`
+    );
+    if (shortfall > 0) {
+      notes.push(`Existing share shortfall of ${inr(shortfall)} on running loans is collected too`);
+    }
+  }
+  notes.push('CIBIL score not checked in this demo');
+  return {
+    productId: p.id,
+    productName: p.name,
+    eligible,
+    eligibleAmount: amount,
+    sharePct: pct,
+    shareToBuy,
+    netInHand: amount && shareToBuy !== undefined ? amount - shareToBuy : undefined,
+    minAmount: p.minAmount,
+    maxAmount: p.maxAmount,
+    passed,
+    failed,
+    notes
+  };
+}
+
+function toBorrower(c: DemoClient, detail: boolean): Borrower {
+  const category = categoryOf(c);
+  const active = c.loans.filter((l) => l.status === 'Active');
+  const order = STAGES.map((s) => s.stage);
+  const worst = active.map(stageOf).sort((a, b) => order.indexOf(b) - order.indexOf(a))[0];
+  const elig = category === 'GOOD' ? DEMO_PRODUCTS.map((p) => eligibility(c, p)) : [];
+  const loans: BorrowerLoan[] = c.loans.map((l) => ({
+    loanId: l.id,
+    accountNo: l.accountNo,
+    productName: productName(l.productId),
+    status: l.status,
+    stage: labelOf(stageOf(l)),
+    dpd: l.dpd,
+    emisPaid: l.emisPaid,
+    emisLate: l.emisLate,
+    disbursed: l.disbursed,
+    outstanding: l.outstanding,
+    overdue: l.overdue,
+    sharePct: sharePct(l.productId),
+    shareRequired: l.status === 'Active' ? (l.disbursed * sharePct(l.productId)) / 100 : 0
+  }));
+  const st = statement(c);
+  return {
+    clientId: c.id,
+    clientName: c.name,
+    clientAccountNo: c.accountNo,
+    category,
+    activeLoans: active.length,
+    closedLoans: c.loans.filter((l) => l.status === 'Closed').length,
+    writtenOffLoans: c.loans.filter((l) => l.status === 'Written off').length,
+    outstanding: active.reduce((s, l) => s + l.outstanding, 0),
+    maxDpd: active.reduce((m, l) => Math.max(m, l.dpd), 0),
+    worstStage: worst ? labelOf(worst) : undefined,
+    monthlyIncome: c.monthlyIncome,
+    age: c.age,
+    depositBalance: c.fdBalance + c.savingsBalance,
+    currentEmi: active.reduce((s, l) => s + l.emi, 0),
+    eligibleProducts: elig.filter((e) => e.eligible).length,
+    emisPaid: c.loans.reduce((s, l) => s + l.emisPaid, 0),
+    emisLate: c.loans.reduce((s, l) => s + l.emisLate, 0),
+    shareHeld: c.shareHeld,
+    shareRequired: MEMBERSHIP_SHARE + shareRequired(c),
+    accountType: st.type,
+    avgCredits: st.credits,
+    avgDebits: st.debits,
+    returns: st.returns,
+    accounts: detail ? c.accounts : undefined,
+    loans: detail ? loans : undefined,
+    eligibility: detail ? elig : undefined
+  };
+}
+
+export function demoSummary(): LoanEligibilitySummary {
+  const all = BOOK.flatMap((c) => c.loans);
+  const stages: LoanStageRow[] = STAGES.map((s) => {
+    const ls = all.filter((l) => stageOf(l) === s.stage);
+    return {
+      ...s,
+      loans: ls.length,
+      outstanding: ls.reduce((a, l) => a + l.outstanding, 0),
+      overdue: ls.reduce((a, l) => a + l.overdue, 0)
+    };
+  });
+  const active = all.filter((l) => l.status === 'Active');
+  const npa = active.filter((l) => isNpa(stageOf(l)));
+  const activeOut = active.reduce((a, l) => a + l.outstanding, 0);
+  const npaOut = npa.reduce((a, l) => a + l.outstanding, 0);
+  const cats = BOOK.map(categoryOf);
+  const linked = BOOK.filter((c) => shareRequired(c) > 0);
+  const shortOf = (c: DemoClient) => Math.max(0, shareRequired(c) - (c.shareHeld - MEMBERSHIP_SHARE));
+  return {
+    shareRequired: linked.reduce((a, c) => a + shareRequired(c), 0),
+    shareHeld: linked.reduce((a, c) => a + c.shareHeld - MEMBERSHIP_SHARE, 0),
+    shareShortMembers: linked.filter((c) => shortOf(c) > 0).length,
+    shareShortfall: linked.reduce((a, c) => a + shortOf(c), 0),
+    asOnDate: AS_ON,
+    activeLoans: active.length,
+    activeOutstanding: activeOut,
+    performingLoans: active.length - npa.length,
+    performingOutstanding: activeOut - npaOut,
+    npaLoans: npa.length,
+    npaOutstanding: npaOut,
+    grossNpaPct: activeOut > 0 ? Math.round((npaOut / activeOut) * 10000) / 100 : 0,
+    closedLoans: all.filter((l) => l.status === 'Closed').length,
+    writtenOffLoans: all.filter((l) => l.status === 'Written off').length,
+    writtenOffAmount: all.filter((l) => l.status === 'Written off').reduce((a, l) => a + l.disbursed * 0.6, 0),
+    goodBorrowers: cats.filter((c) => c === 'GOOD').length,
+    watchBorrowers: cats.filter((c) => c === 'WATCH').length,
+    badBorrowers: cats.filter((c) => c === 'BAD').length,
+    stages,
+    products: DEMO_PRODUCTS.map((p) => {
+      const ls = active.filter((l) => l.productId === p.id);
+      const bad = ls.filter((l) => isNpa(stageOf(l)));
+      return {
+        productId: p.id,
+        productName: p.name,
+        activeLoans: ls.length,
+        performingLoans: ls.length - bad.length,
+        npaLoans: bad.length,
+        outstanding: ls.reduce((a, l) => a + l.outstanding, 0),
+        npaOutstanding: bad.reduce((a, l) => a + l.outstanding, 0)
+      };
+    }).sort((a, b) => b.outstanding - a.outstanding),
+    notes: [
+      'Demo data: the figures are illustrative, not the bank’s books.',
+      'Share linking to borrowing: members hold shares of 5% of unsecured and 2.5% of secured loans (UCBs keeping CRAR of 12% on a continuous basis are exempt).',
+      'Classification as per RBI IRAC norms on days past due (90+ days = NPA; Sub-standard up to 12 months as NPA, then Doubtful D1 / D2 / D3).',
+      'Eligibility uses each product’s rules: age, age at maturity, monthly income, FOIR, loans per customer and, for loans against FD, the LTV on the deposit.'
+    ]
+  };
+}
+
+export function demoBorrowers(category: BorrowerCategory | '', search: string): Borrower[] {
+  const q = search.trim().toLowerCase();
+  return BOOK.filter((c) => !category || categoryOf(c) === category)
+    .filter((c) => !q || c.name.toLowerCase().includes(q) || c.accountNo.includes(q))
+    .map((c) => toBorrower(c, false))
+    .sort(
+      (a, b) =>
+        b.maxDpd - a.maxDpd || b.eligibleProducts - a.eligibleProducts || a.clientName.localeCompare(b.clientName)
+    );
+}
+
+export function demoBorrower(clientId: number): Borrower | undefined {
+  const c = BOOK.find((x) => x.id === clientId);
+  return c ? toBorrower(c, true) : undefined;
+}

src/app/loan-eligibility/loan-eligibility.module.ts

@@ -0,0 +1,15 @@
+/**
+ * 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 { LoanEligibilityRoutingModule } from './loan-eligibility-routing.module';
+
+@NgModule({
+  imports: [LoanEligibilityRoutingModule]
+})
+export class LoanEligibilityModule {}

src/app/loan-eligibility/loan-eligibility.service.ts

@@ -0,0 +1,154 @@
+/**
+ * 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 } from '@angular/core';
+import { Observable, delay, of, throwError } from 'rxjs';
+import { demoBorrower, demoBorrowers, demoSummary } from './loan-eligibility.mock';
+
+export type BorrowerCategory = 'GOOD' | 'WATCH' | 'BAD';
+
+export interface LoanStageRow {
+  stage: string;
+  label: string;
+  dpdRange: string;
+  group: 'PERFORMING' | 'NPA' | 'CLOSED';
+  loans: number;
+  outstanding: number;
+  overdue: number;
+}
+
+export interface LoanProductRow {
+  productId: number;
+  productName: string;
+  activeLoans: number;
+  performingLoans: number;
+  npaLoans: number;
+  outstanding: number;
+  npaOutstanding: number;
+}
+
+/** Loan book health as on the business date (RBI asset classes, products, borrowers). */
+export interface LoanEligibilitySummary {
+  asOnDate: string;
+  activeLoans: number;
+  activeOutstanding: number;
+  performingLoans: number;
+  performingOutstanding: number;
+  npaLoans: number;
+  npaOutstanding: number;
+  grossNpaPct: number;
+  closedLoans: number;
+  writtenOffLoans: number;
+  writtenOffAmount: number;
+  /** Share linking to borrowing across members with running loans. */
+  shareRequired: number;
+  shareHeld: number;
+  shareShortMembers: number;
+  shareShortfall: number;
+  goodBorrowers: number;
+  watchBorrowers: number;
+  badBorrowers: number;
+  stages: LoanStageRow[];
+  products: LoanProductRow[];
+  notes: string[];
+}
+
+export interface BorrowerLoan {
+  loanId: number;
+  accountNo: string;
+  productName: string;
+  status: string;
+  stage: string;
+  dpd: number;
+  emisPaid: number;
+  emisLate: number;
+  disbursed: number;
+  outstanding: number;
+  overdue: number;
+  sharePct: number;
+  shareRequired: number;
+}
+
+export interface AccountMonth {
+  month: string;
+  credits: number;
+  debits: number;
+  avgBalance: number;
+  returns: number;
+}
+
+/** Savings / current account statement, month by month. */
+export interface BorrowerAccount {
+  type: 'Savings' | 'Current';
+  accountNo: string;
+  months: AccountMonth[];
+}
+
+export interface ProductEligibility {
+  productId: number;
+  productName: string;
+  eligible: boolean;
+  eligibleAmount?: number;
+  sharePct: number;
+  /** Shares to be taken with this loan (incl. any existing shortfall). */
+  shareToBuy?: number;
+  netInHand?: number;
+  minAmount?: number;
+  maxAmount?: number;
+  passed: string[];
+  failed: string[];
+  notes: string[];
+}
+
+export interface Borrower {
+  clientId: number;
+  clientName: string;
+  clientAccountNo: string;
+  category: BorrowerCategory;
+  activeLoans: number;
+  closedLoans: number;
+  writtenOffLoans: number;
+  outstanding: number;
+  maxDpd: number;
+  worstStage?: string;
+  monthlyIncome?: number;
+  age?: number;
+  depositBalance: number;
+  currentEmi: number;
+  eligibleProducts: number;
+  /** Repayment record over all loans: EMIs fallen due and how many were paid late. */
+  emisPaid: number;
+  emisLate: number;
+  shareHeld: number;
+  shareRequired: number;
+  /** Six-month averages of the operative account. */
+  accountType: 'Savings' | 'Current';
+  avgCredits: number;
+  avgDebits: number;
+  returns: number;
+  accounts?: BorrowerAccount[];
+  loans?: BorrowerLoan[];
+  eligibility?: ProductEligibility[];
+}
+
+/** Loan Eligibility (AI / Intelligence – Lending & Risk): demo data, worked out on the eligibility rules. */
+@Injectable({ providedIn: 'root' })
+export class LoanEligibilityService {
+  getSummary(): Observable<LoanEligibilitySummary> {
+    return of(demoSummary()).pipe(delay(2800));
+  }
+
+  getBorrowers(category: BorrowerCategory | '', search: string): Observable<Borrower[]> {
+    return of(demoBorrowers(category, search)).pipe(delay(700));
+  }
+
+  getBorrower(clientId: number): Observable<Borrower> {
+    const b = demoBorrower(clientId);
+    return b ? of(b).pipe(delay(900)) : throwError(() => new Error('Borrower not found'));
+  }
+}

src/app/npa/npa-data.ts

@@ -967,6 +967,7 @@ export const REPORT_META: ReportMeta[] = [
   { id: 'probable', group: 'classification', label: 'Probable NPA' },
   { id: 'sma', group: 'classification', label: 'SMA Report' },
   { id: 'recovery-dashboard', group: 'recovery-mgmt', label: 'Recovery Management Dashboard' },
+  { id: 'cc-recovery', group: 'recovery-mgmt', label: 'Cash Credit (CC) Recovery Management' },
   { id: 'daywise-overdue', group: 'recovery-mgmt', label: 'Day-wise Overdue Report' },
   { id: 'daywise-overdrawn', group: 'recovery-mgmt', label: 'Day-wise Overdrawn Report' },
   { id: 'agri-gold-value', group: 'recovery-mgmt', label: 'Agriculture / Gold Market Value Report' },

src/app/npa/npa-reports/npa-reports.component.html

@@ -1400,6 +1400,184 @@
     </div>
   }
 
+  <!-- ===================== CASH CREDIT (CC) RECOVERY MANAGEMENT ===================== -->
+  @if (activeReport === 'cc-recovery') {
+    <div class="pg-card">
+      <div class="pos-section-label">
+        Cash Credit (CC) Recovery Management — Drawing Power &amp; Overdrawn-Day Tracking
+      </div>
+      <p class="pg-sub npa-report-note">
+        Cash Credit is a revolving working-capital facility secured against stock / receivables. Unlike a Term Loan, it
+        isn't checked against a fixed instalment — it is checked against its <strong>Drawing Power (DP)</strong>, and
+        tracked by how many continuous <strong>Days Overdrawn</strong> ("Out of Order") it has run — crossing 90 days
+        turns it <strong>NPA</strong>.
+      </p>
+      <div class="npa-glossary">
+        <div class="npa-glossary-card npa-glossary-card--dp">
+          <span class="npa-glossary-card__icon"><fa-icon icon="wallet"></fa-icon></span>
+          <div class="npa-glossary-card__term">Drawing Power (DP)</div>
+          <p class="npa-glossary-card__desc">
+            The maximum amount the borrower may actually draw against the sanctioned CC limit — fixed from the value of
+            stock / book-debts declared in the latest stock statement. Can be lower than the sanctioned limit.
+          </p>
+        </div>
+        <div class="npa-glossary-card npa-glossary-card--ooo">
+          <span class="npa-glossary-card__icon"><fa-icon icon="hourglass-half"></fa-icon></span>
+          <div class="npa-glossary-card__term">Out of Order</div>
+          <p class="npa-glossary-card__desc">
+            A CC account turns "Out of Order" once its outstanding continuously stays above the limit/DP, or adequate
+            credits stop coming in, for 90 days — the CC-specific overdue trigger, in place of a missed EMI.
+          </p>
+        </div>
+        <div class="npa-glossary-card npa-glossary-card--sma">
+          <span class="npa-glossary-card__icon"><fa-icon icon="flag"></fa-icon></span>
+          <div class="npa-glossary-card__term">Days Overdrawn</div>
+          <p class="npa-glossary-card__desc">
+            The running count of continuous days an account has stayed Out of Order — the number a recovery desk
+            actually watches day to day, instead of a classification label. A rising count is the early-warning sign.
+          </p>
+        </div>
+        <div class="npa-glossary-card npa-glossary-card--npa">
+          <span class="npa-glossary-card__icon"><fa-icon icon="ban"></fa-icon></span>
+          <div class="npa-glossary-card__term">NPA (Non-Performing Asset)</div>
+          <p class="npa-glossary-card__desc">
+            Once Out of Order crosses 90 days, the CC account slips to NPA — Sub-Standard, then Doubtful-1/2/3, then
+            Loss Asset as it ages further.
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="pg-card">
+      <div class="inv-kpis npa-kpis--ratio npa-kpis--compact">
+        <div class="inv-kpi npa-kpi--accent npa-kpi--accent--neutral">
+          <span class="npa-kpi__icon"><fa-icon icon="wallet"></fa-icon></span>
+          <span class="inv-kpi__label">Total CC Accounts</span>
+          <span class="inv-kpi__value">{{ ccAccounts.length }}</span>
+          <span class="inv-kpi__sub">₹{{ ccTotalSanctioned | number: '1.0-0' }} sanctioned</span>
+        </div>
+        <div class="inv-kpi npa-kpi--accent npa-kpi--accent--warn">
+          <span class="npa-kpi__icon"><fa-icon icon="hourglass-half"></fa-icon></span>
+          <span class="inv-kpi__label">Overdrawn (1–90 Days)</span>
+          <span class="inv-kpi__value" [class.npa-warn]="ccOverdrawnCount > 0">{{ ccOverdrawnCount }}</span>
+          <span class="inv-kpi__sub">Out of Order, not yet NPA</span>
+        </div>
+        <div class="inv-kpi npa-kpi--accent npa-kpi--accent--npa">
+          <span class="npa-kpi__icon"><fa-icon icon="ban"></fa-icon></span>
+          <span class="inv-kpi__label">NPA (90+ Days Overdrawn)</span>
+          <span class="inv-kpi__value npa-warn">{{ ccNpaCount }}</span>
+          <span class="inv-kpi__sub">₹{{ ccTotalOutstanding | number: '1.0-0' }} total outstanding</span>
+        </div>
+        <div class="inv-kpi npa-kpi--accent npa-kpi--accent--info">
+          <span class="npa-kpi__icon"><fa-icon icon="money-bill-wave"></fa-icon></span>
+          <span class="inv-kpi__label">Interest Paid (This Cycle)</span>
+          <span class="inv-kpi__value">₹{{ ccInterestPaidThisCycle | number: '1.0-0' }}</span>
+          <span class="inv-kpi__sub">of ₹{{ ccInterestDueThisCycle | number: '1.0-0' }} due</span>
+        </div>
+        <div class="inv-kpi npa-kpi--accent npa-kpi--accent--positive">
+          <span class="npa-kpi__icon"><fa-icon icon="hand-holding-usd"></fa-icon></span>
+          <span class="inv-kpi__label">Total Recovered</span>
+          <span class="inv-kpi__value">₹{{ ccTotalRecovered | number: '1.0-0' }}</span>
+          <span class="inv-kpi__sub"
+            >{{ ccRecoveryPct | number: '1.1-1' }}% of ₹{{ ccTotalSanctioned | number: '1.0-0' }} sanctioned</span
+          >
+        </div>
+      </div>
+    </div>
+
+    <div class="pg-card">
+      <div class="pos-section-label">
+        Cash Credit Accounts — Limit, DP &amp; Classification ({{ ccOutOfOrderCount }} of {{ ccAccounts.length }} Out of
+        Order)
+      </div>
+      <div class="pg-table-scroll">
+        <table class="pg-table">
+          <thead>
+            <tr>
+              <th>Account No</th>
+              <th>Customer</th>
+              <th>Branch</th>
+              <th class="num">Sanctioned Limit</th>
+              <th class="num">Drawing Power (DP)</th>
+              <th class="num">Outstanding</th>
+              <th class="num col-out">Pending to Recover</th>
+              <th class="num col-out">Excess Over DP</th>
+              <th class="num">Interest Due (This Cycle)</th>
+              <th class="num col-in">Interest Paid (This Cycle)</th>
+              <th class="num col-in">Total Recovered</th>
+              <th class="num">Days Overdrawn</th>
+              <th>Status</th>
+              <th>Recovery Officer</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (a of paged(ccAccounts); track a.accountNo) {
+              <tr>
+                <td>
+                  <span class="pg-chip">{{ a.accountNo }}</span>
+                </td>
+                <td>{{ a.customerName }}</td>
+                <td>{{ a.branchName }}</td>
+                <td class="num">₹{{ a.sanctionedAmount | number: '1.0-0' }}</td>
+                <td class="num">₹{{ a.drawingPower | number: '1.0-0' }}</td>
+                <td class="num">₹{{ a.outstandingBalance | number: '1.0-0' }}</td>
+                <td class="num col-out">₹{{ a.overdueAmount | number: '1.0-0' }}</td>
+                <td class="num col-out">₹{{ excessOverDp(a) | number: '1.0-0' }}</td>
+                <td class="num">₹{{ expectedThisMonth(a) | number: '1.0-0' }}</td>
+                <td class="num" [class.col-in]="actualThisMonth(a) > 0" [class.col-out]="actualThisMonth(a) === 0">
+                  ₹{{ actualThisMonth(a) | number: '1.0-0' }}
+                </td>
+                <td class="num col-in">₹{{ recovered(a) | number: '1.0-0' }}</td>
+                <td class="num">{{ isNpaStageOf(a) || overdrawnBreachOf(a) ? a.overdueDays : 0 }}</td>
+                <td>
+                  <span
+                    class="npa-badge"
+                    [class.npa-badge--standard]="!isNpaStageOf(a) && !overdrawnBreachOf(a)"
+                    [class.npa-badge--sma1]="!isNpaStageOf(a) && overdrawnBreachOf(a)"
+                    [class.npa-badge--substandard]="isNpaStageOf(a)"
+                  >
+                    {{ isNpaStageOf(a) ? 'NPA' : overdrawnBreachOf(a) ? 'Overdrawn' : 'Regular' }}
+                  </span>
+                </td>
+                <td>{{ a.recoveryOfficer }}</td>
+              </tr>
+            } @empty {
+              <tr>
+                <td colspan="14" class="pg-empty">No Cash Credit accounts in this branch.</td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+      @if (ccAccounts.length > pageSize) {
+        <div class="pg-pagination">
+          <span class="pg-pagination__info"
+            >Showing {{ rangeStart(ccAccounts) }}–{{ rangeEnd(ccAccounts) }} of {{ ccAccounts.length }}</span
+          >
+          <div class="pg-pagination__controls">
+            <button
+              type="button"
+              class="pg-btn pg-btn--ghost"
+              [disabled]="currentPage === 1"
+              (click)="goToPage(currentPage - 1, ccAccounts)"
+            >
+              ‹ Prev
+            </button>
+            <span class="pg-pagination__page">Page {{ currentPage }} of {{ pageCount(ccAccounts) }}</span>
+            <button
+              type="button"
+              class="pg-btn pg-btn--ghost"
+              [disabled]="currentPage === pageCount(ccAccounts)"
+              (click)="goToPage(currentPage + 1, ccAccounts)"
+            >
+              Next ›
+            </button>
+          </div>
+        </div>
+      }
+    </div>
+  }
+
   <!-- ===================== 14 AGRICULTURE / GOLD MARKET VALUE REPORT ===================== -->
   @if (activeReport === 'agri-gold-value') {
     <div class="pg-card">

src/app/npa/npa-reports/npa-reports.component.ts

@@ -660,6 +660,69 @@ export class NpaReportsComponent implements OnInit, OnDestroy {
     return this.overdrawnAccounts.filter((a) => this.overdrawnBreachOf(a)).length;
   }
 
+  // -------------------- Cash Credit (CC) Recovery Management --------------------
+  /** Pure Cash Credit (MSME) accounts only — product code '01' — kept separate from the combined
+   *  Overdrawn (CC/OD/KCC) bucket so CC's own Drawing Power / Out-of-Order / SMA-NPA position can
+   *  be reviewed on its own, the way a recovery desk actually works a CC book. */
+  get ccAccounts(): LoanAccount[] {
+    return this.allAccounts
+      .filter((a) => a.productCode === '01')
+      .sort((a, b) => this.excessOverDp(b) - this.excessOverDp(a));
+  }
+
+  /** Any CC account that's irregular — either drawn beyond its Drawing Power right now, or already
+   *  NPA-staged from its overdrawn history (an NPA account doesn't "go Regular" just because it's
+   *  briefly back within DP — RBI upgrade norms require full clearance first). Covers the same
+   *  population the 1–90-day Overdrawn and 90+-day NPA buckets below split in two. */
+  get ccOutOfOrderCount(): number {
+    return this.ccAccounts.filter((a) => this.overdrawnBreachOf(a) || this.isNpaStageOf(a)).length;
+  }
+
+  /** Out of Order for 1–90 continuous days — the pre-NPA monitoring window a recovery desk tracks
+   *  by plain day-count, not by an SMA-0/1/2 label (that split only matters for regulatory
+   *  reporting, not the day-to-day collection screen). */
+  get ccOverdrawnCount(): number {
+    return this.ccAccounts.filter((a) => this.overdrawnBreachOf(a) && !this.isNpaStageOf(a)).length;
+  }
+
+  /** Out of Order for more than 90 continuous days — the point RBI norms classify a CC/OD account
+   *  as NPA. */
+  get ccNpaCount(): number {
+    return this.ccAccounts.filter((a) => this.isNpaStageOf(a)).length;
+  }
+
+  get ccTotalSanctioned(): number {
+    return this.ccAccounts.reduce((s, a) => s + a.sanctionedAmount, 0);
+  }
+
+  get ccTotalOutstanding(): number {
+    return this.ccAccounts.reduce((s, a) => s + a.outstandingBalance, 0);
+  }
+
+  /** A Cash Credit account has no fixed EMI — each cycle's "due" amount is interest servicing on
+   *  the drawn balance, so this total doubles as "how much interest was CC customers due to pay
+   *  this cycle". */
+  get ccInterestDueThisCycle(): number {
+    return this.ccAccounts.reduce((s, a) => s + this.expectedThisMonth(a), 0);
+  }
+
+  /** How much of that interest the CC book has actually paid this cycle — the answer to "which
+   *  customers have paid how much interest", summed across the Cash Credit book. */
+  get ccInterestPaidThisCycle(): number {
+    return this.ccAccounts.reduce((s, a) => s + this.actualThisMonth(a), 0);
+  }
+
+  /** Lifetime cash recovered against the CC book (recorded recovery transactions — cash deposits,
+   *  cheques, NEFT/RTGS, auction/SARFAESI, OTS) — the answer to "loan diya kitna, recover kitna
+   *  hua", measured against what was actually sanctioned. */
+  get ccTotalRecovered(): number {
+    return this.ccAccounts.reduce((s, a) => s + this.recovered(a), 0);
+  }
+
+  get ccRecoveryPct(): number {
+    return this.ccTotalSanctioned ? (this.ccTotalRecovered / this.ccTotalSanctioned) * 100 : 0;
+  }
+
   // -------------------- Agriculture / Gold Market Value Report --------------------
   get agriGoldAccounts(): LoanAccount[] {
     return this.allAccounts
@@ -1617,6 +1680,63 @@ export class NpaReportsComponent implements OnInit, OnDestroy {
           }
         ];
 
+      case 'cc-recovery':
+        return [
+          {
+            sheetName: 'Cash Credit Recovery',
+            title: 'Cash Credit (CC) Recovery Management — Drawing Power & Overdrawn-Day Tracking',
+            subtitle,
+            headers: [
+              'Account No',
+              'Customer',
+              'Branch',
+              'Sanctioned Limit',
+              'Drawing Power',
+              'Outstanding',
+              'Pending to Recover',
+              'Excess Over DP',
+              'Interest Due (This Cycle)',
+              'Interest Paid (This Cycle)',
+              'Total Recovered',
+              'Days Overdrawn',
+              'Status',
+              'Recovery Officer'
+            ],
+            widths: [
+              16,
+              22,
+              16,
+              16,
+              16,
+              16,
+              16,
+              16,
+              18,
+              18,
+              18,
+              14,
+              14,
+              20
+            ],
+            rows: this.ccAccounts.map((a) => [
+              a.accountNo,
+              a.customerName,
+              a.branchName,
+              a.sanctionedAmount,
+              a.drawingPower,
+              a.outstandingBalance,
+              a.overdueAmount,
+              this.excessOverDp(a),
+              this.expectedThisMonth(a),
+              this.actualThisMonth(a),
+              this.recovered(a),
+              this.isNpaStageOf(a) || this.overdrawnBreachOf(a) ? a.overdueDays : 0,
+              this.isNpaStageOf(a) ? 'NPA' : this.overdrawnBreachOf(a) ? 'Overdrawn' : 'Regular',
+              a.recoveryOfficer
+            ])
+          }
+        ];
+
       case 'daywise-overdrawn':
         return [
           {

src/app/npa/npa-shared.scss

@@ -94,6 +94,165 @@
   grid-template-columns: repeat(3, 1fr);
 }
 
+// -----------------------------------------------------------------------
+// Cash Credit Recovery Management — a glossary strip explaining DP / Out of
+// Order / SMA / NPA to a reader meeting the terms for the first time (e.g. a
+// stakeholder demo), plus tone-coloured accents for that screen's KPI row.
+// -----------------------------------------------------------------------
+.npa-glossary {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(230px, 1fr));
+  gap: 14px;
+  margin-top: 18px;
+}
+
+.npa-glossary-card {
+  padding: 16px 16px 16px 18px;
+  border-radius: 12px;
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-left: 4px solid #64748b;
+  transition: box-shadow 0.15s ease;
+
+  &:hover {
+    box-shadow: 0 4px 14px rgb(15 23 42 / 8%);
+  }
+
+  &__icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 34px;
+    height: 34px;
+    border-radius: 999px;
+    background: #f1f5f9;
+    color: #475569;
+    font-size: 14px;
+    margin-bottom: 10px;
+  }
+
+  &__term {
+    font-size: 12px;
+    font-weight: 800;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    color: #0f172a;
+    margin-bottom: 6px;
+  }
+
+  &__desc {
+    font-size: 12.5px;
+    line-height: 1.55;
+    color: #475569;
+    margin: 0;
+  }
+
+  &--dp {
+    border-left-color: #2563eb;
+
+    .npa-glossary-card__icon {
+      background: #dbeafe;
+      color: #2563eb;
+    }
+  }
+
+  &--ooo {
+    border-left-color: #d97706;
+
+    .npa-glossary-card__icon {
+      background: #fef3c7;
+      color: #b45309;
+    }
+  }
+
+  &--sma {
+    border-left-color: #ca8a04;
+
+    .npa-glossary-card__icon {
+      background: #fef9c3;
+      color: #854d0e;
+    }
+  }
+
+  &--npa {
+    border-left-color: #dc2626;
+
+    .npa-glossary-card__icon {
+      background: #fee2e2;
+      color: #dc2626;
+    }
+  }
+}
+
+// Compact gap variant for a KPI row that otherwise uses npa-kpis--ratio's 4-wide grid — used by
+// the CC Recovery Management summary row, which packs more (smaller) tiles than the main header.
+.npa-kpis--compact {
+  gap: 8px;
+}
+
+// Tone-coloured KPI tile for the CC summary row — same .inv-kpi tile, with a left accent + icon
+// chip so "Out of Order"/"SMA"/"NPA" read as a severity strip rather than four identical boxes.
+// Sized smaller than the default .inv-kpi tile since this row packs 6 of them.
+.npa-kpi--accent {
+  padding: 10px 12px 10px 14px;
+  border-left: 4px solid var(--npa-kpi-accent, #64748b);
+
+  .inv-kpi__label {
+    font-size: 9px;
+  }
+
+  .inv-kpi__value {
+    font-size: 16px;
+  }
+
+  .inv-kpi__sub {
+    font-size: 10px;
+  }
+
+  .npa-kpi__icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 22px;
+    height: 22px;
+    border-radius: 999px;
+    background: var(--npa-kpi-accent-soft, #f1f5f9);
+    color: var(--npa-kpi-accent, #475569);
+    font-size: 10px;
+    margin-bottom: 4px;
+  }
+
+  &--neutral {
+    --npa-kpi-accent: #0f4f3c;
+    --npa-kpi-accent-soft: #dcfce7;
+  }
+
+  &--warn {
+    --npa-kpi-accent: #d97706;
+    --npa-kpi-accent-soft: #fef3c7;
+  }
+
+  &--sma {
+    --npa-kpi-accent: #ca8a04;
+    --npa-kpi-accent-soft: #fef9c3;
+  }
+
+  &--npa {
+    --npa-kpi-accent: #dc2626;
+    --npa-kpi-accent-soft: #fee2e2;
+  }
+
+  &--info {
+    --npa-kpi-accent: #2563eb;
+    --npa-kpi-accent-soft: #dbeafe;
+  }
+
+  &--positive {
+    --npa-kpi-accent: #15803d;
+    --npa-kpi-accent-soft: #dcfce7;
+  }
+}
+
 // Account Detail header — title/badge on the left, the Recovery Journey trigger pinned right.
 .npa-detail-header {
   display: flex;

src/app/platform-admin/menu-access/menu-access.component.ts

@@ -65,6 +65,7 @@ export class PlatformMenuAccessComponent {
     { code: 'MENU_DEPOSITS', label: 'Deposits', icon: 'piggy-bank' },
     { code: 'MENU_ADVANCES', label: 'Advances', icon: 'hand-holding-usd' },
     { code: 'MENU_LOAN_ORIGINATION', label: 'Loan Origination', icon: 'clipboard-check' },
+    { code: 'MENU_CREDIT_BUREAU', label: 'Credit Bureau', icon: 'id-card' },
     { code: 'MENU_SHARE', label: 'Share', icon: 'coins' },
     { code: 'MENU_NPA', label: 'NPA', icon: 'exclamation-triangle' },
     { code: 'MENU_GENERAL_LEDGER', label: 'General Ledger', icon: 'book-open' },

src/app/savings/common-resolvers/savings-account-view.resolver.ts

@@ -11,10 +11,12 @@ import { Injectable, inject } from '@angular/core';
 import { ActivatedRouteSnapshot } from '@angular/router';
 
 /** rxjs Imports */
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
+import { catchError, map, switchMap } from 'rxjs/operators';
 
 /** Custom Services */
 import { SavingsService } from '../savings.service';
+import { VoucherCorrectionService } from '../../cashier/voucher-correction.service';
 
 /**
  * Savings Account data resolver.
@@ -22,14 +24,29 @@ import { SavingsService } from '../savings.service';
 @Injectable()
 export class SavingsAccountViewResolver {
   private savingsService = inject(SavingsService);
+  private voucherCorrectionService = inject(VoucherCorrectionService);
 
   /**
-   * Returns the Savings Account data.
+   * Returns the Savings Account data, without the deposits a completed voucher correction took off this account:
+   * the passbook and the transaction list read their rows from here, and a deposit that was posted to the wrong
+   * account and moved should not appear on it at all.
    * @param {ActivatedRouteSnapshot} route Route Snapshot
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
     const savingAccountId = route.paramMap.get('savingAccountId');
-    return this.savingsService.getSavingsAccountData(savingAccountId);
+    return this.savingsService.getSavingsAccountData(savingAccountId).pipe(
+      switchMap((account: any) =>
+        this.voucherCorrectionService.voidedTransactions(Number(savingAccountId)).pipe(
+          catchError(() => of([] as number[])),
+          map((voided: number[]) => {
+            if (voided.length && Array.isArray(account?.transactions)) {
+              account.transactions = account.transactions.filter((txn: any) => !voided.includes(txn.id));
+            }
+            return account;
+          })
+        )
+      )
+    );
   }
 }

src/app/tasks/checker-inbox-and-tasks/checker-inbox-and-tasks.component.html

@@ -144,6 +144,24 @@
       <fa-icon icon="money-bill-wave" class="ac-tab__ic"></fa-icon>
       <span>Withdrawal Requests</span>
     </a>
+    <a
+      class="ac-tab"
+      routerLink="./cash-transfers"
+      routerLinkActive="ac-tab--active"
+      *mifosxHasPermission="'ALL_FUNCTIONS_READ'"
+    >
+      <fa-icon icon="exchange" class="ac-tab__ic"></fa-icon>
+      <span>Cash Transfers</span>
+    </a>
+    <a
+      class="ac-tab"
+      routerLink="./voucher-corrections"
+      routerLinkActive="ac-tab--active"
+      *mifosxHasPermission="'ALL_FUNCTIONS_READ'"
+    >
+      <fa-icon icon="undo" class="ac-tab__ic"></fa-icon>
+      <span>Voucher Corrections</span>
+    </a>
     <a
       class="ac-tab"
       routerLink="./share-withdrawal-requests"

src/app/tasks/checker-inbox-and-tasks/checker-inbox-and-tasks.component.scss

@@ -16,7 +16,7 @@ $green: #10b981;
 $amber: #f59e0b;
 
 .ac-container {
-  padding: 20px 24px;
+  padding: 12px 20px;
   max-width: 1440px;
   margin: 0 auto;
 }
@@ -25,40 +25,40 @@ $amber: #f59e0b;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-bottom: 16px;
+  margin-bottom: 10px;
   gap: 12px;
   flex-wrap: wrap;
 
   &__left {
     display: flex;
     align-items: center;
-    gap: 12px;
+    gap: 10px;
   }
 
   &__icon {
-    width: 44px;
-    height: 44px;
+    width: 32px;
+    height: 32px;
     display: inline-flex;
     align-items: center;
     justify-content: center;
-    border-radius: 12px;
+    border-radius: 9px;
     background: linear-gradient(135deg, $blue 0%, $purple 100%);
     color: #fff;
-    font-size: 18px;
+    font-size: 14px;
     box-shadow: 0 2px 8px rgb(29 78 216 / 25%);
   }
 
   &__title {
     margin: 0;
-    font-size: 20px;
+    font-size: 16px;
     font-weight: 800;
     color: $navy;
     line-height: 1.1;
   }
 
   &__sub {
-    margin-top: 2px;
-    font-size: 12.5px;
+    margin-top: 1px;
+    font-size: 11px;
     color: #64748b;
   }
 }
@@ -68,26 +68,26 @@ $amber: #f59e0b;
    hides most of them behind prev/next pagination arrows. Wrapping keeps every tab visible and one
    click away instead of a scroll-and-hunt. */
 .ac-tabs {
-  margin-bottom: 20px;
+  margin-bottom: 12px;
   background: #fff;
   border: 1px solid #e2e8f0;
-  border-radius: 14px;
-  padding: 6px;
+  border-radius: 10px;
+  padding: 4px;
   box-shadow: 0 1px 3px rgb(15 23 42 / 4%);
   display: flex;
   flex-wrap: wrap;
-  gap: 4px;
+  gap: 2px;
 }
 
 .ac-tab {
   display: inline-flex;
   align-items: center;
-  gap: 8px;
-  height: 38px;
-  padding: 0 18px;
-  border-radius: 10px;
+  gap: 6px;
+  height: 28px;
+  padding: 0 11px;
+  border-radius: 8px;
   font-family: Inter, 'DM Sans', Roboto, sans-serif;
-  font-size: 13px;
+  font-size: 11.5px;
   font-weight: 600;
   letter-spacing: 0.01em;
   color: #64748b;
@@ -99,7 +99,7 @@ $amber: #f59e0b;
   cursor: pointer;
 
   &__ic {
-    font-size: 13px;
+    font-size: 11px;
     color: inherit;
   }
 
@@ -118,7 +118,7 @@ $amber: #f59e0b;
 
 @media (width <= 768px) {
   .ac-tab {
-    padding: 0 14px;
-    font-size: 12px;
+    padding: 0 10px;
+    font-size: 11px;
   }
 }

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

@@ -194,6 +194,22 @@ const routes: Routes = [
           component: ShareWithdrawalRequestsComponent,
           data: { title: 'Share Withdrawal Requests' }
         },
+        {
+          path: 'cash-transfers',
+          loadComponent: () =>
+            import('../cashier/cash-transfer-approvals/cash-transfer-approvals.component').then(
+              (m) => m.CashTransferApprovalsComponent
+            ),
+          data: { title: 'Cash Transfers' }
+        },
+        {
+          path: 'voucher-corrections',
+          loadComponent: () =>
+            import('../cashier/voucher-correction-approvals/voucher-correction-approvals.component').then(
+              (m) => m.VoucherCorrectionApprovalsComponent
+            ),
+          data: { title: 'Voucher Corrections' }
+        },
         {
           path: 'dividend-requests',
           component: DividendRequestsComponent,

src/assets/animations/loading_animation.json

@@ -45,15 +45,17 @@
       "hasMask": false,
       "ao": 0,
       "ks": { "a": { "a": 0, "k": [
-            -17.052704811096184,
-            -15.0467209815979
+            0,
+            0,
+            0
           ], "ix": 1 }, "s": { "a": 0, "k": [
-            362.228,
-            362.228,
+            394,
+            394,
             100
           ], "ix": 6 }, "sk": { "a": 0, "k": 0 }, "p": { "a": 0, "k": [
-            188.2303284168625,
-            195.49656352277756
+            250,
+            250,
+            0
           ], "ix": 2 }, "r": { "a": 0, "k": 0, "ix": 10 }, "sa": { "a": 0, "k": 0 }, "o": { "a": 0, "k": 100, "ix": 11 } },
       "shapes": [
         {
@@ -341,16 +343,16 @@
               "g": { "p": 3, "k": { "a": 0, "k": [
                     0,
                     1,
-                    0.4470588235294118,
-                    0,
+                    0.6,
+                    0.2,
                     0.485,
-                    0.9725490196078431,
-                    0.2235294117647059,
-                    0.5019607843137255,
                     1,
-                    0.9411764705882353,
-                    0,
-                    1
+                    0.6,
+                    0.2,
+                    1,
+                    1,
+                    0.6,
+                    0.2
                   ], "ix": 8 } },
               "t": 1,
               "a": { "a": 0, "k": 0 },
@@ -363,7 +365,7 @@
               "lj": 1,
               "ml": 4,
               "o": { "a": 0, "k": 100, "ix": 9 },
-              "w": { "a": 0, "k": 2, "ix": 10 }
+              "w": { "a": 0, "k": 2.5, "ix": 10 }
             },
             {
               "ty": "fl",
@@ -402,8 +404,8 @@
           "o": {
             "a": 1,
             "k": [
-              { "o": { "x": 0.167, "y": 0.167 }, "i": { "x": 0.833, "y": 0.833 }, "s": [0], "t": 0 },
-              { "s": [360], "t": 90.0000036657751 }
+              { "o": { "x": 0.167, "y": 0.167 }, "i": { "x": 0.833, "y": 0.833 }, "s": [28], "t": 0 },
+              { "s": [388], "t": 90.0000036657751 }
             ],
             "ix": 3
           },
@@ -437,7 +439,7 @@
             250,
             250,
             0
-          ], "ix": 2 }, "r": { "a": 0, "k": 60, "ix": 10 }, "sa": { "a": 0, "k": 0 }, "o": { "a": 0, "k": 100, "ix": 11 } },
+          ], "ix": 2 }, "r": { "a": 0, "k": 0, "ix": 10 }, "sa": { "a": 0, "k": 0 }, "o": { "a": 0, "k": 100, "ix": 11 } },
       "shapes": [
         {
           "ty": "gr",
@@ -723,16 +725,16 @@
                 ], "ix": 5 },
               "g": { "p": 3, "k": { "a": 0, "k": [
                     0,
-                    0,
-                    0.7764705882352941,
+                    1,
+                    1,
                     1,
                     0.485,
-                    0.24705882352941178,
-                    0.38823529411764707,
                     1,
                     1,
-                    0.49411764705882355,
-                    0,
+                    1,
+                    1,
+                    1,
+                    1,
                     1
                   ], "ix": 8 } },
               "t": 1,
@@ -746,7 +748,7 @@
               "lj": 1,
               "ml": 4,
               "o": { "a": 0, "k": 100, "ix": 9 },
-              "w": { "a": 0, "k": 0.5, "ix": 10 }
+              "w": { "a": 0, "k": 2.5, "ix": 10 }
             },
             {
               "ty": "fl",
@@ -813,14 +815,14 @@
             0,
             0
           ], "ix": 1 }, "s": { "a": 0, "k": [
-            362.228,
-            362.228,
+            330,
+            330,
             100
           ], "ix": 6 }, "sk": { "a": 0, "k": 0 }, "p": { "a": 0, "k": [
             250,
             250,
             0
-          ], "ix": 2 }, "r": { "a": 0, "k": 30, "ix": 10 }, "sa": { "a": 0, "k": 0 }, "o": { "a": 0, "k": 100, "ix": 11 } },
+          ], "ix": 2 }, "r": { "a": 0, "k": 0, "ix": 10 }, "sa": { "a": 0, "k": 0 }, "o": { "a": 0, "k": 100, "ix": 11 } },
       "shapes": [
         {
           "ty": "gr",
@@ -1106,17 +1108,17 @@
                 ], "ix": 5 },
               "g": { "p": 3, "k": { "a": 0, "k": [
                     0,
-                    1,
-                    0.8235294117647058,
-                    0,
+                    0.0784,
+                    0.7059,
+                    0.2118,
                     0.485,
-                    0.5019607843137255,
-                    0.8117647058823529,
-                    0.5019607843137255,
+                    0.0784,
+                    0.7059,
+                    0.2118,
                     1,
-                    0,
-                    0.8,
-                    1
+                    0.0784,
+                    0.7059,
+                    0.2118
                   ], "ix": 8 } },
               "t": 1,
               "a": { "a": 0, "k": 0 },
@@ -1129,7 +1131,7 @@
               "lj": 1,
               "ml": 4,
               "o": { "a": 0, "k": 100, "ix": 9 },
-              "w": { "a": 0, "k": 0.5, "ix": 10 }
+              "w": { "a": 0, "k": 2.5, "ix": 10 }
             },
             {
               "ty": "fl",
@@ -1168,8 +1170,8 @@
           "o": {
             "a": 1,
             "k": [
-              { "o": { "x": 0.167, "y": 0.167 }, "i": { "x": 0.833, "y": 0.833 }, "s": [0], "t": 0 },
-              { "s": [360], "t": 90.0000036657751 }
+              { "o": { "x": 0.167, "y": 0.167 }, "i": { "x": 0.833, "y": 0.833 }, "s": [-28], "t": 0 },
+              { "s": [332], "t": 90.0000036657751 }
             ],
             "ix": 3
           },

src/environments/.env.ts

@@ -9,8 +9,8 @@
 /* tslint:disable */
 export default {
   'mifos_x': {
-    'version': '261012',
-    'hash': '6b0f218b'
+    'version': '261019',
+    'hash': '1b70fb453'
   },
   'allow_switching_backend_instance': true
 };

src/index.html

@@ -325,10 +325,10 @@
         };
         document.head.appendChild(script);
 
-        // Progress simulation stages (Guaranteed ~2 seconds duration on refresh)
+        // Progress simulation stages (Guaranteed ~4 seconds duration on refresh: 2% every 90ms reaches 90% in about 4s)
         var interval = setInterval(function () {
           if (progress < 90) {
-            progress += 5;
+            progress += 2;
           } else if (angularReady && progress < 100) {
             progress += 5;
           }
@@ -351,7 +351,7 @@
           }
         }, 90);
 
-        // Enforce minimum hold time (2000ms = 2 seconds) so refresh always shows the animation
+        // Enforce minimum hold time (4000ms = 4 seconds) so refresh always shows the animation
         setTimeout(function () {
           minTimePassed = true;
           if (angularReady) {
@@ -359,7 +359,7 @@
             if (bar) bar.style.width = '100%';
             dismissSplash();
           }
-        }, 2000);
+        }, 4000);
 
         function dismissSplash() {
           if (dismissed) return;
@@ -387,12 +387,12 @@
           }
         };
 
-        // Safety fallback (Max 7s in case of backend network failure)
+        // Safety fallback (Max 9s in case of backend network failure)
         setTimeout(function () {
           angularReady = true;
           minTimePassed = true;
           dismissSplash();
-        }, 7000);
+        }, 9000);
       })();
     </script>