feat: add CKYC management tab, checker inbox views, and maker-checker diff utilities

Dockerfile

@@ -1,4 +1,3 @@
-# syntax=docker/dockerfile:1
 ###############
 ### STAGE 1: Build app
 ###############
@@ -10,13 +9,10 @@ ARG NPM_REGISTRY_URL=https://registry.npmjs.org/
 ARG BUILD_ENVIRONMENT_OPTIONS="--configuration production"
 ARG PUPPETEER_DOWNLOAD_HOST_ARG=https://storage.googleapis.com
 ARG PUPPETEER_CHROMIUM_REVISION_ARG=1011831
-# Build ko Chromium nahi chahiye — skip (warna npm ci Chromium download par atak jata hai).
+ARG PUPPETEER_SKIP_DOWNLOAD_ARG
-ARG PUPPETEER_SKIP_DOWNLOAD_ARG=true
 
 # Set the environment variable to increase Node.js memory limit
-# (Mifos web-app ka production build memory-heavy hai; upstream build:prod
+ENV NODE_OPTIONS="--max-old-space-size=4096"
-#  16384 use karta hai. 4096 par 'ng build' OOM ho jata hai.)
-ENV NODE_OPTIONS="--max-old-space-size=8192"
 
 RUN apk add --no-cache git
 
@@ -29,22 +25,14 @@ ENV PUPPETEER_DOWNLOAD_HOST=$PUPPETEER_DOWNLOAD_HOST_ARG
 ENV PUPPETEER_CHROMIUM_REVISION=$PUPPETEER_CHROMIUM_REVISION_ARG
 ENV PUPPETEER_SKIP_DOWNLOAD=$PUPPETEER_SKIP_DOWNLOAD_ARG
 
-# Test/e2e tooling ke bhaari binary downloads skip karo — build inhe use nahi
-# karta, aur inke bina npm ci turant complete ho jata hai.
-#   Cypress   -> ~250MB binary (CI me sabse zyada atakta hai)
-#   Playwright-> browser binaries
-ENV CYPRESS_INSTALL_BINARY=0
-ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
-
 COPY ./ /usr/src/app/
 
-RUN npm config set fetch-retry-maxtimeout 120000 \
+RUN npm cache clear --force
- && npm config set registry $NPM_REGISTRY_URL --location=global
 
-# BuildKit cache mount: npm ka download cache builds ke beech persist hota hai,
+RUN npm config set fetch-retry-maxtimeout 120000
-# isliye har build par saare packages dobara download nahi hote (bahut fast).
+RUN npm config set registry $NPM_REGISTRY_URL --location=global
-# 'npm cache clear --force' hata diya — wo har build par cache wipe kar deta tha.
+
-RUN --mount=type=cache,target=/root/.npm npm ci --no-audit --no-fund
+RUN npm ci
 
 RUN sh -c "ng build --output-path=/dist $BUILD_ENVIRONMENT_OPTIONS"
 
@@ -53,14 +41,6 @@ RUN sh -c "ng build --output-path=/dist $BUILD_ENVIRONMENT_OPTIONS"
 ###############
 FROM $NGINX_IMAGE
 
-# envsubst (gettext) alpine-slim me nahi hota — runtime env.js generation ke
-# liye zaroori hai, isliye explicitly install kar rahe hain.
-RUN apk add --no-cache gettext
-
-# Static-only nginx config (SPA fallback, no API proxy). Stock default.conf
-# ko replace karta hai taaki deep-link refresh par 404 na aaye.
-COPY nginx.spa.conf /etc/nginx/conf.d/default.conf
-
 COPY --from=builder /dist/browser /usr/share/nginx/html
 
 EXPOSE 80

angular.json

@@ -69,8 +69,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "18mb",
+                  "maximumWarning": "15mb",
-                  "maximumError": "20mb"
+                  "maximumError": "17mb"
                 },
                 {
                   "type": "anyComponentStyle",

nginx.spa.conf

@@ -1,45 +0,0 @@
-# Static-only nginx config for the CBSNexora Angular UI.
-# NOTE: No API reverse-proxy here by design — the browser calls the Fineract
-# backend directly via FINERACT_API_URL (env.js). nginx sirf static files
-# serve karta hai + Angular SPA routing handle karta hai.
-
-server {
-    listen       80;
-    server_name  _;
-
-    root   /usr/share/nginx/html;
-    index  index.html;
-
-    # ---- Compression ----
-    gzip              on;
-    gzip_comp_level   6;
-    gzip_min_length   1024;
-    gzip_proxied      any;
-    gzip_types        text/plain text/css application/javascript application/json
-                      application/xml image/svg+xml font/woff font/woff2;
-
-    # ---- Runtime env: env.js aur index.html kabhi cache na ho ----
-    # (env.js har container start par envsubst se regenerate hoti hai;
-    #  index.html hashed asset filenames point karti hai)
-    location = /assets/env.js {
-        add_header Cache-Control "no-store, no-cache, must-revalidate";
-        expires -1;
-    }
-
-    location = /index.html {
-        add_header Cache-Control "no-store, no-cache, must-revalidate";
-        expires -1;
-    }
-
-    # ---- Hashed static assets: lambe time cache ----
-    location ~* \.(?:js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
-        expires 7d;
-        add_header Cache-Control "public";
-        try_files $uri =404;
-    }
-
-    # ---- Angular SPA fallback: har route index.html par ----
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-}

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

@@ -72,7 +72,6 @@ import { ViewJournalEntryTransactionComponent } from 'app/shared/accounting/view
 import { JournalEntryTransactionResolver } from './common-resolvers/journal-entry-transaction.resolver';
 import { ExternalAssetOwnerJournalEntryResolver } from 'app/loans/common-resolvers/external-asset-owner-journal-entry.resolver';
 import { ExternalAssetConfigurationResolver } from './common-resolvers/external-asset-configuration.resolver';
-import { accountingFeatureEnabledGuard } from './disabled-features';
 
 /** Accounting Routes */
 const routes: Routes = [
@@ -100,8 +99,7 @@ const routes: Routes = [
             {
               path: 'frequent-postings',
               component: FrequentPostingsComponent,
-              canActivate: [accountingFeatureEnabledGuard],
+              data: { title: 'Frequent Postings', breadcrumb: 'Frequent Postings' },
-              data: { title: 'Frequent Postings', breadcrumb: 'Frequent Postings', feature: 'frequentPostings' },
               resolve: {
                 offices: OfficesResolver,
                 accountingRules: AccountingRulesAssociationsResolver,
@@ -112,8 +110,7 @@ const routes: Routes = [
             {
               path: 'create',
               component: CreateJournalEntryComponent,
-              canActivate: [accountingFeatureEnabledGuard],
+              data: { title: 'Create Journal Entry', breadcrumb: 'Create' },
-              data: { title: 'Create Journal Entry', breadcrumb: 'Create', feature: 'createJournalEntries' },
               resolve: {
                 offices: OfficesResolver,
                 currencies: CurrenciesResolver,
@@ -197,11 +194,6 @@ const routes: Routes = [
             offices: OfficesResolver
           }
         },
-        {
-          path: 'balance-sheet',
-          loadComponent: () => import('./balance-sheet/balance-sheet.component').then((c) => c.BalanceSheetComponent),
-          data: { title: 'Balance Sheet', breadcrumb: 'Balance Sheet' }
-        },
         {
           path: 'chart-of-accounts',
           data: { title: 'Chart of Accounts', breadcrumb: 'Chart of Accounts' },
@@ -252,8 +244,7 @@ const routes: Routes = [
         },
         {
           path: 'closing-entries',
-          canActivate: [accountingFeatureEnabledGuard],
+          data: { title: 'Accounting Closures', breadcrumb: 'Closing Entries' },
-          data: { title: 'Accounting Closures', breadcrumb: 'Closing Entries', feature: 'closingEntries' },
           children: [
             {
               path: '',
@@ -294,8 +285,7 @@ const routes: Routes = [
         },
         {
           path: 'accounting-rules',
-          canActivate: [accountingFeatureEnabledGuard],
+          data: { title: 'Accounting Rules', breadcrumb: 'Accounting Rules' },
-          data: { title: 'Accounting Rules', breadcrumb: 'Accounting Rules', feature: 'accountingRules' },
           children: [
             {
               path: '',
@@ -342,17 +332,11 @@ const routes: Routes = [
         {
           path: 'periodic-accruals',
           component: PeriodicAccrualsComponent,
-          canActivate: [accountingFeatureEnabledGuard],
+          data: { title: 'Periodic Accrual Accounting', breadcrumb: 'Execute Periodic Accrual Accounting' }
-          data: {
-            title: 'Periodic Accrual Accounting',
-            breadcrumb: 'Execute Periodic Accrual Accounting',
-            feature: 'accruals'
-          }
         },
         {
           path: 'provisioning-entries',
-          canActivate: [accountingFeatureEnabledGuard],
+          data: { title: 'Provisioning Entries', breadcrumb: 'Provisioning Entries' },
-          data: { title: 'Provisioning Entries', breadcrumb: 'Provisioning Entries', feature: 'provisioningEntries' },
           children: [
             {
               path: '',

src/app/accounting/accounting.component.html

@@ -17,39 +17,35 @@
 
   <!-- Cards Grid -->
   <div class="acc-grid">
-    <!-- Frequent Postings — hidden while disabled, see disabled-features.ts -->
+    <!-- Frequent Postings -->
-    @if (!disabledFeatures.frequentPostings) {
+    <a
-      <a
+      class="acc-card"
-        class="acc-card"
+      [routerLink]="['journal-entries/frequent-postings']"
-        [routerLink]="['journal-entries/frequent-postings']"
+      *mifosxHasPermission="'CREATE_JOURNALENTRY'"
-        *mifosxHasPermission="'CREATE_JOURNALENTRY'"
+      #frequentPostings
-        #frequentPostings
+    >
-      >
+      <div class="acc-card__icon blue"><i class="fas fa-sync-alt"></i></div>
-        <div class="acc-card__icon blue"><i class="fas fa-sync-alt"></i></div>
+      <div class="acc-card__info">
-        <div class="acc-card__info">
+        <span class="acc-card__title">{{ 'labels.heading.Frequent Postings' | translate }}</span>
-          <span class="acc-card__title">{{ 'labels.heading.Frequent Postings' | translate }}</span>
+        <span class="acc-card__desc">{{ 'labels.text.These are predefined postings' | translate }}</span>
-          <span class="acc-card__desc">{{ 'labels.text.These are predefined postings' | translate }}</span>
+      </div>
-        </div>
+    </a>
-      </a>
-    }
 
-    <!-- Create Journal Entries — hidden while disabled, see disabled-features.ts -->
+    <!-- Create Journal Entries -->
-    @if (!disabledFeatures.createJournalEntries) {
+    <a
-      <a
+      class="acc-card"
-        class="acc-card"
+      [routerLink]="['journal-entries/create']"
-        [routerLink]="['journal-entries/create']"
+      *mifosxHasPermission="'CREATE_JOURNALENTRY'"
-        *mifosxHasPermission="'CREATE_JOURNALENTRY'"
+      #createJournalEntries
-        #createJournalEntries
+    >
-      >
+      <div class="acc-card__icon green"><i class="fas fa-plus-circle"></i></div>
-        <div class="acc-card__icon green"><i class="fas fa-plus-circle"></i></div>
+      <div class="acc-card__info">
-        <div class="acc-card__info">
+        <span class="acc-card__title">{{ 'labels.heading.Create Journal Entries' | translate }}</span>
-          <span class="acc-card__title">{{ 'labels.heading.Create Journal Entries' | translate }}</span>
+        <span class="acc-card__desc">{{
-          <span class="acc-card__desc">{{
+          'labels.text.Manual journal entry transactions recorded in a journal' | translate
-            'labels.text.Manual journal entry transactions recorded in a journal' | translate
+        }}</span>
-          }}</span>
+      </div>
-        </div>
+    </a>
-      </a>
-    }
 
     <!-- Search Journal Entries -->
     <a class="acc-card" [routerLink]="['journal-entries']" *mifosxHasPermission="'READ_JOURNALENTRY'">
@@ -117,64 +113,43 @@
       </div>
     </a>
 
-    <!-- Balance Sheet -->
+    <!-- Closing Entries -->
-    <a class="acc-card" [routerLink]="['balance-sheet']" *mifosxHasPermission="'READ_GLACCOUNT'" #balanceSheet>
+    <a class="acc-card" [routerLink]="['closing-entries']" *mifosxHasPermission="'READ_GLCLOSURE'" #closingEntries>
-      <div class="acc-card__icon teal"><i class="fas fa-balance-scale"></i></div>
+      <div class="acc-card__icon red"><i class="fas fa-archive"></i></div>
       <div class="acc-card__info">
-        <span class="acc-card__title">Balance Sheet</span>
+        <span class="acc-card__title">{{ 'labels.heading.Closing Entries' | translate }}</span>
-        <span class="acc-card__desc">Header/Detail balances as on any date</span>
+        <span class="acc-card__desc">{{
+          'labels.text.Journal entries made at the end of accounting period' | translate
+        }}</span>
       </div>
     </a>
 
-    <!-- Closing Entries — hidden while disabled, see disabled-features.ts -->
+    <!-- Accounting Rules -->
-    @if (!disabledFeatures.closingEntries) {
+    <a class="acc-card" [routerLink]="['accounting-rules']" *mifosxHasPermission="'READ_ACCOUNTINGRULE'">
-      <a class="acc-card" [routerLink]="['closing-entries']" *mifosxHasPermission="'READ_GLCLOSURE'" #closingEntries>
+      <div class="acc-card__icon purple"><i class="fas fa-list-ul"></i></div>
-        <div class="acc-card__icon red"><i class="fas fa-archive"></i></div>
+      <div class="acc-card__info">
-        <div class="acc-card__info">
+        <span class="acc-card__title">{{ 'labels.heading.Accounting Rules' | translate }}</span>
-          <span class="acc-card__title">{{ 'labels.heading.Closing Entries' | translate }}</span>
+        <span class="acc-card__desc">{{ 'labels.text.List of all accounting rules' | translate }}</span>
-          <span class="acc-card__desc">{{
+      </div>
-            'labels.text.Journal entries made at the end of accounting period' | translate
+    </a>
-          }}</span>
-        </div>
-      </a>
-    }
 
-    <!-- Accounting Rules — hidden while disabled, see disabled-features.ts -->
+    <!-- Accruals -->
-    @if (!disabledFeatures.accountingRules) {
+    <a class="acc-card" [routerLink]="['periodic-accruals']" *mifosxHasPermission="'EXECUTE_PERIODICACCRUALACCOUNTING'">
-      <a class="acc-card" [routerLink]="['accounting-rules']" *mifosxHasPermission="'READ_ACCOUNTINGRULE'">
+      <div class="acc-card__icon green"><i class="fas fa-calendar-check"></i></div>
-        <div class="acc-card__icon purple"><i class="fas fa-list-ul"></i></div>
+      <div class="acc-card__info">
-        <div class="acc-card__info">
+        <span class="acc-card__title">{{ 'labels.heading.Accruals' | translate }}</span>
-          <span class="acc-card__title">{{ 'labels.heading.Accounting Rules' | translate }}</span>
+        <span class="acc-card__desc">{{ 'labels.text.Accrues income, expenses and liabilities' | translate }}</span>
-          <span class="acc-card__desc">{{ 'labels.text.List of all accounting rules' | translate }}</span>
+      </div>
-        </div>
+    </a>
-      </a>
-    }
 
-    <!-- Accruals — hidden while disabled, see disabled-features.ts -->
+    <!-- Provisioning Entries -->
-    @if (!disabledFeatures.accruals) {
+    <a class="acc-card" [routerLink]="['provisioning-entries']" *mifosxHasPermission="'VIEW_PROVISIONING_ENTRIES'">
-      <a
+      <div class="acc-card__icon amber"><i class="fas fa-cogs"></i></div>
-        class="acc-card"
+      <div class="acc-card__info">
-        [routerLink]="['periodic-accruals']"
+        <span class="acc-card__title">{{ 'labels.heading.Provisioning Entries' | translate }}</span>
-        *mifosxHasPermission="'EXECUTE_PERIODICACCRUALACCOUNTING'"
+        <span class="acc-card__desc">{{ 'labels.text.Create provisioning entries' | translate }}</span>
-      >
+      </div>
-        <div class="acc-card__icon green"><i class="fas fa-calendar-check"></i></div>
+    </a>
-        <div class="acc-card__info">
-          <span class="acc-card__title">{{ 'labels.heading.Accruals' | translate }}</span>
-          <span class="acc-card__desc">{{ 'labels.text.Accrues income, expenses and liabilities' | translate }}</span>
-        </div>
-      </a>
-    }
-
-    <!-- Provisioning Entries — hidden while disabled, see disabled-features.ts -->
-    @if (!disabledFeatures.provisioningEntries) {
-      <a class="acc-card" [routerLink]="['provisioning-entries']" *mifosxHasPermission="'VIEW_PROVISIONING_ENTRIES'">
-        <div class="acc-card__icon amber"><i class="fas fa-cogs"></i></div>
-        <div class="acc-card__info">
-          <span class="acc-card__title">{{ 'labels.heading.Provisioning Entries' | translate }}</span>
-          <span class="acc-card__desc">{{ 'labels.text.Create provisioning entries' | translate }}</span>
-        </div>
-      </a>
-    }
   </div>
 </div>
 

src/app/accounting/accounting.component.ts

@@ -18,7 +18,6 @@ import { MatIcon } from '@angular/material/icon';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { MatLine } from '@angular/material/grid-list';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { DISABLED_ACCOUNTING_FEATURES } from './disabled-features';
 
 /**
  * Accounting component.
@@ -64,9 +63,6 @@ export class AccountingComponent implements AfterViewInit {
   // Initialize an array of 10 boolean values, all set to false
   arrowBooleans: boolean[] = new Array(10).fill(false);
 
-  /** Which accounting tiles are switched off for this installation — see disabled-features.ts. */
-  disabledFeatures = DISABLED_ACCOUNTING_FEATURES;
-
   /**
    * Popover function
    * @param template TemplateRef<any>.
@@ -108,15 +104,12 @@ export class AccountingComponent implements AfterViewInit {
         );
       });
     }
-    // Closing Entries and Create Journal Entries can be switched off (see disabled-features.ts), in
+    if (this.configurationWizardService.showClosingEntries) {
-    // which case their tiles never render and these refs stay undefined — the wizard simply has no
-    // step to point at, rather than throwing on a missing element.
-    if (this.configurationWizardService.showClosingEntries && this.closingEntries) {
       setTimeout(() => {
         this.showPopover(this.templateClosingEntries, this.closingEntries.nativeElement, 'bottom', true);
       });
     }
-    if (this.configurationWizardService.showCreateJournalEntries && this.createJournalEntries) {
+    if (this.configurationWizardService.showCreateJournalEntries) {
       setTimeout(() => {
         this.showPopover(this.templateCreateJournalEntries, this.createJournalEntries.nativeElement, 'bottom', true);
       });

src/app/accounting/accounting.service.ts

@@ -116,22 +116,6 @@ export class AccountingService {
     return this.http.get(`/glaccounts`, { params: httpParams });
   }
 
-  /**
-   * As-on-date balance sheet, grouped by Header/Detail hierarchy — see BalanceSheetApiResource.
-   * @param asOnDate yyyy-MM-dd. Defaults to today on the backend when omitted.
-   * @param officeId Optional — scopes every balance to one office instead of the whole organization.
-   */
-  getBalanceSheet(asOnDate?: string, officeId?: number): Observable<any> {
-    let httpParams = new HttpParams();
-    if (asOnDate) {
-      httpParams = httpParams.set('asOnDate', asOnDate);
-    }
-    if (officeId != null) {
-      httpParams = httpParams.set('officeId', officeId.toString());
-    }
-    return this.http.get('/accounting/balancesheet', { params: httpParams });
-  }
-
   /**
    * @param transactionId Transaction ID of journal entries.
    * @returns {Observable<any>} Journal Entries.

src/app/accounting/balance-sheet/balance-sheet-pdf.ts

@@ -1,363 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/*
- * Builds the Consolidated Balance Sheet PDF, laid out like the bank's printed report: liabilities
- * on the left, assets on the right, each top-level group a named block with its accounts listed
- * under it and a subtotal in the TOTAL column.
- *
- * Drawn directly with jsPDF rather than printed from the DOM: window.print() carries the whole app
- * shell (sidenav, toolbar, ticker) into the output and gives no control over where a page breaks,
- * which is what made the printed sheet unreadable. Here each column is paginated on its own, the
- * way the printed report does it — the left side can run onto page 2 while the right side is still
- * on page 1 — and every page repeats the heading.
- */
-
-import { jsPDF } from 'jspdf';
-
-export interface BalanceSheetPdfNode {
-  name: string;
-  glCode: string;
-  usage: 'HEADER' | 'DETAIL';
-  balance: number;
-  children: BalanceSheetPdfNode[];
-}
-
-export interface BalanceSheetPdfSide {
-  label: string;
-  total: number;
-  groups: { classification: string; total: number; nodes: BalanceSheetPdfNode[] }[];
-}
-
-export interface BalanceSheetPdfInput {
-  bankName: string;
-  officeLabel: string;
-  /** yyyy-MM-dd */
-  asOnDate: string;
-  creditSide: BalanceSheetPdfSide;
-  debitSide: BalanceSheetPdfSide;
-}
-
-// ── Page geometry, in mm on A4 portrait ─────────────────────────────────────
-const PAGE_W = 210;
-const PAGE_H = 297;
-const MARGIN = 8;
-const COL_W = (PAGE_W - MARGIN * 2) / 2;
-const COL_X = [
-  MARGIN,
-  MARGIN + COL_W
-];
-/** Right edges of the BALANCE and TOTAL columns, relative to a column's left edge. */
-const BALANCE_R = COL_W - 26;
-const TOTAL_R = COL_W - 2;
-/** Name text wraps within this width so it never runs under the BALANCE column. */
-const NAME_W = COL_W - 30;
-
-const BODY_TOP = 36;
-/** Leaves room under the body for the sign-off row and the print-date footer. */
-const BODY_BOTTOM = PAGE_H - 21;
-const LINE_H = 3.1;
-
-const INK: [number, number, number] = [
-  20,
-  20,
-  20
-];
-const MUTED: [number, number, number] = [
-  90,
-  90,
-  90
-];
-
-type Line =
-  | { kind: 'block'; text: string }
-  | { kind: 'subhead'; text: string; depth: number }
-  | { kind: 'detail'; lines: string[]; amount: string; depth: number }
-  | { kind: 'subsubtotal'; amount: string }
-  | { kind: 'subtotal'; amount: string }
-  | { kind: 'standalone'; lines: string[]; amount: string }
-  | { kind: 'grand'; amount: string }
-  | { kind: 'gap' };
-
-function money(value: number): string {
-  return new Intl.NumberFormat('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(value ?? 0);
-}
-
-function ddmmyyyy(iso: string): string {
-  if (!iso) {
-    return '';
-  }
-  const [
-    y,
-    m,
-    d
-  ] = iso.split('-');
-  return `${d}/${m}/${y}`;
-}
-
-function heightOf(line: Line): number {
-  switch (line.kind) {
-    case 'block':
-      // Heading plus the short dashed rule beneath it.
-      return LINE_H + 1.8;
-    case 'detail':
-    case 'standalone':
-      return LINE_H * line.lines.length;
-    case 'gap':
-      return 2.4;
-    case 'grand':
-      // Rule above, the figure, and the double rule beneath it.
-      return LINE_H + 6;
-    default:
-      return LINE_H;
-  }
-}
-
-/**
- * Flattens one side into the exact sequence of printed lines. Done up front so pagination is a
- * matter of measuring heights, with no recursion happening mid-page.
- */
-function flatten(doc: jsPDF, side: BalanceSheetPdfSide): Line[] {
-  const out: Line[] = [];
-  // splitTextToSize measures with whatever font is currently set, so it has to match the font the
-  // detail lines are actually drawn in — otherwise names wrap at the wrong width.
-  doc.setFont('helvetica', 'normal').setFontSize(6.8);
-
-  const pushNode = (node: BalanceSheetPdfNode, depth: number): void => {
-    if (node.usage === 'DETAIL') {
-      const indent = depth * 2;
-      const wrapped: string[] = doc.splitTextToSize(node.name, NAME_W - indent);
-      out.push({ kind: 'detail', lines: wrapped, amount: money(node.balance), depth });
-      return;
-    }
-    out.push({ kind: 'subhead', text: node.name, depth });
-    node.children.forEach((child) => pushNode(child, depth + 1));
-    out.push({ kind: 'subsubtotal', amount: money(node.balance) });
-  };
-
-  for (const group of side.groups) {
-    for (const root of group.nodes) {
-      if (root.usage === 'DETAIL') {
-        // A Detail account sitting under no group at all: a group of one, printed on a single line
-        // carrying both its balance and its total, rather than a heading and a figure on separate
-        // rows with the BALANCE column left empty.
-        out.push({
-          kind: 'standalone',
-          lines: doc.splitTextToSize(root.name.toUpperCase(), NAME_W),
-          amount: money(root.balance)
-        });
-        out.push({ kind: 'gap' });
-        continue;
-      }
-      out.push({ kind: 'block', text: root.name });
-      root.children.forEach((child) => pushNode(child, 0));
-      out.push({ kind: 'subtotal', amount: money(root.balance) });
-      out.push({ kind: 'gap' });
-    }
-  }
-  // Carried as a line of its own so pagination reserves room for it, rather than squeezing it
-  // against the bottom margin under the last block.
-  out.push({ kind: 'grand', amount: money(side.total) });
-  return out;
-}
-
-function dottedLine(doc: jsPDF, x1: number, y: number, x2: number): void {
-  doc.setLineDashPattern(
-    [
-      0.4,
-      0.6
-    ],
-    0
-  );
-  doc.setLineWidth(0.15);
-  doc.line(x1, y, x2, y);
-  doc.setLineDashPattern([], 0);
-}
-
-function drawPageFrame(doc: jsPDF, input: BalanceSheetPdfInput, page: number, pageCount: number): void {
-  doc.setTextColor(...INK);
-
-  doc.setFont('helvetica', 'bold').setFontSize(9.5);
-  doc.text(`${input.bankName.toUpperCase()} , HEAD OFFICE`, PAGE_W / 2, 11, { align: 'center' });
-
-  doc.setFontSize(8);
-  doc.text(`CONSOLIDATED BALANCE SHEET (SUB GROUP WISE) AS ON : ${ddmmyyyy(input.asOnDate)}`, PAGE_W / 2, 16, {
-    align: 'center'
-  });
-  doc.setFont('helvetica', 'normal').setFontSize(7);
-  doc.text(`Page ${page} of ${pageCount}`, PAGE_W - MARGIN, 16, { align: 'right' });
-  doc.text(`FOR BRANCHES : ${input.officeLabel}`, PAGE_W / 2, 20, { align: 'center' });
-
-  dottedLine(doc, MARGIN, 23, PAGE_W - MARGIN);
-
-  // Side titles and column headings, drawn per column.
-  const titles = [
-    'LIABILITIES ( CREDIT )',
-    'ASSETS ( DEBIT )'
-  ];
-  for (let c = 0; c < 2; c++) {
-    const x = COL_X[c];
-    doc.setFont('helvetica', 'bold').setFontSize(7.5);
-    doc.text(titles[c], x + 1, 27.5);
-    doc.setFontSize(6.5);
-    doc.text('ACCOUNT NAME', x + 1, 32);
-    doc.text('BALANCE', x + BALANCE_R, 32, { align: 'right' });
-    doc.text('TOTAL', x + TOTAL_R, 32, { align: 'right' });
-    dottedLine(doc, x + 1, 33.4, x + COL_W - 2);
-  }
-
-  // The divider between the two sides.
-  doc.setLineWidth(0.15);
-  doc.setDrawColor(150, 150, 150);
-  doc.line(COL_X[1], 24, COL_X[1], BODY_BOTTOM + 2);
-  doc.setDrawColor(0, 0, 0);
-
-  // Footer.
-  dottedLine(doc, MARGIN, BODY_BOTTOM + 6, PAGE_W - MARGIN);
-  doc
-    .setFont('helvetica', 'normal')
-    .setFontSize(6.5)
-    .setTextColor(...MUTED);
-  const now = new Date();
-  const stamp =
-    `${`${now.getDate()}`.padStart(2, '0')}/${`${now.getMonth() + 1}`.padStart(2, '0')}/${now.getFullYear()} ` +
-    `${`${now.getHours()}`.padStart(2, '0')}:${`${now.getMinutes()}`.padStart(2, '0')}:${`${now.getSeconds()}`.padStart(2, '0')}`;
-  doc.text(`Print Date : ${stamp}`, MARGIN, BODY_BOTTOM + 10);
-  doc.text('Consolidated Balance Sheet (Sub Group Wise)', PAGE_W - MARGIN, BODY_BOTTOM + 10, { align: 'right' });
-  doc.setTextColor(...INK);
-}
-
-/** Draws one line into a column at y, and returns the y the next line starts at. */
-function drawLine(doc: jsPDF, line: Line, x: number, y: number): number {
-  switch (line.kind) {
-    case 'block': {
-      doc.setFont('helvetica', 'bold').setFontSize(7);
-      doc.text(line.text.toUpperCase(), x + 1, y);
-      dottedLine(doc, x + 1, y + 1.1, x + 34);
-      return y + heightOf(line);
-    }
-    case 'subhead': {
-      doc.setFont('helvetica', 'bold').setFontSize(6.8);
-      doc.text(line.text, x + 1 + line.depth * 2, y);
-      return y + heightOf(line);
-    }
-    case 'detail': {
-      doc.setFont('helvetica', 'normal').setFontSize(6.8);
-      const indent = x + 2 + line.depth * 2;
-      line.lines.forEach((text, i) => doc.text(text, indent, y + i * LINE_H));
-      // The amount sits on the first line of a wrapped name, as the printed report has it.
-      doc.text(line.amount, x + BALANCE_R, y, { align: 'right' });
-      return y + heightOf(line);
-    }
-    case 'subsubtotal': {
-      doc.setFont('helvetica', 'bold').setFontSize(6.8);
-      dottedLine(doc, x + BALANCE_R - 22, y - 2.2, x + BALANCE_R);
-      doc.text(line.amount, x + BALANCE_R, y, { align: 'right' });
-      return y + heightOf(line);
-    }
-    case 'subtotal': {
-      doc.setFont('helvetica', 'bold').setFontSize(7);
-      doc.text(line.amount, x + TOTAL_R, y, { align: 'right' });
-      return y + heightOf(line);
-    }
-    case 'standalone': {
-      doc.setFont('helvetica', 'bold').setFontSize(7);
-      line.lines.forEach((text, i) => doc.text(text, x + 1, y + i * LINE_H));
-      doc.text(line.amount, x + BALANCE_R, y, { align: 'right' });
-      doc.text(line.amount, x + TOTAL_R, y, { align: 'right' });
-      return y + heightOf(line);
-    }
-    case 'grand': {
-      const top = y + 1.5;
-      doc.setLineWidth(0.3);
-      doc.line(x + 1, top, x + COL_W - 2, top);
-      doc.setFont('helvetica', 'bold').setFontSize(7.5);
-      doc.text(line.amount, x + TOTAL_R, top + 3.6, { align: 'right' });
-      doc.setLineWidth(0.2);
-      doc.line(x + 1, top + 5, x + COL_W - 2, top + 5);
-      doc.line(x + 1, top + 5.7, x + COL_W - 2, top + 5.7);
-      return y + heightOf(line);
-    }
-    default:
-      return y + heightOf(line);
-  }
-}
-
-/** Splits one side's lines into per-page chunks that fit between BODY_TOP and BODY_BOTTOM. */
-function paginate(lines: Line[]): Line[][] {
-  const pages: Line[][] = [];
-  let current: Line[] = [];
-  let y = BODY_TOP;
-
-  for (const line of lines) {
-    const h = heightOf(line);
-    if (y + h > BODY_BOTTOM) {
-      pages.push(current);
-      current = [];
-      y = BODY_TOP;
-    }
-    current.push(line);
-    y += h;
-  }
-  // Keep the trailing chunk only if it has something on it, but always return at least one page so
-  // a side with no balances still gets its heading and a zero total.
-  if (current.length > 0 || pages.length === 0) {
-    pages.push(current);
-  }
-  return pages;
-}
-
-export function buildBalanceSheetPdf(input: BalanceSheetPdfInput): jsPDF {
-  const doc = new jsPDF({ orientation: 'p', unit: 'mm', format: 'a4', compress: true });
-
-  const creditPages = paginate(flatten(doc, input.creditSide));
-  const debitPages = paginate(flatten(doc, input.debitSide));
-  // Both sides print side by side, so the sheet runs as long as the longer of the two, plus a
-  // final page for the grand totals when they would not fit under the last block.
-  const pageCount = Math.max(creditPages.length, debitPages.length);
-
-  for (let p = 0; p < pageCount; p++) {
-    if (p > 0) {
-      doc.addPage();
-    }
-    drawPageFrame(doc, input, p + 1, pageCount);
-
-    const sides = [
-      creditPages[p] ?? [],
-      debitPages[p] ?? []
-    ];
-
-    for (let c = 0; c < 2; c++) {
-      const x = COL_X[c];
-      let y = BODY_TOP;
-      for (const line of sides[c]) {
-        y = drawLine(doc, line, x, y);
-      }
-    }
-
-    // Sign-off row, on the closing page only.
-    if (p === pageCount - 1) {
-      doc
-        .setFont('helvetica', 'normal')
-        .setFontSize(6.5)
-        .setTextColor(...MUTED);
-      const roles = [
-        'CLERK',
-        'ACCOUNTANT / OFFICER',
-        'ASST. GEN MANAGER',
-        'GENERAL MANAGER',
-        'CHAIRMAN'
-      ];
-      const step = (PAGE_W - MARGIN * 2) / roles.length;
-      roles.forEach((role, i) => doc.text(role, MARGIN + step * i + step / 2, BODY_BOTTOM + 2, { align: 'center' }));
-      doc.setTextColor(...INK);
-    }
-  }
-
-  return doc;
-}

src/app/accounting/balance-sheet/balance-sheet.component.html

@@ -1,182 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<div class="bs-page">
-  <!-- Controls — not part of the printed sheet. -->
-  <div class="bs-controls">
-    <label class="bs-field">
-      <span>As on date</span>
-      <input type="date" [(ngModel)]="asOnDate" (change)="load()" />
-    </label>
-    <label class="bs-field">
-      <span>Branch</span>
-      <select [(ngModel)]="officeId" (ngModelChange)="load()">
-        <option [ngValue]="null">All branches</option>
-        @for (office of offices; track office.id) {
-          <option [ngValue]="office.id">{{ office.name }}</option>
-        }
-      </select>
-    </label>
-    <label class="bs-check">
-      <input type="checkbox" [(ngModel)]="hideZeroBalances" (ngModelChange)="applyZeroFilter()" />
-      <span>Hide nil balances</span>
-    </label>
-    <span class="bs-controls__spacer"></span>
-    @if (!loading && debitSide && creditSide) {
-      <span class="bs-tally" [class.bs-tally--off]="!tallied">
-        {{ tallied ? 'Balanced' : 'Out of balance by ' + fmt(difference) }}
-      </span>
-    }
-    <button type="button" class="bs-btn" (click)="load()" [disabled]="loading">
-      {{ loading ? 'Loading…' : 'Refresh' }}
-    </button>
-    <button type="button" class="bs-btn bs-btn--primary" (click)="downloadPdf()" [disabled]="loading || !debitSide">
-      Download PDF
-    </button>
-  </div>
-
-  @if (error) {
-    <div class="bs-alert">{{ error }}</div>
-  }
-
-  @if (loading) {
-    <div class="bs-loading">Loading balance sheet…</div>
-  }
-
-  @if (!loading && debitSide && creditSide) {
-    <!-- The sheet itself — this block is what prints. -->
-    <div class="bs-sheet">
-      <header class="bs-sheet__head">
-        <h2>CONSOLIDATED BALANCE SHEET (SUB GROUP WISE)</h2>
-        <p>AS ON : {{ displayDate(asOnDateLoaded) }}</p>
-        <p class="bs-sheet__branches">FOR BRANCHES : {{ officeLabel }}</p>
-      </header>
-
-      <div class="bs-sheet__body">
-        <!-- Liabilities (credit) on the left, assets (debit) on the right — as the printed sheet reads. -->
-        <section class="bs-col">
-          <div class="bs-col__title">LIABILITIES ( CREDIT )</div>
-          <div class="bs-row bs-row--colhead">
-            <span>ACCOUNT NAME</span>
-            <span>BALANCE</span>
-            <span>TOTAL</span>
-          </div>
-          @for (group of creditSide.groups; track group.classification) {
-            @for (root of group.nodes; track root.id) {
-              <ng-container *ngTemplateOutlet="block; context: { $implicit: root }"></ng-container>
-            }
-          }
-          @if (creditSide.groups.length === 0) {
-            <div class="bs-empty">No liability, equity or income balances as on this date.</div>
-          }
-          <div class="bs-row bs-row--grand">
-            <span></span>
-            <span></span>
-            <span>{{ fmt(creditSide.total) }}</span>
-          </div>
-        </section>
-
-        <section class="bs-col">
-          <div class="bs-col__title">ASSETS ( DEBIT )</div>
-          <div class="bs-row bs-row--colhead">
-            <span>ACCOUNT NAME</span>
-            <span>BALANCE</span>
-            <span>TOTAL</span>
-          </div>
-          @for (group of debitSide.groups; track group.classification) {
-            @for (root of group.nodes; track root.id) {
-              <ng-container *ngTemplateOutlet="block; context: { $implicit: root }"></ng-container>
-            }
-          }
-          @if (debitSide.groups.length === 0) {
-            <div class="bs-empty">No asset or expense balances as on this date.</div>
-          }
-          <div class="bs-row bs-row--grand">
-            <span></span>
-            <span></span>
-            <span>{{ fmt(debitSide.total) }}</span>
-          </div>
-        </section>
-      </div>
-
-      <footer class="bs-sheet__foot">
-        <span>CLERK</span>
-        <span>ACCOUNTANT / OFFICER</span>
-        <span>ASST. GEN MANAGER</span>
-        <span>GENERAL MANAGER</span>
-        <span>CHAIRMAN</span>
-      </footer>
-    </div>
-  }
-</div>
-
-<!--
-  One top-level block: the Header account's name, a rule, its lines, then its subtotal in the TOTAL
-  column.
--->
-<ng-template #block let-root>
-  @if (root.usage === 'DETAIL') {
-    <!-- A Detail account with no Header of its own: a group of one, so it gets a single line
-         carrying both its balance and its total rather than a heading repeating its own name. -->
-    <div class="bs-block bs-block--single">
-      <div class="bs-row bs-row--standalone">
-        <span class="bs-name" [title]="root.glCode">{{ root.name }}</span>
-        <span class="bs-amt">{{ fmt(root.balance) }}</span>
-        <span class="bs-amt">{{ fmt(root.balance) }}</span>
-      </div>
-    </div>
-  } @else {
-    <div class="bs-block">
-      <div class="bs-block__name" [title]="root.glCode">{{ root.name }}</div>
-      <div class="bs-block__rule"></div>
-      @for (child of root.children; track child.id) {
-        <ng-container *ngTemplateOutlet="lines; context: { $implicit: child, depth: 0 }"></ng-container>
-      }
-      @if (root.children.length === 0) {
-        <div class="bs-row bs-row--line">
-          <span class="bs-name bs-name--muted">No accounts under this group</span>
-          <span></span>
-          <span></span>
-        </div>
-      }
-      <div class="bs-row bs-row--subtotal">
-        <span></span>
-        <span></span>
-        <span>{{ fmt(root.balance) }}</span>
-      </div>
-    </div>
-  }
-</ng-template>
-
-<!--
-  Everything below a top-level block. A nested Header keeps its own name and its own subtotal, so a
-  Header inside a Header still reads as its own sub-group rather than flattening into the parent.
--->
-<ng-template #lines let-node let-depth="depth">
-  @if (node.usage === 'DETAIL') {
-    <div class="bs-row bs-row--line">
-      <span class="bs-name" [style.paddingLeft.px]="depth * 14" [title]="node.glCode">{{ node.name }}</span>
-      <span class="bs-amt">{{ fmt(node.balance) }}</span>
-      <span></span>
-    </div>
-  } @else {
-    <div class="bs-row bs-row--subhead">
-      <span class="bs-name" [style.paddingLeft.px]="depth * 14" [title]="node.glCode">{{ node.name }}</span>
-      <span></span>
-      <span></span>
-    </div>
-    @for (child of node.children; track child.id) {
-      <ng-container *ngTemplateOutlet="lines; context: { $implicit: child, depth: depth + 1 }"></ng-container>
-    }
-    <div class="bs-row bs-row--subsubtotal">
-      <span></span>
-      <span class="bs-amt">{{ fmt(node.balance) }}</span>
-      <span></span>
-    </div>
-  }
-</ng-template>

src/app/accounting/balance-sheet/balance-sheet.component.scss

@@ -1,372 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-$ink: #111827;
-$ink-soft: #374151;
-$ink-faint: #9ca3af;
-$rule: #cbd5e1;
-$border: #e2e8f0;
-$accent: #1d4ed8;
-$ok: #15803d;
-$ok-soft: #f0fdf4;
-$danger: #b91c1c;
-$danger-soft: #fef2f2;
-
-// Amount columns share one width so BALANCE and TOTAL line up down the whole sheet.
-$amt-col: 128px;
-
-.bs-page {
-  padding: 20px 24px 40px;
-  background: #f1f5f9;
-  min-height: 100%;
-}
-
-// ── Controls (screen only) ────────────────────────────────────────────────
-.bs-controls {
-  display: flex;
-  align-items: flex-end;
-  gap: 14px;
-  flex-wrap: wrap;
-  margin-bottom: 18px;
-
-  &__spacer {
-    flex: 1 1 auto;
-  }
-}
-
-.bs-field {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-  font-size: 10.5px;
-  font-weight: 700;
-  text-transform: uppercase;
-  letter-spacing: 0.06em;
-  color: $ink-soft;
-
-  input,
-  select {
-    height: 36px;
-    padding: 0 10px;
-    border: 1px solid $border;
-    border-radius: 6px;
-    background: #fff;
-    font-size: 13px;
-    font-weight: 500;
-    text-transform: none;
-    letter-spacing: normal;
-    color: $ink;
-  }
-}
-
-.bs-check {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  height: 36px;
-  font-size: 12.5px;
-  font-weight: 600;
-  color: $ink-soft;
-  cursor: pointer;
-  user-select: none;
-
-  input {
-    width: 15px;
-    height: 15px;
-    cursor: pointer;
-    accent-color: $accent;
-  }
-}
-
-.bs-btn {
-  height: 36px;
-  padding: 0 16px;
-  border: 1px solid $border;
-  border-radius: 6px;
-  background: #fff;
-  color: $ink-soft;
-  font-size: 12.5px;
-  font-weight: 700;
-  cursor: pointer;
-
-  &--primary {
-    background: $ink;
-    border-color: $ink;
-    color: #fff;
-  }
-
-  &:disabled {
-    opacity: 0.55;
-    cursor: not-allowed;
-  }
-}
-
-.bs-tally {
-  padding: 6px 12px;
-  border-radius: 999px;
-  background: $ok-soft;
-  color: $ok;
-  font-size: 12px;
-  font-weight: 700;
-
-  &--off {
-    background: $danger-soft;
-    color: $danger;
-  }
-}
-
-.bs-alert {
-  padding: 10px 14px;
-  border-radius: 6px;
-  background: $danger-soft;
-  color: $danger;
-  border: 1px solid #fecaca;
-  font-size: 13px;
-  margin-bottom: 14px;
-}
-
-.bs-loading {
-  padding: 48px 0;
-  text-align: center;
-  color: $ink-faint;
-  font-size: 13.5px;
-}
-
-// ── The printed sheet ─────────────────────────────────────────────────────
-.bs-sheet {
-  background: #fff;
-  border: 1px solid $border;
-  padding: 22px 26px 18px;
-  // The ledger reads as a printed report, so the whole sheet is set in a mono face with
-  // figures on tabular numerals — columns stay aligned however long the names run.
-  font-family: 'DejaVu Sans Mono', 'Liberation Mono', Consolas, 'Courier New', monospace;
-  font-variant-numeric: tabular-nums;
-  color: $ink;
-
-  &__head {
-    text-align: center;
-    border-bottom: 1px dotted $rule;
-    padding-bottom: 10px;
-    margin-bottom: 12px;
-
-    h2 {
-      margin: 0;
-      font-size: 13.5px;
-      font-weight: 700;
-      letter-spacing: 0.04em;
-    }
-
-    p {
-      margin: 4px 0 0;
-      font-size: 11.5px;
-      color: $ink-soft;
-    }
-  }
-
-  &__branches {
-    letter-spacing: 0.05em;
-  }
-
-  &__body {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 0;
-  }
-
-  &__foot {
-    display: flex;
-    justify-content: space-between;
-    gap: 8px;
-    margin-top: 26px;
-    padding-top: 10px;
-    border-top: 1px dotted $rule;
-    font-size: 10px;
-    letter-spacing: 0.05em;
-    color: $ink-soft;
-  }
-}
-
-.bs-col {
-  padding: 0 16px;
-  min-width: 0;
-
-  &:first-child {
-    border-right: 1px dotted $rule;
-    padding-left: 0;
-  }
-
-  &:last-child {
-    padding-right: 0;
-  }
-
-  &__title {
-    font-size: 12px;
-    font-weight: 700;
-    letter-spacing: 0.05em;
-    padding-bottom: 6px;
-  }
-}
-
-// ── Rows: one grid so name / BALANCE / TOTAL align across every block ──────
-.bs-row {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) $amt-col $amt-col;
-  gap: 8px;
-  align-items: baseline;
-  font-size: 11.5px;
-  line-height: 1.55;
-
-  > span:nth-child(2),
-  > span:nth-child(3) {
-    text-align: right;
-    white-space: nowrap;
-  }
-
-  &--colhead {
-    font-weight: 700;
-    font-size: 10.5px;
-    letter-spacing: 0.05em;
-    border-bottom: 1px dotted $rule;
-    padding-bottom: 4px;
-    margin-bottom: 6px;
-    color: $ink-soft;
-  }
-
-  &--line {
-    color: $ink-soft;
-  }
-
-  // A nested Header inside a block: its own named sub-group.
-  &--subhead {
-    font-weight: 700;
-    color: $ink;
-    padding-top: 3px;
-  }
-
-  // Sub-group subtotal sits in the BALANCE column, so it never collides with the
-  // block's own figure in TOTAL.
-  &--subsubtotal {
-    border-top: 1px dotted $rule;
-    font-weight: 700;
-    color: $accent;
-  }
-
-  // Top-level block subtotal, in the TOTAL column.
-  &--subtotal {
-    font-weight: 700;
-    color: $ink;
-    padding-top: 2px;
-  }
-
-  // A Header-less Detail account: its own one-line group.
-  &--standalone {
-    font-weight: 700;
-    color: $ink;
-
-    .bs-name {
-      text-transform: uppercase;
-      letter-spacing: 0.03em;
-    }
-  }
-
-  &--grand {
-    margin-top: 14px;
-    padding-top: 8px;
-    border-top: 1px solid $ink;
-    border-bottom: 3px double $ink;
-    font-weight: 700;
-    font-size: 12.5px;
-  }
-}
-
-.bs-name {
-  overflow-wrap: anywhere;
-
-  &--muted {
-    color: $ink-faint;
-    font-style: italic;
-  }
-}
-
-.bs-amt {
-  font-variant-numeric: tabular-nums;
-}
-
-.bs-block {
-  margin-bottom: 14px;
-
-  &--single {
-    margin-bottom: 10px;
-  }
-
-  &__name {
-    font-size: 11.5px;
-    font-weight: 700;
-    letter-spacing: 0.03em;
-    text-transform: uppercase;
-  }
-
-  // The short dashed rule the printed sheet puts under every group heading.
-  &__rule {
-    width: 130px;
-    border-top: 1px dotted $ink-faint;
-    margin: 2px 0 4px;
-  }
-}
-
-.bs-empty {
-  padding: 14px 0;
-  font-size: 11.5px;
-  color: $ink-faint;
-}
-
-// ── Narrow screens: stack the two sides instead of squeezing the columns ───
-@media (width <= 1100px) {
-  .bs-sheet__body {
-    grid-template-columns: 1fr;
-  }
-
-  .bs-col {
-    padding: 0;
-
-    &:first-child {
-      border-right: none;
-      border-bottom: 1px dotted $rule;
-      padding-bottom: 16px;
-      margin-bottom: 16px;
-    }
-  }
-}
-
-// ── Print: only the sheet, at report proportions ───────────────────────────
-@media print {
-  .bs-controls,
-  .bs-alert,
-  .bs-loading {
-    display: none !important;
-  }
-
-  .bs-page {
-    padding: 0;
-    background: #fff;
-  }
-
-  .bs-sheet {
-    border: none;
-    padding: 0;
-    font-size: 10px;
-  }
-
-  .bs-sheet__body {
-    grid-template-columns: 1fr 1fr;
-  }
-
-  .bs-block {
-    break-inside: avoid;
-  }
-}

src/app/accounting/balance-sheet/balance-sheet.component.ts

@@ -1,218 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { Component, OnInit, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { AccountingService } from '../accounting.service';
-import { OrganizationService } from '../../organization/organization.service';
-import { buildBalanceSheetPdf } from './balance-sheet-pdf';
-
-interface BalanceSheetNode {
-  id: number;
-  name: string;
-  glCode: string;
-  usage: 'HEADER' | 'DETAIL';
-  balance: number;
-  children: BalanceSheetNode[];
-}
-
-interface BalanceSheetGroup {
-  classification: string;
-  total: number;
-  nodes: BalanceSheetNode[];
-}
-
-interface BalanceSheetSide {
-  label: string;
-  total: number;
-  groups: BalanceSheetGroup[];
-}
-
-/**
- * Consolidated Balance Sheet (sub-group wise), laid out the way the bank's own printed balance
- * sheet reads: liabilities on the left, assets on the right, each top-level Header account a named
- * block whose Detail accounts are listed under it and subtotalled in the TOTAL column.
- *
- * Balances come from BalanceSheetApiResource, which reads the live ledger - a Detail account's own
- * postings, and a Header's as the recursive sum of its children (a Header never carries a posting
- * of its own). A Detail account that sits under no Header at all is shown as its own one-line block
- * rather than being dropped.
- */
-@Component({
-  selector: 'mifosx-balance-sheet',
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule
-  ],
-  templateUrl: './balance-sheet.component.html',
-  styleUrl: './balance-sheet.component.scss'
-})
-export class BalanceSheetComponent implements OnInit {
-  private accountingService = inject(AccountingService);
-  private organizationService = inject(OrganizationService);
-
-  /** Printed at the head of the PDF. Falls back to a neutral title if the profile is not set up. */
-  bankName = 'Bank';
-
-  asOnDate: string = new Date().toISOString().slice(0, 10);
-  officeId: number | null = null;
-  offices: { id: number; name: string }[] = [];
-
-  loading = false;
-  error = '';
-  asOnDateLoaded = '';
-
-  /** What the server returned, kept whole so the zero-balance toggle never needs a refetch. */
-  private rawDebitSide: BalanceSheetSide | null = null;
-  private rawCreditSide: BalanceSheetSide | null = null;
-
-  debitSide: BalanceSheetSide | null = null;
-  creditSide: BalanceSheetSide | null = null;
-
-  /**
-   * A working chart of accounts carries far more accounts than a bank actually operates, and a
-   * printed balance sheet lists only the ones carrying a balance — leaving every nil line in makes
-   * the sheet unreadable. On by default for that reason; switch it off to audit the full chart.
-   */
-  hideZeroBalances = true;
-
-  /** Both sides are derived from the same double-entry ledger, so they can only disagree if a
-   *  posting is missing a leg — worth surfacing rather than hiding. */
-  get tallied(): boolean {
-    if (!this.debitSide || !this.creditSide) {
-      return true;
-    }
-    return Math.abs(this.debitSide.total - this.creditSide.total) < 0.01;
-  }
-
-  get difference(): number {
-    if (!this.debitSide || !this.creditSide) {
-      return 0;
-    }
-    return Math.abs(this.debitSide.total - this.creditSide.total);
-  }
-
-  get officeLabel(): string {
-    if (this.officeId == null) {
-      return 'ALL BRANCHES';
-    }
-    return (this.offices.find((o) => o.id === this.officeId)?.name ?? '').toUpperCase();
-  }
-
-  ngOnInit(): void {
-    this.accountingService.getOffices().subscribe({
-      next: (offices) => (this.offices = offices || []),
-      error: () => (this.offices = [])
-    });
-    this.organizationService.getInstitutionProfile().subscribe({
-      next: (profile: any) => {
-        this.bankName = profile?.statementHeaderName || profile?.bankName || this.bankName;
-      },
-      // A missing institution profile must not stop the sheet from loading — the PDF just carries
-      // the fallback title.
-      error: () => undefined
-    });
-    this.load();
-  }
-
-  load(): void {
-    this.loading = true;
-    this.error = '';
-    this.accountingService.getBalanceSheet(this.asOnDate, this.officeId ?? undefined).subscribe({
-      next: (res: any) => {
-        this.rawDebitSide = res.debitSide;
-        this.rawCreditSide = res.creditSide;
-        this.asOnDateLoaded = res.asOnDate;
-        this.applyZeroFilter();
-        this.loading = false;
-      },
-      error: () => {
-        this.error = 'Could not load the balance sheet for this date.';
-        this.loading = false;
-      }
-    });
-  }
-
-  /**
-   * Rebuilds the displayed sides from what the server sent, dropping nil lines when asked. The
-   * totals are deliberately left as the server computed them — hiding a nil line must never change
-   * a figure, and a group total is unaffected by removing children that summed to nothing.
-   */
-  applyZeroFilter(): void {
-    this.debitSide = this.filterSide(this.rawDebitSide);
-    this.creditSide = this.filterSide(this.rawCreditSide);
-  }
-
-  private filterSide(side: BalanceSheetSide | null): BalanceSheetSide | null {
-    if (!side) {
-      return null;
-    }
-    if (!this.hideZeroBalances) {
-      return side;
-    }
-    const groups = side.groups
-      .map((group) => ({
-        ...group,
-        nodes: group.nodes
-          .map((node) => this.pruneZeros(node))
-          .filter((node): node is BalanceSheetNode => node !== null)
-      }))
-      .filter((group) => group.nodes.length > 0);
-    return { ...side, groups };
-  }
-
-  /** Drops a node whose balance is nil, and any Header left with nothing under it. */
-  private pruneZeros(node: BalanceSheetNode): BalanceSheetNode | null {
-    if (Math.abs(node.balance) < 0.005) {
-      return null;
-    }
-    const children = node.children
-      .map((child) => this.pruneZeros(child))
-      .filter((child): child is BalanceSheetNode => child !== null);
-    return { ...node, children };
-  }
-
-  /** Indian grouping with two decimals, matching the printed report (2,76,92,608.00). */
-  fmt(value: number): string {
-    return new Intl.NumberFormat('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(value ?? 0);
-  }
-
-  /** dd/MM/yyyy, as the printed report dates it. */
-  displayDate(iso: string): string {
-    if (!iso) {
-      return '';
-    }
-    const [
-      y,
-      m,
-      d
-    ] = iso.split('-');
-    return `${d}/${m}/${y}`;
-  }
-
-  /**
-   * Builds the report as a real PDF rather than printing the page: window.print() takes the whole
-   * app shell with it and breaks pages wherever they happen to fall, which is what made the earlier
-   * output unusable.
-   */
-  downloadPdf(): void {
-    if (!this.debitSide || !this.creditSide) {
-      return;
-    }
-    const doc = buildBalanceSheetPdf({
-      bankName: this.bankName,
-      officeLabel: this.officeLabel,
-      asOnDate: this.asOnDateLoaded || this.asOnDate,
-      creditSide: this.creditSide,
-      debitSide: this.debitSide
-    });
-    doc.save(`balance-sheet-${this.asOnDateLoaded || this.asOnDate}.pdf`);
-  }
-}

src/app/accounting/disabled-features.ts

@@ -1,43 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { inject } from '@angular/core';
-import { Router, CanActivateFn } from '@angular/router';
-
-/**
- * Accounting features switched off for this installation.
- *
- * Nothing is deleted — the components, routes and services all stay in place, and flipping a flag
- * back to `false` brings the feature back with its tile and its route. The matching API block lives
- * in DisabledFeatureApiFilter on the backend, so a hidden feature cannot be reached by calling the
- * endpoint directly either.
- */
-export const DISABLED_ACCOUNTING_FEATURES = {
-  createJournalEntries: true,
-  frequentPostings: true,
-  closingEntries: true,
-  accruals: true,
-  provisioningEntries: true,
-  accountingRules: true
-};
-
-/**
- * Blocks a route belonging to a disabled feature, for anyone who reaches it by typing the URL
- * rather than through a tile. `data.feature` names the flag to check.
- */
-export const accountingFeatureEnabledGuard: CanActivateFn = (route) => {
-  const router = inject(Router);
-  const feature = route.data?.['feature'] as keyof typeof DISABLED_ACCOUNTING_FEATURES | undefined;
-
-  if (!feature || !DISABLED_ACCOUNTING_FEATURES[feature]) {
-    return true;
-  }
-
-  router.navigate(['/accounting'], { replaceUrl: true });
-  return false;
-};

src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.ts

@@ -16,7 +16,6 @@ import { AccountingService } from '../../accounting.service';
 import { GLAccount } from 'app/shared/models/general.model';
 import { GlAccountSelectorComponent } from '../../../shared/accounting/gl-account-selector/gl-account-selector.component';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { accountOptionsForActivity } from '../financial-activity-account-options';
 
 /**
  * Create financial activity mapping component.
@@ -88,11 +87,21 @@ export class CreateFinancialActivityMappingComponent implements OnInit {
    */
   setGlAccountData() {
     this.financialActivityMappingForm.get('financialActivityId').valueChanges.subscribe((financialActivityId) => {
-      this.glAccountData = accountOptionsForActivity(
+      switch (financialActivityId) {
-        this.financialActivityData,
+        case 100:
-        financialActivityId,
+        case 101:
-        this.glAccountOptions
+        case 102:
-      );
+        case 103:
+          this.glAccountData = this.glAccountOptions.assetAccountOptions;
+          break;
+        case 200:
+        case 201:
+          this.glAccountData = this.glAccountOptions.liabilityAccountOptions;
+          break;
+        case 300:
+          this.glAccountData = this.glAccountOptions.equityAccountOptions;
+          break;
+      }
     });
   }
 

src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.ts

@@ -16,7 +16,6 @@ import { AccountingService } from '../../accounting.service';
 import { GLAccount } from 'app/shared/models/general.model';
 import { GlAccountSelectorComponent } from '../../../shared/accounting/gl-account-selector/gl-account-selector.component';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { accountOptionsForActivity } from '../financial-activity-account-options';
 
 /**
  * Edit financial activity mapping component.
@@ -99,11 +98,21 @@ export class EditFinancialActivityMappingComponent implements OnInit {
    */
   setGLAccountData() {
     this.financialActivityMappingForm.get('financialActivityId').valueChanges.subscribe((financialActivityId) => {
-      this.glAccountData = accountOptionsForActivity(
+      switch (financialActivityId) {
-        this.financialActivityData,
+        case 100:
-        financialActivityId,
+        case 101:
-        this.glAccountOptions
+        case 102:
-      );
+        case 103:
+          this.glAccountData = this.glAccountOptions.assetAccountOptions;
+          break;
+        case 200:
+        case 201:
+          this.glAccountData = this.glAccountOptions.liabilityAccountOptions;
+          break;
+        case 300:
+          this.glAccountData = this.glAccountOptions.equityAccountOptions;
+          break;
+      }
     });
   }
 

src/app/accounting/financial-activity-mappings/financial-activity-account-options.ts

@@ -1,38 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/**
- * The GL accounts a financial activity may be mapped to.
- *
- * The activity itself says which kind of account it needs — the template returns `mappedGLAccountType` on every
- * option — so the answer is read from the activity rather than worked out from its id. The screens used to switch on
- * the id instead, listing the ones they knew:
- *
- *     case 100, 101, 102, 103 → asset
- *     case 200, 201           → liability
- *     case 300                → equity
- *
- * Every activity added since fell through that switch and left the account dropdown empty, which is how dividendPaid
- * (202), reserveForDividend (301), distributableProfit (302), retainedProfit (303) and dividendRoundOff (304) became
- * unmappable — the screen offered no accounts and gave no reason. A list keyed on ids has to be extended by hand for
- * each new activity, and is silently wrong until someone notices; asking the activity what it needs cannot fall out
- * of step with the backend.
- *
- * @param activities the template's financialActivityOptions
- * @param activityId the activity the user picked
- * @param glAccountOptions the template's glAccountOptions, keyed assetAccountOptions / liabilityAccountOptions / …
- */
-export function accountOptionsForActivity(activities: any[], activityId: number, glAccountOptions: any): any[] {
-  const activity = (activities || []).find((a) => a?.id === activityId);
-  const accountType = activity?.mappedGLAccountType;
-  if (!accountType || !glAccountOptions) {
-    return [];
-  }
-  // ASSET → assetAccountOptions, and so on for LIABILITY, EQUITY, INCOME and EXPENSE.
-  return glAccountOptions[`${accountType.toLowerCase()}AccountOptions`] ?? [];
-}

src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.html

@@ -49,144 +49,119 @@
   }
 
   @if (glStatus && !glError) {
-    @if (todayAlreadyOpen) {
+    <!-- Step 2: what the ledger already says, so the count is counted against something concrete. -->
-      <!-- This screen is a one-time "day 1" tool - today's business day already exists, so counting
+    <div class="mcd-gl" [class.mcd-gl--fresh]="!glHasBalance">
-           a drawer here would only be rejected at submit (BranchDayRegisterApiResource rejects
+      <mat-icon>account_balance</mat-icon>
-           reopening an already-open day). Day Register is where every day after the first belongs. -->
+      <div>
-      <div class="mcd-gl mcd-gl--error">
+        <div class="mcd-gl__label">Cash GL Account</div>
-        <mat-icon>lock</mat-icon>
+        <div class="mcd-gl__value">({{ glStatus.glCode }}) {{ glStatus.glAccountName }}</div>
-        <div>
-          <div class="mcd-gl__label">Business Day Already Open</div>
-          <div class="mcd-gl__value">
-            {{ todayOpenInfo.businessDate }} — opened by {{ todayOpenInfo.openedByName }}, opening cash ₹{{
-              todayOpenInfo.openingCash | number: '1.2-2'
-            }}
-          </div>
-          <div class="mcd-gl__hint">
-            This branch has already opened today's business day — counting the drawer again here would only be rejected
-            on submit. Deposits, withdrawals and closing today's day happen from Day Register instead.
-          </div>
-          <button type="button" mat-stroked-button (click)="goToBranchDay()">Go to Day Register</button>
-        </div>
-      </div>
-    } @else {
-      <!-- Step 2: what the ledger already says, so the count is counted against something concrete. -->
-      <div class="mcd-gl" [class.mcd-gl--fresh]="!glHasBalance">
-        <mat-icon>account_balance</mat-icon>
-        <div>
-          <div class="mcd-gl__label">Cash GL Account</div>
-          <div class="mcd-gl__value">({{ glStatus.glCode }}) {{ glStatus.glAccountName }}</div>
-          @if (glHasBalance) {
-            <div class="mcd-gl__hint">
-              Already holds
-              <strong>₹{{ glTarget.toLocaleString('en-IN') }}</strong>
-              — count the drawer to exactly this amount.
-            </div>
-          } @else {
-            <div class="mcd-gl__hint">
-              No opening balance posted yet — whatever you count below becomes this account's opening balance.
-            </div>
-          }
-        </div>
-      </div>
-
-      <!-- Step 3: the actual count. -->
-      <mat-card class="mcd-card mcd-card--flush">
-        <mat-card-content>
-          <div class="mcd-grid mcd-grid--head">
-            <div class="mcd-grid__denom">Denomination</div>
-            <div class="mcd-grid__count">Count</div>
-            <div class="mcd-grid__amt">Amount</div>
-          </div>
-          @for (d of allDenoms; track d.id) {
-            <div class="mcd-grid mcd-grid--row">
-              <div class="mcd-grid__denom">
-                {{ d.label }} <span class="mcd-grid__kind">{{ d.kind }}</span>
-              </div>
-              <div class="mcd-grid__count">
-                <button type="button" mat-icon-button (click)="bumpCount(d, -1)"><mat-icon>remove</mat-icon></button>
-                <input
-                  type="number"
-                  min="0"
-                  class="mcd-grid__input"
-                  [style.width.ch]="countInputWidthCh(d)"
-                  [ngModel]="countFor(d)"
-                  (ngModelChange)="onCountChange(d, $event)"
-                />
-                <button type="button" mat-icon-button (click)="bumpCount(d, 1)"><mat-icon>add</mat-icon></button>
-              </div>
-              <div class="mcd-grid__amt">₹{{ subtotalFor(d).toLocaleString('en-IN') }}</div>
-            </div>
-          }
-        </mat-card-content>
-      </mat-card>
-
-      <!-- The one number that matters. -->
-      <div class="mcd-balance" [class.mcd-balance--ok]="isReconciled">
-        <div class="mcd-balance__figure">
-          <span class="mcd-balance__label">Counted Total</span>
-          <span class="mcd-balance__amt">₹{{ countedTotal.toLocaleString('en-IN') }}</span>
-        </div>
         @if (glHasBalance) {
-          <div class="mcd-balance__figure">
+          <div class="mcd-gl__hint">
-            <span class="mcd-balance__label">GL Target</span>
+            Already holds
-            <span class="mcd-balance__amt">₹{{ glTarget.toLocaleString('en-IN') }}</span>
+            <strong>₹{{ glTarget.toLocaleString('en-IN') }}</strong>
+            — count the drawer to exactly this amount.
+          </div>
+        } @else {
+          <div class="mcd-gl__hint">
+            No opening balance posted yet — whatever you count below becomes this account's opening balance.
           </div>
         }
-        <div class="mcd-balance__status">
-          @if (countedTotal <= 0) {
-            <mat-icon>edit_note</mat-icon>
-            <span>Count each denomination above</span>
-          } @else if (isReconciled) {
-            <mat-icon>check_circle</mat-icon>
-            <span>{{ glHasBalance ? 'Matches the GL balance' : 'Will define the GL opening balance' }}</span>
-          } @else {
-            <mat-icon>error</mat-icon>
-            <span
-              >Off by ₹{{
-                (countedTotal - glTarget < 0 ? glTarget - countedTotal : countedTotal - glTarget).toLocaleString(
-                  'en-IN'
-                )
-              }}</span
-            >
-          }
-        </div>
       </div>
+    </div>
 
-      @if (needsDifferenceReason) {
+    <!-- Step 3: the actual count. -->
-        <mat-card class="mcd-card">
+    <mat-card class="mcd-card mcd-card--flush">
-          <mat-card-content>
+      <mat-card-content>
-            <mat-form-field class="mcd-reason">
+        <div class="mcd-grid mcd-grid--head">
-              <mat-label>Why does the count differ from the GL balance?</mat-label>
+          <div class="mcd-grid__denom">Denomination</div>
-              <input matInput [(ngModel)]="differenceReason" />
+          <div class="mcd-grid__count">Count</div>
-            </mat-form-field>
+          <div class="mcd-grid__amt">Amount</div>
-          </mat-card-content>
+        </div>
-        </mat-card>
+        @for (d of allDenoms; track d.id) {
-      }
+          <div class="mcd-grid mcd-grid--row">
-
+            <div class="mcd-grid__denom">
-      @if (errorMsg) {
+              {{ d.label }} <span class="mcd-grid__kind">{{ d.kind }}</span>
-        <div class="mcd-error">{{ errorMsg }}</div>
-      }
-
-      @if (successMsg) {
-        <div class="mcd-success">
-          <mat-icon>check_circle</mat-icon>
-          <div>
-            {{ successMsg }}
-            <div class="mcd-success__actions">
-              <button type="button" mat-stroked-button (click)="goToBranchDay()">Go to Day Register</button>
             </div>
+            <div class="mcd-grid__count">
+              <button type="button" mat-icon-button (click)="bumpCount(d, -1)"><mat-icon>remove</mat-icon></button>
+              <input
+                type="number"
+                min="0"
+                class="mcd-grid__input"
+                [ngModel]="countFor(d)"
+                (ngModelChange)="onCountChange(d, $event)"
+              />
+              <button type="button" mat-icon-button (click)="bumpCount(d, 1)"><mat-icon>add</mat-icon></button>
+            </div>
+            <div class="mcd-grid__amt">₹{{ subtotalFor(d).toLocaleString('en-IN') }}</div>
+          </div>
+        }
+      </mat-card-content>
+    </mat-card>
+
+    <!-- The one number that matters. -->
+    <div class="mcd-balance" [class.mcd-balance--ok]="isReconciled">
+      <div class="mcd-balance__figure">
+        <span class="mcd-balance__label">Counted Total</span>
+        <span class="mcd-balance__amt">₹{{ countedTotal.toLocaleString('en-IN') }}</span>
+      </div>
+      @if (glHasBalance) {
+        <div class="mcd-balance__figure">
+          <span class="mcd-balance__label">GL Target</span>
+          <span class="mcd-balance__amt">₹{{ glTarget.toLocaleString('en-IN') }}</span>
+        </div>
+      }
+      <div class="mcd-balance__status">
+        @if (countedTotal <= 0) {
+          <mat-icon>edit_note</mat-icon>
+          <span>Count each denomination above</span>
+        } @else if (isReconciled) {
+          <mat-icon>check_circle</mat-icon>
+          <span>{{ glHasBalance ? 'Matches the GL balance' : 'Will define the GL opening balance' }}</span>
+        } @else {
+          <mat-icon>error</mat-icon>
+          <span
+            >Off by ₹{{
+              (countedTotal - glTarget < 0 ? glTarget - countedTotal : countedTotal - glTarget).toLocaleString('en-IN')
+            }}</span
+          >
+        }
+      </div>
+    </div>
+
+    @if (needsDifferenceReason) {
+      <mat-card class="mcd-card">
+        <mat-card-content>
+          <mat-form-field class="mcd-reason">
+            <mat-label>Why does the count differ from the GL balance?</mat-label>
+            <input matInput [(ngModel)]="differenceReason" />
+          </mat-form-field>
+        </mat-card-content>
+      </mat-card>
+    }
+
+    @if (errorMsg) {
+      <div class="mcd-error">{{ errorMsg }}</div>
+    }
+
+    @if (successMsg) {
+      <div class="mcd-success">
+        <mat-icon>check_circle</mat-icon>
+        <div>
+          {{ successMsg }}
+          <div class="mcd-success__actions">
+            <button type="button" mat-stroked-button (click)="goToBranchDay()">Go to Day Register</button>
           </div>
         </div>
-      }
+      </div>
+    }
 
-      @if (!successMsg) {
+    @if (!successMsg) {
-        <div class="mcd-actions">
+      <div class="mcd-actions">
-          <button mat-raised-button color="primary" [disabled]="!canSubmit" (click)="submit()">
+        <button mat-raised-button color="primary" [disabled]="!canSubmit" (click)="submit()">
-            {{ submitting ? 'Submitting…' : 'Migrate & Open Business Day' }}
+          {{ submitting ? 'Submitting…' : 'Migrate & Open Business Day' }}
-          </button>
+        </button>
-        </div>
+      </div>
-      }
     }
   }
 </div>

src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.scss

@@ -115,10 +115,6 @@
     color: #64748b;
     line-height: 1.4;
   }
-
-  button {
-    margin-top: 10px;
-  }
 }
 
 .mcd-grid {
@@ -175,11 +171,7 @@
   }
 
   &__input {
-    /* Width is set inline per row (see countInputWidthCh()), growing with the digit count typed —
+    width: 48px;
-       min-width here only covers the fallback before Angular has bound anything. */
-    min-width: 48px;
-    max-width: 96px;
-    transition: width 0.1s ease-out;
     text-align: center;
     font-variant-numeric: tabular-nums;
     border: 1px solid #e2e8f0;

src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.ts

@@ -66,14 +66,6 @@ export class MigrateCashDenominationComponent implements OnInit {
   glStatus: any = null;
   glError = '';
 
-  /** Set once per office change: whether TODAY's business day is already open for this office. This
-   *  screen is a one-time "day 1" tool (see the class doc) - once a day has actually been opened,
-   *  reopening the same one is exactly what BranchDayRegisterApiResource#migrateCashDenomination
-   *  itself refuses (its own openDayInternal call rejects a day that is already open), so this is
-   *  checked here too, before the user counts an entire drawer only to have the submit rejected. */
-  todayAlreadyOpen = false;
-  todayOpenInfo: any = null;
-
   notes: Denom[] = [];
   coins: Denom[] = [];
   counts: Record<number, number> = {};
@@ -126,8 +118,6 @@ export class MigrateCashDenominationComponent implements OnInit {
     this.result = null;
     this.successMsg = '';
     this.errorMsg = '';
-    this.todayAlreadyOpen = false;
-    this.todayOpenInfo = null;
     if (!this.officeId) return;
 
     this.glLoading = true;
@@ -141,15 +131,6 @@ export class MigrateCashDenominationComponent implements OnInit {
           this.glError = res.message || 'No cash GL account is configured for this tenant yet.';
         }
       });
-
-    this.service
-      .branchDayRegister(this.officeId)
-      .pipe(catchError(() => of(null)))
-      .subscribe((res: any) => {
-        const openDay = res?.openDay;
-        this.todayAlreadyOpen = !!openDay && openDay.businessDate === res?.today;
-        this.todayOpenInfo = this.todayAlreadyOpen ? openDay : null;
-      });
   }
 
   countFor(d: Denom): number {
@@ -168,12 +149,6 @@ export class MigrateCashDenominationComponent implements OnInit {
     this.counts[d.id] = Math.max(0, (this.counts[d.id] || 0) + delta);
   }
 
-  /** Widens the count box as the typed count grows more digits, so a large count (hundreds,
-   *  thousands) is never clipped or hard to read inside a field sized for one or two digits. */
-  countInputWidthCh(d: Denom): number {
-    return Math.max(3, String(this.countFor(d)).length + 2);
-  }
-
   get countedTotal(): number {
     return this.allDenoms.reduce((s, d) => s + this.subtotalFor(d), 0);
   }

src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.html

@@ -162,18 +162,7 @@
             <div class="mob-grid mob-grid--data" formArrayName="glAccountEntries">
               <div class="mob-grid__row" [formGroupName]="i">
                 <div class="mob-grid__code">{{ openingBalancesData.glAccounts[i].glAccountCode }}</div>
-                <div class="mob-grid__name">
+                <div class="mob-grid__name">{{ openingBalancesData.glAccounts[i].glAccountName }}</div>
-                  {{ openingBalancesData.glAccounts[i].glAccountName }}
-                  @if (isDenominationManaged(openingBalancesData.glAccounts[i].glAccountId)) {
-                    <span
-                      class="mob-grid__lock"
-                      matTooltip="Set by Migrate Cash Denomination — use that screen to change it"
-                    >
-                      <mat-icon inline="true">lock</mat-icon>
-                      <a [routerLink]="['/accounting/migrate-cash-denomination']">Migrate Cash Denomination</a>
-                    </span>
-                  }
-                </div>
                 <div class="mob-grid__amt">
                   <mat-form-field class="mob-grid__input">
                     <input matInput type="number" min="0" formControlName="debit" placeholder="0.00" />

src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.scss

@@ -219,33 +219,6 @@
     word-break: break-word;
   }
 
-  /* Cash at Vault / Cash at Teller — locked, see MigrateOpeningBalancesComponent.isDenominationManaged. */
-  &__lock {
-    display: inline-flex;
-    align-items: center;
-    gap: 4px;
-    margin-left: 8px;
-    padding: 1px 8px 1px 6px;
-    border-radius: 999px;
-    background: #fff7ed;
-    color: #9a3412;
-    font-size: 11px;
-    font-weight: 600;
-    white-space: nowrap;
-    vertical-align: middle;
-
-    mat-icon {
-      font-size: 13px;
-      width: 13px;
-      height: 13px;
-    }
-
-    a {
-      color: inherit;
-      text-decoration: underline;
-    }
-  }
-
   &__amt {
     text-align: right;
   }

src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.ts

@@ -17,7 +17,6 @@ import {
 } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { MatIconModule } from '@angular/material/icon';
-import { MatTooltipModule } from '@angular/material/tooltip';
 
 /** Custom Services */
 import { AccountingService } from '../accounting.service';
@@ -44,8 +43,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
     ...STANDALONE_SHARED_IMPORTS,
     GlAccountDisplayComponent,
     CurrencyPipe,
-    MatIconModule,
+    MatIconModule
-    MatTooltipModule
   ]
 })
 export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
@@ -76,13 +74,6 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
   debitsSum = 0;
   /** Sum total of credits. */
   creditsSum = 0;
-  /** GL account ids mapped to Financial Activity 101 (Cash at Vault) / 102 (Cash at Teller) — the
-   *  account(s) Migrate Cash Denomination owns. Their opening balance is shown here for visibility
-   *  but locked against editing: redefining it as a bare number here, instead of through a counted
-   *  denomination breakdown, would let the GL figure drift away from what is physically in the till.
-   *  The backend enforces the same rule independently (see defineOpeningBalance's
-   *  validateNoDenominationManagedCashAccounts) — this is a convenience, not the source of truth. */
-  denominationManagedGlAccountIds: number[] = [];
 
   /* Reference of search form */
   @ViewChild('searchFormRef') searchFormRef: ElementRef<any>;
@@ -104,22 +95,6 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
       this.officeData = data.offices;
       this.currencyData = data.currencies.selectedCurrencyOptions;
     });
-    // Office-independent: which GL account(s) this tenant has mapped to Cash at Vault / Cash at
-    // Teller, so their row can be locked the moment the office's accounts are drawn.
-    this.accountingService.getFinancialActivityAccounts().subscribe((mappings: any[]) => {
-      this.denominationManagedGlAccountIds = (mappings || [])
-        .filter((mapping) => mapping.financialActivityData?.id === 101 || mapping.financialActivityData?.id === 102)
-        .map((mapping) => mapping.glAccountData?.id)
-        .filter((id) => id != null);
-      // Retrieve may already have run before this (fast) request came back — lock any row it
-      // missed rather than leaving it editable for the rest of this visit.
-      this.glAccountEntries?.controls.forEach((control) => {
-        const glAccountId = control.get('glAccountId')?.value;
-        if (this.isDenominationManaged(glAccountId) && control.enabled) {
-          control.disable();
-        }
-      });
-    });
   }
 
   /**
@@ -161,31 +136,14 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
    * @returns {FormGroup} GL Account entry form.
    */
   createGLAccountEntryForm(glAccount: any): UntypedFormGroup {
-    // A never-touched account arrives as a placeholder row (amount/entryType both null); one that
+    return this.formBuilder.group(
-    // already carries an opening balance arrives with its real, committed figure — show that
-    // instead of leaving the field looking blank.
-    const existingDebit = glAccount.entryType?.value === 'DEBIT' ? glAccount.amount : null;
-    const existingCredit = glAccount.entryType?.value === 'CREDIT' ? glAccount.amount : null;
-    const group = this.formBuilder.group(
       {
         glAccountId: [glAccount.glAccountId],
-        debit: [existingDebit],
+        debit: [null],
-        credit: [existingCredit]
+        credit: [null]
       },
       { validator: onlyOneOfTheFieldsIsRequiredValidator }
     );
-    if (this.isDenominationManaged(glAccount.glAccountId)) {
-      // Disabling excludes this row from the form's own .value, so it is never resubmitted here —
-      // the account keeps whatever Migrate Cash Denomination last set it to.
-      group.disable();
-    }
-    return group;
-  }
-
-  /** Whether this GL account is Cash at Vault / Cash at Teller — locked here, see
-   *  denominationManagedGlAccountIds. */
-  isDenominationManaged(glAccountId: number): boolean {
-    return this.denominationManagedGlAccountIds.includes(glAccountId);
   }
 
   /**
@@ -218,30 +176,17 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
 
         this.openingBalancesData = openingBalancesData;
 
-        entry.valueChanges.subscribe(() => this.recomputeSums());
+        entry.valueChanges.subscribe(() => {
-        // Runs once immediately too: valueChanges only fires on a later edit, and the locked cash
+          this.debitsSum = 0;
-        // row's own prefilled figure (set once, above, never through a further value change) would
+          this.creditsSum = 0;
-        // otherwise never be reflected in the banner at all.
+          entry.controls.forEach((value) => {
-        this.recomputeSums();
+            this.debitsSum += value.value.debit;
+            this.creditsSum += value.value.credit;
+          });
+        });
       });
   }
 
-  /** Total Debit / Total Credit shown in the balance banner. A locked (denomination-managed) row is
-   *  excluded here exactly as it is excluded from the form's own .value used at submit time — this
-   *  screen only needs to balance the accounts it is itself about to (re)define, not the one
-   *  Migrate Cash Denomination already settled and this form can never touch. */
-  private recomputeSums(): void {
-    this.debitsSum = 0;
-    this.creditsSum = 0;
-    this.glAccountEntries.controls.forEach((control) => {
-      if (control.disabled) {
-        return;
-      }
-      this.debitsSum += control.value.debit || 0;
-      this.creditsSum += control.value.credit || 0;
-    });
-  }
-
   /**
    * Submits the opening balances form and defines opening balances,
    * if successful redirects to view created transaction.

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

@@ -53,13 +53,10 @@
         <fa-icon icon="sync" [class.fa-spin]="ledgerLoading"></fa-icon>
         Refresh
       </button>
-      <!-- New Entry — hidden while Create Journal Entries is disabled, see disabled-features.ts -->
+      <button class="gl-hero-btn gl-hero-btn--primary" [routerLink]="['/accounting/journal-entries/create']">
-      @if (!disabledFeatures.createJournalEntries) {
+        <fa-icon icon="plus"></fa-icon>
-        <button class="gl-hero-btn gl-hero-btn--primary" [routerLink]="['/accounting/journal-entries/create']">
+        New Entry
-          <fa-icon icon="plus"></fa-icon>
+      </button>
-          New Entry
-        </button>
-      }
     </div>
   </div>
 </div>
@@ -718,10 +715,7 @@
       ></mat-row>
     </mat-table>
 
-    <!-- Keyed off the rows actually rendered, not totalEntries: that count comes from the ledger
+    @if (totalEntries === 0) {
-         summary, which only reports a figure once a GL account is chosen, so the search view would
-         otherwise show "No entries found" above a full table. -->
-    @if (((dataSource?.entries$ | async) || []).length === 0) {
       <div class="gl-empty">
         <div class="gl-empty__icon"><fa-icon icon="search"></fa-icon></div>
         <div class="gl-empty__title">No entries found</div>
@@ -730,11 +724,7 @@
     }
 
     <div class="gl-pager-wrap">
-      <mat-paginator
+      <mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
-        [length]="(dataSource?.records$ | async) || 0"
-        [pageSizeOptions]="[10, 25, 50, 100]"
-        showFirstLastButtons
-      ></mat-paginator>
     </div>
   </div>
 </div>

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

@@ -14,7 +14,6 @@ import { ActivatedRoute, RouterLink } from '@angular/router';
 import { merge } from 'rxjs';
 import { tap, startWith, map, distinctUntilChanged, debounceTime } from 'rxjs/operators';
 import { AccountingService } from '../accounting.service';
-import { DISABLED_ACCOUNTING_FEATURES } from '../disabled-features';
 import { SettingsService } from 'app/settings/settings.service';
 import { JournalEntriesDataSource } from './journal-entry.datasource';
 import { Dates } from 'app/core/utils/dates';
@@ -91,8 +90,6 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
   // ── Misc ──────────────────────────────────────────────────────────────────
   minDate = new Date(2000, 0, 1);
   maxDate = new Date();
-  /** Accounting features switched off for this installation — see disabled-features.ts. */
-  disabledFeatures = DISABLED_ACCOUNTING_FEATURES;
 
   // ── Filter controls ───────────────────────────────────────────────────────
   officeName = new UntypedFormControl();

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

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

src/app/aml/aml.service.ts

@@ -34,17 +34,6 @@ export class AmlService {
     return this.http.post(`/aml/alerts/${alertId}/review`, { disposition, notes });
   }
 
-  /**
-   * Decides named rules within one alert, leaving its other rules open.
-   *
-   * <p>
-   * The alert's own status follows from what is left undecided, so it is not sent: whitelisting five of six rules
-   * leaves the alert open on the sixth.
-   */
-  reviewAlertRules(alertId: number, ruleCodes: string[], disposition: string, notes: string): Observable<any> {
-    return this.http.post(`/aml/alerts/${alertId}/review`, { disposition, notes, ruleCodes });
-  }
-
   // ═══ Recurring-alert review queue ═══
 
   /**
@@ -133,15 +122,6 @@ export class AmlService {
     return this.http.get<any[]>('/aml/ctr-reports');
   }
 
-  /**
-   * The reportable lines behind the generated CTRs, each resolved to the account, customer, branch
-   * and date a FIU-IND filing names. Omit `reportId` for every generated month.
-   */
-  getCtrReportLines(reportId?: number): Observable<any[]> {
-    const params = reportId ? new HttpParams().set('reportId', String(reportId)) : undefined;
-    return this.http.get<any[]>('/aml/ctr-reports/lines', { params });
-  }
-
   /** month format: yyyy-MM */
   generateCtrReport(month: string): Observable<any> {
     return this.http.post('/aml/ctr-reports/generate', { month });
@@ -152,38 +132,4 @@ export class AmlService {
   getRiskCategoryHistory(clientId: number): Observable<any[]> {
     return this.http.get<any[]>(`/clients/${clientId}/risk-category-history`);
   }
-
-  // ═══ Risk-category changes (maker-checker) ═══
-  //
-  // The rating decides how often a customer is re-KYC'd and what AML thresholds apply to them, so
-  // it moves only once a checker agrees rather than on one officer's say-so.
-
-  /** @param requestedCategory 1 Low, 2 Medium, 3 High */
-  requestRiskChange(clientId: number, requestedCategory: number, reason: string): Observable<any> {
-    return this.http.post('/aml/risk-change-requests', { clientId, requestedCategory, reason });
-  }
-
-  getRiskChangeRequests(status?: string): Observable<any[]> {
-    const params = status ? new HttpParams().set('status', status) : undefined;
-    return this.http.get<any[]>('/aml/risk-change-requests', { params });
-  }
-
-  approveRiskChange(requestId: number): Observable<any> {
-    return this.http.post(`/aml/risk-change-requests/${requestId}/approve`, {});
-  }
-
-  rejectRiskChange(requestId: number, rejectionReason: string): Observable<any> {
-    return this.http.post(`/aml/risk-change-requests/${requestId}/reject`, { rejectionReason });
-  }
-
-  /**
-   * The latest behaviour window for each customer, as the nightly job computed it.
-   *
-   * One row per customer carrying the review period's figures and the rating they suggest. The Risk Review report
-   * prefers these over its own per-alert reckoning, because a rating describes a period rather than the handful of
-   * transactions that happened to trip a rule.
-   */
-  getBehaviourWindows(): Observable<any[]> {
-    return this.http.get<any[]>('/risk-review/behaviour-windows');
-  }
 }

src/app/board-resolution/bor-report.component.html

@@ -1,147 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-<div class="bor-root">
-  <div class="bor-head">
-    <div class="bor-head-left">
-      <fa-icon icon="gavel" class="bor-head-ic"></fa-icon>
-      <div>
-        <h2 class="bor-head-t">Board of Resolution Register — Share Capital</h2>
-        <p class="bor-head-s">
-          Every share account with the board resolution that authorised the allotment. Accounts with no resolution on
-          record sort to the top.
-        </p>
-      </div>
-    </div>
-    <button class="bor-btn bor-btn--xls" type="button" [disabled]="exporting || !filtered.length" (click)="exportExcel()">
-      <fa-icon icon="file-excel"></fa-icon>
-      {{ exporting ? 'Exporting…' : 'Export' }}
-    </button>
-  </div>
-
-  @if (loading) {
-    <div class="bor-note">Loading the register…</div>
-  } @else if (loadError) {
-    <div class="bor-note bor-note--warn"><fa-icon icon="exclamation-triangle"></fa-icon> {{ loadError }}</div>
-  }
-
-  @if (!loading && !loadError) {
-    <!-- Counted over the whole register, not the filtered view: it is a standing figure the
-         secretary acts on, and hiding it behind a filter would hide the problem. -->
-    @if (missingResolutionCount > 0) {
-      <div class="bor-note bor-note--warn">
-        <fa-icon icon="exclamation-triangle"></fa-icon>
-        {{ missingResolutionCount }} share account{{ missingResolutionCount === 1 ? '' : 's' }} carr{{
-          missingResolutionCount === 1 ? 'ies' : 'y'
-        }}
-        no resolution number. Share capital allotted without a board resolution cannot be evidenced to the Registrar.
-      </div>
-    }
-
-    <div class="bor-kpis">
-      <div class="bor-kpi">
-        <div class="bor-kpi-n">{{ filtered.length | number }}</div>
-        <div class="bor-kpi-l">Share Accounts</div>
-      </div>
-      <div class="bor-kpi bor-kpi--blue">
-        <div class="bor-kpi-n">{{ distinctResolutions | number }}</div>
-        <div class="bor-kpi-l">Resolutions</div>
-      </div>
-      <div class="bor-kpi bor-kpi--green">
-        <div class="bor-kpi-n">{{ totalShares | number }}</div>
-        <div class="bor-kpi-l">Shares Allotted</div>
-      </div>
-      <div class="bor-kpi bor-kpi--amber">
-        <div class="bor-kpi-n">&#8377;{{ totalValue | number: '1.0-0' }}</div>
-        <div class="bor-kpi-l">Share Value</div>
-      </div>
-    </div>
-
-    <div class="bor-filters">
-      <div class="bor-filter">
-        <label>Resolution No.</label>
-        <input class="bor-inp" type="text" [(ngModel)]="filterResolution" placeholder="e.g. BOR/2026-27/001" />
-      </div>
-      <div class="bor-filter">
-        <label>Branch</label>
-        <select class="bor-inp" [(ngModel)]="filterBranch">
-          <option value="">All branches</option>
-          @for (b of branches; track b) {
-            <option [value]="b">{{ b }}</option>
-          }
-        </select>
-      </div>
-      <div class="bor-filter">
-        <label>Status</label>
-        <select class="bor-inp" [(ngModel)]="filterStatus">
-          <option [ngValue]="''">Any status</option>
-          @for (s of statuses; track s) {
-            <option [ngValue]="s">{{ statusText(s) }}</option>
-          }
-        </select>
-      </div>
-      <div class="bor-filter bor-filter--grow">
-        <label>Search</label>
-        <input class="bor-inp" type="text" [(ngModel)]="search" placeholder="Member name, share A/c or CIF…" />
-      </div>
-      <label class="bor-check">
-        <input type="checkbox" [(ngModel)]="missingOnly" />
-        No resolution only
-      </label>
-      <button class="bor-btn" type="button" (click)="resetFilters()"><fa-icon icon="undo"></fa-icon> Reset</button>
-    </div>
-
-    <div class="bor-table-wrap">
-      <table class="bor-table">
-        <thead>
-          <tr>
-            <th>Resolution No.</th>
-            <th>Resolution Date</th>
-            <th>Share A/c No.</th>
-            <th>CIF No.</th>
-            <th>Member Name</th>
-            <th>Branch</th>
-            <th>Product</th>
-            <th class="num">Shares</th>
-            <th class="num">Share Value</th>
-            <th class="num">Tranches</th>
-            <th>Status</th>
-            <th>Activated On</th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (r of filtered; track r.shareAccountId) {
-            <tr [class.bor-row--missing]="!r.resolutionNumber">
-              <td>
-                @if (r.resolutionNumber) {
-                  <strong class="bor-res">{{ r.resolutionNumber }}</strong>
-                } @else {
-                  <span class="bor-missing">Not recorded</span>
-                }
-              </td>
-              <td class="mono">{{ r.resolutionDate || '—' }}</td>
-              <td class="mono">{{ r.accountNo }}</td>
-              <td class="mono">{{ r.cifNumber || '—' }}</td>
-              <td>{{ r.clientName }}</td>
-              <td>{{ r.officeName || '—' }}</td>
-              <td>{{ r.productName || '—' }}</td>
-              <td class="num">{{ r.approvedShares | number }}</td>
-              <td class="num strong">{{ r.shareValue | number: '1.2-2' }}</td>
-              <td class="num">{{ r.trancheCount }}</td>
-              <td><span [class]="statusClass(r.statusEnum)">{{ statusText(r.statusEnum) }}</span></td>
-              <td class="mono">{{ r.activatedDate || '—' }}</td>
-            </tr>
-          } @empty {
-            <tr>
-              <td colspan="12" class="bor-empty">No share account matches the filters.</td>
-            </tr>
-          }
-        </tbody>
-      </table>
-    </div>
-  }
-</div>

src/app/board-resolution/bor-report.component.scss

@@ -1,313 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-.bor-root {
-  padding: 20px 24px 40px;
-  background: #f8fafc;
-  min-height: 100%;
-}
-
-.bor-head {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 16px;
-  margin-bottom: 18px;
-}
-
-.bor-head-left {
-  display: flex;
-  align-items: flex-start;
-  gap: 12px;
-}
-
-.bor-head-ic {
-  font-size: 26px;
-  color: #0f4f3c;
-  margin-top: 2px;
-}
-
-.bor-head-t {
-  margin: 0 0 3px;
-  font-size: 20px;
-  font-weight: 700;
-  color: #1e293b;
-}
-
-.bor-head-s {
-  margin: 0;
-  max-width: 780px;
-  font-size: 13px;
-  line-height: 1.5;
-  color: #64748b;
-}
-
-.bor-note {
-  display: flex;
-  align-items: flex-start;
-  gap: 9px;
-  padding: 11px 14px;
-  margin-bottom: 14px;
-  border: 1px solid #bfdbfe;
-  border-radius: 9px;
-  background: #eff6ff;
-  color: #1e3a8a;
-  font-size: 12.5px;
-  line-height: 1.55;
-
-  fa-icon {
-    flex: 0 0 auto;
-    margin-top: 1px;
-  }
-
-  /* An allotment with no resolution behind it is the finding, not a detail. */
-  &--warn {
-    border-color: #fde68a;
-    background: #fffbeb;
-    color: #92400e;
-
-    fa-icon {
-      color: #d97706;
-    }
-  }
-}
-
-.bor-kpis {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
-  gap: 12px;
-  margin-bottom: 16px;
-}
-
-.bor-kpi {
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-left: 4px solid #0f4f3c;
-  border-radius: 11px;
-  padding: 12px 16px;
-
-  &--blue {
-    border-left-color: #2563eb;
-  }
-
-  &--green {
-    border-left-color: #15803d;
-  }
-
-  &--amber {
-    border-left-color: #d97706;
-  }
-}
-
-.bor-kpi-n {
-  font-size: 22px;
-  font-weight: 700;
-  color: #1e293b;
-  line-height: 1.2;
-}
-
-.bor-kpi-l {
-  font-size: 12px;
-  color: #64748b;
-  margin-top: 2px;
-}
-
-.bor-filters {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: flex-end;
-  gap: 12px;
-  padding: 14px 16px;
-  margin-bottom: 14px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 11px;
-}
-
-.bor-filter {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-
-  label {
-    font-size: 10.5px;
-    font-weight: 700;
-    letter-spacing: 0.04em;
-    text-transform: uppercase;
-    color: #64748b;
-  }
-
-  &--grow {
-    flex: 1 1 240px;
-  }
-}
-
-.bor-inp {
-  height: 34px;
-  min-width: 170px;
-  padding: 0 10px;
-  border: 1px solid #cbd5e1;
-  border-radius: 7px;
-  font: inherit;
-  font-size: 13px;
-  color: #1e293b;
-  background: #fff;
-
-  &:focus {
-    outline: 2px solid #2563eb;
-    outline-offset: -1px;
-  }
-}
-
-.bor-check {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  height: 34px;
-  font-size: 12.5px;
-  color: #334155;
-  cursor: pointer;
-}
-
-.bor-btn {
-  display: inline-flex;
-  align-items: center;
-  gap: 7px;
-  height: 34px;
-  padding: 0 14px;
-  border: 1px solid #cbd5e1;
-  border-radius: 7px;
-  background: #fff;
-  font: inherit;
-  font-size: 12.5px;
-  font-weight: 600;
-  color: #334155;
-  cursor: pointer;
-
-  &:hover:not(:disabled) {
-    background: #f1f5f9;
-  }
-
-  &:disabled {
-    opacity: 0.55;
-    cursor: default;
-  }
-
-  &--xls {
-    border-color: #15803d;
-    background: #16a34a;
-    color: #fff;
-
-    &:hover:not(:disabled) {
-      background: #15803d;
-    }
-  }
-}
-
-.bor-table-wrap {
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 11px;
-  overflow-x: auto;
-}
-
-.bor-table {
-  width: 100%;
-  border-collapse: collapse;
-  font-size: 12.5px;
-
-  th {
-    text-align: left;
-    padding: 10px;
-    background: #f1f5f9;
-    font-size: 10.5px;
-    font-weight: 700;
-    text-transform: uppercase;
-    letter-spacing: 0.04em;
-    color: #475569;
-    white-space: nowrap;
-    border-bottom: 1px solid #e2e8f0;
-  }
-
-  td {
-    padding: 11px 10px;
-    border-bottom: 1px solid #f1f5f9;
-    vertical-align: middle;
-    color: #334155;
-  }
-
-  .num {
-    text-align: right;
-    font-family: 'DM Mono', monospace;
-  }
-
-  .mono {
-    font-family: 'DM Mono', monospace;
-  }
-
-  .strong {
-    font-weight: 700;
-  }
-
-  tbody tr:hover {
-    background: #f8fafc;
-  }
-}
-
-/* The row an auditor is looking for, marked in the table as well as counted above it. */
-.bor-row--missing {
-  background: #fffbeb;
-}
-
-.bor-res {
-  color: #0f4f3c;
-  font-family: 'DM Mono', monospace;
-}
-
-.bor-missing {
-  display: inline-block;
-  padding: 2px 8px;
-  border-radius: 999px;
-  background: #fef3c7;
-  color: #92400e;
-  font-size: 11px;
-  font-weight: 700;
-}
-
-.bor-status {
-  display: inline-block;
-  padding: 2px 9px;
-  border-radius: 999px;
-  font-size: 11px;
-  font-weight: 700;
-  background: #f1f5f9;
-  color: #475569;
-
-  &--active {
-    background: #dcfce7;
-    color: #15803d;
-  }
-
-  &--submitted,
-  &--approved {
-    background: #fef3c7;
-    color: #b45309;
-  }
-
-  &--rejected,
-  &--closed {
-    background: #fee2e2;
-    color: #b91c1c;
-  }
-}
-
-.bor-empty {
-  padding: 30px;
-  text-align: center;
-  color: #94a3b8;
-}

src/app/board-resolution/bor-report.component.ts

@@ -1,221 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { Component, OnInit, inject } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-
-import { exportWorkbook } from '../cashier/cashier-export';
-import { BorRegisterRow, BorReportService } from './bor-report.service';
-
-/** m_share_account.status_enum, as the register labels it. */
-const STATUS_LABEL: Record<number, string> = {
-  100: 'Submitted',
-  200: 'Approved',
-  300: 'Active',
-  400: 'Rejected',
-  500: 'Closed',
-  600: 'Inactive'
-};
-
-/**
- * The Board of Resolution register for share capital.
- *
- * A co-operative allots shares only under a board resolution, and this is the list the Registrar or
- * an auditor asks for: every member's holding against the resolution that authorised it. The
- * account with no resolution recorded is the point of the register, so it sorts to the top and is
- * counted on its own rather than being left to be noticed.
- */
-@Component({
-  selector: 'mifosx-bor-report',
-  templateUrl: './bor-report.component.html',
-  styleUrls: ['./bor-report.component.scss'],
-  imports: [
-    ...STANDALONE_SHARED_IMPORTS,
-    FaIconComponent,
-    FormsModule
-  ]
-})
-export class BorReportComponent implements OnInit {
-  private borService = inject(BorReportService);
-
-  readonly statusLabel = STATUS_LABEL;
-
-  rows: BorRegisterRow[] = [];
-  loading = false;
-  loadError = '';
-
-  /** '' = every status. */
-  filterStatus: number | '' = '';
-  filterBranch = '';
-  filterResolution = '';
-  search = '';
-  /** Only the accounts with no resolution on file — the ones that need chasing. */
-  missingOnly = false;
-
-  exporting = false;
-
-  ngOnInit(): void {
-    this.load();
-  }
-
-  load(): void {
-    this.loading = true;
-    this.loadError = '';
-    this.borService.getRegister().subscribe({
-      next: (rows) => {
-        this.loading = false;
-        this.rows = rows;
-      },
-      error: (err: any) => {
-        this.loading = false;
-        this.rows = [];
-        this.loadError = err?.error?.defaultUserMessage || 'Could not load the BOR register.';
-      }
-    });
-  }
-
-  /** Branches present in the data, so the filter offers only what can actually be selected. */
-  get branches(): string[] {
-    return [...new Set(this.rows.map((r) => r.officeName).filter(Boolean))].sort();
-  }
-
-  get statuses(): number[] {
-    return [...new Set(this.rows.map((r) => r.statusEnum))].sort((a, b) => a - b);
-  }
-
-  get filtered(): BorRegisterRow[] {
-    const needle = this.search.trim().toLowerCase();
-    const resolutionNeedle = this.filterResolution.trim().toLowerCase();
-    return this.rows.filter((r) => {
-      if (this.filterStatus !== '' && r.statusEnum !== this.filterStatus) {
-        return false;
-      }
-      if (this.filterBranch && r.officeName !== this.filterBranch) {
-        return false;
-      }
-      if (this.missingOnly && r.resolutionNumber) {
-        return false;
-      }
-      if (resolutionNeedle && !r.resolutionNumber.toLowerCase().includes(resolutionNeedle)) {
-        return false;
-      }
-      if (
-        needle &&
-        !(
-          r.clientName.toLowerCase().includes(needle) ||
-          r.accountNo.toLowerCase().includes(needle) ||
-          r.cifNumber.toLowerCase().includes(needle)
-        )
-      ) {
-        return false;
-      }
-      return true;
-    });
-  }
-
-  get totalShares(): number {
-    return this.filtered.reduce((s, r) => s + r.approvedShares, 0);
-  }
-
-  get totalValue(): number {
-    return this.filtered.reduce((s, r) => s + r.shareValue, 0);
-  }
-
-  /** How many resolutions the filtered holdings were authorised under. */
-  get distinctResolutions(): number {
-    return new Set(this.filtered.map((r) => r.resolutionNumber).filter(Boolean)).size;
-  }
-
-  get missingResolutionCount(): number {
-    return this.rows.filter((r) => !r.resolutionNumber).length;
-  }
-
-  statusText(statusEnum: number): string {
-    return STATUS_LABEL[statusEnum] || '—';
-  }
-
-  statusClass(statusEnum: number): string {
-    return 'bor-status bor-status--' + (STATUS_LABEL[statusEnum] || 'unknown').toLowerCase();
-  }
-
-  resetFilters(): void {
-    this.filterStatus = '';
-    this.filterBranch = '';
-    this.filterResolution = '';
-    this.search = '';
-    this.missingOnly = false;
-  }
-
-  async exportExcel(): Promise<void> {
-    this.exporting = true;
-    try {
-      const rows = this.filtered;
-      await exportWorkbook(
-        [
-          {
-            sheetName: 'BOR Register',
-            title: 'Board of Resolution Register — Share Capital',
-            subtitle: `${rows.length} share account(s) · ${this.distinctResolutions} resolution(s) · ${this.totalShares} shares`,
-            headers: [
-              'Resolution No.',
-              'Resolution Date',
-              'Share A/c No.',
-              'CIF No.',
-              'Member Name',
-              'Branch',
-              'Product',
-              'Shares',
-              'Unit Price',
-              'Share Value',
-              'Tranches',
-              'Status',
-              'Activated On'
-            ],
-            widths: [
-              20,
-              16,
-              18,
-              16,
-              30,
-              18,
-              18,
-              10,
-              12,
-              14,
-              10,
-              12,
-              14
-            ],
-            rows: rows.map((r) => [
-              // Named rather than left blank, because an empty cell in a filing reads as an
-              // oversight in the export rather than a gap in the register.
-              r.resolutionNumber || 'NOT RECORDED',
-              r.resolutionDate || '—',
-              r.accountNo,
-              r.cifNumber,
-              r.clientName,
-              r.officeName,
-              r.productName,
-              r.approvedShares,
-              r.unitPrice,
-              r.shareValue,
-              r.trancheCount,
-              this.statusText(r.statusEnum),
-              r.activatedDate || '—'
-            ])
-          }
-        ],
-        'BOR-Register'
-      );
-    } finally {
-      this.exporting = false;
-    }
-  }
-}

src/app/board-resolution/bor-report.service.ts

@@ -1,94 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/** Angular Imports */
-import { Injectable, inject } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
-import { Observable, map } from 'rxjs';
-
-/** Custom Helpers */
-import { toIsoDate } from '../core/utils/api-date';
-
-/** One share account and the board resolution that authorised it. */
-export interface BorRegisterRow {
-  shareAccountId: number;
-  accountNo: string;
-  clientId: number;
-  cifNumber: string;
-  clientName: string;
-  officeId: number | null;
-  officeName: string;
-  productName: string;
-  currencyCode: string;
-  statusEnum: number;
-  approvedShares: number;
-  pendingShares: number;
-  unitPrice: number;
-  shareValue: number;
-  resolutionNumber: string;
-  /** ISO date, or '' where no meeting date was ever recorded against the allotment. */
-  resolutionDate: string;
-  /** How many purchase tranches make up the holding. */
-  trancheCount: number;
-  submittedDate: string;
-  approvedDate: string;
-  activatedDate: string;
-  closedDate: string;
-}
-
-/**
- * The BOR register.
- *
- * One call returns every account with its resolution. The share allotment report next door fetches
- * each account separately and stops at two hundred, which is a limit on a register rather than on a
- * page of one.
- */
-@Injectable({ providedIn: 'root' })
-export class BorReportService {
-  private http = inject(HttpClient);
-
-  getRegister(status?: number, officeId?: number): Observable<BorRegisterRow[]> {
-    let params = new HttpParams();
-    if (status != null) {
-      params = params.set('status', String(status));
-    }
-    if (officeId != null) {
-      params = params.set('officeId', String(officeId));
-    }
-    return this.http
-      .get<any[]>('/shareaccounts/bor-register', { params })
-      .pipe(map((rows) => (rows || []).map((r) => this.toRow(r))));
-  }
-
-  /** Dates arrive as [y, M, d] arrays; flattened to ISO so they sort and filter as strings. */
-  private toRow(r: any): BorRegisterRow {
-    return {
-      shareAccountId: r.shareAccountId,
-      accountNo: r.accountNo || '',
-      clientId: r.clientId,
-      cifNumber: r.cifNumber || '',
-      clientName: r.clientName || '',
-      officeId: r.officeId ?? null,
-      officeName: r.officeName || '',
-      productName: r.productName || '',
-      currencyCode: r.currencyCode || 'INR',
-      statusEnum: Number(r.statusEnum) || 0,
-      approvedShares: Number(r.approvedShares) || 0,
-      pendingShares: Number(r.pendingShares) || 0,
-      unitPrice: Number(r.unitPrice) || 0,
-      shareValue: Number(r.shareValue) || 0,
-      resolutionNumber: (r.resolutionNumber || '').trim(),
-      resolutionDate: toIsoDate(r.resolutionDate),
-      trancheCount: Number(r.trancheCount) || 0,
-      submittedDate: toIsoDate(r.submittedDate),
-      approvedDate: toIsoDate(r.approvedDate),
-      activatedDate: toIsoDate(r.activatedDate),
-      closedDate: toIsoDate(r.closedDate)
-    };
-  }
-}

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

@@ -49,18 +49,6 @@
     </div>
   }
 
-  @if (firstOpenNeedsCashMigration && !missedOnly) {
-    <div class="bd-locked">
-      <mat-icon>lock</mat-icon>
-      <span>
-        This branch has never opened a business day, and its Cash at Vault GL account has no opening balance yet. Count
-        the vault and open the first business day together from
-        <a [routerLink]="['/accounting/migrate-cash-denomination']">Migrate Cash Denomination</a> — Open Day here is
-        locked until that is done, so today's cash tracking never starts out of step with the ledger.
-      </span>
-    </div>
-  }
-
   <!-- Missed closes first: these are the ones that need action. -->
   @if (missed.length > 0) {
     <div class="db-exceptions">
@@ -715,10 +703,10 @@
                   <span class="db-muted">· {{ timeOnly(d.closedAt) }}</span>
                 }
               </td>
-              <td class="num">{{ hasValue(d.closingCash) ? '₹' + (d.closingCash | number: '1.2-2') : '—' }}</td>
+              <td class="num">{{ d.closingCash != null ? '₹' + (d.closingCash | number: '1.2-2') : '—' }}</td>
-              <td class="num">{{ hasValue(d.bookCash) ? '₹' + (d.bookCash | number: '1.2-2') : '—' }}</td>
+              <td class="num">{{ d.bookCash != null ? '₹' + (d.bookCash | number: '1.2-2') : '—' }}</td>
               <td>
-                @if (!hasValue(d.cashDifference)) {
+                @if (d.cashDifference == null) {
                   —
                 } @else if (d.cashDifference === 0) {
                   <span class="db-badge db-badge--ok">Tallied</span>

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

@@ -30,36 +30,6 @@
   }
 }
 
-/* Blocks Open Day until the branch's first-ever open has gone through Migrate Cash Denomination —
-   see BranchDayComponent.checkFirstOpenCashMigration(). Same shape as .ve-note, in the error palette
-   the rest of this screen already uses for a missed close (.bd-missed). */
-.bd-locked {
-  display: flex;
-  align-items: flex-start;
-  gap: 8px;
-  padding: 10px 14px;
-  margin-bottom: 14px;
-  background: #fef2f2;
-  border: 1px solid #fecaca;
-  border-radius: 8px;
-  color: #b91c1c;
-  font-size: 12px;
-  line-height: 1.5;
-
-  mat-icon {
-    flex: none;
-    font-size: 18px;
-    width: 18px;
-    height: 18px;
-  }
-
-  a {
-    color: inherit;
-    font-weight: 600;
-    text-decoration: underline;
-  }
-}
-
 .bd-success {
   padding: 10px 14px;
   margin-bottom: 14px;

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

@@ -10,7 +10,7 @@ import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
-import { ActivatedRoute, RouterLink } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { catchError, forkJoin, map, of, switchMap } from 'rxjs';
 import { CashierService } from '../cashier.service';
 
@@ -61,8 +61,7 @@ interface BranchDay {
   imports: [
     CommonModule,
     FormsModule,
-    MatIconModule,
+    MatIconModule
-    RouterLink
   ]
 })
 export class BranchDayComponent implements OnInit {
@@ -86,12 +85,6 @@ export class BranchDayComponent implements OnInit {
   loaded = false;
   errorMsg = '';
   successMsg = '';
-  /** True only for a branch that has never opened a business day and whose Cash at Vault / Cash at
-   *  Teller GL account has never had anything posted to it — Open Day here would let day-to-day cash
-   *  tracking begin while the ledger silently stays wherever it already was. The backend enforces
-   *  this independently too (see BranchDayRegisterApiResource#requireCashMigrationBeforeFirstEverOpen);
-   *  this flag only steers the user to the right screen before they hit that rejection. */
-  firstOpenNeedsCashMigration = false;
 
   // Open-day form
   showOpenForm = false;
@@ -209,7 +202,6 @@ export class BranchDayComponent implements OnInit {
         this.today = res?.today ?? '';
         this.canOperate = !!res?.canOperate;
         this.openDate = this.today;
-        this.checkFirstOpenCashMigration();
       });
 
     this.service
@@ -220,42 +212,9 @@ export class BranchDayComponent implements OnInit {
       });
   }
 
-  /**
-   * Only relevant the moment this branch has never opened a business day before — every later
-   * open/close on this screen is untouched, so there is nothing to re-check once history exists.
-   */
-  private checkFirstOpenCashMigration(): void {
-    if (this.days.length > 0 || this.openDay) {
-      this.firstOpenNeedsCashMigration = false;
-      return;
-    }
-    this.service.cashGlStatus().subscribe({
-      next: (status: any) => {
-        // configured === false means this tenant has no Cash at Vault / Cash at Teller account
-        // mapped at all — nothing for this check to reconcile against, so it does not block.
-        this.firstOpenNeedsCashMigration = status?.configured !== false && !status?.hasBalance;
-      },
-      error: () => {
-        this.firstOpenNeedsCashMigration = false;
-      }
-    });
-  }
-
   /** True when the branch has no open day at all, so today can be opened. */
   get canOpenToday(): boolean {
-    return this.canOperate && !this.openDay && !this.firstOpenNeedsCashMigration;
+    return this.canOperate && !this.openDay;
-  }
-
-  /**
-   * A still-open day's closing/book figures are dropped from the API response entirely (the
-   * backend's Gson instance omits a null map value rather than sending it as JSON null), so the
-   * field arrives as undefined, not null. Checking only `!== null` against that — which a stricter
-   * pass of this file made the mistake of doing — leaves undefined on the "has a value" branch,
-   * which then renders `'₹' + null` (the number pipe's own null output, string-concatenated) as the
-   * literal text "₹null". This checks for either, the way an open day actually shows up.
-   */
-  hasValue(value: number | null | undefined): boolean {
-    return value !== null && value !== undefined;
   }
 
   startOpen(): void {

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

@@ -26,6 +26,7 @@ import { VaultPositionComponent } from './vault-position/vault-position.componen
 import { AccountRegisterComponent } from './account-register/account-register.component';
 import { ClosingCashReportComponent } from './closing-cash-report/closing-cash-report.component';
 import { ExcessTransactionReportComponent } from './excess-transaction-report/excess-transaction-report.component';
+import { ShareCollectionComponent } from './share-collection/share-collection.component';
 
 const routes: Routes = [
   Route.withShell([
@@ -344,6 +345,11 @@ const routes: Routes = [
           component: ExcessTransactionReportComponent,
           data: { title: 'Excess Transaction Report', breadcrumb: 'Excess Transaction Report' }
         },
+        {
+          path: 'share-collection',
+          component: ShareCollectionComponent,
+          data: { title: 'Share Collection', breadcrumb: 'Share Collection' }
+        },
         {
           path: 'transaction-entry',
           canActivate: [CashierOnlyGuard],

src/app/cashier/cashier.module.ts

@@ -20,6 +20,7 @@ import { ReconciliationComponent } from './reconciliation/reconciliation.compone
 import { CashHistoryComponent } from './cash-history/cash-history.component';
 import { ClosingCashReportComponent } from './closing-cash-report/closing-cash-report.component';
 import { ExcessTransactionReportComponent } from './excess-transaction-report/excess-transaction-report.component';
+import { ShareCollectionComponent } from './share-collection/share-collection.component';
 
 @NgModule({
   imports: [
@@ -34,7 +35,8 @@ import { ExcessTransactionReportComponent } from './excess-transaction-report/ex
     ReconciliationComponent,
     CashHistoryComponent,
     ClosingCashReportComponent,
-    ExcessTransactionReportComponent
+    ExcessTransactionReportComponent,
+    ShareCollectionComponent
   ]
 })
 export class CashierModule {}

src/app/cashier/cashier.service.ts

@@ -178,13 +178,6 @@ export class CashierService {
     return this.http.get('/vouchers/my-work', { params });
   }
 
-  /** One voucher and every debit/credit line it is made of — the full slip behind a summarised
-   *  row (a "+2 more" badge in a register only ever shows the first side of each). */
-  voucherDetail(voucherNo: string): Observable<any> {
-    const params = new HttpParams().set('voucherNo', voucherNo);
-    return this.http.get('/vouchers/detail', { params });
-  }
-
   /**
    * Account register for one date: what opened and closed that day, each account's balance as it
    * stood then, and what it holds now.
@@ -364,6 +357,19 @@ export class CashierService {
     return this.http.get<any[]>('/paymenttypes');
   }
 
+  // ── Share Collection ──
+  getShareAccountForCollection(accountId: string): Observable<any> {
+    return this.http.get(`/accounts/share/${accountId}`);
+  }
+
+  collectSharePayment(data: any): Observable<any> {
+    return this.http.post('/cashier/sharecollection', data);
+  }
+
+  getShareCollectionStatus(shareAccountId: number): Observable<any> {
+    return this.http.get(`/cashier/sharecollection/${shareAccountId}`);
+  }
+
   /** One unapplied Share Sundry receipt, found by the voucher number the member quotes. */
   getShareAdvanceByVoucher(voucherNo: string, glAccountNo: string, clientId?: number): Observable<any> {
     // The voucher travels as a query parameter, not a path segment: numbers are formatted
@@ -390,18 +396,10 @@ export class CashierService {
     return this.http.get('/shareadvancecollection/requirement', { params: { shareAccountId: String(shareAccountId) } });
   }
 
-  /**
+  /** Receipts still sitting in Share Sundry, optionally for a single member. */
-   * Everything an Apply screen needs, in one call: `own` is this member's own unapplied receipts,
+  getUnappliedShareAdvances(clientId?: number): Observable<any> {
-   * ready to tick; `rows` is every other Share Collection receipt still available — unclaimed GL
+    const suffix = clientId ? `?clientId=${clientId}` : '';
-   * deposits and receipts linked to another member — which attach by voucher instead.
+    return this.http.get(`/shareadvancecollection${suffix}`);
-   *
-   * One request rather than two: both lists come from the same table under the same filters, and
-   * splitting them across endpoints only meant the same rows were fetched twice and, where they
-   * overlapped, drawn twice on the same screen.
-   */
-  getShareCollectionReceipts(clientId?: number): Observable<any> {
-    const params = clientId ? new HttpParams().set('clientId', String(clientId)) : undefined;
-    return this.http.get('/shareadvancecollection/unattributed', { params });
   }
 
   /** Moves a receipt out of Sundry into share capital for an activated account. */
@@ -409,12 +407,6 @@ export class CashierService {
     return this.http.post(`/shareadvancecollection/${collectionId}/apply`, data);
   }
 
-  /** The receipt's own real Dr/Cr GL legs — never the GL account currently picked in a search box,
-   *  which is unrelated screen state that can name a different account than this receipt sits in. */
-  getShareAdvanceGlEntries(collectionId: number): Observable<any> {
-    return this.http.get(`/shareadvancecollection/${collectionId}/gl-entries`);
-  }
-
   /** Every additional-share tranche awaiting approval, across every share account. */
   getShareAdditionRequests(): Observable<any> {
     return this.http.get('/shareadditionrequests');
@@ -427,14 +419,4 @@ export class CashierService {
   getShareAdditionRequest(transactionId: number): Observable<any> {
     return this.http.get(`/shareadditionrequests/${transactionId}`);
   }
-
-  /**
-   * Entry Type options for a GL credit (General / Share Collection / DD Issue / …) — the
-   * "GLEntryType" code under Admin > System > Manage Codes, so an admin can add another type later
-   * without a deployment. Empty on failure rather than erroring, since a row missing this dropdown's
-   * options should still be usable for every other field.
-   */
-  getEntryTypeOptions(): Observable<any[]> {
-    return this.http.get<any[]>('/codes/name/GLEntryType/codevalues').pipe(catchError(() => of([])));
-  }
 }

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

@@ -303,8 +303,8 @@
             <tr>
               <th class="gl-th--voucher">Voucher No</th>
               <th class="gl-th--date">Date</th>
-              <th>Debit</th>
+              <th>A/C No</th>
-              <th>Credit</th>
+              <th>A/C Name</th>
               <th class="gl-th--pt">Payment Type</th>
               <th class="gl-th--teller">Teller</th>
               <th class="num gl-th--dr">DR (₹)</th>
@@ -326,25 +326,8 @@
                     <div class="gl-time">{{ r.txnTime }}</div>
                   }
                 </td>
-                <!-- Both legs of the voucher, the same pair My Vouchers shows — not just the one
+                <td class="gl-acno">{{ r.acNo }}</td>
-                     side this row's own denomination breakdown happens to know about. Falls back
+                <td class="gl-acname">{{ r.acName }}</td>
-                     to that one side (acNo/acName) when the voucher predates m_voucher_line. -->
-                <td class="gl-acname">
-                  <div>{{ r.debitParty || r.acName }}</div>
-                  @if (r.debitAccount || r.acNo) {
-                    <div class="gl-acno">{{ r.debitAccount || r.acNo }}</div>
-                  }
-                </td>
-                <td class="gl-acname">
-                  @if (r.creditParty) {
-                    <div>{{ r.creditParty }}</div>
-                    @if (r.creditAccount) {
-                      <div class="gl-acno">{{ r.creditAccount }}</div>
-                    }
-                  } @else {
-                    <span class="gl-pt-none">—</span>
-                  }
-                </td>
                 <td class="gl-pt">
                   @if (r.paymentType) {
                     <span class="gl-pt-badge">{{ r.paymentType }}</span>

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

@@ -174,24 +174,19 @@ export class ClosingCashReportComponent implements OnInit {
     return this.noteRows.reduce((s, r) => s + Number(r.settledOutAmount ?? 0), 0);
   }
 
-  /**
-   * Summed from each row's own `netCount`, not re-derived from today's legs — a row's `netCount`
-   * already carries forward what a cashier was holding from before today (`openingCount`), for the
-   * force-closed-day/late-settlement case. Recomputing here from only today's vaultIn/deposit/
-   * withdrawal/settledOut dropped that carry-forward and put the Total row back into negative
-   * numbers a cashier had already reconciled.
-   */
   get noteNetCount(): number {
-    return this.noteRows.reduce((s, r) => s + Number(r.netCount ?? 0), 0);
+    return this.noteVaultInCount + this.noteDepositCount - this.noteWithdrawalCount - this.noteSettledOutCount;
   }
 
   /**
-   * What is left in the drawer in notes: everything that came in, less everything that went out —
+   * What is left in the drawer in notes: everything that came in, less everything that went out.
-   * including cash carried forward from before today. See `noteNetCount` for why this sums each
+   *
-   * row's own `netAmount` rather than re-deriving it from today's legs.
+   * Was deposits minus withdrawals, which is the counter's movement rather than the drawer's
+   * contents — it left out the cash drawn from the vault, so a teller holding a ₹500 note saw a net
+   * of zero and had nothing to count against.
    */
   get noteNetAmount(): number {
-    return this.noteRows.reduce((s, r) => s + Number(r.netAmount ?? 0), 0);
+    return this.noteVaultInAmount + this.noteDepositAmount - this.noteWithdrawalAmount - this.noteSettledOutAmount;
   }
   get coinRows(): any[] {
     return this.rows.filter((r) => r.kind === 'coin');

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

@@ -152,21 +152,9 @@
               <tbody>
                 @for (r of g.rows; track r.voucherNo) {
                   <!-- The left edge repeats the section's own colour, so a row still says which part it
-                   is when the heading has scrolled away. Clicking anywhere on the row opens the full
+                   is when the heading has scrolled away. -->
-                   slip -- every line, not just the first debit and first credit this table has room
+                  <tr [class]="'mw-row mw-row--' + r.myRole">
-                   to show. -->
+                    <td class="mw-vno">{{ r.voucherNo }}</td>
-                  <tr
-                    [class]="'mw-row mw-row--' + r.myRole"
-                    class="mw-row--clickable"
-                    (click)="openDetail(r.voucherNo)"
-                    [attr.aria-busy]="loadingDetailFor === r.voucherNo"
-                  >
-                    <td class="mw-vno">
-                      {{ r.voucherNo }}
-                      @if (loadingDetailFor === r.voucherNo) {
-                        <mat-icon class="mw-vno__spinner" inline>hourglass_empty</mat-icon>
-                      }
-                    </td>
                     <td>
                       <span class="mw-badge" [class]="'mw-badge--' + (r.side || 'JV')">{{ sideLabel(r.side) }}</span>
                     </td>
@@ -183,7 +171,7 @@
                         <span class="mw-acct">{{ r.creditAccount }}</span>
                       }
                       @if (r.extraLines > 0) {
-                        <span class="mw-more" title="Click the row to see every line">+{{ r.extraLines }} more</span>
+                        <span class="mw-more">+{{ r.extraLines }} more</span>
                       }
                     </td>
                     <td class="num">₹{{ r.amount | number: '1.2-2' }}</td>

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

@@ -178,21 +178,6 @@
   }
 }
 
-.mw-row--clickable {
-  cursor: pointer;
-
-  &:hover {
-    background: #f8fafc;
-  }
-}
-
-.mw-vno__spinner {
-  margin-left: 4px;
-  font-size: 14px;
-  vertical-align: middle;
-  color: #94a3b8;
-}
-
 /* One section per part played. The heading carries the section's own count and total, so a maker's
    tally and a checker's are each readable without adding rows up. */
 .mw-group {

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

@@ -10,10 +10,8 @@ import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
-import { MatDialog, MatDialogModule } from '@angular/material/dialog';
+import { catchError, of } from 'rxjs';
-import { catchError, finalize, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
-import { VoucherDetailDialogComponent } from './voucher-detail-dialog.component';
 
 /** What the signed-in user's part in a voucher was. */
 export type MyRole = 'RAISED' | 'VERIFIED' | 'RAISED_AND_VERIFIED';
@@ -74,17 +72,11 @@ interface MyWorkReport {
   imports: [
     CommonModule,
     FormsModule,
-    MatIconModule,
+    MatIconModule
-    MatDialogModule
   ]
 })
 export class MyWorkComponent implements OnInit {
   private service = inject(CashierService);
-  private dialog = inject(MatDialog);
-
-  /** Which voucher's detail is currently being fetched, so the row that was clicked can show its
-   *  own spinner instead of a page-wide one for what is a small, single-row lookup. */
-  loadingDetailFor: string | null = null;
 
   /** Day is the working default; a month is what a close or an audit asks for. */
   period: 'DAY' | 'MONTH' = 'DAY';
@@ -331,31 +323,6 @@ export class MyWorkComponent implements OnInit {
     return { from: first, to: lastIso };
   }
 
-  /** Opens the full slip for one voucher — every debit and credit line, not just the first side of
-   *  each a table row has room to show. */
-  openDetail(voucherNo: string): void {
-    if (this.loadingDetailFor) {
-      return;
-    }
-    this.loadingDetailFor = voucherNo;
-    this.service
-      .voucherDetail(voucherNo)
-      .pipe(
-        catchError(() => of(null)),
-        finalize(() => (this.loadingDetailFor = null))
-      )
-      .subscribe((detail: any) => {
-        if (!detail) {
-          return;
-        }
-        this.dialog.open(VoucherDetailDialogComponent, {
-          data: { detail },
-          width: '600px',
-          autoFocus: false
-        });
-      });
-  }
-
   private todayIso(): string {
     const d = new Date();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;

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

@@ -1,320 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { Component, inject } from '@angular/core';
-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';
-
-export interface VoucherDetailDialogData {
-  /** Already-loaded detail from CashierService.voucherDetail() — the caller fetches, this dialog
-   *  only renders, so one loading state lives in the row's own click handler rather than being
-   *  duplicated inside every dialog that could ever show a voucher. */
-  detail: {
-    voucherNo: string;
-    voucherType: string | null;
-    amount: number | null;
-    branchName: string | null;
-    createdBy: string | null;
-    createdAt: string | null;
-    totalDebit: number;
-    totalCredit: number;
-    balanced: boolean;
-    lines: {
-      lineNo: number;
-      entryType: 'DR' | 'CR';
-      partyName: string | null;
-      accountNo: string | null;
-      amount: number;
-      description: string | null;
-    }[];
-    /** GL entries a native platform command posted for the same underlying event, outside this
-     *  voucher entirely — a share redemption's Dr Share Capital / Cr Share Sundry pair, posted at
-     *  manager approval, before this voucher's own Dr Sundry / Cr Cash at Vault settlement leg even
-     *  exists. Empty for every voucher that already is the whole transaction on its own. */
-    relatedLines: {
-      stage: string;
-      entryType: 'DR' | 'CR';
-      partyName: string | null;
-      accountNo: string | null;
-      amount: number;
-      description: string | null;
-    }[];
-  };
-}
-
-/** The full slip behind a summarised register row — every debit and credit line a voucher is
- *  made of, not just the first side of each that a table row has room for. */
-@Component({
-  selector: 'mifosx-voucher-detail-dialog',
-  standalone: true,
-  imports: [
-    CommonModule,
-    MatDialogModule,
-    MatButtonModule,
-    MatIconModule
-  ],
-  template: `
-    <div class="vd-shell">
-      <div class="vd-header">
-        <div class="vd-header__title">
-          <mat-icon class="vd-icon">receipt_long</mat-icon>
-          <div>
-            <h2>{{ detail.voucherNo }}</h2>
-            <p>{{ detail.voucherType || 'Voucher' }} &middot; {{ detail.branchName || 'Head Office' }}</p>
-          </div>
-        </div>
-        <button mat-icon-button mat-dialog-close aria-label="Close">
-          <mat-icon>close</mat-icon>
-        </button>
-      </div>
-
-      <div class="vd-meta">
-        <span
-          >Raised by <strong>{{ detail.createdBy || '—' }}</strong></span
-        >
-        @if (detail.createdAt) {
-          <span>{{ detail.createdAt | date: 'dd MMM yyyy, h:mm a' }}</span>
-        }
-        @if (!detail.balanced) {
-          <span class="vd-unbalanced">
-            <mat-icon inline>warning</mat-icon>
-            Debit and credit do not balance
-          </span>
-        }
-      </div>
-
-      <table class="vd-table">
-        <thead>
-          <tr>
-            <th>Side</th>
-            <th>Party</th>
-            <th>Account No.</th>
-            <th class="num">Amount</th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (line of detail.lines; track line.lineNo) {
-            <tr>
-              <td>
-                <span
-                  class="vd-side"
-                  [class.vd-side--dr]="line.entryType === 'DR'"
-                  [class.vd-side--cr]="line.entryType === 'CR'"
-                >
-                  {{ line.entryType === 'DR' ? 'Debit' : 'Credit' }}
-                </span>
-              </td>
-              <td>{{ line.partyName || '—' }}</td>
-              <td class="vd-acct">{{ line.accountNo || '—' }}</td>
-              <td class="num">₹{{ line.amount | number: '1.2-2' }}</td>
-            </tr>
-            @if (line.description) {
-              <tr class="vd-desc-row">
-                <td></td>
-                <td colspan="3" class="vd-desc">{{ line.description }}</td>
-              </tr>
-            }
-          } @empty {
-            <tr>
-              <td colspan="4" class="vd-empty">This voucher's individual lines were not recorded.</td>
-            </tr>
-          }
-        </tbody>
-        @if (detail.lines.length > 0) {
-          <tfoot>
-            <tr>
-              <td colspan="3">Total</td>
-              <td class="num">
-                ₹{{ detail.totalDebit | number: '1.2-2' }} / ₹{{ detail.totalCredit | number: '1.2-2' }}
-              </td>
-            </tr>
-          </tfoot>
-        }
-      </table>
-
-      @if (detail.relatedLines.length > 0) {
-        <div class="vd-related">
-          <div class="vd-related__title">
-            <mat-icon inline>link</mat-icon>
-            Also posted for this transaction — not part of this voucher
-          </div>
-          <table class="vd-table vd-table--related">
-            <tbody>
-              @for (line of detail.relatedLines; track $index) {
-                <tr>
-                  <td>
-                    <span
-                      class="vd-side"
-                      [class.vd-side--dr]="line.entryType === 'DR'"
-                      [class.vd-side--cr]="line.entryType === 'CR'"
-                    >
-                      {{ line.entryType === 'DR' ? 'Debit' : 'Credit' }}
-                    </span>
-                  </td>
-                  <td>{{ line.partyName || '—' }}</td>
-                  <td class="vd-acct">{{ line.accountNo || '—' }}</td>
-                  <td class="num">₹{{ line.amount | number: '1.2-2' }}</td>
-                </tr>
-              }
-            </tbody>
-          </table>
-          <p class="vd-related__hint">
-            {{ detail.relatedLines[0].stage }} — this and the lines above are the same transaction's full accounting.
-          </p>
-        </div>
-      }
-
-      <div class="vd-actions">
-        <button mat-flat-button color="primary" mat-dialog-close>Close</button>
-      </div>
-    </div>
-  `,
-  styles: [
-    `
-      .vd-shell {
-        display: flex;
-        flex-direction: column;
-        gap: 16px;
-        padding: 20px 24px 16px;
-        min-width: 420px;
-        max-width: 560px;
-      }
-      .vd-header {
-        display: flex;
-        align-items: flex-start;
-        justify-content: space-between;
-      }
-      .vd-header__title {
-        display: flex;
-        align-items: center;
-        gap: 12px;
-      }
-      .vd-header__title h2 {
-        margin: 0;
-        font-size: 18px;
-        font-weight: 600;
-      }
-      .vd-header__title p {
-        margin: 2px 0 0;
-        font-size: 13px;
-        color: rgba(0, 0, 0, 0.6);
-      }
-      .vd-icon {
-        color: #1976d2;
-      }
-      .vd-meta {
-        display: flex;
-        flex-wrap: wrap;
-        gap: 6px 16px;
-        font-size: 13px;
-        color: rgba(0, 0, 0, 0.65);
-      }
-      .vd-unbalanced {
-        display: inline-flex;
-        align-items: center;
-        gap: 4px;
-        color: #b91c1c;
-        font-weight: 600;
-      }
-      .vd-table {
-        width: 100%;
-        border-collapse: collapse;
-        font-size: 13px;
-      }
-      .vd-table th {
-        text-align: left;
-        text-transform: uppercase;
-        font-size: 11px;
-        letter-spacing: 0.03em;
-        color: rgba(0, 0, 0, 0.5);
-        padding: 6px 8px;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-      }
-      .vd-table td {
-        padding: 8px;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.06);
-      }
-      .vd-table .num {
-        text-align: right;
-        font-variant-numeric: tabular-nums;
-      }
-      .vd-acct {
-        color: rgba(0, 0, 0, 0.55);
-      }
-      .vd-side {
-        display: inline-block;
-        padding: 2px 8px;
-        border-radius: 4px;
-        font-size: 11px;
-        font-weight: 600;
-      }
-      .vd-side--dr {
-        background: #fee2e2;
-        color: #b91c1c;
-      }
-      .vd-side--cr {
-        background: #dcfce7;
-        color: #15803d;
-      }
-      .vd-desc-row td {
-        padding-top: 0;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.06);
-      }
-      .vd-desc {
-        font-size: 12px;
-        color: rgba(0, 0, 0, 0.5);
-        font-style: italic;
-      }
-      .vd-empty {
-        text-align: center;
-        color: rgba(0, 0, 0, 0.5);
-        padding: 16px 8px;
-      }
-      .vd-table tfoot td {
-        font-weight: 600;
-        border-bottom: none;
-        border-top: 1px solid rgba(0, 0, 0, 0.1);
-      }
-      .vd-related {
-        border-top: 1px dashed rgba(0, 0, 0, 0.15);
-        padding-top: 12px;
-      }
-      .vd-related__title {
-        display: flex;
-        align-items: center;
-        gap: 6px;
-        font-size: 12px;
-        font-weight: 600;
-        text-transform: uppercase;
-        letter-spacing: 0.03em;
-        color: #6d28d9;
-        margin-bottom: 8px;
-      }
-      .vd-table--related td {
-        background: #faf5ff;
-      }
-      .vd-related__hint {
-        margin: 6px 0 0;
-        font-size: 12px;
-        color: rgba(0, 0, 0, 0.5);
-      }
-      .vd-actions {
-        display: flex;
-        justify-content: flex-end;
-      }
-    `
-  ]
-})
-export class VoucherDetailDialogComponent {
-  dialogRef = inject(MatDialogRef<VoucherDetailDialogComponent>);
-  private data = inject<VoucherDetailDialogData>(MAT_DIALOG_DATA);
-
-  detail = this.data.detail;
-}

src/app/cashier/share-collection/share-collection.component.html

@@ -0,0 +1,375 @@
+<!--
+  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 ── -->
+  <header class="pg-head">
+    <div>
+      <div class="pg-eyebrow">CASHIER · SHARE COLLECTION</div>
+      <h1 class="pg-title">Share Collection</h1>
+      <p class="pg-sub">
+        Collect cash from member for share purchase — amounts are held in Sundry GL until the account is activated.
+      </p>
+    </div>
+  </header>
+
+  <!-- ── SEARCH BAR ── -->
+  @if (pageState !== 'success') {
+    <div class="sc-search-bar">
+      <div class="sc-search-bar__input-wrap">
+        <mat-icon class="sc-search-bar__icon">search</mat-icon>
+        <input
+          class="sc-search-bar__input"
+          type="text"
+          placeholder="Enter Share Account ID or Account No."
+          [(ngModel)]="accountInput"
+          (keyup.enter)="searchAccount()"
+        />
+      </div>
+      <button
+        type="button"
+        class="pg-btn pg-btn--primary"
+        [disabled]="pageState === 'searching' || !accountInput.trim()"
+        (click)="searchAccount()"
+      >
+        <mat-icon>manage_search</mat-icon>
+        {{ pageState === 'searching' ? 'Searching…' : 'Search' }}
+      </button>
+    </div>
+  }
+
+  <!-- ── ERROR ── -->
+  @if (errorMsg) {
+    <div class="sc-alert sc-alert--error">
+      <mat-icon>error_outline</mat-icon>
+      <span>{{ errorMsg }}</span>
+    </div>
+  }
+
+  <!-- ── SEARCHING SPINNER ── -->
+  @if (pageState === 'searching') {
+    <div class="pg-empty">
+      <mat-icon class="sc-spin">hourglass_empty</mat-icon>
+      <p>Looking up account…</p>
+    </div>
+  }
+
+  <!-- ── ACCOUNT LOADED ── -->
+  @if (pageState === 'loaded') {
+    <!-- Member Card -->
+    <div class="sc-member-card">
+      <div class="sc-member-card__avatar">
+        <mat-icon>person</mat-icon>
+      </div>
+      <div class="sc-member-card__info">
+        <div class="sc-member-card__name">{{ account.clientName }}</div>
+        <div class="sc-member-card__meta">
+          <span class="sc-badge sc-badge--account">{{ account.accountNo }}</span>
+          <span class="sc-badge sc-badge--product">{{ account.productName }}</span>
+          <span
+            class="sc-badge"
+            [class.sc-badge--pending]="account.status?.code?.includes('pending')"
+            [class.sc-badge--active]="account.status?.code?.includes('active')"
+            >{{ account.status?.value }}</span
+          >
+        </div>
+      </div>
+
+      <!-- Editable Shares + Price -->
+      <div class="sc-member-card__shares">
+        <div class="sc-shares-inputs">
+          <div class="sc-shares-field">
+            <label class="sc-shares-label">No. of Shares</label>
+            <input
+              class="sc-shares-input"
+              type="number"
+              min="0"
+              [(ngModel)]="requestedSharesInput"
+              (input)="recalc()"
+              placeholder="0"
+            />
+          </div>
+          <div class="sc-shares-sep">×</div>
+          <div class="sc-shares-field">
+            <label class="sc-shares-label">Price / Share (₹)</label>
+            <input
+              class="sc-shares-input"
+              type="number"
+              min="0"
+              [(ngModel)]="pricePerShare"
+              (input)="recalc()"
+              placeholder="0.00"
+            />
+          </div>
+          <div class="sc-shares-sep">=</div>
+          <div class="sc-shares-result">
+            <div class="sc-shares-label">Share Amount</div>
+            <div class="sc-shares-total">{{ currencySymbol }}{{ shareAmount | number: '1.2-2' }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Amount Breakdown + GL Preview -->
+    <div class="sc-split">
+      <!-- LEFT: Amount Breakdown -->
+      <div class="pg-card sc-breakdown">
+        <div class="sc-breakdown__header">
+          <mat-icon>receipt_long</mat-icon>
+          <span>Amount Breakdown</span>
+        </div>
+        <table class="pg-table">
+          <thead>
+            <tr>
+              <th>Description</th>
+              <th class="num">Amount</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>
+                Share Amount
+                <span class="sc-dim">
+                  ({{ requestedSharesInput }} shares × {{ currencySymbol }}{{ pricePerShare | number: '1.2-2' }})
+                </span>
+              </td>
+              <td class="num">{{ currencySymbol }}{{ shareAmount | number: '1.2-2' }}</td>
+            </tr>
+            @for (charge of charges; track charge.id) {
+              <tr>
+                <td>{{ charge.name }}</td>
+                <td class="num sc-charge-amount">
+                  <input class="sc-charge-input" type="number" min="0" [(ngModel)]="charge.amount" (input)="recalc()" />
+                </td>
+              </tr>
+            }
+            @if (charges.length === 0) {
+              <tr>
+                <td colspan="2">
+                  <span class="sc-dim">No charges applicable</span>
+                </td>
+              </tr>
+            }
+          </tbody>
+          <tfoot>
+            <tr class="sc-total-row">
+              <td><strong>Total Payable</strong></td>
+              <td class="num sc-total-amount">
+                <strong>{{ currencySymbol }}{{ totalAmount | number: '1.2-2' }}</strong>
+              </td>
+            </tr>
+          </tfoot>
+        </table>
+      </div>
+
+      <!-- RIGHT: GL Preview -->
+      <div class="pg-card sc-gl-preview">
+        <div class="sc-breakdown__header">
+          <mat-icon>account_tree</mat-icon>
+          <span>GL Entries Preview</span>
+        </div>
+        <table class="pg-table">
+          <thead>
+            <tr>
+              <th>Account</th>
+              <th>Dr / Cr</th>
+              <th class="num">Amount</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr class="gl-row--dr">
+              <td class="gl-acname">Cash Vault GL</td>
+              <td><span class="sc-dr-badge">Dr</span></td>
+              <td class="num gl-amt--dr">{{ currencySymbol }}{{ totalAmount | number: '1.2-2' }}</td>
+            </tr>
+            <tr class="gl-row--cr">
+              <td class="gl-acname">Share Sundry GL</td>
+              <td><span class="sc-cr-badge">Cr</span></td>
+              <td class="num gl-amt--cr">{{ currencySymbol }}{{ shareAmount | number: '1.2-2' }}</td>
+            </tr>
+            @if (totalChargeAmount > 0) {
+              <tr class="gl-row--cr">
+                <td class="gl-acname">Charge Receivable GL</td>
+                <td><span class="sc-cr-badge">Cr</span></td>
+                <td class="num gl-amt--cr">{{ currencySymbol }}{{ totalChargeAmount | number: '1.2-2' }}</td>
+              </tr>
+            }
+          </tbody>
+        </table>
+        <div class="sc-gl-note">
+          <mat-icon>info_outline</mat-icon>
+          Funds move to Share GL &amp; Income GL when account is <strong>activated</strong>.
+        </div>
+      </div>
+    </div>
+
+    <!-- ── DENOMINATION (Cash Only) ── -->
+    @if (isCashPayment && allDenominations.length > 0) {
+      <div class="pg-card sc-denom">
+        <div class="sc-breakdown__header">
+          <mat-icon>payments</mat-icon>
+          <span>Denomination Entry</span>
+          @if (denominationTotal > 0) {
+            <span
+              class="sc-denom-badge"
+              [class.sc-denom-badge--match]="denomMatchesTotal"
+              [class.sc-denom-badge--mismatch]="!denomMatchesTotal"
+            >
+              ₹{{ denominationTotal | number: '1.2-2' }}
+              {{ denomMatchesTotal ? '✓ Matches' : '≠ Mismatch' }}
+            </span>
+          }
+          @if (denominationTotal === 0) {
+            <span class="sc-denom-required">⚠ Required for Cash</span>
+          }
+        </div>
+        <div class="sc-denom-body">
+          <table class="pg-table sc-denom-table">
+            <thead>
+              <tr>
+                <th>Denomination</th>
+                <th class="num">Count</th>
+                <th class="num">Amount</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (d of allDenominations; track d.id) {
+                <tr>
+                  <td>
+                    <span class="sc-denom-chip" [class.sc-denom-chip--coin]="d.kind === 'coin'">{{ d.label }}</span>
+                  </td>
+                  <td class="num">
+                    <div class="sc-denom-stepper">
+                      <button type="button" (click)="bumpDenom(d, -1)" [disabled]="countFor(d) === 0">−</button>
+                      <input
+                        type="number"
+                        min="0"
+                        [value]="countFor(d) || ''"
+                        placeholder="0"
+                        (input)="onDenomChange(d, $any($event.target).value)"
+                      />
+                      <button type="button" (click)="bumpDenom(d, 1)">+</button>
+                    </div>
+                  </td>
+                  <td class="num">{{ subtotalFor(d) > 0 ? (subtotalFor(d) | number: '1.2-2') : '—' }}</td>
+                </tr>
+              }
+            </tbody>
+            <tfoot>
+              <tr>
+                <td><strong>Total</strong></td>
+                <td></td>
+                <td class="num">
+                  <strong>₹{{ denominationTotal | number: '1.2-2' }}</strong>
+                </td>
+              </tr>
+            </tfoot>
+          </table>
+          @if (!denomMatchesTotal && denominationTotal > 0) {
+            <div class="sc-denom-mismatch">
+              <mat-icon>warning</mat-icon>
+              Denomination ₹{{ denominationTotal | number: '1.2-2' }} must equal Total Payable ₹{{
+                totalAmount | number: '1.2-2'
+              }}.
+            </div>
+          }
+          @if (denominationTotal > 0) {
+            <div class="sc-denom-actions">
+              <button type="button" class="pg-btn pg-btn--ghost" (click)="clearDenominations()">
+                <mat-icon>clear</mat-icon> Clear
+              </button>
+            </div>
+          }
+        </div>
+      </div>
+    }
+
+    <!-- Transaction Details -->
+    <div class="pg-toolbar pg-toolbar--mat">
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <mat-label>Transaction Date *</mat-label>
+        <input matInput type="date" [(ngModel)]="transactionDate" />
+      </mat-form-field>
+
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <mat-label>Payment Mode</mat-label>
+        <mat-select [(ngModel)]="paymentTypeId">
+          <mat-option [value]="null">— Cash (Default) —</mat-option>
+          @for (pt of paymentTypes; track pt.id) {
+            <mat-option [value]="pt.id">{{ pt.name }}</mat-option>
+          }
+        </mat-select>
+      </mat-form-field>
+
+      <mat-form-field appearance="outline" subscriptSizing="dynamic" class="pg-note-field">
+        <mat-label>Note (Optional)</mat-label>
+        <input matInput type="text" [(ngModel)]="note" placeholder="e.g. Share purchase for 100 shares" />
+      </mat-form-field>
+    </div>
+
+    <!-- Footer Submit Bar -->
+    <div class="pg-total-bar sc-footer">
+      <div class="sc-footer__summary">
+        <span class="sc-footer__label">Total to Collect</span>
+        <span class="sc-footer__amount">{{ currencySymbol }}{{ totalAmount | number: '1.2-2' }}</span>
+      </div>
+      <div class="sc-footer__actions">
+        <button type="button" class="pg-btn pg-btn--ghost" (click)="reset()"><mat-icon>close</mat-icon> Cancel</button>
+        <button type="button" class="pg-btn pg-btn--primary" [disabled]="!isValid || saving" (click)="submit()">
+          <mat-icon>payments</mat-icon>
+          {{ saving ? 'Posting…' : 'Collect & Post' }}
+        </button>
+      </div>
+    </div>
+  }
+
+  <!-- ── SUCCESS ── -->
+  @if (pageState === 'success' && collectionResult) {
+    <div class="sc-success">
+      <div class="sc-success__icon-wrap">
+        <mat-icon>check_circle</mat-icon>
+      </div>
+      <h2 class="sc-success__title">Collection Posted Successfully</h2>
+      <p class="sc-success__sub">
+        Cash of
+        <strong>{{ collectionResult.currencyCode }} {{ collectionResult.totalAmount | number: '1.2-2' }}</strong>
+        collected from <strong>{{ collectionResult.clientName }}</strong> on
+        <strong>{{ collectionResult.collectionDate }}</strong> by <strong>{{ collectionResult.collectedBy }}</strong
+        >.
+      </p>
+
+      <!-- Transaction reference -->
+      <div class="sc-success__ref">
+        <span class="sc-success__ref-label">Transaction ID</span>
+        <span class="sc-success__ref-val">{{ collectionResult.transactionId }}</span>
+      </div>
+
+      <!-- GL entries from backend -->
+      <div class="sc-success__gl">
+        @for (entry of collectionResult.glEntries; track entry.account) {
+          <div
+            class="sc-success__gl-row"
+            [class.sc-success__gl-row--dr]="entry.type === 'Dr'"
+            [class.sc-success__gl-row--cr]="entry.type === 'Cr'"
+          >
+            <span>{{ entry.type }}. {{ entry.account }}</span>
+            <span>{{ entry.currency }} {{ entry.amount | number: '1.2-2' }}</span>
+          </div>
+        }
+      </div>
+
+      <p class="sc-success__note">
+        Funds are held in Sundry GL. They will move to Share Equity GL when the account is activated.
+      </p>
+
+      <button type="button" class="pg-btn pg-btn--primary" (click)="reset()">
+        <mat-icon>add</mat-icon> New Collection
+      </button>
+    </div>
+  }
+</div>

src/app/cashier/share-collection/share-collection.component.scss

@@ -0,0 +1,701 @@
+/**
+ * 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/.
+ */
+
+// ── Search Bar ───────────────────────────────────────────────────────────────
+
+.sc-search-bar {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-radius: 12px;
+  padding: 10px 14px;
+
+  &__input-wrap {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    flex: 1 1 auto;
+  }
+
+  &__icon {
+    color: #94a3b8;
+    font-size: 20px;
+    width: 20px;
+    height: 20px;
+    flex-shrink: 0;
+  }
+
+  &__input {
+    flex: 1 1 auto;
+    border: none;
+    outline: none;
+    font-size: 14px;
+    font-family: inherit;
+    color: #0d1b2a;
+    background: transparent;
+
+    &::placeholder {
+      color: #94a3b8;
+    }
+  }
+}
+
+// ── Alert ────────────────────────────────────────────────────────────────────
+
+.sc-alert {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 12px 16px;
+  border-radius: 10px;
+  font-size: 13px;
+  font-weight: 500;
+
+  mat-icon {
+    font-size: 20px;
+    width: 20px;
+    height: 20px;
+    flex-shrink: 0;
+  }
+
+  &--error {
+    background: #fef2f2;
+    border: 1px solid #fecaca;
+    color: #dc2626;
+  }
+}
+
+// ── Spinner ──────────────────────────────────────────────────────────────────
+
+.sc-spin {
+  animation: sc-spin 1.2s linear infinite;
+  display: block;
+  margin: 0 auto 8px;
+  font-size: 32px !important;
+  width: 32px !important;
+  height: 32px !important;
+  color: #94a3b8;
+}
+
+@keyframes sc-spin {
+  from {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+// ── Member Card ──────────────────────────────────────────────────────────────
+
+.sc-member-card {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-radius: 12px;
+  padding: 16px 20px;
+
+  &__avatar {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 48px;
+    height: 48px;
+    border-radius: 50%;
+    background: #eff6ff;
+    flex-shrink: 0;
+
+    mat-icon {
+      color: #2563eb;
+      font-size: 24px;
+      width: 24px;
+      height: 24px;
+    }
+  }
+
+  &__info {
+    flex: 1 1 auto;
+    min-width: 0;
+  }
+
+  &__name {
+    font-size: 16px;
+    font-weight: 700;
+    color: #1e293b;
+    margin-bottom: 6px;
+  }
+
+  &__meta {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+  }
+
+  &__shares {
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+  }
+}
+
+// ── Badges ───────────────────────────────────────────────────────────────────
+
+.sc-badge {
+  display: inline-flex;
+  align-items: center;
+  height: 22px;
+  padding: 0 8px;
+  border-radius: 5px;
+  font-size: 11px;
+  font-weight: 700;
+  background: #f1f5f9;
+  color: #475569;
+  border: 1px solid #e2e8f0;
+
+  &--account {
+    background: #eff6ff;
+    color: #1d4ed8;
+    border-color: #bfdbfe;
+    font-family: 'Roboto Mono', monospace;
+  }
+
+  &--product {
+    background: #f0fdf4;
+    color: #15803d;
+    border-color: #bbf7d0;
+  }
+
+  &--pending {
+    background: #fffbeb;
+    color: #d97706;
+    border-color: #fde68a;
+  }
+
+  &--active {
+    background: #f0fdf4;
+    color: #15803d;
+    border-color: #bbf7d0;
+  }
+}
+
+// ── Editable Share Inputs ────────────────────────────────────────────────────
+
+.sc-shares-inputs {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+}
+
+.sc-shares-field {
+  display: flex;
+  flex-direction: column;
+  gap: 3px;
+}
+
+.sc-shares-label {
+  font-size: 10px;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.07em;
+  color: #94a3b8;
+}
+
+.sc-shares-input {
+  width: 110px;
+  height: 38px;
+  border: 1.5px solid #e2e8f0;
+  border-radius: 8px;
+  padding: 0 10px;
+  font-size: 14px;
+  font-weight: 700;
+  font-family: inherit;
+  color: #1353a0;
+  text-align: right;
+  outline: none;
+  background: #f8fafc;
+  transition: border-color 0.15s;
+
+  &:focus {
+    border-color: #1353a0;
+    background: #fff;
+  }
+
+  &::-webkit-outer-spin-button,
+  &::-webkit-inner-spin-button {
+    appearance: none;
+  }
+}
+
+.sc-shares-sep {
+  font-size: 20px;
+  font-weight: 300;
+  color: #94a3b8;
+  padding-top: 16px;
+}
+
+.sc-shares-result {
+  text-align: right;
+}
+
+.sc-shares-total {
+  font-size: 20px;
+  font-weight: 800;
+  color: #0f4f3c;
+  font-variant-numeric: tabular-nums;
+}
+
+// ── Editable Charge Amount ───────────────────────────────────────────────────
+
+.sc-charge-amount {
+  padding: 4px 14px !important;
+}
+
+.sc-charge-input {
+  width: 100px;
+  height: 32px;
+  border: 1.5px solid #e2e8f0;
+  border-radius: 6px;
+  padding: 0 8px;
+  font-size: 13px;
+  font-weight: 700;
+  font-family: inherit;
+  color: #1353a0;
+  text-align: right;
+  outline: none;
+  background: #f8fafc;
+  transition: border-color 0.15s;
+
+  &:focus {
+    border-color: #1353a0;
+    background: #fff;
+  }
+
+  &::-webkit-outer-spin-button,
+  &::-webkit-inner-spin-button {
+    appearance: none;
+  }
+}
+
+// ── Split Layout ─────────────────────────────────────────────────────────────
+
+.sc-split {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 16px;
+
+  @media (width <= 900px) {
+    grid-template-columns: 1fr;
+  }
+}
+
+// ── Breakdown Card ───────────────────────────────────────────────────────────
+
+.sc-breakdown {
+  &__header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 12px 16px;
+    background: #f8fafc;
+    border-bottom: 1px solid #e2e8f0;
+    font-size: 13px;
+    font-weight: 700;
+    color: #334155;
+
+    mat-icon {
+      font-size: 18px;
+      width: 18px;
+      height: 18px;
+      color: #0f4f3c;
+    }
+  }
+}
+
+.sc-gl-preview {
+  .sc-breakdown__header {
+    mat-icon {
+      color: #1d4ed8;
+    }
+  }
+}
+
+.sc-gl-note {
+  display: flex;
+  align-items: flex-start;
+  gap: 6px;
+  padding: 10px 14px;
+  font-size: 12px;
+  color: #64748b;
+  background: #f8fafc;
+  border-top: 1px solid #e2e8f0;
+
+  mat-icon {
+    font-size: 16px;
+    width: 16px;
+    height: 16px;
+    flex-shrink: 0;
+    margin-top: 1px;
+    color: #94a3b8;
+  }
+}
+
+// ── Table helpers ────────────────────────────────────────────────────────────
+
+.sc-dim {
+  color: #94a3b8;
+  font-size: 12px;
+}
+
+.sc-total-row td {
+  background: #f8fafc;
+  border-top: 2px solid #e2e8f0;
+  font-size: 14px;
+}
+
+.sc-total-amount {
+  color: #0f4f3c;
+}
+
+// ── Dr / Cr badges ───────────────────────────────────────────────────────────
+
+.sc-dr-badge,
+.sc-cr-badge {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 32px;
+  height: 20px;
+  border-radius: 4px;
+  font-size: 11px;
+  font-weight: 800;
+  letter-spacing: 0.04em;
+}
+
+.sc-dr-badge {
+  background: #fef2f2;
+  color: #dc2626;
+  border: 1px solid #fecaca;
+}
+
+.sc-cr-badge {
+  background: #f0fdf4;
+  color: #15803d;
+  border: 1px solid #bbf7d0;
+}
+
+// ── Footer ───────────────────────────────────────────────────────────────────
+
+.sc-footer {
+  justify-content: space-between !important;
+
+  &__summary {
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+  }
+
+  &__label {
+    font-size: 11px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.07em;
+    color: #64748b;
+  }
+
+  &__amount {
+    font-size: 22px;
+    font-weight: 800;
+    color: #0f4f3c;
+    font-variant-numeric: tabular-nums;
+  }
+
+  &__actions {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+  }
+}
+
+// ── Denomination Panel ────────────────────────────────────────────────────────
+
+.sc-denom {
+  padding: 0;
+  overflow: hidden;
+}
+
+.sc-denom-body {
+  padding: 14px 16px;
+}
+
+.sc-denom-table {
+  width: 100%;
+
+  th,
+  td {
+    padding: 7px 10px;
+    font-size: 13px;
+  }
+
+  tfoot td {
+    border-top: 2px solid #e2e8f0;
+    background: #f8fafc;
+    font-size: 14px;
+  }
+}
+
+.sc-denom-chip {
+  display: inline-flex;
+  align-items: center;
+  height: 24px;
+  padding: 0 10px;
+  border-radius: 5px;
+  font-size: 12px;
+  font-weight: 700;
+  background: #eff6ff;
+  color: #1d4ed8;
+  border: 1px solid #bfdbfe;
+
+  &--coin {
+    background: #fffbeb;
+    color: #d97706;
+    border-color: #fde68a;
+  }
+}
+
+.sc-denom-stepper {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  justify-content: flex-end;
+
+  button {
+    width: 26px;
+    height: 26px;
+    border: 1.5px solid #e2e8f0;
+    border-radius: 5px;
+    background: #f8fafc;
+    color: #475569;
+    font-size: 16px;
+    line-height: 1;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0;
+
+    &:hover:not(:disabled) {
+      background: #e0f2fe;
+      border-color: #7dd3fc;
+      color: #0369a1;
+    }
+
+    &:disabled {
+      opacity: 0.35;
+      cursor: not-allowed;
+    }
+  }
+
+  input {
+    width: 62px;
+    height: 28px;
+    border: 1.5px solid #e2e8f0;
+    border-radius: 6px;
+    padding: 0 6px;
+    font-size: 13px;
+    font-weight: 600;
+    font-family: inherit;
+    text-align: right;
+    outline: none;
+    background: #fff;
+
+    &:focus {
+      border-color: #1353a0;
+    }
+
+    &::-webkit-outer-spin-button,
+    &::-webkit-inner-spin-button {
+      appearance: none;
+    }
+  }
+}
+
+.sc-denom-badge {
+  margin-left: auto;
+  display: inline-flex;
+  align-items: center;
+  height: 22px;
+  padding: 0 10px;
+  border-radius: 5px;
+  font-size: 12px;
+  font-weight: 700;
+
+  &--match {
+    background: #f0fdf4;
+    color: #15803d;
+    border: 1px solid #bbf7d0;
+  }
+
+  &--mismatch {
+    background: #fef2f2;
+    color: #dc2626;
+    border: 1px solid #fecaca;
+  }
+}
+
+.sc-denom-required {
+  margin-left: auto;
+  font-size: 12px;
+  font-weight: 700;
+  color: #d97706;
+}
+
+.sc-denom-mismatch {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  margin-top: 10px;
+  padding: 9px 12px;
+  background: #fef2f2;
+  border: 1px solid #fecaca;
+  border-radius: 8px;
+  font-size: 12px;
+  font-weight: 600;
+  color: #dc2626;
+
+  mat-icon {
+    font-size: 16px;
+    width: 16px;
+    height: 16px;
+    flex-shrink: 0;
+  }
+}
+
+.sc-denom-actions {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+
+// ── Success ──────────────────────────────────────────────────────────────────
+
+.sc-success {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  padding: 40px 24px;
+  gap: 16px;
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-radius: 16px;
+
+  &__icon-wrap {
+    width: 72px;
+    height: 72px;
+    border-radius: 50%;
+    background: #f0fdf4;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    mat-icon {
+      font-size: 40px;
+      width: 40px;
+      height: 40px;
+      color: #16a34a;
+    }
+  }
+
+  &__title {
+    font-size: 22px;
+    font-weight: 700;
+    color: #1e293b;
+    margin: 0;
+  }
+
+  &__sub {
+    font-size: 14px;
+    color: #64748b;
+    max-width: 480px;
+    margin: 0;
+  }
+
+  &__ref {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    background: #f1f5f9;
+    border: 1px solid #e2e8f0;
+    border-radius: 8px;
+    padding: 8px 16px;
+  }
+
+  &__ref-label {
+    font-size: 11px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.07em;
+    color: #94a3b8;
+    white-space: nowrap;
+  }
+
+  &__ref-val {
+    font-family: 'Roboto Mono', 'Courier New', monospace;
+    font-size: 13px;
+    font-weight: 600;
+    color: #1353a0;
+  }
+
+  &__note {
+    font-size: 12px;
+    color: #94a3b8;
+    max-width: 420px;
+    margin: 0;
+    text-align: center;
+  }
+
+  &__gl {
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+    width: 100%;
+    max-width: 400px;
+    background: #f8fafc;
+    border: 1px solid #e2e8f0;
+    border-radius: 10px;
+    padding: 14px 16px;
+  }
+
+  &__gl-row {
+    display: flex;
+    justify-content: space-between;
+    font-size: 13px;
+    font-weight: 600;
+    padding: 4px 0;
+    border-bottom: 1px dotted #e2e8f0;
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    &--dr {
+      color: #dc2626;
+    }
+
+    &--cr {
+      color: #15803d;
+    }
+  }
+}

src/app/cashier/share-collection/share-collection.component.ts

@@ -0,0 +1,282 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component, OnInit, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
+import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatSelectModule } from '@angular/material/select';
+import { MatInputModule } from '@angular/material/input';
+import { catchError } from 'rxjs/operators';
+import { of } from 'rxjs';
+import { CashierService } from '../cashier.service';
+
+type PageState = 'idle' | 'searching' | 'loaded' | 'submitting' | 'success';
+
+interface Denomination {
+  id: number;
+  value: number;
+  kind: 'note' | 'coin';
+  label: string;
+}
+
+interface ShareCharge {
+  id: number;
+  name: string;
+  amount: number;
+  currencySymbol: string;
+}
+
+@Component({
+  selector: 'mifosx-share-collection',
+  templateUrl: './share-collection.component.html',
+  styleUrls: [
+    '../cashier-shared.scss',
+    './share-collection.component.scss'
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    RouterModule,
+    MatIconModule,
+    MatSnackBarModule,
+    MatFormFieldModule,
+    MatSelectModule,
+    MatInputModule
+  ]
+})
+export class ShareCollectionComponent implements OnInit {
+  private service = inject(CashierService);
+  private snackBar = inject(MatSnackBar);
+
+  pageState: PageState = 'idle';
+  accountInput = '';
+  transactionDate = '';
+  paymentTypeId: number | null = null;
+  paymentTypes: any[] = [];
+  note = '';
+  errorMsg = '';
+  saving = false;
+
+  account: any = null;
+  charges: ShareCharge[] = [];
+  collectionResult: any = null; // filled after successful POST
+
+  // Editable fields — cashier can override if API returns 0
+  requestedSharesInput = 0;
+  pricePerShare = 0;
+
+  // ── Denomination ────────────────────────────────────────────────────────────
+  notes: Denomination[] = [];
+  coins: Denomination[] = [];
+  denominationCounts: Record<string, number> = {};
+
+  get shareAmount(): number {
+    return this.requestedSharesInput * this.pricePerShare;
+  }
+
+  get totalChargeAmount(): number {
+    return this.charges.reduce((s, c) => s + c.amount, 0);
+  }
+
+  get totalAmount(): number {
+    return this.shareAmount + this.totalChargeAmount;
+  }
+
+  get currencySymbol(): string {
+    return this.account?.currency?.displaySymbol ?? '₹';
+  }
+
+  get isCashPayment(): boolean {
+    if (this.paymentTypeId === null) return true;
+    const pt = this.paymentTypes.find((p: any) => p.id === this.paymentTypeId);
+    return !!pt?.isCashPayment;
+  }
+
+  get allDenominations(): Denomination[] {
+    const desc = (a: Denomination, b: Denomination) => b.value - a.value;
+    return [
+      ...[...this.notes].sort(desc),
+      ...[...this.coins].sort(desc)
+    ];
+  }
+
+  get denominationTotal(): number {
+    return this.allDenominations.reduce((s, d) => s + this.subtotalFor(d), 0);
+  }
+
+  get denomMatchesTotal(): boolean {
+    return this.denominationTotal === this.totalAmount;
+  }
+
+  get isValid(): boolean {
+    if (!this.account || this.totalAmount <= 0 || !this.transactionDate) return false;
+    if (this.isCashPayment && this.allDenominations.length > 0) {
+      return this.denomMatchesTotal;
+    }
+    return true;
+  }
+
+  ngOnInit(): void {
+    const d = new Date();
+    this.transactionDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+    this.service
+      .getPaymentTypes()
+      .pipe(catchError(() => of([])))
+      .subscribe((types: any[]) => (this.paymentTypes = types || []));
+    this.loadDenominations();
+  }
+
+  private loadDenominations(): void {
+    this.service
+      .getActiveDenominations()
+      .pipe(catchError(() => of([])))
+      .subscribe((list: any[]) => {
+        const rows: Denomination[] = (list || []).map((d: any) => ({
+          id: d.id,
+          value: d.denomination ?? d.value,
+          kind: d.type === 'coin' ? 'coin' : 'note',
+          label: '₹' + (d.denomination ?? d.value)
+        }));
+        const order = (a: Denomination, b: Denomination) => b.value - a.value;
+        this.notes = rows.filter((r) => r.kind === 'note').sort(order);
+        this.coins = rows.filter((r) => r.kind === 'coin').sort(order);
+      });
+  }
+
+  // ── Denomination helpers ──────────────────────────────────────────────────
+
+  denomKey(d: Denomination): string {
+    return `${d.kind}:${d.value}`;
+  }
+
+  countFor(d: Denomination): number {
+    return this.denominationCounts[this.denomKey(d)] || 0;
+  }
+
+  subtotalFor(d: Denomination): number {
+    return this.countFor(d) * d.value;
+  }
+
+  onDenomChange(d: Denomination, raw: any): void {
+    this.denominationCounts[this.denomKey(d)] = Math.max(0, Math.floor(Number(raw) || 0));
+  }
+
+  bumpDenom(d: Denomination, delta: number): void {
+    this.denominationCounts[this.denomKey(d)] = Math.max(0, this.countFor(d) + delta);
+  }
+
+  clearDenominations(): void {
+    this.denominationCounts = {};
+  }
+
+  searchAccount(): void {
+    const query = this.accountInput.trim();
+    if (!query) return;
+    this.pageState = 'searching';
+    this.account = null;
+    this.charges = [];
+    this.errorMsg = '';
+
+    this.service
+      .getShareAccountForCollection(query)
+      .pipe(
+        catchError((err) => {
+          this.errorMsg =
+            err?.error?.errors?.[0]?.defaultUserMessage ||
+            err?.error?.developerMessage ||
+            'Account not found. Please check the account ID and try again.';
+          this.pageState = 'idle';
+          return of(null);
+        })
+      )
+      .subscribe((acc: any) => {
+        if (!acc) return;
+        this.account = acc;
+
+        // Auto-detect shares from summary or first pending purchasedShares entry
+        const pendingTx = (acc.purchasedShares || []).find(
+          (t: any) =>
+            t.status?.code === 'purchasedSharesStatusType.applied' && t.type?.code === 'purchasedSharesType.purchased'
+        );
+        this.requestedSharesInput = Number(
+          acc.summary?.totalPendingForApprovalShares || pendingTx?.numberOfShares || acc.requestedShares || 0
+        );
+        this.pricePerShare = Number(pendingTx?.purchasedPrice || acc.currentMarketPrice || acc.unitPrice || 0);
+
+        // Show ALL charges on the account — no type filtering
+        this.charges = (acc.charges || []).map((c: any) => ({
+          id: c.chargeId ?? c.id,
+          name: c.name,
+          amount: Number(c.amount ?? c.amountOutstanding ?? 0),
+          currencySymbol: c.currency?.displaySymbol ?? '₹'
+        }));
+
+        this.pageState = 'loaded';
+      });
+  }
+
+  recalc(): void {
+    // triggered by input changes — nothing extra needed, getters auto-recalculate
+  }
+
+  submit(): void {
+    if (!this.isValid || this.saving) return;
+    this.saving = true;
+    const payload = {
+      shareAccountId: this.account.id,
+      accountNo: this.account.accountNo,
+      clientName: this.account.clientName,
+      transactionDate: this.transactionDate,
+      requestedShares: this.requestedSharesInput,
+      pricePerShare: this.pricePerShare,
+      shareAmount: this.shareAmount,
+      chargeAmount: this.totalChargeAmount,
+      totalAmount: this.totalAmount,
+      paymentTypeId: this.paymentTypeId || null,
+      note: this.note || null
+    };
+
+    this.service.collectSharePayment(payload).subscribe({
+      next: (result: any) => {
+        this.collectionResult = result;
+        this.snackBar.open('Share collection posted successfully.', 'Close', { duration: 3000 });
+        this.pageState = 'success';
+        this.saving = false;
+      },
+      error: (err: any) => {
+        const msg =
+          err?.error?.errors?.[0]?.defaultUserMessage ||
+          err?.error?.developerMessage ||
+          err?.error?.defaultUserMessage ||
+          'Collection failed. Please try again.';
+        this.snackBar.open(msg, 'Close', { duration: 8000 });
+        this.saving = false;
+      }
+    });
+  }
+
+  reset(): void {
+    this.pageState = 'idle';
+    this.accountInput = '';
+    this.account = null;
+    this.charges = [];
+    this.errorMsg = '';
+    this.note = '';
+    this.paymentTypeId = null;
+    this.requestedSharesInput = 0;
+    this.pricePerShare = 0;
+    this.collectionResult = null;
+    this.saving = false;
+    this.clearDenominations();
+  }
+}

src/app/cashier/transaction-entry/cashier-issue-dd-dialog.component.ts

@@ -8,7 +8,7 @@
 
 import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule, FormBuilder, FormGroup, FormArray, Validators } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule, FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
@@ -35,35 +35,6 @@ export interface CashierIssueDdDialogData {
   accountNo?: string;
   /** The account holder, for the same reason. */
   accountHolderName?: string;
-  /**
-   * How many drafts this slip raises. Absent or 1 is the ordinary single draft and the dialog is
-   * unchanged; 2 or more turns it into a slip, asking for a face value, charge and beneficiary per
-   * draft and reporting the combined total the account will be debited for.
-   */
-  ddCount?: number;
-  /**
-   * Whether the funding account is a GL account rather than a member's. Only affects wording: a GL
-   * account has no passbook, so it is not promised one.
-   */
-  glFunded?: boolean;
-  /**
-   * The leaflets provisionally shown against each line of a slip.
-   *
-   * Only ever indicative. The server allocates the real numbers inside the locked transaction that
-   * submits the slip, so what is shown here is the next-available run at the moment the dialog was
-   * opened — accurate unless another clerk submits first, which is precisely why the numbers cannot
-   * be promised until submit returns them.
-   */
-  previewDdNumbers?: string[];
-}
-
-/** One captured draft on a multi-DD slip. */
-export interface DdSlipLineResult {
-  beneficiaryName: string;
-  payableAtBranch: string;
-  payableAtCity: string;
-  faceValue: number;
-  chargesAmount: number;
 }
 
 @Component({
@@ -85,20 +56,10 @@ export interface DdSlipLineResult {
         <div class="dd-dialog-header__title">
           <mat-icon class="dd-icon">receipt_long</mat-icon>
           <div>
-            <h2>
+            <h2>{{ isAccountDebit ? 'Account-Debit Demand Draft (DD)' : 'Walk-in Cash Demand Draft (DD)' }}</h2>
-              @if (isSlip) {
-                Multi-DD Slip · {{ lineCount }} Demand Drafts
-              } @else {
-                {{ isAccountDebit ? 'Account-Debit Demand Draft (DD)' : 'Walk-in Cash Demand Draft (DD)' }}
-              }
-            </h2>
             <p>
-              @if (isSlip) {
+              Next available DD leaflet auto-selected ·
-                One debit funds all {{ lineCount }} drafts · Enter each draft's beneficiary and amount
+              {{ isAccountDebit ? 'Enter beneficiary details' : 'Enter purchaser &amp; beneficiary details' }}
-              } @else {
-                Next available DD leaflet auto-selected ·
-                {{ isAccountDebit ? 'Enter beneficiary details' : 'Enter purchaser &amp; beneficiary details' }}
-              }
             </p>
           </div>
         </div>
@@ -108,91 +69,38 @@ export interface DdSlipLineResult {
       </div>
 
       <mat-dialog-content class="dd-dialog-body">
-        <!--
+        <!-- Draft & Financials Summary Card -->
-          Slip running total.
+        <div class="dd-summary-card">
-
+          <div class="summary-col">
-          A slip's figures are not known until every line is typed — different drafts carry different
+            <span class="label">Auto-Selected Leaflet</span>
-          face values and different charges — so the total the account will be debited for is built
+            <strong class="dd-number-highlight">{{ data.leaflet.ddNumber }}</strong>
-          up here as the clerk works, rather than shown as a fixed figure up front. Answering "what
+            <span class="sublabel">{{ data.sponsorBankName || 'Sponsor Bank' }} · {{ data.branchName }}</span>
-          is this going to cost my member" without it would mean adding the lines by hand.
-        -->
-        @if (isSlip) {
-          <div class="dd-summary-card">
-            <div class="summary-col">
-              <span class="label">Drafts On This Slip</span>
-              <strong class="dd-number-highlight">{{ lineCount }}</strong>
-              <span class="sublabel">{{ data.sponsorBankName || 'Sponsor Bank' }} · {{ data.branchName }}</span>
-            </div>
-            <div class="summary-divider"></div>
-            <div class="summary-col">
-              <span class="label">Total Face Value</span>
-              <strong class="amount">₹{{ slipFaceValue | number: '1.2-2' }}</strong>
-              <span class="sublabel">+ Charges ₹{{ slipCharges | number: '1.2-2' }}</span>
-            </div>
-            <div class="summary-divider"></div>
-            <div class="summary-col">
-              <span class="label">GST ({{ data.gstPercentage }}%)</span>
-              <strong class="amount">₹{{ slipGst | number: '1.2-2' }}</strong>
-              <span class="sublabel">on charges only</span>
-            </div>
-            <div class="summary-divider"></div>
-            <div class="summary-col highlight-col">
-              <span class="label">Total To Debit</span>
-              <strong class="total-amount">₹{{ slipTotal | number: '1.2-2' }}</strong>
-              <span class="sublabel">{{ data.accountNo || 'Account' }} · one debit</span>
-            </div>
           </div>
-
+          <div class="summary-divider"></div>
-          <!--
+          <div class="summary-col">
-            Said plainly because the numbers on screen are the one thing in this dialog the clerk
+            <span class="label">Face Value</span>
-            cannot rely on. They are the next-available run as it stood when the dialog opened; the
+            <strong class="amount">₹{{ data.faceValue | number: '1.2-2' }}</strong>
-            binding allocation happens inside the submit transaction, so a slip filed after another
+            <span class="sublabel">+ Charges ₹{{ data.chargesAmount | number: '1.2-2' }}</span>
-            clerk's gets the following numbers instead.
-          -->
-          <div class="dd-preview-note">
-            <mat-icon>info</mat-icon>
-            <div>
-              DD numbers below are <strong>provisional</strong>. The final numbers are allocated when the slip is
-              submitted and will be confirmed on the receipt.
-            </div>
           </div>
-        } @else {
+          <div class="summary-divider"></div>
-          <!-- Draft & Financials Summary Card -->
+          <div class="summary-col">
-          <div class="dd-summary-card">
+            <span class="label">GST ({{ data.gstPercentage }}%)</span>
-            <!-- The number the customer will actually see printed on the instrument. "Auto-Selected
+            <strong class="amount">₹{{ data.gstAmount | number: '1.2-2' }}</strong>
-               Leaflet" named the stock item rather than the draft, so it was not obvious that this
+            <span class="sublabel">on charges only</span>
-               is the DD number being issued. -->
-            <div class="summary-col">
-              <span class="label">DD Number Being Issued</span>
-              <strong class="dd-number-highlight">{{ data.leaflet.ddNumber }}</strong>
-              <span class="sublabel">{{ data.sponsorBankName || 'Sponsor Bank' }} · {{ data.branchName }}</span>
-            </div>
-            <div class="summary-divider"></div>
-            <div class="summary-col">
-              <span class="label">Face Value</span>
-              <strong class="amount">₹{{ data.faceValue | number: '1.2-2' }}</strong>
-              <span class="sublabel">+ Charges ₹{{ data.chargesAmount | number: '1.2-2' }}</span>
-            </div>
-            <div class="summary-divider"></div>
-            <div class="summary-col">
-              <span class="label">GST ({{ data.gstPercentage }}%)</span>
-              <strong class="amount">₹{{ data.gstAmount | number: '1.2-2' }}</strong>
-              <span class="sublabel">on charges only</span>
-            </div>
-            <div class="summary-divider"></div>
-            <div class="summary-col highlight-col">
-              <span class="label">{{ isAccountDebit ? 'Total Debited' : 'Total Cash Collected' }}</span>
-              <strong class="total-amount">₹{{ data.totalCashPayable | number: '1.2-2' }}</strong>
-              <span class="sublabel">
-                @if (isAccountDebit) {
-                  {{ data.accountNo || 'Account' }}
-                } @else {
-                  Denominations verified
-                }
-              </span>
-            </div>
           </div>
-        }
+          <div class="summary-divider"></div>
+          <div class="summary-col highlight-col">
+            <span class="label">{{ isAccountDebit ? 'Total Debited' : 'Total Cash Collected' }}</span>
+            <strong class="total-amount">₹{{ data.totalCashPayable | number: '1.2-2' }}</strong>
+            <span class="sublabel">
+              @if (isAccountDebit) {
+                {{ data.accountNo || 'Account' }}
+              } @else {
+                Denominations verified
+              }
+            </span>
+          </div>
+        </div>
 
         <!--
           The account funding the draft, stated before the form.
@@ -210,237 +118,123 @@ export interface DdSlipLineResult {
                 · {{ data.accountHolderName }}
               }
               <div class="dd-funding-sub">
-                @if (isSlip) {
+                ₹{{ data.totalCashPayable | number: '1.2-2' }} will be debited from this account when a checker
-                  ₹{{ slipTotal | number: '1.2-2' }} will be debited from this account as a
+                approves. No cash is taken at the counter.
-                  <strong>single transaction</strong> covering all {{ lineCount }} drafts, when a checker approves the
-                  slip —
-                  <!-- A GL account has no passbook, so the reassurance a member gets is phrased for
-                       the ledger instead of promising a statement line that does not exist. -->
-                  @if (isGlFunded) {
-                    one journal entry against this GL account, not {{ lineCount }}.
-                  } @else {
-                    the member's passbook shows one entry, not {{ lineCount }}.
-                  }
-                } @else {
-                  ₹{{ data.totalCashPayable | number: '1.2-2' }} will be debited from this account when a checker
-                  approves. No cash is taken at the counter.
-                }
               </div>
             </div>
           </div>
         }
 
-        <!--
+        <form [formGroup]="form" class="dd-form">
-          A slip's drafts, one card each.
+          <!--
-
-          Face value and charge sit on the line rather than on the slip because that is how the bank
-          actually uses this: three drafts to three institutions are three different amounts, and the
-          charge is levied per draft. The server stores and posts them per line for the same reason.
-        -->
-        @if (isSlip) {
-          <form [formGroup]="slipForm" class="dd-form">
-            <div formArrayName="lines">
-              @for (lineCtrl of slipLines.controls; track $index) {
-                <div class="dd-line-card" [formGroupName]="$index">
-                  <div class="dd-line-head">
-                    <span class="dd-line-badge">DD {{ $index + 1 }} of {{ lineCount }}</span>
-                    @if (previewNumberAt($index)) {
-                      <span class="dd-line-number">No. {{ previewNumberAt($index) }} <em>(provisional)</em></span>
-                    }
-                    <span class="dd-line-total"> Debit ₹{{ lineTotalAt($index) | number: '1.2-2' }} </span>
-                  </div>
-
-                  <mat-form-field appearance="outline" class="full-width">
-                    <mat-label>Beneficiary Name (In Favour Of) *</mat-label>
-                    <input
-                      matInput
-                      formControlName="beneficiaryName"
-                      placeholder="e.g. UNIVERSITY OF MUMBAI"
-                      maxlength="120"
-                      style="text-transform: uppercase;"
-                    />
-                    <mat-error *ngIf="lineCtrl.get('beneficiaryName')?.hasError('required')"
-                      >Beneficiary name is required</mat-error
-                    >
-                    <mat-error *ngIf="lineCtrl.get('beneficiaryName')?.hasError('maxlength')"
-                      >Max 120 characters</mat-error
-                    >
-                  </mat-form-field>
-
-                  <div class="form-row">
-                    <mat-form-field appearance="outline" class="form-field-flex">
-                      <mat-label>Payable At - Branch *</mat-label>
-                      <input
-                        matInput
-                        formControlName="payableAtBranch"
-                        placeholder="e.g. FORT BRANCH"
-                        maxlength="150"
-                        style="text-transform: uppercase;"
-                      />
-                      <mat-error *ngIf="lineCtrl.get('payableAtBranch')?.hasError('required')"
-                        >Payable Branch is required</mat-error
-                      >
-                    </mat-form-field>
-
-                    <mat-form-field appearance="outline" class="form-field-flex">
-                      <mat-label>Payable At - City *</mat-label>
-                      <input
-                        matInput
-                        formControlName="payableAtCity"
-                        placeholder="e.g. MUMBAI"
-                        maxlength="100"
-                        style="text-transform: uppercase;"
-                      />
-                      <mat-error *ngIf="lineCtrl.get('payableAtCity')?.hasError('required')"
-                        >Payable City is required</mat-error
-                      >
-                    </mat-form-field>
-                  </div>
-
-                  <div class="form-row">
-                    <mat-form-field appearance="outline" class="form-field-flex">
-                      <mat-label>Face Value *</mat-label>
-                      <input matInput type="number" formControlName="faceValue" placeholder="0.00" />
-                      <span matPrefix>₹&nbsp;</span>
-                      <mat-error *ngIf="lineCtrl.get('faceValue')?.hasError('required')"
-                        >Face value is required</mat-error
-                      >
-                      <mat-error *ngIf="lineCtrl.get('faceValue')?.hasError('min')"
-                        >Face value must be greater than zero</mat-error
-                      >
-                    </mat-form-field>
-
-                    <mat-form-field appearance="outline" class="form-field-flex">
-                      <mat-label>Charges</mat-label>
-                      <input matInput type="number" formControlName="chargesAmount" placeholder="0.00" />
-                      <span matPrefix>₹&nbsp;</span>
-                      <mat-hint>GST ₹{{ lineGstAt($index) | number: '1.2-2' }} at {{ data.gstPercentage }}%</mat-hint>
-                      <mat-error *ngIf="lineCtrl.get('chargesAmount')?.hasError('min')"
-                        >Charges cannot be negative</mat-error
-                      >
-                    </mat-form-field>
-                  </div>
-                </div>
-              }
-            </div>
-          </form>
-        } @else {
-          <form [formGroup]="form" class="dd-form">
-            <!--
             Purchaser identity is asked for only when the bank has none: a walk-in paying cash. On an
             account debit the purchaser IS the account holder, already identified and KYC'd, and
             re-capturing a name and Aadhaar here would invite a mismatch against the account on record.
           -->
-            @if (!isAccountDebit) {
+          @if (!isAccountDebit) {
-              <div class="form-section-title">Walk-in Purchaser Details</div>
+            <div class="form-section-title">Walk-in Purchaser Details</div>
-
-              <div class="form-row">
-                <mat-form-field appearance="outline" class="form-field-flex">
-                  <mat-label>Walk-in Purchaser Name *</mat-label>
-                  <input
-                    matInput
-                    formControlName="walkinPurchaserName"
-                    placeholder="e.g. RAMESH CHANDRA"
-                    style="text-transform: uppercase;"
-                  />
-                  <mat-error *ngIf="form.get('walkinPurchaserName')?.hasError('required')"
-                    >Purchaser name is required</mat-error
-                  >
-                  <mat-error *ngIf="form.get('walkinPurchaserName')?.hasError('minlength')"
-                    >Must be at least 3 characters</mat-error
-                  >
-                </mat-form-field>
-
-                <mat-form-field appearance="outline" class="form-field-flex">
-                  <mat-label>12-Digit Aadhaar Number *</mat-label>
-                  <input
-                    matInput
-                    formControlName="walkinPurchaserAadhaar"
-                    placeholder="12-digit Aadhaar"
-                    maxlength="12"
-                  />
-                  <mat-hint>Masked to last 4 digits before storage</mat-hint>
-                  <mat-error *ngIf="form.get('walkinPurchaserAadhaar')?.hasError('required')"
-                    >Aadhaar number is required</mat-error
-                  >
-                  <mat-error *ngIf="form.get('walkinPurchaserAadhaar')?.hasError('pattern')"
-                    >Must be exactly 12 numeric digits</mat-error
-                  >
-                </mat-form-field>
-              </div>
-
-              <mat-form-field appearance="outline" class="full-width">
-                <mat-label>Purchaser Address / Location *</mat-label>
-                <input
-                  matInput
-                  formControlName="walkinPurchaserAddress"
-                  placeholder="e.g. 14, SECTOR 5, MAIN ROAD, MUMBAI"
-                  style="text-transform: uppercase;"
-                />
-                <mat-error *ngIf="form.get('walkinPurchaserAddress')?.hasError('required')"
-                  >Address is required</mat-error
-                >
-              </mat-form-field>
-            }
-
-            <!-- Beneficiary Section -->
-            <div class="form-section-title">Beneficiary & Payment Details</div>
-
-            <mat-form-field appearance="outline" class="full-width">
-              <mat-label>Beneficiary Name (In Favour Of) *</mat-label>
-              <input
-                matInput
-                formControlName="beneficiaryName"
-                placeholder="e.g. UNIVERSITY OF MUMBAI"
-                maxlength="120"
-                style="text-transform: uppercase;"
-              />
-              <mat-error *ngIf="form.get('beneficiaryName')?.hasError('required')"
-                >Beneficiary name is required</mat-error
-              >
-              <mat-error *ngIf="form.get('beneficiaryName')?.hasError('maxlength')">Max 120 characters</mat-error>
-            </mat-form-field>
 
             <div class="form-row">
               <mat-form-field appearance="outline" class="form-field-flex">
-                <mat-label>Payable At - Branch *</mat-label>
+                <mat-label>Walk-in Purchaser Name *</mat-label>
                 <input
                   matInput
-                  formControlName="payableAtBranch"
+                  formControlName="walkinPurchaserName"
-                  placeholder="e.g. FORT BRANCH"
+                  placeholder="e.g. RAMESH CHANDRA"
-                  maxlength="150"
                   style="text-transform: uppercase;"
                 />
-                <mat-error *ngIf="form.get('payableAtBranch')?.hasError('required')"
+                <mat-error *ngIf="form.get('walkinPurchaserName')?.hasError('required')"
-                  >Payable Branch is required</mat-error
+                  >Purchaser name is required</mat-error
+                >
+                <mat-error *ngIf="form.get('walkinPurchaserName')?.hasError('minlength')"
+                  >Must be at least 3 characters</mat-error
                 >
               </mat-form-field>
 
               <mat-form-field appearance="outline" class="form-field-flex">
-                <mat-label>Payable At - City *</mat-label>
+                <mat-label>12-Digit Aadhaar Number *</mat-label>
                 <input
                   matInput
-                  formControlName="payableAtCity"
+                  formControlName="walkinPurchaserAadhaar"
-                  placeholder="e.g. MUMBAI"
+                  placeholder="12-digit Aadhaar"
-                  maxlength="100"
+                  maxlength="12"
-                  style="text-transform: uppercase;"
                 />
-                <mat-error *ngIf="form.get('payableAtCity')?.hasError('required')">Payable City is required</mat-error>
+                <mat-hint>Masked to last 4 digits before storage</mat-hint>
+                <mat-error *ngIf="form.get('walkinPurchaserAadhaar')?.hasError('required')"
+                  >Aadhaar number is required</mat-error
+                >
+                <mat-error *ngIf="form.get('walkinPurchaserAadhaar')?.hasError('pattern')"
+                  >Must be exactly 12 numeric digits</mat-error
+                >
               </mat-form-field>
             </div>
-          </form>
+
-        }
+            <mat-form-field appearance="outline" class="full-width">
+              <mat-label>Purchaser Address / Location *</mat-label>
+              <input
+                matInput
+                formControlName="walkinPurchaserAddress"
+                placeholder="e.g. 14, SECTOR 5, MAIN ROAD, MUMBAI"
+                style="text-transform: uppercase;"
+              />
+              <mat-error *ngIf="form.get('walkinPurchaserAddress')?.hasError('required')"
+                >Address is required</mat-error
+              >
+            </mat-form-field>
+          }
+
+          <!-- Beneficiary Section -->
+          <div class="form-section-title">Beneficiary & Payment Details</div>
+
+          <mat-form-field appearance="outline" class="full-width">
+            <mat-label>Beneficiary Name (In Favour Of) *</mat-label>
+            <input
+              matInput
+              formControlName="beneficiaryName"
+              placeholder="e.g. UNIVERSITY OF MUMBAI"
+              maxlength="120"
+              style="text-transform: uppercase;"
+            />
+            <mat-error *ngIf="form.get('beneficiaryName')?.hasError('required')"
+              >Beneficiary name is required</mat-error
+            >
+            <mat-error *ngIf="form.get('beneficiaryName')?.hasError('maxlength')">Max 120 characters</mat-error>
+          </mat-form-field>
+
+          <div class="form-row">
+            <mat-form-field appearance="outline" class="form-field-flex">
+              <mat-label>Payable At - Branch *</mat-label>
+              <input
+                matInput
+                formControlName="payableAtBranch"
+                placeholder="e.g. FORT BRANCH"
+                maxlength="150"
+                style="text-transform: uppercase;"
+              />
+              <mat-error *ngIf="form.get('payableAtBranch')?.hasError('required')"
+                >Payable Branch is required</mat-error
+              >
+            </mat-form-field>
+
+            <mat-form-field appearance="outline" class="form-field-flex">
+              <mat-label>Payable At - City *</mat-label>
+              <input
+                matInput
+                formControlName="payableAtCity"
+                placeholder="e.g. MUMBAI"
+                maxlength="100"
+                style="text-transform: uppercase;"
+              />
+              <mat-error *ngIf="form.get('payableAtCity')?.hasError('required')">Payable City is required</mat-error>
+            </mat-form-field>
+          </div>
+        </form>
       </mat-dialog-content>
 
       <mat-dialog-actions class="dd-dialog-actions" align="end">
-        @if (isSlip) {
-          <span class="dd-actions-total">
-            {{ lineCount }} drafts · <strong>₹{{ slipTotal | number: '1.2-2' }}</strong> to debit
-          </span>
-        }
         <button mat-button type="button" (click)="onClose()">Cancel</button>
-        <button mat-flat-button color="primary" [disabled]="activeForm.invalid" (click)="onSubmit()">
+        <button mat-flat-button color="primary" [disabled]="form.invalid" (click)="onSubmit()">
-          {{ isSlip ? 'Save Slip Details' : 'Save DD Details' }}
+          Submit for Manager Approval
         </button>
       </mat-dialog-actions>
     </div>
@@ -598,81 +392,6 @@ export interface DdSlipLineResult {
         line-height: 1.5;
         color: #64748b;
       }
-      /* One card per draft on a slip — the boundary is what stops a clerk typing line 2's
-         beneficiary against line 1's amount. */
-      .dd-line-card {
-        border: 1px solid #e2e8f0;
-        border-left: 3px solid #0369a1;
-        border-radius: 8px;
-        padding: 14px 16px 4px;
-        margin-bottom: 14px;
-        background: #fcfdff;
-      }
-      .dd-line-head {
-        display: flex;
-        align-items: center;
-        gap: 10px;
-        flex-wrap: wrap;
-        margin-bottom: 12px;
-      }
-      .dd-line-badge {
-        font-size: 11px;
-        font-weight: 700;
-        text-transform: uppercase;
-        letter-spacing: 0.4px;
-        color: #ffffff;
-        background: #0369a1;
-        padding: 3px 9px;
-        border-radius: 999px;
-      }
-      .dd-line-number {
-        font-family: monospace;
-        font-size: 12px;
-        color: #475569;
-      }
-      .dd-line-number em {
-        font-style: normal;
-        color: #94a3b8;
-        font-size: 11px;
-      }
-      .dd-line-total {
-        margin-left: auto;
-        font-size: 12px;
-        font-weight: 600;
-        color: #065f46;
-        background: #ecfdf5;
-        border: 1px solid #a7f3d0;
-        padding: 3px 10px;
-        border-radius: 6px;
-      }
-      .dd-preview-note {
-        display: flex;
-        gap: 8px;
-        align-items: flex-start;
-        margin: 0 0 16px;
-        padding: 9px 12px;
-        background: #fffbeb;
-        border: 1px solid #fde68a;
-        border-radius: 6px;
-        font-size: 12px;
-        line-height: 1.5;
-        color: #78350f;
-      }
-      .dd-preview-note mat-icon {
-        color: #b45309;
-        font-size: 18px;
-        width: 18px;
-        height: 18px;
-        flex-shrink: 0;
-      }
-      .dd-actions-total {
-        margin-right: auto;
-        font-size: 13px;
-        color: #475569;
-      }
-      .dd-actions-total strong {
-        color: #065f46;
-      }
     `
   ]
 })
@@ -682,127 +401,13 @@ export class CashierIssueDdDialogComponent implements OnInit {
   public data: CashierIssueDdDialogData = inject(MAT_DIALOG_DATA);
 
   form!: FormGroup;
-  /** Built only in slip mode; `form` stays untouched so the single-draft path is unchanged. */
-  slipForm!: FormGroup;
 
   /** Whether the draft is funded by debiting a member's account rather than by cash at the counter. */
   get isAccountDebit(): boolean {
     return this.data.paymentMethod === 'ACCOUNT_DEBIT';
   }
 
-  /** How many drafts this dialog is capturing — 1 unless the clerk asked for a slip. */
-  get lineCount(): number {
-    const n = Number(this.data.ddCount) || 1;
-    return n > 1 ? n : 1;
-  }
-
-  /** Whether this dialog is capturing a multi-DD slip rather than a single draft. */
-  get isSlip(): boolean {
-    return this.lineCount > 1;
-  }
-
-  /** Whether the debit lands on a GL account rather than a member's — wording only. */
-  get isGlFunded(): boolean {
-    return !!this.data.glFunded;
-  }
-
-  /** The form the Save button validates against — whichever of the two was built. */
-  get activeForm(): FormGroup {
-    return this.isSlip ? this.slipForm : this.form;
-  }
-
-  get slipLines(): FormArray {
-    return this.slipForm.get('lines') as FormArray;
-  }
-
-  /** The provisional leaflet number shown against a line, if the caller supplied a run of them. */
-  previewNumberAt(index: number): string | null {
-    return this.data.previewDdNumbers?.[index] ?? null;
-  }
-
-  private lineValueAt(index: number, field: string): number {
-    return Number(this.slipLines.at(index)?.get(field)?.value) || 0;
-  }
-
-  /**
-   * GST on one line's charge.
-   *
-   * Rounded per line, matching the server, which computes and stores GST against each draft rather
-   * than once for the slip. Summing rounded lines and rounding a summed charge can differ by a
-   * paisa, and it is the per-line figure that ends up on the draft.
-   */
-  lineGstAt(index: number): number {
-    const charges = this.lineValueAt(index, 'chargesAmount');
-    if (charges <= 0) return 0;
-    return Math.round(charges * (Number(this.data.gstPercentage) || 0)) / 100;
-  }
-
-  /** What one line adds to the debit — its face value, its charge and the GST on that charge. */
-  lineTotalAt(index: number): number {
-    return this.lineValueAt(index, 'faceValue') + this.lineValueAt(index, 'chargesAmount') + this.lineGstAt(index);
-  }
-
-  get slipFaceValue(): number {
-    return this.slipLines.controls.reduce((sum, _c, i) => sum + this.lineValueAt(i, 'faceValue'), 0);
-  }
-
-  get slipCharges(): number {
-    return this.slipLines.controls.reduce((sum, _c, i) => sum + this.lineValueAt(i, 'chargesAmount'), 0);
-  }
-
-  get slipGst(): number {
-    return this.slipLines.controls.reduce((sum, _c, i) => sum + this.lineGstAt(i), 0);
-  }
-
-  /** The figure the account is debited for — rounded up to the whole rupee, as the single flow does. */
-  get slipTotal(): number {
-    return Math.ceil(this.slipFaceValue + this.slipCharges + this.slipGst - 1e-9);
-  }
-
   ngOnInit(): void {
-    if (this.isSlip) {
-      this.slipForm = this.fb.group({
-        lines: this.fb.array(
-          Array.from({ length: this.lineCount }, () =>
-            this.fb.group({
-              beneficiaryName: [
-                '',
-                [
-                  Validators.required,
-                  Validators.maxLength(120)
-                ]
-              ],
-              payableAtBranch: [
-                '',
-                [Validators.required]
-              ],
-              payableAtCity: [
-                '',
-                [Validators.required]
-              ],
-              // Zero is rejected rather than merely warned about: the server refuses a line with a
-              // face value at or below zero, and a slip that fails there has already cost the clerk
-              // every other line they typed.
-              faceValue: [
-                null as
-                  | number
-                  | null,
-                [
-                  Validators.required,
-                  Validators.min(0.01)
-                ]
-              ],
-              chargesAmount: [
-                0,
-                [Validators.min(0)]
-              ]
-            })
-          )
-        )
-      });
-      return;
-    }
-
     // Walk-in identity is required for cash and rejected outright for an account debit — the server
     // refuses a walk-in name alongside an account — so the controls are only built when they apply.
     // Registering them unconditionally and merely hiding them would hold the form invalid on a
@@ -869,25 +474,7 @@ export class CashierIssueDdDialogComponent implements OnInit {
   }
 
   onSubmit(): void {
-    if (this.activeForm.invalid) return;
+    if (this.form.invalid) return;
-
-    // A slip closes with its lines. There is no walk-in branch here: a slip is only ever offered on
-    // a member-account debit, where the purchaser is the account holder already on record.
-    if (this.isSlip) {
-      const lines: DdSlipLineResult[] = this.slipLines.controls.map((c) => {
-        const v = c.value;
-        return {
-          beneficiaryName: (v.beneficiaryName || '').trim().toUpperCase(),
-          payableAtBranch: (v.payableAtBranch || '').trim().toUpperCase(),
-          payableAtCity: (v.payableAtCity || '').trim().toUpperCase(),
-          faceValue: Number(v.faceValue) || 0,
-          chargesAmount: Number(v.chargesAmount) || 0
-        };
-      });
-      this.dialogRef.close({ lines });
-      return;
-    }
-
     const val = this.form.value;
     const beneficiary = {
       beneficiaryName: (val.beneficiaryName || '').trim().toUpperCase(),

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

@@ -166,50 +166,23 @@
                     </div>
                     <div class="ws-f ws-f--actyp">
                       <label class="ws-f__lbl" title="Account Type">AC. TP.</label>
-                      @if (acTypLockedByToken && row === selectedRow) {
+                      <select
-                        <span
+                        class="ws-f__ctl"
-                          class="ws-f__ctl ws-f__ctl--locked"
+                        [(ngModel)]="row.acTyp"
-                          title="Locked — filled from a token-driven request, not a normal account entry"
+                        (click)="$event.stopPropagation()"
-                          >{{ acTypLockedLabel }}</span
+                        (change)="
-                        >
+                          row.acTyp === 'GL' &&
-                      } @else {
+                            row.typ !== 'Disbursement' &&
-                        <select
+                            row.typ !== 'Fund Transfer' &&
-                          class="ws-f__ctl"
+                            row.typ !== 'Enter Bank Transfer' &&
-                          [(ngModel)]="row.acTyp"
+                            (row.dbCr = 'Cr')
-                          (click)="$event.stopPropagation()"
+                        "
-                          (change)="
+                      >
-                            row.acTyp === 'GL' &&
+                        @for (a of acTypOptions; track a) {
-                              row.typ !== 'Disbursement' &&
+                          <option [value]="a">{{ a }}</option>
-                              row.typ !== 'Fund Transfer' &&
+                        }
-                              row.typ !== 'Enter Bank Transfer' &&
+                      </select>
-                              (row.dbCr = 'Cr')
-                          "
-                        >
-                          @for (a of acTypOptionsFor(row); track a) {
-                            <option [value]="a">{{ a }}</option>
-                          }
-                        </select>
-                      }
                     </div>
-                    @if (showsEntryType(row)) {
-                      <div class="ws-f ws-f--paytype">
-                        <label
-                          class="ws-f__lbl ws-f__lbl--accent"
-                          title="What this money was actually collected for — checked before a share application or DD issuance can adopt this voucher"
-                          >ENTRY TYPE</label
-                        >
-                        <select
-                          class="ws-f__ctl ws-f__ctl--accent"
-                          [(ngModel)]="row.entryTypeCvId"
-                          (click)="$event.stopPropagation()"
-                        >
-                          <option [ngValue]="null">Select…</option>
-                          @for (t of entryTypeOptions; track t.id) {
-                            <option [ngValue]="t.id">{{ t.name }}</option>
-                          }
-                        </select>
-                      </div>
-                    }
                   </div>
                 </div>
 
@@ -233,20 +206,14 @@
                               ? ddGlMapping?.ddPayableGlCode || 'Auto GL'
                               : 'Account number'
                         "
-                        [readonly]="
+                        [readonly]="row.typ === 'DD' && !isDdAccountDebitRow(row)"
-                          (row.typ === 'DD' && !isDdAccountDebitRow(row)) || (acTypLockedByToken && row === selectedRow)
+                        [class.ws-f__ctl--readonly]="row.typ === 'DD' && !isDdAccountDebitRow(row)"
-                        "
-                        [class.ws-f__ctl--readonly]="
-                          (row.typ === 'DD' && !isDdAccountDebitRow(row)) || (acTypLockedByToken && row === selectedRow)
-                        "
                         [title]="
-                          acTypLockedByToken && row === selectedRow
+                          isDdAccountDebitRow(row)
-                            ? 'Locked — filled from a token-driven request, not a normal account entry'
+                            ? 'Member account the draft is funded from'
-                            : isDdAccountDebitRow(row)
+                            : row.typ === 'DD'
-                              ? 'Member account the draft is funded from'
+                              ? 'Configured Sponsor DD Payable GL (Auto-selected)'
-                              : row.typ === 'DD'
+                              : 'Account number'
-                                ? 'Configured Sponsor DD Payable GL (Auto-selected)'
-                                : 'Account number'
                         "
                       />
                     </div>
@@ -319,13 +286,9 @@
                           [value]="row.amount ?? ''"
                           (input)="row.amount = +$any($event.target).value; syncShareLinkedAmounts()"
                           (click)="$event.stopPropagation()"
-                          [placeholder]="isMultiDdRow(row) ? 'Per draft' : row.acTyp === 'SHR' ? '0' : '0.00'"
+                          [placeholder]="row.acTyp === 'SHR' ? '0' : '0.00'"
-                          [readonly]="
+                          [readonly]="!isClerk && !!(activeWithdrawalRequest || activeClosureRequest)"
-                            isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
+                          [class.ws-amt-input--locked]="!isClerk && !!(activeWithdrawalRequest || activeClosureRequest)"
-                          "
-                          [class.ws-amt-input--locked]="
-                            isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
-                          "
                         />
                       </div>
                       @if (row.acTyp === 'SHR' && rowSharePrices[row.acNo]) {
@@ -335,19 +298,6 @@
                           }}/share</span
                         >
                       }
-                      <!-- On a slip the face value belongs to each draft, so the row total is the sum of
-                           them and is filled in by the dialog rather than typed here. A clerk-typed
-                           figure could disagree with the drafts, and the account would be debited for
-                           a total the drafts do not add up to. -->
-                      @if (isMultiDdRow(row)) {
-                        <span class="ws-f__hint">
-                          {{
-                            row.ddLines?.length
-                              ? 'Total of ' + row.ddLines?.length + ' drafts'
-                              : 'Set per draft in Fill DD Details'
-                          }}
-                        </span>
-                      }
                     </div>
                     @if (row.acTyp === 'SHR' && (row.typ === 'Enter Bank Transfer' || row.typ === 'Fund Transfer')) {
                       <div class="ws-f ws-f--cheqno">
@@ -427,36 +377,9 @@
                   <div class="ws-group ws-group--flex">
                     <span class="ws-caption">DD Charges &amp; GST — Admin Rate {{ ddGstPercentage }}%</span>
                     <div class="ws-group__fields">
-                      <!-- How many drafts this one debit funds. Typed before the details are filled in,
-                           because it is what decides how many beneficiary forms the dialog presents.
-                           Offered only where the server can honour it: a member savings/current
-                           account debit, never a GL or cash draft. -->
-                      @if (canRowBeMultiDd(row)) {
-                        <div class="ws-f ws-f--amt">
-                          <label class="ws-f__lbl" title="Number of demand drafts to raise against this single debit"
-                            >NO. OF DD</label
-                          >
-                          <div class="ws-amt-wrap">
-                            <input
-                              class="ws-f__ctl ws-amt-input"
-                              type="number"
-                              min="1"
-                              [max]="maxDdSlipLines"
-                              step="1"
-                              [value]="ddCountFor(row)"
-                              (input)="onDdCountChange(row, +$any($event.target).value)"
-                              (click)="$event.stopPropagation()"
-                              placeholder="1"
-                            />
-                          </div>
-                          @if (isMultiDdRow(row)) {
-                            <span class="ws-f__hint">One debit · {{ ddCountFor(row) }} drafts</span>
-                          }
-                        </div>
-                      }
                       <div class="ws-f ws-f--amt">
                         <label class="ws-f__lbl" title="DD issuance charges / commission">CHARGES</label>
-                        <div class="ws-amt-wrap" [class.ws-amt-wrap--locked]="isMultiDdRow(row)">
+                        <div class="ws-amt-wrap">
                           <span class="ws-amt-prefix">₹</span>
                           <input
                             class="ws-f__ctl ws-amt-input"
@@ -465,15 +388,8 @@
                             (input)="row.ddCharges = +$any($event.target).value"
                             (click)="$event.stopPropagation()"
                             placeholder="0.00"
-                            [readonly]="isMultiDdRow(row)"
-                            [class.ws-amt-input--locked]="isMultiDdRow(row)"
                           />
                         </div>
-                        <!-- Charges are levied per draft and can differ between them, so on a slip they
-                             are entered against each draft and totalled here. -->
-                        @if (isMultiDdRow(row)) {
-                          <span class="ws-f__hint">Set per draft</span>
-                        }
                       </div>
                       <div class="ws-f ws-f--amt">
                         <label class="ws-f__lbl" title="GST on charges, at the admin-configured rate">
@@ -484,7 +400,7 @@
                           <input
                             class="ws-f__ctl ws-amt-input ws-amt-input--locked"
                             type="text"
-                            [value]="ddGstDisplayFor(row)"
+                            [value]="ddGstAmountFor(row) | number: '1.2-2'"
                             readonly
                           />
                         </div>
@@ -498,7 +414,7 @@
                           <input
                             class="ws-f__ctl ws-amt-input ws-amt-input--locked"
                             type="text"
-                            [value]="ddTotalDisplayFor(row)"
+                            [value]="ddTotalPayableFor(row)"
                             readonly
                           />
                         </div>
@@ -511,28 +427,13 @@
                           [disabled]="saving"
                           (click)="openIssueWalkinDd(row); $event.stopPropagation()"
                           [title]="
-                            isMultiDdRow(row)
+                            isDdAccountDebitRow(row)
-                              ? 'Opens one beneficiary form per draft; DD numbers are allocated on submission'
+                              ? 'Auto-selects next available leaflet and opens the beneficiary form'
-                              : isDdAccountDebitRow(row)
+                              : 'Auto-selects next available leaflet and opens walk-in purchaser form'
-                                ? 'Auto-selects next available leaflet and opens the beneficiary form'
-                                : 'Auto-selects next available leaflet and opens walk-in purchaser form'
                           "
                         >
-                          <mat-icon style="font-size: 18px; width: 18px; height: 18px">{{
+                          <mat-icon style="font-size: 18px; width: 18px; height: 18px">post_add</mat-icon>
-                            row.ddDetails || row.ddLines?.length ? 'edit_note' : 'post_add'
+                          <span>Fill DD Details &amp; Send for Approval</span>
-                          }}</mat-icon>
-                          <!-- Names the leaflet once details are captured, so the clerk can see at a
-                               glance which rows are ready before pressing Save. A slip names the count
-                               instead: its numbers are not allocated until it is submitted. -->
-                          <span>{{
-                            row.ddLines?.length
-                              ? row.ddLines?.length + ' Drafts Captured · Edit Slip'
-                              : row.ddDetails
-                                ? 'DD ' + row.ddDetails.ddNumber + ' · Edit Details'
-                                : isMultiDdRow(row)
-                                  ? 'Fill ' + ddCountFor(row) + ' DD Details'
-                                  : 'Fill DD Details'
-                          }}</span>
                         </button>
                       </div>
                     </div>
@@ -1616,50 +1517,23 @@
                         </div>
                         <div class="ws-f ws-f--actyp">
                           <label class="ws-f__lbl">AC. TP.</label>
-                          @if (acTypLockedByToken && row === selectedRow) {
+                          <select
-                            <span
+                            class="ws-f__ctl"
-                              class="ws-f__ctl ws-f__ctl--locked"
+                            [(ngModel)]="row.acTyp"
-                              title="Locked — filled from a token-driven request, not a normal account entry"
+                            (click)="$event.stopPropagation()"
-                              >{{ acTypLockedLabel }}</span
+                            (change)="
-                            >
+                              row.acTyp === 'GL' &&
-                          } @else {
+                                row.typ !== 'Disbursement' &&
-                            <select
+                                row.typ !== 'Fund Transfer' &&
-                              class="ws-f__ctl"
+                                row.typ !== 'Enter Bank Transfer' &&
-                              [(ngModel)]="row.acTyp"
+                                (row.dbCr = 'Cr')
-                              (click)="$event.stopPropagation()"
+                            "
-                              (change)="
+                          >
-                                row.acTyp === 'GL' &&
+                            @for (a of acTypOptions; track a) {
-                                  row.typ !== 'Disbursement' &&
+                              <option [value]="a">{{ a }}</option>
-                                  row.typ !== 'Fund Transfer' &&
+                            }
-                                  row.typ !== 'Enter Bank Transfer' &&
+                          </select>
-                                  (row.dbCr = 'Cr')
-                              "
-                            >
-                              @for (a of acTypOptionsFor(row); track a) {
-                                <option [value]="a">{{ a }}</option>
-                              }
-                            </select>
-                          }
                         </div>
-                        @if (showsEntryType(row)) {
-                          <div class="ws-f ws-f--paytype">
-                            <label
-                              class="ws-f__lbl ws-f__lbl--accent"
-                              title="What this money was actually collected for — checked before a share application or DD issuance can adopt this voucher"
-                              >ENTRY TYPE</label
-                            >
-                            <select
-                              class="ws-f__ctl ws-f__ctl--accent"
-                              [(ngModel)]="row.entryTypeCvId"
-                              (click)="$event.stopPropagation()"
-                            >
-                              <option [ngValue]="null">Select…</option>
-                              @for (t of entryTypeOptions; track t.id) {
-                                <option [ngValue]="t.id">{{ t.name }}</option>
-                              }
-                            </select>
-                          </div>
-                        }
                       </div>
                     </div>
                     <div class="ws-vdivider"></div>
@@ -1676,16 +1550,10 @@
                             [placeholder]="
                               row.typ === 'DD' ? ddGlMapping?.ddPayableGlCode || 'Auto GL' : 'Account number'
                             "
-                            [readonly]="row.typ === 'DD' || (acTypLockedByToken && row === selectedRow)"
+                            [readonly]="row.typ === 'DD'"
-                            [class.ws-f__ctl--readonly]="
+                            [class.ws-f__ctl--readonly]="row.typ === 'DD'"
-                              row.typ === 'DD' || (acTypLockedByToken && row === selectedRow)
-                            "
                             [title]="
-                              acTypLockedByToken && row === selectedRow
+                              row.typ === 'DD' ? 'Configured Sponsor DD Payable GL (Auto-selected)' : 'Account number'
-                                ? 'Locked — filled from a token-driven request, not a normal account entry'
-                                : row.typ === 'DD'
-                                  ? 'Configured Sponsor DD Payable GL (Auto-selected)'
-                                  : 'Account number'
                             "
                           />
                         </div>
@@ -1754,12 +1622,10 @@
                               [value]="row.amount ?? ''"
                               (input)="row.amount = +$any($event.target).value; syncShareLinkedAmounts()"
                               (click)="$event.stopPropagation()"
-                              [placeholder]="isMultiDdRow(row) ? 'Per draft' : row.acTyp === 'SHR' ? '0' : '0.00'"
+                              [placeholder]="row.acTyp === 'SHR' ? '0' : '0.00'"
-                              [readonly]="
+                              [readonly]="!isClerk && !!(activeWithdrawalRequest || activeClosureRequest)"
-                                isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
-                              "
                               [class.ws-amt-input--locked]="
-                                isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
+                                !isClerk && !!(activeWithdrawalRequest || activeClosureRequest)
                               "
                             />
                           </div>
@@ -1770,19 +1636,6 @@
                               }}/share</span
                             >
                           }
-                          <!-- On a slip the face value belongs to each draft, so the row total is the
-                               sum of them and is filled in by the dialog rather than typed here. A
-                               clerk-typed figure could disagree with the drafts, and the account would
-                               be debited for a total the drafts do not add up to. -->
-                          @if (isMultiDdRow(row)) {
-                            <span class="ws-f__hint">
-                              {{
-                                row.ddLines?.length
-                                  ? 'Total of ' + row.ddLines?.length + ' drafts'
-                                  : 'Set per draft in Fill DD Details'
-                              }}
-                            </span>
-                          }
                         </div>
                         @if (
                           row.acTyp === 'SHR' && (row.typ === 'Enter Bank Transfer' || row.typ === 'Fund Transfer')
@@ -1847,38 +1700,9 @@
                       <div class="ws-group ws-group--flex">
                         <span class="ws-caption">DD Charges &amp; GST — Admin Rate {{ ddGstPercentage }}%</span>
                         <div class="ws-group__fields">
-                          <!-- How many drafts this one debit funds. Typed before the details are filled
-                               in, because it is what decides how many beneficiary forms the dialog
-                               presents. Offered only where the server can honour it: a member
-                               savings/current account debit, never a GL or cash draft. -->
-                          @if (canRowBeMultiDd(row)) {
-                            <div class="ws-f ws-f--amt">
-                              <label
-                                class="ws-f__lbl"
-                                title="Number of demand drafts to raise against this single debit"
-                                >NO. OF DD</label
-                              >
-                              <div class="ws-amt-wrap">
-                                <input
-                                  class="ws-f__ctl ws-amt-input"
-                                  type="number"
-                                  min="1"
-                                  [max]="maxDdSlipLines"
-                                  step="1"
-                                  [value]="ddCountFor(row)"
-                                  (input)="onDdCountChange(row, +$any($event.target).value)"
-                                  (click)="$event.stopPropagation()"
-                                  placeholder="1"
-                                />
-                              </div>
-                              @if (isMultiDdRow(row)) {
-                                <span class="ws-f__hint">One debit · {{ ddCountFor(row) }} drafts</span>
-                              }
-                            </div>
-                          }
                           <div class="ws-f ws-f--amt">
                             <label class="ws-f__lbl" title="DD issuance charges / commission">CHARGES</label>
-                            <div class="ws-amt-wrap" [class.ws-amt-wrap--locked]="isMultiDdRow(row)">
+                            <div class="ws-amt-wrap">
                               <span class="ws-amt-prefix">₹</span>
                               <input
                                 class="ws-f__ctl ws-amt-input"
@@ -1887,15 +1711,8 @@
                                 (input)="row.ddCharges = +$any($event.target).value"
                                 (click)="$event.stopPropagation()"
                                 placeholder="0.00"
-                                [readonly]="isMultiDdRow(row)"
-                                [class.ws-amt-input--locked]="isMultiDdRow(row)"
                               />
                             </div>
-                            <!-- Charges are levied per draft and can differ between them, so on a slip
-                                 they are entered against each draft and totalled here. -->
-                            @if (isMultiDdRow(row)) {
-                              <span class="ws-f__hint">Set per draft</span>
-                            }
                           </div>
                           <div class="ws-f ws-f--amt">
                             <label class="ws-f__lbl" title="GST on charges, at the admin-configured rate">
@@ -1906,7 +1723,7 @@
                               <input
                                 class="ws-f__ctl ws-amt-input ws-amt-input--locked"
                                 type="text"
-                                [value]="ddGstDisplayFor(row)"
+                                [value]="ddGstAmountFor(row) | number: '1.2-2'"
                                 readonly
                               />
                             </div>
@@ -1920,7 +1737,7 @@
                               <input
                                 class="ws-f__ctl ws-amt-input ws-amt-input--locked"
                                 type="text"
-                                [value]="ddTotalDisplayFor(row)"
+                                [value]="ddTotalPayableFor(row)"
                                 readonly
                               />
                             </div>
@@ -1933,28 +1750,13 @@
                               [disabled]="saving"
                               (click)="openIssueWalkinDd(row); $event.stopPropagation()"
                               [title]="
-                                isMultiDdRow(row)
+                                isDdAccountDebitRow(row)
-                                  ? 'Opens one beneficiary form per draft; DD numbers are allocated on submission'
+                                  ? 'Auto-selects next available leaflet and opens the beneficiary form'
-                                  : isDdAccountDebitRow(row)
+                                  : 'Auto-selects next available leaflet and opens walk-in purchaser form'
-                                    ? 'Auto-selects next available leaflet and opens the beneficiary form'
-                                    : 'Auto-selects next available leaflet and opens walk-in purchaser form'
                               "
                             >
-                              <mat-icon style="font-size: 18px; width: 18px; height: 18px">{{
+                              <mat-icon style="font-size: 18px; width: 18px; height: 18px">post_add</mat-icon>
-                                row.ddDetails || row.ddLines?.length ? 'edit_note' : 'post_add'
+                              <span>Fill DD Details &amp; Send for Approval</span>
-                              }}</mat-icon>
-                              <!-- Names what has been captured, so the clerk can see at a glance which
-                                   rows are ready before pressing Save. A slip names its count instead:
-                                   its numbers are not allocated until it is submitted. -->
-                              <span>{{
-                                row.ddLines?.length
-                                  ? row.ddLines?.length + ' Drafts Captured · Edit Slip'
-                                  : row.ddDetails
-                                    ? 'DD ' + row.ddDetails.ddNumber + ' · Edit Details'
-                                    : isMultiDdRow(row)
-                                      ? 'Fill ' + ddCountFor(row) + ' DD Details'
-                                      : 'Fill DD Details'
-                              }}</span>
                             </button>
                           </div>
                         </div>

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

@@ -916,20 +916,6 @@ input.ws-f__ctl--readonly {
   font-size: 11px;
 }
 
-/* AC.TP shown as a locked label instead of the normal editable select, while the row is filled
-   from a token-driven request whose real account type row.acTyp cannot show (see
-   acTypLockedByToken in the component). */
-span.ws-f__ctl--locked {
-  display: inline-flex;
-  align-items: center;
-  background: #f1f5f9;
-  color: #475569;
-  cursor: not-allowed;
-  user-select: none;
-  font-size: 11px;
-  font-weight: 600;
-}
-
 input.ws-amt-input--locked {
   background: #fef9c3;
   color: #713f12;

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

@@ -969,11 +969,6 @@
           createClientForm.get('alternateMobileNo')?.touched
         ) {
           <mat-error>Enter valid 10-digit number (starts with 6-9)</mat-error>
-        } @else if (
-          createClientForm.get('alternateMobileNo')?.hasError('sameAsMobile') &&
-          createClientForm.get('alternateMobileNo')?.touched
-        ) {
-          <mat-error>Alternate number can't be the same as Mobile No</mat-error>
         }
       </mat-form-field>
 
@@ -984,11 +979,7 @@
             color="primary"
             type="button"
             class="verify-btn"
-            [disabled]="
+            [disabled]="readOnly || createClientForm.get('alternateMobileNo')?.value?.length !== 10"
-              readOnly ||
-              createClientForm.get('alternateMobileNo')?.value?.length !== 10 ||
-              createClientForm.get('alternateMobileNo')?.hasError('sameAsMobile')
-            "
             (click)="verifyAlternateDIP()"
           >
             <fa-icon icon="shield-alt" class="m-r-10"></fa-icon>

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

@@ -25,10 +25,7 @@ import {
   UntypedFormGroup,
   Validators,
   UntypedFormControl,
-  ReactiveFormsModule,
+  ReactiveFormsModule
-  ValidatorFn,
-  AbstractControl,
-  ValidationErrors
 } from '@angular/forms';
 import { Subject, Subscription, merge } from 'rxjs';
 import { filter, switchMap, takeUntil } from 'rxjs/operators';
@@ -925,16 +922,6 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
     }
   }
 
-  /** Alternate Mobile No must differ from Mobile No — the same number saved in both fields is
-   *  meaningless (there's no second contact route) and the DIP checks would just repeat. */
-  private notSameAsMobileNoValidator(): ValidatorFn {
-    return (control: AbstractControl): ValidationErrors | null => {
-      const value = control.value;
-      const mobileNo = control.parent?.get('mobileNo')?.value;
-      return value && mobileNo && value === mobileNo ? { sameAsMobile: true } : null;
-    };
-  }
-
   /**
    * Creates the client form.
    */
@@ -974,8 +961,7 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
         '',
         [
           Validators.pattern(/^[6-9]\d{9}$/),
-          Validators.maxLength(10),
+          Validators.maxLength(10)
-          this.notSameAsMobileNoValidator()
         ]
       ],
       emailAddress: [
@@ -1348,10 +1334,6 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
         // invalid) and its own reset never had a chance to run.
         this.mobileOtpVerified = false;
         this.mobileNewOtpId = null;
-        // Alternate Mobile No's "not same as Mobile No" validator reads mobileNo's current
-        // value, so re-run it here too — otherwise fixing mobileNo away from a clash leaves
-        // the alternate field's error stuck until the user also edits that field.
-        this.createClientForm.get('alternateMobileNo')?.updateValueAndValidity({ emitEvent: false });
       });
 
     this.createClientForm

src/app/clients/client-stepper/client-india-address-step/client-india-address-step.component.html

@@ -221,22 +221,6 @@
                 <mat-datepicker #addrIssueDatePicker></mat-datepicker>
               </mat-form-field>
             }
-            <mat-form-field appearance="outline" class="addr-ff">
-              <mat-label>Expiry date (optional)</mat-label>
-              <span matPrefix class="addr-prefix"><mat-icon>event_busy</mat-icon></span>
-              <input
-                matInput
-                [matDatepicker]="addrExpiryDatePicker"
-                formControlName="expiryDate"
-                [readonly]="readOnly || isAddressProofLinkedToKyc"
-              />
-              <mat-datepicker-toggle
-                matSuffix
-                [for]="addrExpiryDatePicker"
-                [disabled]="readOnly || isAddressProofLinkedToKyc"
-              ></mat-datepicker-toggle>
-              <mat-datepicker #addrExpiryDatePicker></mat-datepicker>
-            </mat-form-field>
           </div>
 
           <div class="addr-upload-grid" [class.addr-upload-grid--two]="selectedAddrProof.sides === 2">
@@ -254,18 +238,14 @@
               @if (existingAddressProofDocuments.length > 0 && !addrFiles.front && readOnly) {
                 <div class="addr-dropzone addr-dropzone--has addr-dropzone--locked">
                   <div class="addr-dropzone__existing">
-                    @if (existingAddrFrontSlotPreview) {
+                    @if (addrMergedPreview) {
-                      <img
+                      <img [src]="addrMergedPreview" alt="Saved address proof" class="addr-dropzone__thumb" />
-                        [src]="existingAddrFrontSlotPreview"
-                        alt="Saved address proof"
-                        class="addr-dropzone__thumb"
-                      />
                     } @else {
                       <mat-icon class="addr-dropzone__doc-ic">description</mat-icon>
                     }
                     <div class="addr-dropzone__existing-meta">
                       <span class="addr-dropzone__existing-name">
-                        {{ existingAddrFrontSlotName }}
+                        {{ existingAddressProofDocuments[0].fileName || existingAddressProofDocuments[0].name }}
                       </span>
                       <button type="button" class="addr-dropzone__view" (click)="viewExistingAddressProof()">
                         <mat-icon>visibility</mat-icon>
@@ -298,18 +278,14 @@
                     <!-- Edit mode WITH existing doc — let the user view it OR
                          click anywhere to replace. -->
                     <div class="addr-dropzone__existing">
-                      @if (existingAddrFrontSlotPreview) {
+                      @if (addrMergedPreview) {
-                        <img
+                        <img [src]="addrMergedPreview" alt="Saved address proof" class="addr-dropzone__thumb" />
-                          [src]="existingAddrFrontSlotPreview"
-                          alt="Saved address proof"
-                          class="addr-dropzone__thumb"
-                        />
                       } @else {
                         <mat-icon class="addr-dropzone__doc-ic">description</mat-icon>
                       }
                       <div class="addr-dropzone__existing-meta">
                         <span class="addr-dropzone__existing-name">
-                          {{ existingAddrFrontSlotName }}
+                          {{ existingAddressProofDocuments[0].fileName || existingAddressProofDocuments[0].name }}
                         </span>
                         <div class="addr-dropzone__existing-actions">
                           <button
@@ -351,18 +327,14 @@
                 @if (existingAddressProofDocuments.length > 0 && !addrFiles.back && readOnly) {
                   <div class="addr-dropzone addr-dropzone--has addr-dropzone--locked">
                     <div class="addr-dropzone__existing">
-                      @if (existingAddrBackSlotPreview) {
+                      @if (addrMergedPreview) {
-                        <img
+                        <img [src]="addrMergedPreview" alt="Saved address proof" class="addr-dropzone__thumb" />
-                          [src]="existingAddrBackSlotPreview"
-                          alt="Saved address proof"
-                          class="addr-dropzone__thumb"
-                        />
                       } @else {
                         <mat-icon class="addr-dropzone__doc-ic">description</mat-icon>
                       }
                       <div class="addr-dropzone__existing-meta">
                         <span class="addr-dropzone__existing-name">
-                          {{ existingAddrBackSlotName }}
+                          {{ existingAddressProofDocuments[0].fileName || existingAddressProofDocuments[0].name }}
                         </span>
                         <button type="button" class="addr-dropzone__view" (click)="viewExistingAddressProof()">
                           <mat-icon>visibility</mat-icon>
@@ -395,18 +367,14 @@
                       <!-- Edit mode WITH existing combined doc — same view + replace
                            pattern as the front slot, anchored to the saved file. -->
                       <div class="addr-dropzone__existing">
-                        @if (existingAddrBackSlotPreview) {
+                        @if (addrMergedPreview) {
-                          <img
+                          <img [src]="addrMergedPreview" alt="Saved address proof" class="addr-dropzone__thumb" />
-                            [src]="existingAddrBackSlotPreview"
-                            alt="Saved address proof"
-                            class="addr-dropzone__thumb"
-                          />
                         } @else {
                           <mat-icon class="addr-dropzone__doc-ic">description</mat-icon>
                         }
                         <div class="addr-dropzone__existing-meta">
                           <span class="addr-dropzone__existing-name">
-                            {{ existingAddrBackSlotName }}
+                            {{ existingAddressProofDocuments[0].fileName || existingAddressProofDocuments[0].name }}
                           </span>
                           <div class="addr-dropzone__existing-actions">
                             <button

src/app/clients/client-stepper/client-india-address-step/client-india-address-step.component.ts

@@ -102,8 +102,7 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
       Validators.required
     ],
     documentKey: [''],
-    issueDate: [''],
+    issueDate: ['']
-    expiryDate: ['']
   });
 
   currentForm: UntypedFormGroup = this.fb.group({
@@ -223,12 +222,6 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
     size: number;
     previewUrl: string | null;
   }[] = [];
-  /** Set only when the saved documents are separately-uploaded "<Proof> — Front"/"— Back"
-   *  files (the CKYC tab / client-kyc-step convention) rather than this component's own single
-   *  merged-PNG upload — lets the two slots show their own file instead of both showing
-   *  whichever one happened to be first. */
-  private existingAddrFrontPreview: string | null = null;
-  private existingAddrBackPreview: string | null = null;
 
   residenceTypes = [
     'Owned',
@@ -314,10 +307,11 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
           this.existingAddressProofDocuments = [];
           if (this.existingKycDocSides.front) this.existingAddressProofDocuments.push(this.existingKycDocSides.front);
           if (this.existingKycDocSides.back) this.existingAddressProofDocuments.push(this.existingKycDocSides.back);
-          // These already carry their own per-side preview from the KYC step's own mapping —
+          if (this.existingKycDocSides.front?.previewUrl) {
-          // keep the two slots distinct rather than collapsing them into one shared preview.
+            this.addrMergedPreview = this.existingKycDocSides.front.previewUrl;
-          this.existingAddrFrontPreview = this.existingKycDocSides.front?.previewUrl || null;
+          } else if (this.existingKycDocSides.back?.previewUrl) {
-          this.existingAddrBackPreview = this.existingKycDocSides.back?.previewUrl || null;
+            this.addrMergedPreview = this.existingKycDocSides.back.previewUrl;
+          }
           this.existingAddressProofIdentifierId = this.existingKycIdentifierId;
         }
       } else if (this.isAddressProofLinkedToKyc) {
@@ -333,8 +327,6 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
     this.currentForm.patchValue({ documentKey: '', issueDate: null });
     this.addrFiles = { front: null, back: null };
     this.addrMergedPreview = null;
-    this.existingAddrFrontPreview = null;
-    this.existingAddrBackPreview = null;
   }
 
   /**
@@ -364,8 +356,6 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
     this.addrFiles = { front: null, back: null };
     this.addrMergedFile = null;
     this.addrMergedPreview = null;
-    this.existingAddrFrontPreview = null;
-    this.existingAddrBackPreview = null;
     this.existingAddressProofIdentifierId = null;
     this.existingAddressProofDocuments = [];
     this.addressLoaded = false;
@@ -498,7 +488,6 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
     proofId: any;
     documentKey: string;
     issueDate: string;
-    expiryDate: string;
     files: { slot: string; file: File }[];
   } {
     const files: { slot: string; file: File }[] = [];
@@ -511,13 +500,11 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
       }
     }
     const rawIssueDate = this.permanentForm.get('issueDate')?.value;
-    const rawExpiryDate = this.permanentForm.get('expiryDate')?.value;
     return {
       proof: this.selectedAddrProof,
       proofId: this.permanentForm.get('proofId')?.value || '',
       documentKey: this.permanentForm.get('documentKey')?.value || '',
       issueDate: rawIssueDate ? this.dates.getDate(rawIssueDate) : '',
-      expiryDate: rawExpiryDate ? this.dates.getDate(rawExpiryDate) : '',
       files
     };
   }
@@ -657,14 +644,7 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
           this.tryLinkKycData();
           return;
         }
-        // Aadhaar, Passport, Voter ID and Driving Licence are valid OVDs for both this slot and
+        const identifier = identifiers.find((i: any) => this.findMatchingProof(i?.documentType?.name));
-        // the separate identity-proof one (client-kyc-step) — when a client has two such
-        // dual-purpose identifiers, that step always runs first and picks the OLDEST match (the
-        // one on file first, historically the identity proof), so picking the NEWEST match here
-        // lands this step on the other row without the two steps needing to coordinate.
-        const identifier = [...identifiers]
-          .sort((a: any, b: any) => (b?.id ?? 0) - (a?.id ?? 0))
-          .find((i: any) => this.findMatchingProof(i?.documentType?.name));
         if (!identifier?.id) {
           this.existingAddressProofCheckComplete = true;
           this.tryLinkKycData();
@@ -684,19 +664,14 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
             proofId: matchedProof.id,
             documentKey: identifier.documentKey || ''
           });
-          // The description carries "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" when set on
+          // The description carries `Issue date: yyyy-MM-dd` when set on create (see
-          // create (see create-client.saveAddressProof / CkycTabComponent) — pull both out so the
+          // create-client.saveAddressProof) — pull it out so the form's issueDate field
-          // form's date fields show what was previously entered. Each match stops at the next
+          // shows what was previously entered.
-          // comma so adding expiry after issue doesn't get swallowed into the issue-date capture.
           const desc: string = identifier.description || '';
-          const issueMatch = desc.match(/Issue date:\s*([^,|]+)/i);
+          const issueMatch = desc.match(/Issue date:\s*(.+)$/i);
-          const expiryMatch = desc.match(/Expiry date:\s*([^,|]+)/i);
           if (issueMatch) {
             this.permanentForm.patchValue({ issueDate: this.dates.parseDate(issueMatch[1].trim()) });
           }
-          if (expiryMatch) {
-            this.permanentForm.patchValue({ expiryDate: this.dates.parseDate(expiryMatch[1].trim()) });
-          }
         }
 
         this.clientsService.getClientIdentificationDocuments(this.existingAddressProofIdentifierId).subscribe({
@@ -710,29 +685,6 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
               size: d.size || 0,
               previewUrl: null as string | null
             }));
-
-            const sideOf = (d: { name: string; fileName: string }): 'front' | 'back' | null => {
-              const text = `${d.name || ''} ${d.fileName || ''}`.toLowerCase();
-              if (text.includes('back')) return 'back';
-              if (text.includes('front')) return 'front';
-              return null;
-            };
-            // Changing the document type (e.g. Aadhaar -> Passport) keeps the old front/back
-            // files attached to this same identifier rather than removing them, so there can be
-            // more than one "— Front"/"— Back" pair on file — sort newest-first before matching
-            // or this would keep showing the very first scan ever uploaded here.
-            const byNewest = [...this.existingAddressProofDocuments].sort((a, b) => Number(b.id) - Number(a.id));
-            const frontDoc = byNewest.find((d) => sideOf(d) === 'front');
-            const backDoc = byNewest.find((d) => sideOf(d) === 'back');
-
-            if (frontDoc || backDoc) {
-              // Separately-uploaded front/back — each side gets its own preview.
-              if (frontDoc) this.downloadAddrSidePreview(frontDoc, 'front');
-              if (backDoc) this.downloadAddrSidePreview(backDoc, 'back');
-              return;
-            }
-
-            // Legacy/single-file case: one combined (or unlabelled) document covers both slots.
             const firstImage = this.existingAddressProofDocuments.find((d) =>
               (d.type || '').toLowerCase().startsWith('image/')
             );
@@ -763,50 +715,6 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
     });
   }
 
-  private downloadAddrSidePreview(doc: { id: string; fileName: string; name: string }, slot: 'front' | 'back'): void {
-    this.clientsService.downloadClientIdentificationDocument(this.existingAddressProofIdentifierId!, doc.id).subscribe({
-      next: async (blob: any) => {
-        const buffer = await blob.arrayBuffer();
-        const bytes = new Uint8Array(buffer);
-        let binary = '';
-        for (let i = 0; i < bytes.length; i++) {
-          binary += String.fromCharCode(bytes[i]);
-        }
-        const url = 'data:' + blob.type + ';base64,' + btoa(binary);
-        if (slot === 'front') this.existingAddrFrontPreview = url;
-        else this.existingAddrBackPreview = url;
-      },
-      error: () => {}
-    });
-  }
-
-  /** What the Front slot should show: its own saved file when front/back were uploaded
-   *  separately, falling back to the single combined preview for legacy/merged uploads. */
-  get existingAddrFrontSlotPreview(): string | null {
-    return this.existingAddrFrontPreview || this.addrMergedPreview;
-  }
-
-  get existingAddrFrontSlotName(): string {
-    const front = this.existingAddressProofDocuments.find((d) =>
-      `${d.name} ${d.fileName}`.toLowerCase().includes('front')
-    );
-    const doc = front || this.existingAddressProofDocuments[0];
-    return doc?.fileName || doc?.name || '';
-  }
-
-  /** Same as above, for the Back slot. */
-  get existingAddrBackSlotPreview(): string | null {
-    return this.existingAddrBackPreview || this.addrMergedPreview;
-  }
-
-  get existingAddrBackSlotName(): string {
-    const back = this.existingAddressProofDocuments.find((d) =>
-      `${d.name} ${d.fileName}`.toLowerCase().includes('back')
-    );
-    const doc = back || this.existingAddressProofDocuments[0];
-    return doc?.fileName || doc?.name || '';
-  }
-
   onPinInput(tab: string) {
     const form = this.getForm(tab);
     const pin = form.get('pinCode')?.value?.replace(/\D/g, '') || '';

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

@@ -7,7 +7,6 @@
  */
 
 import { Component, Input, OnInit, OnChanges, OnDestroy, SimpleChanges, inject } from '@angular/core';
-import { forkJoin, catchError, of } from 'rxjs';
 import { UntypedFormBuilder, UntypedFormGroup, Validators, FormsModule } from '@angular/forms';
 import {
   MatDialog,
@@ -1267,14 +1266,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
         this.loadExistingKycIdentifier(data?.kycDocumentName);
       },
       error: () => {
-        // No m_client_kyc row yet (e.g. CERSAI sync hasn't run) — that's fine, but the client
+        // No existing KYC — that's fine for new clients
-        // can still have a KYC-type identifier already on file (uploaded via the CKYC tab,
-        // which writes straight to client_identifier and never touches this record). Look it
-        // up the same way the success branch does, just without a document-name hint.
         this.kycLoaded = true;
-        this.loadExistingPhoto();
-        this.loadExistingSignature();
-        this.loadExistingKycIdentifier(undefined);
       }
     });
   }
@@ -1290,13 +1283,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
    */
   private loadExistingKycIdentifier(kycDocumentName: string | undefined): void {
     if (!this.clientId) return;
-    forkJoin({
+    this.clientsService.getClientIdentifiers(this.clientId).subscribe({
-      identifiers: this.clientsService.getClientIdentifiers(this.clientId),
+      next: (identifiers: any[]) => {
-      // Only needed to spot the dual-purpose OVD types (Aadhaar/Passport/Voter ID/Driving
-      // Licence) below — a failure here just means that disambiguation step is skipped.
-      proofTypes: this.clientsService.getKycProofTypes().pipe(catchError(() => of({ addressProofs: [] })))
-    }).subscribe({
-      next: ({ identifiers, proofTypes }: { identifiers: any[]; proofTypes: any }) => {
         if (!identifiers || identifiers.length === 0) return;
         const cleanStr = (s: string) => (s || '').toLowerCase().replace(/[^a-z0-9]/g, '');
         const isKycType = (i: any) => {
@@ -1309,13 +1297,6 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
             })
           );
         };
-        // Aadhaar, Passport, Voter ID and Driving Licence are valid OVDs for BOTH this slot and
-        // the separate address-proof one (client-india-address-step) — a client with, say, a PAN
-        // identity proof and an Aadhaar address proof has two client_identifier rows that both
-        // pass isKycType. Without a name to go on, prefer whichever candidate is NOT also an
-        // address-proof type, so this slot doesn't grab the other step's file.
-        const addressTypeNames = new Set<string>((proofTypes?.addressProofs || []).map((p: any) => cleanStr(p?.name)));
-        const isAddressType = (i: any) => addressTypeNames.has(cleanStr(i?.documentType?.name));
         // Re-uploading a KYC document creates a new identifier row rather than updating the
         // old one in place (same pattern as OVD identifiers), so sort newest-first before
         // picking — otherwise a repeat upload of the same document type would keep showing
@@ -1330,15 +1311,7 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
               return name === kName || name.includes(kName) || kName.includes(name);
             })
           : null;
-        // Last resort, when EVERY kyc-type candidate is also address-eligible (e.g. a client
+        const identifier = match || sorted.find(isKycType);
-        // whose identity proof and address proof are both Aadhaar/Passport/Voter ID/Driving
-        // Licence): this stepper always runs before the address step in both the create and
-        // edit wizards, so the identity proof is the one that was on file first — pick the
-        // OLDEST match here, and the address step (client-india-address-step) picks the NEWEST
-        // among ITS own address-eligible candidates, so the two steps land on different rows
-        // without needing to coordinate at runtime.
-        const identifier =
-          match || sorted.find((i) => isKycType(i) && !isAddressType(i)) || [...sorted].reverse().find(isKycType);
         if (!identifier?.id) return;
 
         this.existingKycIdentifierId = identifier.id.toString();
@@ -1354,19 +1327,6 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
             kycDocumentNumber: identifier.documentKey || ''
           });
         }
-        // Same for issue/expiry date — the CKYC tab (and client-india-address-step, for address
-        // proof) write "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" into the identifier's
-        // description; read it back here only to fill in whatever the KYC record itself doesn't
-        // already have, same as the documentKey backfill above.
-        const desc: string = identifier?.description || '';
-        const issueMatch = desc.match(/Issue date:\s*([^,|]+)/i);
-        const expiryMatch = desc.match(/Expiry date:\s*([^,|]+)/i);
-        if (issueMatch && !this.kycForm.get('kycDocIssueDate')?.value) {
-          this.kycForm.patchValue({ kycDocIssueDate: this.parseApiDate(issueMatch[1].trim()) });
-        }
-        if (expiryMatch && !this.kycForm.get('kycDocExpiryDate')?.value) {
-          this.kycForm.patchValue({ kycDocExpiryDate: this.parseApiDate(expiryMatch[1].trim()) });
-        }
 
         this.clientsService.getClientIdentificationDocuments(this.existingKycIdentifierId).subscribe({
           next: (docs: any[]) => {

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

@@ -187,6 +187,124 @@
     }
 
     <div class="ckyc-upload-grid">
+      <!-- ID Proof Document -->
+      <mat-card class="ckyc-upload-card">
+        <mat-card-content>
+          <div class="ckyc-upload-header">
+            <mat-icon class="ckyc-upload-icon">badge</mat-icon>
+            <span>{{ 'labels.inputs.ID Proof Document' | translate }}</span>
+          </div>
+
+          @if (existing.ID_PROOF.present) {
+            <div class="ckyc-existing">
+              <div class="ckyc-existing__head">
+                <fa-icon icon="check-circle" class="ckyc-existing__ok"></fa-icon>
+                <div>
+                  <strong>Already available</strong>
+                  <span class="ckyc-existing__source">from {{ existing.ID_PROOF.source }}</span>
+                  @if (existing.ID_PROOF.previewUnavailable) {
+                    <span class="ckyc-existing__warn">stored file unavailable</span>
+                  }
+                </div>
+              </div>
+              @if (existing.ID_PROOF.previewUrl && isImage('ID_PROOF')) {
+                <img [src]="existing.ID_PROOF.previewUrl" alt="ID proof" class="ckyc-existing__thumb" />
+              }
+              @if (existing.ID_PROOF.previewUrl) {
+                <button mat-stroked-button type="button" class="ckyc-existing__view" (click)="openDocument('ID_PROOF')">
+                  <fa-icon icon="eye"></fa-icon>
+                  &nbsp;View document
+                </button>
+              }
+              <div class="ckyc-existing__meta">
+                <fa-icon icon="file-alt"></fa-icon>
+                <span>{{ existing.ID_PROOF.name }}</span>
+                @if (existing.ID_PROOF.documentKey) {
+                  <span class="ckyc-existing__key">{{ existing.ID_PROOF.documentKey }}</span>
+                }
+                @if (existing.ID_PROOF.fileCount && existing.ID_PROOF.fileCount > 0) {
+                  <span class="ckyc-existing__count">
+                    {{ existing.ID_PROOF.fileCount }}
+                    {{ existing.ID_PROOF.fileCount === 1 ? 'file' : 'files' }}
+                  </span>
+                }
+              </div>
+              <button
+                mat-stroked-button
+                type="button"
+                class="ckyc-existing__replace"
+                (click)="toggleReplace('ID_PROOF')"
+              >
+                <fa-icon [icon]="existing.ID_PROOF.expanded ? 'times' : 'upload'"></fa-icon>
+                {{ existing.ID_PROOF.expanded ? 'Cancel replace' : 'Upload new version' }}
+              </button>
+            </div>
+          }
+
+          @if (!existing.ID_PROOF.present || existing.ID_PROOF.expanded) {
+            <p class="ckyc-upload-hint">{{ 'labels.inputs.Accepted formats' | translate }}: PNG, JPEG, JPG, PDF</p>
+            <div class="ckyc-file-row">
+              <input
+                type="file"
+                #idProofInput
+                accept=".png,.jpeg,.jpg,.pdf"
+                (change)="onFileSelect($event, 'ID_PROOF')"
+                [style.display]="'none'"
+              />
+              <mat-form-field appearance="outline" class="ckyc-file-name-field">
+                <input
+                  matInput
+                  [readonly]="true"
+                  [value]="idProofFile?.name || ''"
+                  [placeholder]="'labels.text.NoFileSelected' | translate"
+                />
+              </mat-form-field>
+              <button mat-stroked-button type="button" (click)="idProofInput.click()">
+                <fa-icon icon="folder-open" size="lg"></fa-icon>
+                &nbsp;{{ 'labels.buttons.Browse' | translate }}
+              </button>
+            </div>
+            <button
+              mat-raised-button
+              color="primary"
+              type="button"
+              [disabled]="!idProofFile || uploading['ID_PROOF']"
+              (click)="uploadDocument('ID_PROOF')"
+            >
+              @if (uploading['ID_PROOF']) {
+                <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+              } @else {
+                {{ 'labels.buttons.Upload' | translate }}
+              }
+            </button>
+            @if (uploadErrors['ID_PROOF']) {
+              <div class="ckyc-upload-error">
+                <mat-icon>error_outline</mat-icon>
+                <span>{{ uploadErrors['ID_PROOF'] }}</span>
+              </div>
+            }
+            @if (uploadResponses['ID_PROOF']) {
+              <div class="ckyc-upload-response">
+                <p>
+                  <b>{{ 'labels.inputs.Status' | translate }}:</b> {{ uploadResponses['ID_PROOF'].status }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Request ID' | translate }}:</b> {{ uploadResponses['ID_PROOF'].requestId }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Acknowledgement Number' | translate }}:</b>
+                  {{ uploadResponses['ID_PROOF'].acknowledgementNumber }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Processing Status' | translate }}:</b>
+                  {{ uploadResponses['ID_PROOF'].processingStatus }}
+                </p>
+              </div>
+            }
+          }
+        </mat-card-content>
+      </mat-card>
+
       <!-- Address Proof Document -->
       <mat-card class="ckyc-upload-card">
         <mat-card-content>
@@ -202,25 +320,24 @@
                 <div>
                   <strong>Already available</strong>
                   <span class="ckyc-existing__source">from {{ existing.ADDRESS_PROOF.source }}</span>
+                  @if (existing.ADDRESS_PROOF.previewUnavailable) {
+                    <span class="ckyc-existing__warn">stored file unavailable</span>
+                  }
                 </div>
               </div>
-              @if (existing.ADDRESS_PROOF.previewUrl || existing.ADDRESS_PROOF.previewUrlBack) {
+              @if (existing.ADDRESS_PROOF.previewUrl && isImage('ADDRESS_PROOF')) {
-                <div class="ckyc-existing__thumbs">
+                <img [src]="existing.ADDRESS_PROOF.previewUrl" alt="Address proof" class="ckyc-existing__thumb" />
-                  @if (existing.ADDRESS_PROOF.previewUrl) {
+              }
-                    <img
+              @if (existing.ADDRESS_PROOF.previewUrl) {
-                      [src]="existing.ADDRESS_PROOF.previewUrl"
+                <button
-                      alt="Address proof scan - front"
+                  mat-stroked-button
-                      class="ckyc-existing__thumb"
+                  type="button"
-                    />
+                  class="ckyc-existing__view"
-                  }
+                  (click)="openDocument('ADDRESS_PROOF')"
-                  @if (existing.ADDRESS_PROOF.previewUrlBack) {
+                >
-                    <img
+                  <fa-icon icon="eye"></fa-icon>
-                      [src]="existing.ADDRESS_PROOF.previewUrlBack"
+                  &nbsp;View document
-                      alt="Address proof scan - back"
+                </button>
-                      class="ckyc-existing__thumb"
-                    />
-                  }
-                </div>
               }
               <div class="ckyc-existing__meta">
                 <fa-icon icon="file-alt"></fa-icon>
@@ -235,51 +352,78 @@
                   </span>
                 }
               </div>
-              @if (cardDate('ADDRESS_PROOF', 'issue') || cardDate('ADDRESS_PROOF', 'expiry')) {
-                <div class="ckyc-existing__dates">
-                  @if (cardDate('ADDRESS_PROOF', 'issue')) {
-                    <span
-                      ><fa-icon icon="calendar-check"></fa-icon> Issued {{ cardDate('ADDRESS_PROOF', 'issue') }}</span
-                    >
-                  }
-                  @if (cardDate('ADDRESS_PROOF', 'expiry')) {
-                    <span
-                      ><fa-icon icon="calendar-check"></fa-icon> Expires {{ cardDate('ADDRESS_PROOF', 'expiry') }}</span
-                    >
-                  }
-                </div>
-              }
               <button
                 mat-stroked-button
                 type="button"
                 class="ckyc-existing__replace"
-                (click)="openUploadDialog('ADDRESS_PROOF')"
+                (click)="toggleReplace('ADDRESS_PROOF')"
               >
-                <fa-icon icon="upload"></fa-icon>
+                <fa-icon [icon]="existing.ADDRESS_PROOF.expanded ? 'times' : 'upload'"></fa-icon>
-                Upload new version
+                {{ existing.ADDRESS_PROOF.expanded ? 'Cancel replace' : 'Upload new version' }}
-              </button>
-            </div>
-          } @else {
-            <div class="ckyc-missing">
-              <p class="ckyc-upload-hint">Not uploaded yet. Accepted formats: PNG, JPEG, JPG, PDF</p>
-              <button mat-raised-button color="primary" type="button" (click)="openUploadDialog('ADDRESS_PROOF')">
-                <fa-icon icon="upload"></fa-icon>
-                &nbsp;{{ 'labels.buttons.Upload' | translate }}
               </button>
             </div>
           }
 
-          @if (uploading['ADDRESS_PROOF']) {
+          @if (!existing.ADDRESS_PROOF.present || existing.ADDRESS_PROOF.expanded) {
-            <div class="ckyc-uploading">
+            <p class="ckyc-upload-hint">{{ 'labels.inputs.Accepted formats' | translate }}: PNG, JPEG, JPG, PDF</p>
-              <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+            <div class="ckyc-file-row">
-              <span>Uploading…</span>
+              <input
-            </div>
+                type="file"
-          }
+                #addressProofInput
-          @if (uploadErrors['ADDRESS_PROOF']) {
+                accept=".png,.jpeg,.jpg,.pdf"
-            <div class="ckyc-upload-error">
+                (change)="onFileSelect($event, 'ADDRESS_PROOF')"
-              <mat-icon>error_outline</mat-icon>
+                [style.display]="'none'"
-              <span>{{ uploadErrors['ADDRESS_PROOF'] }}</span>
+              />
+              <mat-form-field appearance="outline" class="ckyc-file-name-field">
+                <input
+                  matInput
+                  [readonly]="true"
+                  [value]="addressProofFile?.name || ''"
+                  [placeholder]="'labels.text.NoFileSelected' | translate"
+                />
+              </mat-form-field>
+              <button mat-stroked-button type="button" (click)="addressProofInput.click()">
+                <fa-icon icon="folder-open" size="lg"></fa-icon>
+                &nbsp;{{ 'labels.buttons.Browse' | translate }}
+              </button>
             </div>
+            <button
+              mat-raised-button
+              color="primary"
+              type="button"
+              [disabled]="!addressProofFile || uploading['ADDRESS_PROOF']"
+              (click)="uploadDocument('ADDRESS_PROOF')"
+            >
+              @if (uploading['ADDRESS_PROOF']) {
+                <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+              } @else {
+                {{ 'labels.buttons.Upload' | translate }}
+              }
+            </button>
+            @if (uploadErrors['ADDRESS_PROOF']) {
+              <div class="ckyc-upload-error">
+                <mat-icon>error_outline</mat-icon>
+                <span>{{ uploadErrors['ADDRESS_PROOF'] }}</span>
+              </div>
+            }
+            @if (uploadResponses['ADDRESS_PROOF']) {
+              <div class="ckyc-upload-response">
+                <p>
+                  <b>{{ 'labels.inputs.Status' | translate }}:</b> {{ uploadResponses['ADDRESS_PROOF'].status }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Request ID' | translate }}:</b> {{ uploadResponses['ADDRESS_PROOF'].requestId }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Acknowledgement Number' | translate }}:</b>
+                  {{ uploadResponses['ADDRESS_PROOF'].acknowledgementNumber }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Processing Status' | translate }}:</b>
+                  {{ uploadResponses['ADDRESS_PROOF'].processingStatus }}
+                </p>
+              </div>
+            }
           }
         </mat-card-content>
       </mat-card>
@@ -299,25 +443,24 @@
                 <div>
                   <strong>Already available</strong>
                   <span class="ckyc-existing__source">from {{ existing.PHOTO_PROOF.source }}</span>
+                  @if (existing.PHOTO_PROOF.previewUnavailable) {
+                    <span class="ckyc-existing__warn">stored file unavailable</span>
+                  }
                 </div>
               </div>
-              @if (existing.PHOTO_PROOF.previewUrl || existing.PHOTO_PROOF.previewUrlBack) {
+              @if (existing.PHOTO_PROOF.previewUrl && isImage('PHOTO_PROOF')) {
-                <div class="ckyc-existing__thumbs">
+                <img [src]="existing.PHOTO_PROOF.previewUrl" alt="Photo proof" class="ckyc-existing__thumb" />
-                  @if (existing.PHOTO_PROOF.previewUrl) {
+              }
-                    <img
+              @if (existing.PHOTO_PROOF.previewUrl) {
-                      [src]="existing.PHOTO_PROOF.previewUrl"
+                <button
-                      alt="ID proof scan - front"
+                  mat-stroked-button
-                      class="ckyc-existing__thumb"
+                  type="button"
-                    />
+                  class="ckyc-existing__view"
-                  }
+                  (click)="openDocument('PHOTO_PROOF')"
-                  @if (existing.PHOTO_PROOF.previewUrlBack) {
+                >
-                    <img
+                  <fa-icon icon="eye"></fa-icon>
-                      [src]="existing.PHOTO_PROOF.previewUrlBack"
+                  &nbsp;View document
-                      alt="ID proof scan - back"
+                </button>
-                      class="ckyc-existing__thumb"
-                    />
-                  }
-                </div>
               }
               <div class="ckyc-existing__meta">
                 <fa-icon icon="id-card"></fa-icon>
@@ -331,49 +474,78 @@
                   </span>
                 }
               </div>
-              @if (cardDate('PHOTO_PROOF', 'issue') || cardDate('PHOTO_PROOF', 'expiry')) {
-                <div class="ckyc-existing__dates">
-                  @if (cardDate('PHOTO_PROOF', 'issue')) {
-                    <span><fa-icon icon="calendar-check"></fa-icon> Issued {{ cardDate('PHOTO_PROOF', 'issue') }}</span>
-                  }
-                  @if (cardDate('PHOTO_PROOF', 'expiry')) {
-                    <span
-                      ><fa-icon icon="calendar-check"></fa-icon> Expires {{ cardDate('PHOTO_PROOF', 'expiry') }}</span
-                    >
-                  }
-                </div>
-              }
               <button
                 mat-stroked-button
                 type="button"
                 class="ckyc-existing__replace"
-                (click)="openUploadDialog('PHOTO_PROOF')"
+                (click)="toggleReplace('PHOTO_PROOF')"
               >
-                <fa-icon icon="upload"></fa-icon>
+                <fa-icon [icon]="existing.PHOTO_PROOF.expanded ? 'times' : 'upload'"></fa-icon>
-                Upload new version
+                {{ existing.PHOTO_PROOF.expanded ? 'Cancel replace' : 'Upload new version' }}
-              </button>
-            </div>
-          } @else {
-            <div class="ckyc-missing">
-              <p class="ckyc-upload-hint">Not uploaded yet. Accepted formats: PNG, JPEG, JPG, PDF</p>
-              <button mat-raised-button color="primary" type="button" (click)="openUploadDialog('PHOTO_PROOF')">
-                <fa-icon icon="upload"></fa-icon>
-                &nbsp;{{ 'labels.buttons.Upload' | translate }}
               </button>
             </div>
           }
 
-          @if (uploading['PHOTO_PROOF']) {
+          @if (!existing.PHOTO_PROOF.present || existing.PHOTO_PROOF.expanded) {
-            <div class="ckyc-uploading">
+            <p class="ckyc-upload-hint">{{ 'labels.inputs.Accepted formats' | translate }}: PNG, JPEG, JPG, PDF</p>
-              <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+            <div class="ckyc-file-row">
-              <span>Uploading…</span>
+              <input
-            </div>
+                type="file"
-          }
+                #photoProofInput
-          @if (uploadErrors['PHOTO_PROOF']) {
+                accept=".png,.jpeg,.jpg,.pdf"
-            <div class="ckyc-upload-error">
+                (change)="onFileSelect($event, 'PHOTO_PROOF')"
-              <mat-icon>error_outline</mat-icon>
+                [style.display]="'none'"
-              <span>{{ uploadErrors['PHOTO_PROOF'] }}</span>
+              />
+              <mat-form-field appearance="outline" class="ckyc-file-name-field">
+                <input
+                  matInput
+                  [readonly]="true"
+                  [value]="photoProofFile?.name || ''"
+                  [placeholder]="'labels.text.NoFileSelected' | translate"
+                />
+              </mat-form-field>
+              <button mat-stroked-button type="button" (click)="photoProofInput.click()">
+                <fa-icon icon="folder-open" size="lg"></fa-icon>
+                &nbsp;{{ 'labels.buttons.Browse' | translate }}
+              </button>
             </div>
+            <button
+              mat-raised-button
+              color="primary"
+              type="button"
+              [disabled]="!photoProofFile || uploading['PHOTO_PROOF']"
+              (click)="uploadDocument('PHOTO_PROOF')"
+            >
+              @if (uploading['PHOTO_PROOF']) {
+                <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+              } @else {
+                {{ 'labels.buttons.Upload' | translate }}
+              }
+            </button>
+            @if (uploadErrors['PHOTO_PROOF']) {
+              <div class="ckyc-upload-error">
+                <mat-icon>error_outline</mat-icon>
+                <span>{{ uploadErrors['PHOTO_PROOF'] }}</span>
+              </div>
+            }
+            @if (uploadResponses['PHOTO_PROOF']) {
+              <div class="ckyc-upload-response">
+                <p>
+                  <b>{{ 'labels.inputs.Status' | translate }}:</b> {{ uploadResponses['PHOTO_PROOF'].status }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Request ID' | translate }}:</b> {{ uploadResponses['PHOTO_PROOF'].requestId }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Acknowledgement Number' | translate }}:</b>
+                  {{ uploadResponses['PHOTO_PROOF'].acknowledgementNumber }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Processing Status' | translate }}:</b>
+                  {{ uploadResponses['PHOTO_PROOF'].processingStatus }}
+                </p>
+              </div>
+            }
           }
         </mat-card-content>
       </mat-card>
@@ -393,42 +565,95 @@
                 <div>
                   <strong>Already available</strong>
                   <span class="ckyc-existing__source">from {{ existing.CLIENT_IMAGE.source }}</span>
+                  @if (existing.CLIENT_IMAGE.previewUnavailable) {
+                    <span class="ckyc-existing__warn">stored file unavailable</span>
+                  }
                 </div>
               </div>
               @if (existing.CLIENT_IMAGE.previewUrl) {
                 <img [src]="existing.CLIENT_IMAGE.previewUrl" alt="Client photo" class="ckyc-existing__thumb" />
+                <button
+                  mat-stroked-button
+                  type="button"
+                  class="ckyc-existing__view"
+                  (click)="openDocument('CLIENT_IMAGE')"
+                >
+                  <fa-icon icon="eye"></fa-icon>
+                  &nbsp;View document
+                </button>
               }
               <button
                 mat-stroked-button
                 type="button"
                 class="ckyc-existing__replace"
-                (click)="openUploadDialog('CLIENT_IMAGE')"
+                (click)="toggleReplace('CLIENT_IMAGE')"
               >
-                <fa-icon icon="upload"></fa-icon>
+                <fa-icon [icon]="existing.CLIENT_IMAGE.expanded ? 'times' : 'upload'"></fa-icon>
-                Upload new version
+                {{ existing.CLIENT_IMAGE.expanded ? 'Cancel replace' : 'Upload new version' }}
-              </button>
-            </div>
-          } @else {
-            <div class="ckyc-missing">
-              <p class="ckyc-upload-hint">Not uploaded yet. Accepted formats: PNG, JPEG, JPG</p>
-              <button mat-raised-button color="primary" type="button" (click)="openUploadDialog('CLIENT_IMAGE')">
-                <fa-icon icon="upload"></fa-icon>
-                &nbsp;{{ 'labels.buttons.Upload' | translate }}
               </button>
             </div>
           }
 
-          @if (uploading['CLIENT_IMAGE']) {
+          @if (!existing.CLIENT_IMAGE.present || existing.CLIENT_IMAGE.expanded) {
-            <div class="ckyc-uploading">
+            <p class="ckyc-upload-hint">{{ 'labels.inputs.Accepted formats' | translate }}: PNG, JPEG, JPG</p>
-              <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+            <div class="ckyc-file-row">
-              <span>Uploading…</span>
+              <input
-            </div>
+                type="file"
-          }
+                #clientImageInput
-          @if (uploadErrors['CLIENT_IMAGE']) {
+                accept=".png,.jpeg,.jpg"
-            <div class="ckyc-upload-error">
+                (change)="onFileSelect($event, 'CLIENT_IMAGE')"
-              <mat-icon>error_outline</mat-icon>
+                [style.display]="'none'"
-              <span>{{ uploadErrors['CLIENT_IMAGE'] }}</span>
+              />
+              <mat-form-field appearance="outline" class="ckyc-file-name-field">
+                <input
+                  matInput
+                  [readonly]="true"
+                  [value]="clientImageFile?.name || ''"
+                  [placeholder]="'labels.text.NoFileSelected' | translate"
+                />
+              </mat-form-field>
+              <button mat-stroked-button type="button" (click)="clientImageInput.click()">
+                <fa-icon icon="folder-open" size="lg"></fa-icon>
+                &nbsp;{{ 'labels.buttons.Browse' | translate }}
+              </button>
             </div>
+            <button
+              mat-raised-button
+              color="primary"
+              type="button"
+              [disabled]="!clientImageFile || uploading['CLIENT_IMAGE']"
+              (click)="uploadDocument('CLIENT_IMAGE')"
+            >
+              @if (uploading['CLIENT_IMAGE']) {
+                <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+              } @else {
+                {{ 'labels.buttons.Upload' | translate }}
+              }
+            </button>
+            @if (uploadErrors['CLIENT_IMAGE']) {
+              <div class="ckyc-upload-error">
+                <mat-icon>error_outline</mat-icon>
+                <span>{{ uploadErrors['CLIENT_IMAGE'] }}</span>
+              </div>
+            }
+            @if (uploadResponses['CLIENT_IMAGE']) {
+              <div class="ckyc-upload-response">
+                <p>
+                  <b>{{ 'labels.inputs.Status' | translate }}:</b> {{ uploadResponses['CLIENT_IMAGE'].status }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Request ID' | translate }}:</b> {{ uploadResponses['CLIENT_IMAGE'].requestId }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Acknowledgement Number' | translate }}:</b>
+                  {{ uploadResponses['CLIENT_IMAGE'].acknowledgementNumber }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Processing Status' | translate }}:</b>
+                  {{ uploadResponses['CLIENT_IMAGE'].processingStatus }}
+                </p>
+              </div>
+            }
           }
         </mat-card-content>
       </mat-card>
@@ -448,6 +673,9 @@
                 <div>
                   <strong>Already available</strong>
                   <span class="ckyc-existing__source">from {{ existing.CLIENT_SIGNATURE.source }}</span>
+                  @if (existing.CLIENT_SIGNATURE.previewUnavailable) {
+                    <span class="ckyc-existing__warn">stored file unavailable</span>
+                  }
                 </div>
               </div>
               @if (existing.CLIENT_SIGNATURE.previewUrl) {
@@ -457,6 +685,17 @@
                   class="ckyc-existing__thumb ckyc-existing__thumb--wide"
                 />
               }
+              @if (existing.CLIENT_SIGNATURE.previewUrl) {
+                <button
+                  mat-stroked-button
+                  type="button"
+                  class="ckyc-existing__view"
+                  (click)="openDocument('CLIENT_SIGNATURE')"
+                >
+                  <fa-icon icon="eye"></fa-icon>
+                  &nbsp;View document
+                </button>
+              }
               <div class="ckyc-existing__meta">
                 <fa-icon icon="file-signature"></fa-icon>
                 <span>{{ existing.CLIENT_SIGNATURE.name }}</span>
@@ -465,33 +704,75 @@
                 mat-stroked-button
                 type="button"
                 class="ckyc-existing__replace"
-                (click)="openUploadDialog('CLIENT_SIGNATURE')"
+                (click)="toggleReplace('CLIENT_SIGNATURE')"
               >
-                <fa-icon icon="upload"></fa-icon>
+                <fa-icon [icon]="existing.CLIENT_SIGNATURE.expanded ? 'times' : 'upload'"></fa-icon>
-                Upload new version
+                {{ existing.CLIENT_SIGNATURE.expanded ? 'Cancel replace' : 'Upload new version' }}
-              </button>
-            </div>
-          } @else {
-            <div class="ckyc-missing">
-              <p class="ckyc-upload-hint">Not uploaded yet. Accepted formats: PNG, JPEG, JPG</p>
-              <button mat-raised-button color="primary" type="button" (click)="openUploadDialog('CLIENT_SIGNATURE')">
-                <fa-icon icon="upload"></fa-icon>
-                &nbsp;{{ 'labels.buttons.Upload' | translate }}
               </button>
             </div>
           }
 
-          @if (uploading['CLIENT_SIGNATURE']) {
+          @if (!existing.CLIENT_SIGNATURE.present || existing.CLIENT_SIGNATURE.expanded) {
-            <div class="ckyc-uploading">
+            <p class="ckyc-upload-hint">{{ 'labels.inputs.Accepted formats' | translate }}: PNG, JPEG, JPG</p>
-              <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+            <div class="ckyc-file-row">
-              <span>Uploading…</span>
+              <input
-            </div>
+                type="file"
-          }
+                #clientSignatureInput
-          @if (uploadErrors['CLIENT_SIGNATURE']) {
+                accept=".png,.jpeg,.jpg"
-            <div class="ckyc-upload-error">
+                (change)="onFileSelect($event, 'CLIENT_SIGNATURE')"
-              <mat-icon>error_outline</mat-icon>
+                [style.display]="'none'"
-              <span>{{ uploadErrors['CLIENT_SIGNATURE'] }}</span>
+              />
+              <mat-form-field appearance="outline" class="ckyc-file-name-field">
+                <input
+                  matInput
+                  [readonly]="true"
+                  [value]="clientSignatureFile?.name || ''"
+                  [placeholder]="'labels.text.NoFileSelected' | translate"
+                />
+              </mat-form-field>
+              <button mat-stroked-button type="button" (click)="clientSignatureInput.click()">
+                <fa-icon icon="folder-open" size="lg"></fa-icon>
+                &nbsp;{{ 'labels.buttons.Browse' | translate }}
+              </button>
             </div>
+            <button
+              mat-raised-button
+              color="primary"
+              type="button"
+              [disabled]="!clientSignatureFile || uploading['CLIENT_SIGNATURE']"
+              (click)="uploadDocument('CLIENT_SIGNATURE')"
+            >
+              @if (uploading['CLIENT_SIGNATURE']) {
+                <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+              } @else {
+                {{ 'labels.buttons.Upload' | translate }}
+              }
+            </button>
+            @if (uploadErrors['CLIENT_SIGNATURE']) {
+              <div class="ckyc-upload-error">
+                <mat-icon>error_outline</mat-icon>
+                <span>{{ uploadErrors['CLIENT_SIGNATURE'] }}</span>
+              </div>
+            }
+            @if (uploadResponses['CLIENT_SIGNATURE']) {
+              <div class="ckyc-upload-response">
+                <p>
+                  <b>{{ 'labels.inputs.Status' | translate }}:</b> {{ uploadResponses['CLIENT_SIGNATURE'].status }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Request ID' | translate }}:</b>
+                  {{ uploadResponses['CLIENT_SIGNATURE'].requestId }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Acknowledgement Number' | translate }}:</b>
+                  {{ uploadResponses['CLIENT_SIGNATURE'].acknowledgementNumber }}
+                </p>
+                <p>
+                  <b>{{ 'labels.inputs.Processing Status' | translate }}:</b>
+                  {{ uploadResponses['CLIENT_SIGNATURE'].processingStatus }}
+                </p>
+              </div>
+            }
           }
         </mat-card-content>
       </mat-card>

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

@@ -553,21 +553,15 @@
   margin: 0 0 12px;
 }
 
-.ckyc-missing {
+.ckyc-file-row {
-  margin-top: 14px;
   display: flex;
-  flex-direction: column;
-  gap: 10px;
   align-items: flex-start;
+  gap: 8px;
+  margin-bottom: 12px;
 }
 
-.ckyc-uploading {
+.ckyc-file-name-field {
-  display: flex;
+  flex: 1;
-  align-items: center;
-  gap: 8px;
-  margin-top: 10px;
-  font-size: 12px;
-  color: #5f6368;
 }
 
 .ckyc-upload-error {
@@ -589,6 +583,19 @@
   }
 }
 
+.ckyc-upload-response {
+  margin-top: 12px;
+  padding: 10px 14px;
+  background-color: #e8f5e9;
+  border: 1px solid #a5d6a7;
+  border-radius: 8px;
+  font-size: 12px;
+
+  p {
+    margin: 4px 0;
+  }
+}
+
 @media (width <= 900px) {
   .ckyc-upload-grid {
     grid-template-columns: 1fr;
@@ -603,6 +610,14 @@
   .ckyc-upload-grid {
     grid-template-columns: 1fr;
   }
+
+  .ckyc-file-row {
+    flex-direction: column;
+  }
+
+  .ckyc-file-name-field {
+    width: 100%;
+  }
 }
 
 /* ===================== Already-available banners ===================== */
@@ -623,6 +638,35 @@
   }
 }
 
+/* Opens the uploaded artefact full size in a new tab. Sits directly under the thumbnail, and is
+   the only way to inspect a PDF - which cannot render as an inline <img>. */
+.ckyc-existing__view {
+  align-self: flex-start;
+  color: #1d6fd0;
+  border-color: #bcd8f5;
+  background: #fff;
+  font-size: 13px;
+  font-weight: 600;
+
+  &:hover {
+    background: #eef6ff;
+  }
+}
+
+/* Shown when a document row exists but its file could not be fetched from the content store,
+   so "Already available" is not silently misleading. */
+.ckyc-existing__warn {
+  display: inline-block;
+  margin-left: 8px;
+  padding: 1px 8px;
+  border-radius: 10px;
+  background: #fdecec;
+  border: 1px solid #f3c2c2;
+  color: #a12b2b;
+  font-size: 11px;
+  font-weight: 600;
+}
+
 .ckyc-existing {
   display: flex;
   flex-direction: column;
@@ -716,34 +760,6 @@
     letter-spacing: 0.3px;
   }
 
-  &__thumbs {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 10px;
-    flex-wrap: wrap;
-  }
-
-  &__dates {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    font-size: 11px;
-    color: #0f6e56;
-    flex-wrap: wrap;
-
-    span {
-      display: inline-flex;
-      align-items: center;
-      gap: 5px;
-    }
-
-    fa-icon {
-      color: #1d9e75;
-      font-size: 11px;
-    }
-  }
-
   &__thumb {
     width: 100px;
     height: 100px;

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

@@ -9,37 +9,78 @@
 /** Angular Imports */
 import { Component, OnInit, OnDestroy, inject } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Subject, Observable, takeUntil, catchError, of, forkJoin } from 'rxjs';
+import { Subject, takeUntil, catchError, of } from 'rxjs';
 
 /** Custom Services */
 import { ClientsService } from '../../clients.service';
 import { AlertService } from 'app/core/alert/alert.service';
 import { MatIcon } from '@angular/material/icon';
 import { MatProgressSpinner } from '@angular/material/progress-spinner';
-import { MatDialog } from '@angular/material/dialog';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { Dates } from 'app/core/utils/dates';
-import { ProofType, normalizeProofType } from '../../shared/kyc-proof-types';
-import { CkycUploadDialogComponent, CkycUploadDialogResult } from './ckyc-upload-dialog/ckyc-upload-dialog.component';
 
 interface ExistingArtefact {
   present: boolean;
   name?: string;
   source?: string;
   previewUrl?: string;
-  previewUrlBack?: string;
   documentId?: string;
-  documentTypeId?: string;
   documentKey?: string;
-  /** "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" — same convention client-india-address-step
-   *  already writes/reads for address proof; now shared by the photo/identity proof too. */
-  description?: string;
   fileCount?: number;
+  expanded?: boolean;
+  /** Set when the stored file could not be fetched - the row exists but its content is gone. */
+  previewUnavailable?: boolean;
+  /** Stored MIME type, so the card knows whether it can render an inline thumbnail. */
+  mimeType?: string;
 }
 
-type ProofKind = 'ADDRESS_PROOF' | 'PHOTO_PROOF';
+/**
-type CkycDocKind = ProofKind | 'CLIENT_IMAGE' | 'CLIENT_SIGNATURE';
+ * Multipart `name` / `description` sent for each CKYC artefact type.
+ *
+ * The platform has no CKYC-specific document API; these are stored through the generic
+ * DocumentApiResource, whose contract carries no document-type field. The artefact type therefore
+ * travels in `name`, which is the same mechanism the client signature already uses - so
+ * `CLIENT_SIGNATURE` deliberately reuses the existing `clientSignature` value that
+ * loadExistingArtefacts() (and uploadClientSignatureImage()) match on. Changing that string would
+ * orphan every previously uploaded signature.
+ */
+export type CkycDocumentType = 'ID_PROOF' | 'ADDRESS_PROOF' | 'PHOTO_PROOF' | 'CLIENT_IMAGE' | 'CLIENT_SIGNATURE';
+
+const CKYC_DOCUMENT_META: Record<CkycDocumentType, { name: string; description: string }> = {
+  ID_PROOF: { name: 'ckycIdProof', description: 'CKYC ID proof' },
+  ADDRESS_PROOF: { name: 'ckycAddressProof', description: 'CKYC address proof' },
+  PHOTO_PROOF: { name: 'ckycPhotoProof', description: 'CKYC photo proof' },
+  CLIENT_IMAGE: { name: 'ckycClientImage', description: 'CKYC client photograph' },
+  CLIENT_SIGNATURE: { name: 'clientSignature', description: 'Client signature' }
+};
+
+const CKYC_DOCUMENT_TYPES = Object.keys(CKYC_DOCUMENT_META) as CkycDocumentType[];
+
+/**
+ * Client-side upload guards, kept deliberately in step with the backend so a file that passes here
+ * is not rejected server-side:
+ *  - 5 MB matches `spring.servlet.multipart.max-file-size`
+ *  - the extension list is the intersection of the backend `fineract.content.regex-whitelist`
+ *    with what these cards can actually render.
+ * `accept=` on the input is only a file-picker hint and is trivially bypassed, so the real check
+ * lives in onFileSelect().
+ */
+const MAX_UPLOAD_BYTES = 5 * 1024 * 1024;
+const IMAGE_EXTENSIONS = [
+  'png',
+  'jpeg',
+  'jpg'
+];
+const DOCUMENT_EXTENSIONS = [
+  ...IMAGE_EXTENSIONS,
+  'pdf'
+];
+
+/** Types whose card renders an inline <img> preview, so a PDF would not display. */
+const IMAGE_ONLY_TYPES: CkycDocumentType[] = [
+  'CLIENT_IMAGE',
+  'CLIENT_SIGNATURE'
+];
 
 @Component({
   selector: 'mifosx-ckyc-tab',
@@ -57,8 +98,6 @@ export class CkycTabComponent implements OnInit, OnDestroy {
   private route = inject(ActivatedRoute);
   private clientsService = inject(ClientsService);
   private alertService = inject(AlertService);
-  private dialog = inject(MatDialog);
-  private dates = inject(Dates);
 
   private destroy$ = new Subject<void>();
 
@@ -92,55 +131,37 @@ export class CkycTabComponent implements OnInit, OnDestroy {
     return this.panVerified && this.aadhaarVerified;
   }
 
-  /** Pre-existing artefacts detected from client data */
+  /** CKYC artefacts already uploaded for this client, keyed by artefact type. */
-  existing: Record<CkycDocKind, ExistingArtefact> = {
+  existing: Record<CkycDocumentType, ExistingArtefact> = {
+    ID_PROOF: { present: false },
     ADDRESS_PROOF: { present: false },
     PHOTO_PROOF: { present: false },
     CLIENT_IMAGE: { present: false },
     CLIENT_SIGNATURE: { present: false }
   };
 
-  /** Document-type options for the proof pickers, fetched once from /kyc/proof-types */
-  addressProofOptions: ProofType[] = [];
-  idProofOptions: ProofType[] = [];
-
-  /** Document type currently selected in each proof card's picker */
-  selectedProofType: Record<ProofKind, ProofType | null> = {
-    ADDRESS_PROOF: null,
-    PHOTO_PROOF: null
-  };
-
-  /** Front/back files staged for the two proof cards; other cards keep a single file each */
-  docFiles: Record<ProofKind, { front: File | null; back: File | null }> = {
-    ADDRESS_PROOF: { front: null, back: null },
-    PHOTO_PROOF: { front: null, back: null }
-  };
-
-  /** Document number + issue/expiry dates staged from the upload dialog, same fields client
-   *  creation collects for a KYC/address proof — persisted onto the identifier's documentKey
-   *  and description ("Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd"). */
-  private documentDetails: Record<
-    ProofKind,
-    { documentKey: string; issueDate: string | null; expiryDate: string | null }
-  > = {
-    ADDRESS_PROOF: { documentKey: '', issueDate: null, expiryDate: null },
-    PHOTO_PROOF: { documentKey: '', issueDate: null, expiryDate: null }
-  };
-
   /** File references */
+  idProofFile: File | null = null;
+  addressProofFile: File | null = null;
+  photoProofFile: File | null = null;
   clientImageFile: File | null = null;
   clientSignatureFile: File | null = null;
 
   /** Per-document upload state */
   uploading: { [key: string]: boolean } = {
+    ID_PROOF: false,
     ADDRESS_PROOF: false,
     PHOTO_PROOF: false,
     CLIENT_IMAGE: false,
     CLIENT_SIGNATURE: false
   };
 
+  /** Per-document upload response */
+  uploadResponses: { [key: string]: any } = {};
+
   /** Per-document error messages */
   uploadErrors: { [key: string]: string | null } = {
+    ID_PROOF: null,
     ADDRESS_PROOF: null,
     PHOTO_PROOF: null,
     CLIENT_IMAGE: null,
@@ -242,168 +263,191 @@ export class CkycTabComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Fetch photo (profile image), signature (client document),
+   * Loads every CKYC artefact from the client's documents (`m_document`), which is the single
-   * ID proof and address proof (client identifiers) so already-uploaded
+   * source of truth for this screen: each card matches the `name` its own upload writes, so what
-   * artefacts are shown here instead of forcing re-upload.
+   * the checker sees is exactly what CKYC stored.
+   *
+   * Deliberately does NOT read the profile image or client identifiers any more. Those belong to
+   * client registration and the Identities section; reading them here showed artefacts this screen
+   * had never uploaded, and hid the ones it had. Those other screens are untouched.
+   *
+   * A client can accumulate several rows for one artefact (older uploads pre-date replacement, and
+   * the signature is also written by client registration), so the newest row - highest `id` - wins.
    */
   private loadExistingArtefacts(): void {
     this.checkingExisting = true;
 
-    forkJoin({
+    this.clientsService
-      photo: this.clientsService.getClientProfileImage(this.clientId).pipe(catchError(() => of(null))),
+      .getClientDocuments(this.clientId)
-      documents: this.clientsService.getClientDocuments(this.clientId).pipe(catchError(() => of([]))),
+      .pipe(
-      identifiers: this.clientsService.getClientIdentifiers(this.clientId).pipe(catchError(() => of([]))),
+        takeUntil(this.destroy$),
-      proofTypes: this.clientsService.getKycProofTypes().pipe(catchError(() => of({ idProofs: [], addressProofs: [] })))
+        catchError(() => of([]))
-    })
+      )
-      .pipe(takeUntil(this.destroy$))
+      .subscribe((documents: any) => {
-      .subscribe(({ photo, documents, identifiers, proofTypes }) => {
         this.checkingExisting = false;
 
-        // 1. Photo / image of client — from m_client.image_id
+        const list: any[] = Array.isArray(documents) ? documents : (documents?.pageItems ?? []);
-        if (photo && typeof photo === 'string' && photo.length > 0) {
-          this.existing.CLIENT_IMAGE = {
-            present: true,
-            source: 'Client registration',
-            previewUrl: photo,
-            name: 'Profile photo'
-          };
-        }
 
-        // 2. Signature — client document with name='clientSignature'. Multiple rows can exist
+        for (const type of CKYC_DOCUMENT_TYPES) {
-        // for clients who re-cropped/replaced their signature before uploads became single-slot,
+          const expectedName = CKYC_DOCUMENT_META[type].name;
-        // so pick the highest id (latest) rather than the first unordered match.
-        const signatureDoc = (documents as any[])
-          ?.filter((d: any) => d?.name === 'clientSignature')
-          ?.sort((a: any, b: any) => b.id - a.id)?.[0];
-        if (signatureDoc) {
-          this.existing.CLIENT_SIGNATURE = {
-            present: true,
-            source: 'Client registration',
-            name: signatureDoc.fileName || 'Client signature',
-            documentId: signatureDoc.id
-          };
-          // Fetch blob for preview
-          this.clientsService
-            .getClientSignatureImage(this.clientId, signatureDoc.id)
-            .pipe(takeUntil(this.destroy$))
-            .subscribe({
-              next: (blob: any) => {
-                if (blob) {
-                  this.existing.CLIENT_SIGNATURE.previewUrl = URL.createObjectURL(blob);
-                }
-              },
-              error: () => undefined
-            });
-        }
 
-        // 3 & 4. ID proof + Address proof — client identifiers classified via proof-types
+          const doc = list
-        this.idProofOptions = (proofTypes?.idProofs || []).map((p: any) => normalizeProofType(p));
+            .filter((d: any) => d?.name === expectedName)
-        this.addressProofOptions = (proofTypes?.addressProofs || []).map((p: any) => normalizeProofType(p));
+            .sort((a: any, b: any) => (b?.id ?? 0) - (a?.id ?? 0))[0];
-        const idProofIds = new Set<string>((proofTypes?.idProofs || []).map((p: any) => String(p.id)));
-        const addressProofIds = new Set<string>((proofTypes?.addressProofs || []).map((p: any) => String(p.id)));
 
-        const idList = Array.isArray(identifiers) ? identifiers : (identifiers as any)?.pageItems || [];
+          if (!doc) {
-
+            // No upload yet for this artefact - leave the card in its empty state.
-        for (const identity of idList) {
+            this.existing[type] = { present: false };
-          const docTypeId = String(identity?.documentType?.id ?? '');
+            continue;
-          const isActive =
-            !identity?.status ||
-            identity?.status?.code === 'clientIdentifierStatusType.active' ||
-            identity?.status === 'clientIdentifierStatusType.active' ||
-            identity?.status === 'Active';
-          if (!isActive) continue;
-
-          const proofName = identity?.documentType?.name || 'Identifier';
-          // Address proof documentKey is auto-generated as "<ProofName> - <clientId>"
-          // in identities-tab; hide it when it's just that synthetic key.
-          const rawKey = identity?.documentKey || '';
-          const isSyntheticKey = rawKey.startsWith(`${proofName} - `);
-          const common = {
-            present: true,
-            source: 'Identities section',
-            name: proofName,
-            documentKey: isSyntheticKey ? '' : rawKey,
-            documentId: identity?.id,
-            documentTypeId: docTypeId,
-            description: identity?.description || '',
-            fileCount: (identity?.documents || []).length
-          };
-
-          if (idProofIds.has(docTypeId) && !this.existing.PHOTO_PROOF.present) {
-            this.existing.PHOTO_PROOF = common;
-            this.selectedProofType.PHOTO_PROOF = this.idProofOptions.find((p) => String(p.id) === docTypeId) || null;
-            this.loadIdentifierDocPreview('PHOTO_PROOF', identity.id);
-          } else if (addressProofIds.has(docTypeId) && !this.existing.ADDRESS_PROOF.present) {
-            this.existing.ADDRESS_PROOF = common;
-            this.selectedProofType.ADDRESS_PROOF =
-              this.addressProofOptions.find((p) => String(p.id) === docTypeId) || null;
-            this.loadIdentifierDocPreview('ADDRESS_PROOF', identity.id);
           }
+
+          this.existing[type] = {
+            present: true,
+            source: 'CKYC upload',
+            name: doc.fileName || expectedName,
+            documentId: doc.id,
+            mimeType: doc.type
+          };
+
+          this.loadPreview(type, doc.id);
         }
       });
   }
 
   /**
-   * The scanned ID/address-proof card only showed its file name and key — never the scan
+   * Fetches the stored file so the card can show a thumbnail. A failure here is reported on the
-   * itself, unlike the photo and signature cards right beside it. Mirrors those two: fetch
+   * card rather than swallowed: the usual cause is a `m_document` row whose file is no longer in
-   * the identifier's own attached document(s) (m_client_identifier -> m_document, the same
+   * the content store, and silently showing "Already available" with no image hides that.
-   * chain the Identities tab and the create-client stepper read) and download the latest for
-   * an inline preview. Two-sided proof types (Aadhaar, Passport, Voter ID, Driving Licence)
-   * store front/back as two separate documents named "<Proof> — Front"/"— Back" (the same
-   * convention the create-client stepper writes), so both are matched and previewed here;
-   * a legacy single upload with no such marker just shows as the one preview.
    */
-  private loadIdentifierDocPreview(kind: ProofKind, identifierId: string): void {
+  private loadPreview(type: CkycDocumentType, documentId: string | number): void {
     this.clientsService
-      .getClientIdentificationDocuments(identifierId)
+      // silent: a missing stored file returns 500, and the card below already reports that. Without
-      .pipe(
+      // this the global error interceptor pops an "Internal Server Error" modal on every page load
-        takeUntil(this.destroy$),
+      // and after every upload, for a failure the user cannot act on.
-        catchError(() => of([]))
+      .downloadClientDocument(this.clientId, String(documentId), true)
-      )
-      .subscribe((docs: any) => {
-        const list = Array.isArray(docs) ? docs : [];
-        if (!list.length) return;
-        this.existing[kind].fileCount = list.length;
-
-        const byNewest = (a: any, b: any) => b.id - a.id;
-        const label = (d: any) => (d?.name || d?.fileName || '').toString();
-        const back = [...list].filter((d: any) => /back/i.test(label(d))).sort(byNewest)[0];
-        const front =
-          [...list].filter((d: any) => /front/i.test(label(d))).sort(byNewest)[0] ||
-          [...list].filter((d: any) => d.id !== back?.id).sort(byNewest)[0];
-
-        if (front) this.downloadIdentifierDocPreview(identifierId, front.id, kind, 'front');
-        if (back && back.id !== front?.id) this.downloadIdentifierDocPreview(identifierId, back.id, kind, 'back');
-      });
-  }
-
-  private downloadIdentifierDocPreview(
-    identifierId: string,
-    documentId: string,
-    kind: ProofKind,
-    slot: 'front' | 'back'
-  ): void {
-    this.clientsService
-      .downloadClientIdentificationDocument(identifierId, documentId)
       .pipe(takeUntil(this.destroy$))
       .subscribe({
         next: (blob: any) => {
-          if (!blob) return;
+          if (blob && blob.size > 0) {
-          const url = URL.createObjectURL(blob);
+            this.existing[type].previewUrl = URL.createObjectURL(blob);
-          if (slot === 'front') this.existing[kind].previewUrl = url;
+          } else {
-          else this.existing[kind].previewUrlBack = url;
+            // A 200 with an empty body still means there is nothing to show. Without this the card
+            // would sit there claiming "Already available" with no thumbnail and no explanation.
+            this.existing[type].previewUnavailable = true;
+          }
         },
-        error: () => undefined
+        error: () => {
+          this.existing[type].previewUnavailable = true;
+        }
       });
   }
 
+  /**
+   * True when the stored file can be shown as an inline thumbnail. A PDF cannot, so its card falls
+   * back to the "View document" button alone rather than rendering a broken image.
+   */
+  isImage(documentType: CkycDocumentType): boolean {
+    const entry = this.existing[documentType];
+    if (entry?.mimeType) {
+      return entry.mimeType.startsWith('image/');
+    }
+    // Older rows can have no stored MIME type - fall back to the file extension.
+    const extension = (entry?.name?.split('.').pop() || '').toLowerCase();
+    return IMAGE_EXTENSIONS.includes(extension);
+  }
+
+  /**
+   * Opens the uploaded document full size in a new tab. Uses the blob already fetched for the
+   * thumbnail, so it works for PDFs too and costs no extra request.
+   */
+  openDocument(documentType: CkycDocumentType): void {
+    const url = this.existing[documentType]?.previewUrl;
+    if (url) {
+      window.open(url, '_blank', 'noopener');
+    }
+  }
+
+  toggleReplace(documentType: string): void {
+    const entry = (this.existing as any)[documentType];
+    if (entry) entry.expanded = !entry.expanded;
+  }
+
   onAccountSelect(accountNo: string): void {
     this.selectedAccount = this.allAccounts.find((a) => a.accountNo === accountNo) || null;
     this.selectedAccountType = this.selectedAccount?.accountType || '';
   }
 
+  /** Extensions a given card can both store and render. */
+  private allowedExtensions(documentType: string): string[] {
+    return IMAGE_ONLY_TYPES.includes(documentType as CkycDocumentType) ? IMAGE_EXTENSIONS : DOCUMENT_EXTENSIONS;
+  }
+
+  /**
+   * Rejects a file the backend would refuse (or the card could not render) before it is uploaded,
+   * so the user gets a clear message instead of a raw server error. Returns null when the file is
+   * acceptable.
+   */
+  private validationError(file: File, documentType: string): string | null {
+    const allowed = this.allowedExtensions(documentType);
+    const extension = (file.name.split('.').pop() || '').toLowerCase();
+
+    if (!allowed.includes(extension)) {
+      return `Unsupported file type ".${extension}". Allowed: ${allowed.map((e) => e.toUpperCase()).join(', ')}.`;
+    }
+    if (file.size > MAX_UPLOAD_BYTES) {
+      const mb = (file.size / (1024 * 1024)).toFixed(1);
+      return `File is ${mb} MB. The maximum allowed size is 5 MB.`;
+    }
+    if (file.size === 0) {
+      return 'The selected file is empty.';
+    }
+    return null;
+  }
+
+  private setFile(documentType: string, file: File | null): void {
+    switch (documentType) {
+      case 'ID_PROOF':
+        this.idProofFile = file;
+        break;
+      case 'ADDRESS_PROOF':
+        this.addressProofFile = file;
+        break;
+      case 'PHOTO_PROOF':
+        this.photoProofFile = file;
+        break;
+      case 'CLIENT_IMAGE':
+        this.clientImageFile = file;
+        break;
+      case 'CLIENT_SIGNATURE':
+        this.clientSignatureFile = file;
+        break;
+    }
+  }
+
+  onFileSelect(event: any, documentType: string): void {
+    const file = event.target?.files?.[0];
+    if (!file) return;
+
+    const error = this.validationError(file, documentType);
+    if (error) {
+      this.setFile(documentType, null);
+      this.uploadErrors[documentType] = error;
+      event.target.value = '';
+      return;
+    }
+
+    this.setFile(documentType, file);
+    this.uploadErrors[documentType] = null;
+  }
+
   getFile(documentType: string): File | null {
     switch (documentType) {
+      case 'ID_PROOF':
+        return this.idProofFile;
+      case 'ADDRESS_PROOF':
+        return this.addressProofFile;
+      case 'PHOTO_PROOF':
+        return this.photoProofFile;
       case 'CLIENT_IMAGE':
         return this.clientImageFile;
       case 'CLIENT_SIGNATURE':
@@ -413,287 +457,72 @@ export class CkycTabComponent implements OnInit, OnDestroy {
     }
   }
 
-  private static readonly CARD_TITLES: Record<CkycDocKind, string> = {
+  uploadDocument(documentType: CkycDocumentType): void {
-    ADDRESS_PROOF: 'Address Proof Document',
-    PHOTO_PROOF: 'Photo Proof Document',
-    CLIENT_IMAGE: 'Image of Client',
-    CLIENT_SIGNATURE: 'Signature of Client'
-  };
-
-  /** Opens the picker/preview popup for one card and, once the user confirms a file there, feeds
-   *  the picked type/file(s) into the same upload path the card always used. Picking and preview
-   *  now live entirely in the dialog — this screen only stages the result and re-runs upload. */
-  openUploadDialog(kind: CkycDocKind): void {
-    const isProofKind = kind === 'ADDRESS_PROOF' || kind === 'PHOTO_PROOF';
-    const action = this.existing[kind].present ? 'Replace' : 'Upload';
-    const existingDates = isProofKind
-      ? this.parseDescriptionDates(this.existing[kind].description)
-      : { issueDate: null, expiryDate: null };
-
-    const ref = this.dialog.open(CkycUploadDialogComponent, {
-      width: '480px',
-      maxWidth: '95vw',
-      data: {
-        title: `${action} ${CkycTabComponent.CARD_TITLES[kind]}`,
-        isProofKind,
-        accept: isProofKind ? '.png,.jpeg,.jpg,.pdf' : '.png,.jpeg,.jpg',
-        proofOptions:
-          kind === 'PHOTO_PROOF'
-            ? this.idProofOptions
-            : kind === 'ADDRESS_PROOF'
-              ? this.addressProofOptions
-              : undefined,
-        initialProofType: isProofKind ? this.selectedProofType[kind as ProofKind] : undefined,
-        initialDocumentKey: isProofKind ? this.existing[kind].documentKey || '' : undefined,
-        initialIssueDate: existingDates.issueDate,
-        initialExpiryDate: existingDates.expiryDate
-      }
-    });
-
-    ref.afterClosed().subscribe((result: CkycUploadDialogResult | null) => {
-      if (!result) return;
-      if (isProofKind) {
-        const proofKind = kind as ProofKind;
-        this.selectedProofType[proofKind] = result.proofType || null;
-        this.docFiles[proofKind] = { front: result.front, back: result.back || null };
-        this.documentDetails[proofKind] = {
-          documentKey: result.documentKey || '',
-          issueDate: result.issueDate || null,
-          expiryDate: result.expiryDate || null
-        };
-      } else if (kind === 'CLIENT_IMAGE') {
-        this.clientImageFile = result.front;
-      } else {
-        this.clientSignatureFile = result.front;
-      }
-      this.uploadDocument(kind);
-    });
-  }
-
-  /** Reads back the "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" convention this tab (and
-   *  client-india-address-step, for address proof) writes into the identifier's description. */
-  private parseDescriptionDates(description: string | undefined): { issueDate: Date | null; expiryDate: Date | null } {
-    const issueMatch = (description || '').match(/Issue date:\s*([^,|]+)/i);
-    const expiryMatch = (description || '').match(/Expiry date:\s*([^,|]+)/i);
-    return {
-      issueDate: issueMatch ? this.dates.parseDate(issueMatch[1].trim()) : null,
-      expiryDate: expiryMatch ? this.dates.parseDate(expiryMatch[1].trim()) : null
-    };
-  }
-
-  private buildDescription(issueDate: string | null, expiryDate: string | null): string {
-    const parts: string[] = [];
-    if (issueDate) parts.push(`Issue date: ${issueDate}`);
-    if (expiryDate) parts.push(`Expiry date: ${expiryDate}`);
-    return parts.join(', ');
-  }
-
-  /** Issue/expiry date for display on the card, formatted dd-MM-yyyy — parsed from the same
-   *  description text the upload dialog writes. */
-  cardDate(kind: ProofKind, which: 'issue' | 'expiry'): string {
-    const parsed = this.parseDescriptionDates(this.existing[kind].description);
-    const value = which === 'issue' ? parsed.issueDate : parsed.expiryDate;
-    return value ? this.dates.formatDate(value, 'dd-MM-yyyy') : '';
-  }
-
-  /**
-   * Routes each card to whichever real endpoint that artefact is actually stored through — there
-   * is no single "/clients/{id}/ckyc/documents" resource on the backend, so posting every card to
-   * one made-up URL 404'd for all four. A photo goes to the image endpoint, a signature to the
-   * client's own documents, and an ID/address proof to the m_client_identifier it already belongs
-   * to (the same one the Identities tab and create-client stepper post to) — never a fresh,
-   * type-less upload, since which identifier a proof belongs to is exactly what makes it that
-   * proof rather than some other file on the client's record.
-   */
-  uploadDocument(documentType: string): void {
-    if (documentType === 'PHOTO_PROOF' || documentType === 'ADDRESS_PROOF') {
-      this.uploadProofDocument(documentType);
-      return;
-    }
-
     const file = this.getFile(documentType);
     if (!file) return;
 
     this.uploading[documentType] = true;
     this.uploadErrors[documentType] = null;
-    const key = documentType as keyof typeof this.existing;
 
-    let request$: Observable<any>;
+    // DocumentApiResource consumes multipart/form-data with body parts `file`, `name` and
-    switch (documentType) {
+    // `description` (file + description mandatory). There is no document-type field in that
-      case 'CLIENT_IMAGE':
+    // contract, so the artefact type is carried in `name` - which is also the key
-        request$ = this.clientsService.uploadClientProfileImage(this.clientId, file);
+    // loadExistingArtefacts() matches on when reading the document back.
-        break;
+    const meta = CKYC_DOCUMENT_META[documentType];
-      case 'CLIENT_SIGNATURE':
+
-        request$ = this.clientsService.uploadClientSignatureImage(this.clientId, file);
+    const formData = new FormData();
-        break;
+    formData.append('file', file);
-      default:
+    formData.append('name', meta.name);
-        return;
+    formData.append('description', meta.description);
-    }
+
+    // Replace in place when this artefact already has a usable document, so a re-upload updates the
+    // existing row (same document id, same content-store location) instead of stacking up another
+    // copy. Falls back to create for the first upload of an artefact.
+    //
+    // Deliberately create instead of replace when the stored file is missing: the backend's update
+    // path writes the new content relative to the row's existing `location` and never calls
+    // setLocation(), so replacing a row whose file is already gone writes the upload to a fresh
+    // folder while the row keeps pointing at the missing one - the artefact would stay broken and
+    // the user would get a success message. Creating a new row repairs the card instead.
+    const entry = this.existing[documentType];
+    const replacing = !!entry?.documentId && !entry?.previewUnavailable;
+    const existingId = entry?.documentId;
+
+    const request$ = replacing
+      ? this.clientsService.replaceClientDocument(this.clientId, String(existingId), formData)
+      : this.clientsService.uploadCkycDocument(this.clientId, formData);
 
     request$.pipe(takeUntil(this.destroy$)).subscribe({
-      next: () => {
+      next: (response: any) => {
         this.uploading[documentType] = false;
-        this.alertService.alert({ type: 'success', message: 'Document uploaded successfully.' });
+        this.uploadResponses[documentType] = response;
-        this.refreshPreview(documentType);
+        this.setFile(documentType, null);
-      },
+        this.alertService.alert({
-      error: (err: any) => {
+          type: 'success',
-        this.uploading[documentType] = false;
+          message:
-        this.uploadErrors[documentType] = this.extractErrorMessage(err);
+            response?.message || (replacing ? 'Document replaced successfully.' : 'Document uploaded successfully.')
-      }
-    });
-  }
-
-  /**
-   * Proof cards work like the create-client KYC step: pick a document type first (its `sides`
-   * decides whether one image or a front+back pair is required), then upload. Reuses the same
-   * identifier the Identities tab manages — updates its documentTypeId if the picked type
-   * changed, or creates a fresh identifier when none exists yet, so this card never depends on
-   * a separate trip to the Identities tab.
-   */
-  private uploadProofDocument(kind: ProofKind): void {
-    const proof = this.selectedProofType[kind];
-    if (!proof) {
-      this.uploadErrors[kind] = 'Select a document type first.';
-      return;
-    }
-    const files = this.docFiles[kind];
-    if (!files.front || (proof.sides === 2 && !files.back)) {
-      this.uploadErrors[kind] =
-        proof.sides === 2
-          ? 'Both front and back images are required for this document type.'
-          : 'Select a file to upload.';
-      return;
-    }
-
-    this.uploading[kind] = true;
-    this.uploadErrors[kind] = null;
-
-    const existingId = this.existing[kind].documentId;
-    const details = this.documentDetails[kind];
-    const documentKey = details.documentKey || `${proof.name} - ${this.clientId}`;
-    const description = this.buildDescription(details.issueDate, details.expiryDate);
-
-    const identifier$: Observable<any> = !existingId
-      ? this.clientsService.addClientIdentifier(this.clientId, {
-          documentTypeId: proof.id,
-          status: 'ACTIVE',
-          documentKey,
-          description: description || 'KYC document'
-        })
-      : this.clientsService.updateClientIdentifier(this.clientId, existingId, {
-          documentTypeId: proof.id,
-          status: 'ACTIVE',
-          documentKey,
-          description
         });
-
+        // Re-read from m_document so the card reflects what was actually stored, rather than
-    identifier$.pipe(takeUntil(this.destroy$)).subscribe({
+        // assuming the write succeeded exactly as sent.
-      next: (res: any) => {
+        this.loadExistingArtefacts();
-        const identifierId = existingId || res?.resourceId;
-        const uploads: Observable<any>[] = [];
-
-        const front = new FormData();
-        front.append('name', proof.sides === 2 ? `${proof.name} — Front` : proof.name);
-        front.append('file', files.front!);
-        uploads.push(this.clientsService.uploadClientIdentifierDocument(identifierId, front));
-
-        if (proof.sides === 2 && files.back) {
-          const back = new FormData();
-          back.append('name', `${proof.name} — Back`);
-          back.append('file', files.back);
-          uploads.push(this.clientsService.uploadClientIdentifierDocument(identifierId, back));
-        }
-
-        forkJoin(uploads)
-          .pipe(takeUntil(this.destroy$))
-          .subscribe({
-            next: () => {
-              this.uploading[kind] = false;
-              this.existing[kind].present = true;
-              this.existing[kind].documentId = identifierId;
-              this.existing[kind].documentTypeId = String(proof.id);
-              this.existing[kind].documentKey = details.documentKey || '';
-              this.existing[kind].description = description;
-              this.existing[kind].name = proof.name;
-              this.existing[kind].source = this.existing[kind].source || 'Identities section';
-              this.docFiles[kind] = { front: null, back: null };
-              this.alertService.alert({ type: 'success', message: 'Document uploaded successfully.' });
-              this.refreshPreview(kind);
-            },
-            error: (err: any) => {
-              this.uploading[kind] = false;
-              this.uploadErrors[kind] = this.extractErrorMessage(err);
-            }
-          });
       },
       error: (err: any) => {
-        this.uploading[kind] = false;
+        this.uploading[documentType] = false;
-        this.uploadErrors[kind] = this.extractErrorMessage(err);
+        this.uploadErrors[documentType] =
+          err?.error?.developerMessage ||
+          err?.error?.defaultUserMessage ||
+          err?.message ||
+          'Failed to upload document.';
       }
     });
   }
 
-  private extractErrorMessage(err: any): string {
-    return (
-      err?.error?.errors?.[0]?.defaultUserMessage ||
-      err?.error?.developerMessage ||
-      err?.error?.defaultUserMessage ||
-      err?.message ||
-      'Failed to upload document.'
-    );
-  }
-
-  /** Re-fetches whichever artefact was just replaced, so its preview reflects the new file
-   *  immediately instead of the one this screen loaded on entry. */
-  private refreshPreview(documentType: string): void {
-    const staleKey = documentType as keyof typeof this.existing;
-    if (this.existing[staleKey].previewUrl?.startsWith('blob:')) {
-      URL.revokeObjectURL(this.existing[staleKey].previewUrl!);
-    }
-    if (this.existing[staleKey].previewUrlBack?.startsWith('blob:')) {
-      URL.revokeObjectURL(this.existing[staleKey].previewUrlBack!);
-    }
-    switch (documentType) {
-      case 'CLIENT_IMAGE':
-        this.clientsService
-          .getClientProfileImage(this.clientId)
-          .pipe(takeUntil(this.destroy$))
-          .subscribe((photo: any) => {
-            if (photo) this.existing.CLIENT_IMAGE.previewUrl = photo;
-          });
-        break;
-      case 'CLIENT_SIGNATURE':
-        this.clientsService
-          .getClientDocuments(this.clientId)
-          .pipe(takeUntil(this.destroy$))
-          .subscribe((documents: any) => {
-            const doc = (documents as any[])
-              ?.filter((d: any) => d?.name === 'clientSignature')
-              ?.sort((a: any, b: any) => b.id - a.id)?.[0];
-            if (!doc) return;
-            this.existing.CLIENT_SIGNATURE.documentId = doc.id;
-            this.clientsService
-              .getClientSignatureImage(this.clientId, doc.id)
-              .pipe(takeUntil(this.destroy$))
-              .subscribe((blob: any) => {
-                if (blob) this.existing.CLIENT_SIGNATURE.previewUrl = URL.createObjectURL(blob);
-              });
-          });
-        break;
-      case 'PHOTO_PROOF':
-      case 'ADDRESS_PROOF':
-        this.loadIdentifierDocPreview(documentType, this.existing[documentType].documentId!);
-        break;
-    }
-  }
-
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
     // Release object URLs
     Object.values(this.existing).forEach((e) => {
       if (e.previewUrl?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrl);
-      if (e.previewUrlBack?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrlBack);
     });
   }
 }

src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.html

@@ -1,167 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<div class="cud-header">
-  <div class="cud-header__badge">
-    <fa-icon icon="folder-open"></fa-icon>
-  </div>
-  <div class="cud-header__text">
-    <h2 mat-dialog-title class="cud-title">{{ data.title }}</h2>
-    <p class="cud-subtitle">Fill in the document details, then attach the scan.</p>
-  </div>
-  <button mat-icon-button mat-dialog-close class="cud-close" aria-label="Close">
-    <fa-icon icon="times"></fa-icon>
-  </button>
-</div>
-
-<mat-dialog-content class="cud-body">
-  @if (data.isProofKind) {
-    <div class="cud-section">
-      <span class="cud-section__label"><fa-icon icon="id-card"></fa-icon> Document type</span>
-      <mat-form-field appearance="outline" class="cud-field" subscriptSizing="dynamic">
-        <mat-select
-          [value]="selectedProofType"
-          [compareWith]="compareProofType"
-          placeholder="Select document type"
-          (selectionChange)="onProofTypeChange($event.value)"
-        >
-          @for (p of data.proofOptions; track p.id) {
-            <mat-option [value]="p">{{ p.name }}</mat-option>
-          }
-        </mat-select>
-      </mat-form-field>
-      <p class="cud-hint">Upload requirements will update automatically based on the type you pick.</p>
-    </div>
-
-    @if (selectedProofType) {
-      @if (selectedProofType.info) {
-        <div class="cud-banner">
-          <fa-icon icon="check-circle"></fa-icon>
-          <span>{{ selectedProofType.info }}</span>
-        </div>
-      }
-
-      <div class="cud-section">
-        <span class="cud-section__label">
-          <fa-icon icon="hashtag"></fa-icon>
-          {{ selectedProofType.documentKeyLabel || 'Document number' }}
-        </span>
-        <mat-form-field appearance="outline" class="cud-field" subscriptSizing="dynamic">
-          <input
-            matInput
-            [(ngModel)]="documentKey"
-            [ngModelOptions]="{ standalone: true }"
-            [placeholder]="selectedProofType.documentKeyPlaceholder || 'Enter document number'"
-          />
-        </mat-form-field>
-      </div>
-
-      <div class="cud-section cud-section--dates">
-        <div class="cud-date-field">
-          <span class="cud-section__label"><fa-icon icon="calendar-check"></fa-icon> Issue date</span>
-          <mat-form-field appearance="outline" class="cud-field" subscriptSizing="dynamic">
-            <input
-              matInput
-              readonly
-              [matDatepicker]="issuePicker"
-              [(ngModel)]="issueDate"
-              [ngModelOptions]="{ standalone: true }"
-              placeholder="Optional"
-              (click)="issuePicker.open()"
-            />
-            <mat-datepicker-toggle matSuffix [for]="issuePicker"></mat-datepicker-toggle>
-            <mat-datepicker #issuePicker></mat-datepicker>
-          </mat-form-field>
-        </div>
-        <div class="cud-date-field">
-          <span class="cud-section__label"><fa-icon icon="calendar-check"></fa-icon> Expiry date</span>
-          <mat-form-field appearance="outline" class="cud-field" subscriptSizing="dynamic">
-            <input
-              matInput
-              readonly
-              [matDatepicker]="expiryPicker"
-              [(ngModel)]="expiryDate"
-              [ngModelOptions]="{ standalone: true }"
-              placeholder="Optional"
-              (click)="expiryPicker.open()"
-            />
-            <mat-datepicker-toggle matSuffix [for]="expiryPicker"></mat-datepicker-toggle>
-            <mat-datepicker #expiryPicker></mat-datepicker>
-          </mat-form-field>
-        </div>
-      </div>
-
-      <div class="cud-divider"><span>Scan</span></div>
-
-      <div class="cud-grid" [class.cud-grid--two]="sides === 2">
-        <div class="cud-slot">
-          <span class="cud-slot__label">{{ sides === 2 ? 'Front side' : 'Document' }}</span>
-          <label class="cud-dropzone" [class.cud-dropzone--has]="front">
-            <input type="file" [attr.accept]="data.accept" hidden (change)="onFilePick('front', $event)" />
-            @if (frontPreview) {
-              <img [src]="frontPreview" alt="Front side preview" class="cud-dropzone__img" />
-            } @else if (front) {
-              <fa-icon icon="file-alt" class="cud-dropzone__icon"></fa-icon>
-              <p class="cud-dropzone__name">{{ front.name }}</p>
-            } @else {
-              <fa-icon icon="cloud-upload-alt" class="cud-dropzone__icon"></fa-icon>
-              <p class="cud-dropzone__text">Click to choose file</p>
-            }
-          </label>
-        </div>
-
-        @if (sides === 2) {
-          <div class="cud-slot">
-            <span class="cud-slot__label">Back side</span>
-            <label class="cud-dropzone" [class.cud-dropzone--has]="back">
-              <input type="file" [attr.accept]="data.accept" hidden (change)="onFilePick('back', $event)" />
-              @if (backPreview) {
-                <img [src]="backPreview" alt="Back side preview" class="cud-dropzone__img" />
-              } @else if (back) {
-                <fa-icon icon="file-alt" class="cud-dropzone__icon"></fa-icon>
-                <p class="cud-dropzone__name">{{ back.name }}</p>
-              } @else {
-                <fa-icon icon="cloud-upload-alt" class="cud-dropzone__icon"></fa-icon>
-                <p class="cud-dropzone__text">Click to choose file</p>
-              }
-            </label>
-          </div>
-        }
-      </div>
-    }
-  } @else {
-    <div class="cud-grid">
-      <div class="cud-slot">
-        <span class="cud-slot__label">Document</span>
-        <label class="cud-dropzone" [class.cud-dropzone--has]="front">
-          <input type="file" [attr.accept]="data.accept" hidden (change)="onFilePick('front', $event)" />
-          @if (frontPreview) {
-            <img [src]="frontPreview" alt="Preview" class="cud-dropzone__img" />
-          } @else if (front) {
-            <fa-icon icon="file-alt" class="cud-dropzone__icon"></fa-icon>
-            <p class="cud-dropzone__name">{{ front.name }}</p>
-          } @else {
-            <fa-icon icon="cloud-upload-alt" class="cud-dropzone__icon"></fa-icon>
-            <p class="cud-dropzone__text">Click to choose file</p>
-          }
-        </label>
-      </div>
-    </div>
-  }
-</mat-dialog-content>
-
-<mat-dialog-actions class="cud-actions" align="end">
-  <button mat-stroked-button type="button" (click)="cancel()">
-    <fa-icon icon="times"></fa-icon>
-    &nbsp;Cancel
-  </button>
-  <button mat-flat-button color="primary" type="button" [disabled]="!canSubmit" (click)="submit()">
-    <fa-icon icon="upload"></fa-icon>
-    &nbsp;Upload
-  </button>
-</mat-dialog-actions>

src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.scss

@@ -1,270 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-:host {
-  display: block;
-  max-width: 100%;
-}
-
-/* ===================== Header ===================== */
-.cud-header {
-  display: flex;
-  align-items: flex-start;
-  gap: 12px;
-  padding: 20px 24px 16px;
-  border-bottom: 1px solid #eef1f4;
-
-  &__badge {
-    flex-shrink: 0;
-    width: 36px;
-    height: 36px;
-    border-radius: 9px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 15px;
-    color: #fff;
-    background: linear-gradient(135deg, #1a73e8, #4285f4);
-    box-shadow: 0 3px 10px rgb(26 115 232 / 28%);
-  }
-
-  &__text {
-    flex: 1;
-    min-width: 0;
-  }
-}
-
-.cud-title {
-  margin: 0 !important;
-  padding: 0;
-  font-size: 16px;
-  font-weight: 700;
-  color: #1a1d21;
-  line-height: 1.3;
-}
-
-.cud-subtitle {
-  margin: 2px 0 0;
-  font-size: 12px;
-  color: #6b7280;
-}
-
-.cud-close {
-  flex-shrink: 0;
-  width: 32px;
-  height: 32px;
-  margin: -4px -4px 0 0;
-  color: #9aa0a6;
-
-  &:hover {
-    color: #3c4043;
-  }
-}
-
-/* ===================== Body / sections ===================== */
-.cud-body.mat-mdc-dialog-content {
-  padding: 18px 24px !important;
-  max-height: 70vh;
-}
-
-.cud-section {
-  margin-bottom: 14px;
-
-  &--dates {
-    display: flex;
-    gap: 14px;
-
-    .cud-date-field {
-      flex: 1;
-      min-width: 0;
-    }
-  }
-
-  &__label {
-    display: flex;
-    align-items: center;
-    gap: 7px;
-    font-size: 11px;
-    font-weight: 700;
-    color: #475569;
-    text-transform: uppercase;
-    letter-spacing: 0.05em;
-    margin-bottom: 6px;
-
-    fa-icon {
-      color: #1a73e8;
-      font-size: 10.5px;
-    }
-  }
-}
-
-.cud-field {
-  width: 100%;
-}
-
-.cud-hint {
-  font-size: 12px;
-  color: #6b7280;
-  margin: 6px 0 0;
-  line-height: 1.4;
-}
-
-.cud-banner {
-  display: flex;
-  align-items: flex-start;
-  gap: 9px;
-  padding: 10px 14px;
-  margin-bottom: 14px;
-  background: #f0fbf6;
-  border: 1px solid #cfecdd;
-  border-radius: 10px;
-  font-size: 12.5px;
-  color: #085041;
-  line-height: 1.45;
-
-  fa-icon {
-    margin-top: 2px;
-    color: #1d9e75;
-    flex-shrink: 0;
-  }
-}
-
-.cud-divider {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  margin: 16px 0 12px;
-  font-size: 10.5px;
-  font-weight: 700;
-  color: #9aa0a6;
-  text-transform: uppercase;
-  letter-spacing: 0.08em;
-
-  &::before,
-  &::after {
-    content: '';
-    flex: 1;
-    height: 1px;
-    background: #eef1f4;
-  }
-}
-
-/* ===================== Front/back scan grid ===================== */
-.cud-grid {
-  display: grid;
-  grid-template-columns: 1fr;
-  gap: 12px;
-
-  &--two {
-    grid-template-columns: repeat(2, 1fr);
-  }
-}
-
-.cud-slot {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-
-  &__label {
-    font-size: 10.5px;
-    font-weight: 700;
-    color: #5f6368;
-    text-transform: uppercase;
-    letter-spacing: 0.05em;
-  }
-}
-
-.cud-dropzone {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: 8px;
-  min-height: 130px;
-  padding: 16px;
-  border: 2px dashed #cbd5e1;
-  border-radius: 12px;
-  cursor: pointer;
-  text-align: center;
-  background: #fafbfc;
-  transition:
-    border-color 0.15s,
-    background 0.15s,
-    box-shadow 0.15s;
-
-  &:hover {
-    border-color: #1a73e8;
-    background: #f5f9ff;
-    box-shadow: 0 2px 10px rgb(26 115 232 / 10%);
-  }
-
-  &--has {
-    border-style: solid;
-    border-color: #1d9e75;
-    background: #f0fbf6;
-  }
-
-  &__icon {
-    font-size: 22px;
-    color: #9aa5b1;
-  }
-
-  &--has &__icon {
-    color: #1d9e75;
-  }
-
-  &__text {
-    font-size: 12px;
-    color: #64748b;
-    margin: 0;
-    font-weight: 500;
-  }
-
-  &__name {
-    font-size: 11.5px;
-    color: #085041;
-    font-weight: 600;
-    margin: 0;
-    word-break: break-all;
-    padding: 0 8px;
-  }
-
-  &__img {
-    max-width: 100%;
-    max-height: 150px;
-    border-radius: 8px;
-    object-fit: contain;
-    box-shadow: 0 2px 8px rgb(0 0 0 / 8%);
-  }
-}
-
-/* ===================== Actions ===================== */
-.cud-actions {
-  padding: 12px 24px !important;
-  margin: 0 !important;
-  border-top: 1px solid #eef1f4;
-
-  fa-icon {
-    font-size: 12px;
-  }
-}
-
-@media (width <= 560px) {
-  :host {
-    width: 100%;
-  }
-
-  .cud-section--dates {
-    flex-direction: column;
-    gap: 14px;
-  }
-
-  .cud-grid--two {
-    grid-template-columns: 1fr;
-  }
-}

src/app/clients/clients-view/ckyc-tab/ckyc-upload-dialog/ckyc-upload-dialog.component.ts

@@ -1,155 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { Component, OnDestroy, inject } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import {
-  MatDialogRef,
-  MAT_DIALOG_DATA,
-  MatDialogTitle,
-  MatDialogContent,
-  MatDialogActions,
-  MatDialogClose
-} from '@angular/material/dialog';
-import { MatIconButton } from '@angular/material/button';
-import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { Dates } from 'app/core/utils/dates';
-import { ProofType } from '../../../shared/kyc-proof-types';
-
-export interface CkycUploadDialogData {
-  title: string;
-  isProofKind: boolean;
-  accept: string;
-  proofOptions?: ProofType[];
-  initialProofType?: ProofType | null;
-  initialDocumentKey?: string;
-  initialIssueDate?: Date | null;
-  initialExpiryDate?: Date | null;
-}
-
-export interface CkycUploadDialogResult {
-  proofType?: ProofType | null;
-  front: File;
-  back?: File;
-  /** Document number (Aadhaar/PAN/Passport number, etc.) — same field client creation collects. */
-  documentKey?: string;
-  /** 'yyyy-MM-dd', same as the rest of this app's date fields. */
-  issueDate?: string | null;
-  expiryDate?: string | null;
-}
-
-/**
- * A focused popup for replacing/uploading one CKYC artefact at a time — opened from each card on
- * the CKYC tab instead of expanding a form inline underneath it. Collects the same details
- * client creation does for an identity/address proof (document type, number, issue + expiry
- * date) and shows a client-side preview of whatever image is picked before it's ever sent to the
- * server; the actual upload still happens back in CkycTabComponent (this dialog only collects
- * the type, number, dates and file(s), then hands them back).
- */
-@Component({
-  selector: 'mifosx-ckyc-upload-dialog',
-  templateUrl: './ckyc-upload-dialog.component.html',
-  styleUrls: ['./ckyc-upload-dialog.component.scss'],
-  imports: [
-    ...STANDALONE_SHARED_IMPORTS,
-    FormsModule,
-    MatDialogTitle,
-    MatDialogContent,
-    MatDialogActions,
-    MatDialogClose,
-    MatIconButton,
-    FaIconComponent
-  ]
-})
-export class CkycUploadDialogComponent implements OnDestroy {
-  private dates = inject(Dates);
-  dialogRef = inject<MatDialogRef<CkycUploadDialogComponent, CkycUploadDialogResult | null>>(MatDialogRef);
-  data = inject<CkycUploadDialogData>(MAT_DIALOG_DATA);
-
-  selectedProofType: ProofType | null = this.data.initialProofType || null;
-  documentKey = this.data.initialDocumentKey || '';
-  issueDate: Date | null = this.data.initialIssueDate || null;
-  expiryDate: Date | null = this.data.initialExpiryDate || null;
-
-  front: File | null = null;
-  back: File | null = null;
-  frontPreview: string | null = null;
-  backPreview: string | null = null;
-
-  get sides(): number {
-    return this.data.isProofKind ? (this.selectedProofType?.sides ?? 1) : 1;
-  }
-
-  get canSubmit(): boolean {
-    if (this.data.isProofKind) {
-      if (!this.selectedProofType) return false;
-      if (!this.documentKey.trim()) return false;
-    }
-    if (!this.front) return false;
-    if (this.sides === 2 && !this.back) return false;
-    return true;
-  }
-
-  compareProofType = (a: ProofType | null, b: ProofType | null): boolean => (a?.id ?? null) === (b?.id ?? null);
-
-  onProofTypeChange(proof: ProofType | null): void {
-    this.selectedProofType = proof;
-    this.clearSlot('front');
-    this.clearSlot('back');
-  }
-
-  onFilePick(slot: 'front' | 'back', event: any): void {
-    const file = event?.target?.files?.[0];
-    if (event?.target) event.target.value = '';
-    if (!file) return;
-
-    this.clearSlot(slot);
-    const preview = file.type?.startsWith('image/') ? URL.createObjectURL(file) : null;
-    if (slot === 'front') {
-      this.front = file;
-      this.frontPreview = preview;
-    } else {
-      this.back = file;
-      this.backPreview = preview;
-    }
-  }
-
-  private clearSlot(slot: 'front' | 'back'): void {
-    if (slot === 'front') {
-      if (this.frontPreview) URL.revokeObjectURL(this.frontPreview);
-      this.front = null;
-      this.frontPreview = null;
-    } else {
-      if (this.backPreview) URL.revokeObjectURL(this.backPreview);
-      this.back = null;
-      this.backPreview = null;
-    }
-  }
-
-  submit(): void {
-    if (!this.canSubmit) return;
-    this.dialogRef.close({
-      proofType: this.selectedProofType,
-      front: this.front!,
-      back: this.sides === 2 ? this.back! : undefined,
-      documentKey: this.data.isProofKind ? this.documentKey.trim() : undefined,
-      issueDate: this.issueDate ? this.dates.getDate(this.issueDate) : null,
-      expiryDate: this.expiryDate ? this.dates.getDate(this.expiryDate) : null
-    });
-  }
-
-  cancel(): void {
-    this.dialogRef.close(null);
-  }
-
-  ngOnDestroy(): void {
-    if (this.frontPreview) URL.revokeObjectURL(this.frontPreview);
-    if (this.backPreview) URL.revokeObjectURL(this.backPreview);
-  }
-}

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

@@ -229,7 +229,7 @@ export class IdentitiesTabComponent implements OnDestroy {
       }
       const identifierData = {
         documentTypeId,
-        status: 'ACTIVE',
+        status: 'Active',
         documentKey: kind === 'id' ? section.documentKey : `${proofName} - ${this.clientId}`,
         description: kind === 'address' && section.address ? section.address : description
       };

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

@@ -82,13 +82,12 @@
             <strong class="kyc-doc-alert__title">{{ kycDocumentAlertTitle }}</strong>
             <p class="kyc-doc-alert__text">{{ kycDocumentAlertMessage }}</p>
           </div>
-          <!-- Same dialog as the document's own row: the banner is asking for exactly that. -->
           <button
             mat-flat-button
             color="primary"
             type="button"
             class="kyc-doc-alert__action"
-            (click)="updateKycDocument()"
+            (click)="toggleEditMode()"
           >
             Update Document
           </button>
@@ -471,11 +470,7 @@
               }
             </span>
             <span class="kv-table__col kv-table__col--action">
-              <!-- The document is re-collected in its own dialog, the way PAN and Aadhaar are dealt
+              <button mat-stroked-button class="kv-action-btn" type="button" (click)="toggleEditMode()">Update</button>
-                   with on their rows, rather than by opening the whole KYC form for editing. -->
-              <button mat-stroked-button class="kv-action-btn" type="button" (click)="updateKycDocument()">
-                Update
-              </button>
             </span>
           </div>
         }
@@ -1142,46 +1137,6 @@
                 </mat-select>
               </mat-form-field>
 
-              <!-- Risk profile. These are determinations about the customer rather than about anything they
-                   transacted, and the re-rating policy reads them directly: a PEP or a sanctions match holds the
-                   rating at High however ordinary the period's activity looks, and the declared income is what
-                   turnover is measured against. Until they are recorded the policy has nothing to test. -->
-              <div class="full-span kyc-doc-fields">
-                <div class="kyc-doc-fields__head">
-                  <h4 class="kyc-doc-fields__title">Risk Profile</h4>
-                  <span class="kyc-doc-fields__hint">Used by the periodic risk review</span>
-                </div>
-
-                <div class="kyc-risk-flags">
-                  <mat-checkbox formControlName="isPep">
-                    Politically Exposed Person
-                    <span class="kyc-risk-hint">Holds the rating at High; never lowered on ordinary activity</span>
-                  </mat-checkbox>
-                  <mat-checkbox formControlName="sanctionsMatch">
-                    Sanctions / watch-list match
-                    <span class="kyc-risk-hint">UNSC, MHA or internal watch list</span>
-                  </mat-checkbox>
-                  <mat-checkbox formControlName="adverseMediaMatch">
-                    Adverse media / regulatory action
-                    <span class="kyc-risk-hint">FIR, court proceedings or published action</span>
-                  </mat-checkbox>
-                </div>
-
-                <div class="kyc-doc-fields__grid">
-                  <mat-form-field appearance="outline">
-                    <mat-label>Declared annual income (₹)</mat-label>
-                    <input matInput type="number" min="0" formControlName="declaredAnnualIncome" />
-                    <mat-hint>As stated by the customer</mat-hint>
-                  </mat-form-field>
-
-                  <mat-form-field appearance="outline">
-                    <mat-label>Declared annual turnover (₹)</mat-label>
-                    <input matInput type="number" min="0" formControlName="declaredAnnualTurnover" />
-                    <mat-hint>For a business customer</mat-hint>
-                  </mat-form-field>
-                </div>
-              </div>
-
               <!-- Officially Valid Document. Shown when one is on file or the alert is asking for
                    it, so re-collecting an expired document is done on this form rather than
                    sending the officer somewhere else. -->
@@ -1233,83 +1188,15 @@
                     </mat-form-field>
                   </div>
 
-                  <!-- The scan, where the document it belongs to is. Re-collecting an expiring
+                  <!-- The scans live with the document itself, on the identifier the customer's
-                       document is what this panel is for, so sending the officer to the client
+                       original was attached to. Re-scanning is done there rather than duplicated
-                       edit screen to change the image made them leave the record they were
+                       here, so both sides, the cropper and the replace-in-place all behave the
-                       working on and find the same document again. -->
+                       same way they did when the document was first collected. -->
-                  <div class="kyc-doc-scans">
+                  <a class="kyc-doc-scans-link" [routerLink]="['/clients', clientId, 'edit']">
-                    <div class="kyc-doc-scans__head">
+                    <mat-icon>photo_library</mat-icon>
-                      <mat-icon>photo_library</mat-icon>
+                    <span>Replace the scanned front / back of this document</span>
-                      <span>Scanned document</span>
+                    <mat-icon class="kyc-doc-scans-link__go">chevron_right</mat-icon>
-                      @if (docScansLoading) {
+                  </a>
-                        <mat-progress-spinner diameter="16" mode="indeterminate"></mat-progress-spinner>
-                      }
-                    </div>
-
-                    @if (!docScansLoading && !docScans.front && !docScans.back) {
-                      <div class="kyc-doc-scans__empty">
-                        No scan is on file for this document. Upload one below.
-                      </div>
-                    }
-
-                    <div class="kyc-doc-scans__sides">
-                      @for (slot of docScanSlots; track slot) {
-                        <div class="kyc-doc-side">
-                          <div class="kyc-doc-side__label">{{ slot === 'front' ? 'Front' : 'Back' }}</div>
-
-                          <div class="kyc-doc-side__frame">
-                            @if (docScanOf(slot)?.previewUrl) {
-                              <img
-                                [src]="docScanOf(slot)!.previewUrl"
-                                [alt]="slot === 'front' ? 'Front of document' : 'Back of document'"
-                              />
-                            } @else if (docScanOf(slot)) {
-                              <!-- On file but not an image (a PDF, say) — named rather than shown. -->
-                              <div class="kyc-doc-side__file">
-                                <mat-icon>description</mat-icon>
-                                <span>{{ docScanOf(slot)!.fileName }}</span>
-                              </div>
-                            } @else {
-                              <div class="kyc-doc-side__none">Not on file</div>
-                            }
-                          </div>
-
-                          <button
-                            type="button"
-                            mat-stroked-button
-                            class="kyc-doc-side__btn"
-                            [disabled]="!!docScanUploading || docScansLoading"
-                            (click)="scanInput.click()"
-                          >
-                            @if (docScanUploading === slot) {
-                              <mat-progress-spinner diameter="16" mode="indeterminate"></mat-progress-spinner>
-                              Uploading…
-                            } @else {
-                              {{ docScanOf(slot) ? 'Replace' : 'Upload' }}
-                            }
-                          </button>
-                          <input
-                            #scanInput
-                            type="file"
-                            hidden
-                            accept="image/*,application/pdf"
-                            (change)="onDocScanSelected($event, slot)"
-                          />
-                        </div>
-                      }
-                    </div>
-
-                    @if (docScanError) {
-                      <div class="kyc-doc-scans__msg kyc-doc-scans__msg--err">
-                        <mat-icon>error_outline</mat-icon><span>{{ docScanError }}</span>
-                      </div>
-                    }
-                    @if (docScanSuccess) {
-                      <div class="kyc-doc-scans__msg kyc-doc-scans__msg--ok">
-                        <mat-icon>check_circle</mat-icon><span>{{ docScanSuccess }}</span>
-                      </div>
-                    }
-                  </div>
                 </div>
               }
 

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

@@ -1681,154 +1681,3 @@
 .kyc-doc-scans-link__go {
   margin-left: auto;
 }
-
-/* The scan itself, beside the number and dates it belongs to. */
-.kyc-doc-scans {
-  margin-top: 10px;
-  padding: 12px;
-  border: 1px solid #e2e8f0;
-  border-radius: 8px;
-  background: #fff;
-}
-
-.kyc-doc-scans__head {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  margin-bottom: 10px;
-  font-size: 12px;
-  font-weight: 700;
-  letter-spacing: 0.03em;
-  text-transform: uppercase;
-  color: #475569;
-
-  mat-icon {
-    font-size: 18px;
-    width: 18px;
-    height: 18px;
-    color: #64748b;
-  }
-}
-
-.kyc-doc-scans__empty {
-  margin-bottom: 10px;
-  font-size: 12.5px;
-  color: #64748b;
-}
-
-.kyc-doc-scans__sides {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 14px;
-}
-
-.kyc-doc-side {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  width: 190px;
-}
-
-.kyc-doc-side__label {
-  font-size: 11.5px;
-  font-weight: 700;
-  color: #334155;
-}
-
-/* Fixed height so front and back line up whatever the scan's aspect ratio is. */
-.kyc-doc-side__frame {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 118px;
-  padding: 6px;
-  border: 1px solid #e2e8f0;
-  border-radius: 6px;
-  background: #f8fafc;
-  overflow: hidden;
-
-  img {
-    max-width: 100%;
-    max-height: 100%;
-    object-fit: contain;
-    border-radius: 3px;
-  }
-}
-
-.kyc-doc-side__none {
-  font-size: 12px;
-  color: #94a3b8;
-}
-
-.kyc-doc-side__file {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 4px;
-  padding: 0 6px;
-  font-size: 11px;
-  color: #475569;
-  text-align: center;
-  word-break: break-word;
-
-  mat-icon {
-    color: #64748b;
-  }
-}
-
-.kyc-doc-side__btn {
-  font-size: 12px;
-
-  mat-progress-spinner {
-    display: inline-block;
-    margin-right: 6px;
-    vertical-align: middle;
-  }
-}
-
-.kyc-doc-scans__msg {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  margin-top: 10px;
-  font-size: 12.5px;
-
-  mat-icon {
-    font-size: 17px;
-    width: 17px;
-    height: 17px;
-  }
-
-  &--err {
-    color: #b91c1c;
-  }
-
-  &--ok {
-    color: #15803d;
-  }
-}
-
-/* ── Risk profile ────────────────────────────────────────────────────────────
-   Determinations about the customer, which the periodic risk review reads directly. Grouped with
-   the document block so the form reads as "what we know about them" rather than scattering a PEP
-   flag among the identifier fields. */
-
-.kyc-doc-fields__hint {
-  font-size: 12px;
-  color: #64748b;
-}
-
-.kyc-risk-flags {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-  padding: 4px 0 14px;
-}
-
-/* Sits under its checkbox label: the consequence of ticking the box matters more than the box. */
-.kyc-risk-hint {
-  display: block;
-  font-size: 12px;
-  color: #64748b;
-  line-height: 1.4;
-}

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

@@ -11,7 +11,7 @@ import { Component, OnInit, OnDestroy, inject } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { UntypedFormBuilder, UntypedFormGroup, Validators, FormsModule } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
-import { catchError, forkJoin, map, of, Subject, takeUntil } from 'rxjs';
+import { catchError, of, Subject, takeUntil } from 'rxjs';
 
 /** Custom Services */
 import { ClientsService } from '../../clients.service';
@@ -30,11 +30,6 @@ import {
   AadhaarReceiptDialogComponent,
   AadhaarReceiptResult
 } from '../../shared/aadhaar-receipt-dialog/aadhaar-receipt-dialog.component';
-import {
-  KycDocumentUpdateDialogComponent,
-  KycDocumentUpdateData,
-  KycDocumentUpdateResult
-} from '../../shared/kyc-document-update-dialog/kyc-document-update-dialog.component';
 import { Dates } from 'app/core/utils/dates';
 import { jsPDF } from 'jspdf';
 import { MatIcon } from '@angular/material/icon';
@@ -43,15 +38,6 @@ import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 
-/** One side of the scanned KYC document, with the preview once it has been fetched. */
-interface DocScanSide {
-  documentId: string;
-  /** The identifier row this scan hangs off; the two sides can sit on different rows. */
-  identifierId: string;
-  fileName: string;
-  previewUrl: string | null;
-}
-
 /**
  * KYC Tab Component.
  * Displays and manages KYC (Know Your Customer) details for an existing client.
@@ -140,13 +126,6 @@ export class KycTabComponent implements OnInit, OnDestroy {
       1,
       [Validators.required]
     ],
-    // Risk profile. Determinations about the customer, which the periodic risk review reads directly - a PEP or a
-    // sanctions match holds the rating at High whatever the period's activity looks like.
-    isPep: [false],
-    sanctionsMatch: [false],
-    adverseMediaMatch: [false],
-    declaredAnnualIncome: [null],
-    declaredAnnualTurnover: [null],
     // The officially valid document, so a lapsed one can be re-collected on this form. The
     // backend has always accepted these four; only the fields were missing.
     kycDocumentName: [''],
@@ -170,39 +149,9 @@ export class KycTabComponent implements OnInit, OnDestroy {
     exceptionReason: [[]]
   });
 
-  // ── Officially valid document scans ────────────────────────────────────────
-
-  /**
-   * The scans of the document named above, by side.
-   *
-   * The screen used to show the document's number and dates but not the image behind them, and
-   * sent the officer to the client edit screen to change it. Re-collecting an expiring document is
-   * the one thing this panel exists for, so the scan is shown and replaced here.
-   */
-  docScans: { front: DocScanSide | null; back: DocScanSide | null } = { front: null, back: null };
-
-  /** The two sides, in display order, so the template loops rather than repeating itself. */
-  readonly docScanSlots: ('front' | 'back')[] = ['front', 'back'];
-
-  docScanOf(slot: 'front' | 'back') {
-    return this.docScans[slot];
-  }
-
-  /** Identifier row replacements are filed against. Null when the document has no identifier. */
-  private docIdentifierId: string | null = null;
-  /** Every identifier row carrying this document, since the sides can be split across them. */
-  private docIdentifierIds: string[] = [];
-  docScansLoading = false;
-  /** Which side is mid-upload, so only that button shows a spinner. */
-  docScanUploading: 'front' | 'back' | null = null;
-  docScanError: string | null = null;
-  docScanSuccess: string | null = null;
-
   ngOnInit(): void {
     this.route.parent.params.subscribe((params: any) => {
       this.clientId = params['clientId'];
-      // Scans are matched against the document number on the KYC record, so they are loaded once
-      // that record has arrived rather than alongside it.
       this.loadKycData();
       this.loadClientDateOfBirth();
     });
@@ -228,11 +177,6 @@ export class KycTabComponent implements OnInit, OnDestroy {
           this.kycForm.patchValue({
             kycType: data.kycType || 1,
             riskCategory: data.riskCategory || 1,
-            isPep: !!data.isPep,
-            sanctionsMatch: !!data.sanctionsMatch,
-            adverseMediaMatch: !!data.adverseMediaMatch,
-            declaredAnnualIncome: data.declaredAnnualIncome ?? null,
-            declaredAnnualTurnover: data.declaredAnnualTurnover ?? null,
             panNumber: data.panNumber || '',
             // Aadhaar is stored masked on the server; user must re-enter
             // the full 12-digit number to re-verify, so don't pre-fill.
@@ -246,8 +190,6 @@ export class KycTabComponent implements OnInit, OnDestroy {
             isException: data.isException || false,
             exceptionReason: data.exceptionReason ? data.exceptionReason.split(', ') : []
           });
-          // Now that the document number is known, the scans filed under it can be found.
-          this.loadDocumentScans();
         }
       });
   }
@@ -458,28 +400,6 @@ export class KycTabComponent implements OnInit, OnDestroy {
     return new Date();
   }
 
-  /**
-   * The customer's risk profile, as every save has to carry it.
-   *
-   * <p>
-   * Sent from every path that writes the KYC record rather than only the main Save, because the form holds one set of
-   * values: a save triggered from the PAN declaration or the Aadhaar receipt would otherwise write the record without
-   * these and silently clear a PEP flag the officer had just ticked.
-   */
-  private buildRiskProfileFields() {
-    const v = this.kycForm.value;
-    return {
-      isPep: !!v.isPep,
-      sanctionsMatch: !!v.sanctionsMatch,
-      adverseMediaMatch: !!v.adverseMediaMatch,
-      // Blank stays null rather than becoming zero: an income nobody asked for is unknown, and a zero would read as a
-      // customer who declared no income at all.
-      declaredAnnualIncome: v.declaredAnnualIncome === '' || v.declaredAnnualIncome == null ? null : v.declaredAnnualIncome,
-      declaredAnnualTurnover:
-        v.declaredAnnualTurnover === '' || v.declaredAnnualTurnover == null ? null : v.declaredAnnualTurnover
-    };
-  }
-
   private buildExceptionFields() {
     const panVerified = this.verificationStatus.pan === 'VERIFIED' || this.kycData?.panVerified === true;
     const aadhaarVerified = this.verificationStatus.aadhaar === 'VERIFIED' || this.kycData?.aadhaarVerified === true;
@@ -518,8 +438,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
       // dateFormat is required so the backend can parse exceptionResolvedOn when an exception closes.
       dateFormat: 'dd MMMM yyyy',
       ...this.buildDocumentFields(),
-      ...this.buildRiskProfileFields(),
+      ...this.buildExceptionFields()
-        ...this.buildExceptionFields()
     };
 
     if (!this.kycId) {
@@ -565,7 +484,6 @@ export class KycTabComponent implements OnInit, OnDestroy {
         remarks: this.kycForm.value.remarks || null,
         riskCategory: this.kycForm.value.riskCategory || 1,
         dateFormat: 'dd MMMM yyyy',
-        ...this.buildRiskProfileFields(),
         ...this.buildExceptionFields()
       };
 
@@ -765,8 +683,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
       dateFormat,
       riskCategory: this.kycForm.value.riskCategory || 1,
       ...declarationFields,
-      ...this.buildRiskProfileFields(),
+      ...this.buildExceptionFields()
-        ...this.buildExceptionFields()
     };
 
     this.clientsService
@@ -926,8 +843,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
       dateFormat,
       riskCategory: this.kycForm.value.riskCategory || 1,
       ...receiptFields,
-      ...this.buildRiskProfileFields(),
+      ...this.buildExceptionFields()
-        ...this.buildExceptionFields()
     };
 
     this.clientsService
@@ -1391,297 +1307,6 @@ I further confirm that:
     doc.save(`Self_Declaration_${cifNumber}_${clientName.replace(/\s/g, '_')}.pdf`);
   }
 
-  // ── Document scans ─────────────────────────────────────────────────────────
-
-  /**
-   * Finds the identifier the KYC document was filed under and loads its scans.
-   *
-   * The KYC record keeps the document's name and number but not the identifier id, so the two are
-   * matched on the number — that is what makes them the same document, and it survives the client
-   * holding several identifiers of the same type.
-   */
-  private loadDocumentScans(): void {
-    if (!this.clientId) {
-      return;
-    }
-    this.docScansLoading = true;
-    this.clientsService
-      .getClientIdentifiers(this.clientId)
-      .pipe(catchError(() => of([] as any[])))
-      .subscribe((identifiers: any[]) => {
-        const wantedKey = (this.kycData?.kycDocumentNumber || '').toString().trim();
-        const wantedName = (this.kycData?.kycDocumentName || '').toString().trim().toLowerCase();
-        const norm = (s: any) => (s || '').toString().trim().toLowerCase();
-
-        // Every identifier carrying this document number, not just the first. The onboarding step
-        // files each side against its own identifier row, so this client's Aadhaar front sits on
-        // one row and the back on another under the same number - taking only the first match
-        // showed the front and reported the back as missing.
-        let matches = (identifiers || []).filter((i) => wantedKey && norm(i.documentKey) === norm(wantedKey));
-        if (!matches.length) {
-          matches = (identifiers || []).filter((i) => wantedName && norm(i.documentType?.name) === wantedName);
-        }
-
-        if (!matches.length) {
-          this.docScansLoading = false;
-          this.docIdentifierId = null;
-          this.docIdentifierIds = [];
-          this.docScans = { front: null, back: null };
-          return;
-        }
-        // Replacements are filed against the first row, so the sides stay together from here on.
-        this.docIdentifierId = String(matches[0].id);
-        this.docIdentifierIds = matches.map((m: any) => String(m.id));
-        this.fetchScansFor(this.docIdentifierIds);
-      });
-  }
-
-  /**
-   * Sides are read off the document name, which is how they were written at upload
-   * ("<Proof> — Front" / "— Back"). Where the name says nothing, upload order stands in, front
-   * first, rather than leaving a scan the officer cannot see.
-   */
-  private fetchScansFor(identifierIds: string[]): void {
-    forkJoin(
-      identifierIds.map((id) =>
-        this.clientsService.getClientIdentificationDocuments(id).pipe(
-          // Tagged with the row it came from, because the download call needs the parent id and
-          // the sides can be spread across more than one.
-          map((docs: any) => ((docs as any[]) || []).map((d) => ({ ...d, identifierId: id }))),
-          catchError(() => of([] as any[]))
-        )
-      )
-    ).subscribe((perIdentifier: any[][]) => {
-      this.docScansLoading = false;
-      // This runs again after every replace, so the previews being thrown away are revoked
-      // rather than left holding their blobs.
-      for (const old of [this.docScans.front, this.docScans.back]) {
-        if (old?.previewUrl) {
-          URL.revokeObjectURL(old.previewUrl);
-        }
-      }
-
-      // Oldest first by document id, so the newest upload for a side is the last one written and
-      // therefore the one that stands. Identifier order cannot do this job: a replacement is filed
-      // against the first row while the original sits on the second, so reading the rows in order
-      // let a document uploaded months ago overwrite the scan collected a moment ago - the officer
-      // pressed Replace, saw "replaced", and the old image came straight back.
-      const docs = perIdentifier.flat().sort((a, b) => Number(a.id) - Number(b.id));
-      const sides: typeof this.docScans = { front: null, back: null };
-      const unlabelled: any[] = [];
-
-      const entryOf = (d: any): DocScanSide => ({
-        documentId: String(d.id),
-        identifierId: String(d.identifierId),
-        fileName: d.fileName || d.name,
-        previewUrl: null
-      });
-
-      for (const d of docs) {
-        const text = `${d.name || ''} ${d.fileName || ''}`.toLowerCase();
-        // Later uploads win, so a replaced side shows the new scan rather than the original.
-        if (text.includes('back')) {
-          sides.back = entryOf(d);
-        } else if (text.includes('front')) {
-          sides.front = entryOf(d);
-        } else {
-          unlabelled.push(d);
-        }
-      }
-      for (const d of unlabelled) {
-        if (!sides.front) {
-          sides.front = entryOf(d);
-        } else if (!sides.back) {
-          sides.back = entryOf(d);
-        }
-      }
-
-      this.docScans = sides;
-      for (const key of ['front', 'back'] as const) {
-        if (sides[key]) {
-          this.loadScanPreview(sides[key]!);
-        }
-      }
-    });
-  }
-
-  private loadScanPreview(side: DocScanSide): void {
-    this.clientsService
-      .downloadClientIdentificationDocument(side.identifierId, side.documentId)
-      .pipe(catchError(() => of(null)))
-      .subscribe((blob: Blob | null) => {
-        if (!blob || !blob.type?.startsWith('image/')) {
-          return;
-        }
-        // Revoked in ngOnDestroy; a preview left behind holds the blob in memory for the life of
-        // the tab.
-        side.previewUrl = URL.createObjectURL(blob);
-      });
-  }
-
-  /**
-   * Replaces one side with a freshly collected scan.
-   *
-   * The new file is uploaded under the same side name, which is what the readers here and on the
-   * client screen key on, so the latest upload becomes the scan on show. The old file is left in
-   * place deliberately: a KYC document that has been re-collected is a record of what was held
-   * before and when it changed, and destroying it would leave the audit trail with a gap.
-   */
-  onDocScanSelected(event: Event, slot: 'front' | 'back'): void {
-    const input = event.target as HTMLInputElement;
-    const file = input.files?.[0];
-    // Cleared so choosing the same filename twice still fires a change event.
-    input.value = '';
-    if (!file || !this.docIdentifierId) {
-      return;
-    }
-
-    this.docScanError = null;
-    this.docScanSuccess = null;
-    this.docScanUploading = slot;
-
-    const label = slot === 'front' ? 'Front' : 'Back';
-    const docName = this.kycForm.get('kycDocumentName')?.value || this.kycData?.kycDocumentName || 'KYC document';
-
-    const formData = new FormData();
-    formData.append('file', file);
-    formData.append('name', `${docName} — ${label}`);
-    formData.append('description', `Re-collected on ${new Date().toLocaleDateString('en-IN')}`);
-
-    this.clientsService.uploadClientIdentifierDocument(this.docIdentifierId, formData).subscribe({
-      next: () => {
-        this.docScanUploading = null;
-        this.docScanSuccess = `${label} side replaced.`;
-        // Re-read every row, not just the one written to: the other side still lives on its own.
-        this.fetchScansFor(this.docIdentifierIds);
-      },
-      error: (err: any) => {
-        this.docScanUploading = null;
-        this.docScanError =
-          err?.error?.defaultUserMessage || err?.error?.developerMessage || `Could not replace the ${label.toLowerCase()} side.`;
-      }
-    });
-  }
-
-  /**
-   * A verified record only accepts an amendment with a reason on it, so the dialog has to ask for
-   * one. 300 is VERIFIED; the code form is checked too, since either can arrive on the payload.
-   */
-  private get isKycVerified(): boolean {
-    return this.kycData?.kycStatus === 300 || this.kycData?.kycStatusCode === 'clientKycStatus.verified';
-  }
-
-  /**
-   * Re-collects the officially valid document from its own row.
-   *
-   * PAN and Aadhaar are each handled on their row; this one sent the officer into edit mode on the
-   * whole KYC form to do the same job. The dialog asks for the number, the dates and each side of
-   * the scan together, which is what re-collecting a document actually is.
-   */
-  updateKycDocument(): void {
-    if (!this.kycId) {
-      this.docScanError = 'KYC record not found. Save KYC details first.';
-      return;
-    }
-
-    this.dialog
-      .open(KycDocumentUpdateDialogComponent, {
-        width: '640px',
-        maxWidth: '95vw',
-        disableClose: true,
-        data: {
-          documentName: this.kycData?.kycDocumentName || 'KYC document',
-          documentNumber: this.kycData?.kycDocumentNumber || '',
-          issueDate: this.parseApiDate(this.kycData?.kycDocIssueDate),
-          expiryDate: this.parseApiDate(this.kycData?.kycDocExpiryDate),
-          reason: this.showKycDocumentAlert ? this.kycDocumentAlertMessage : '',
-          currentFront: this.docScans.front?.previewUrl || null,
-          currentBack: this.docScans.back?.previewUrl || null,
-          requiresRemarks: this.isKycVerified
-        } as KycDocumentUpdateData
-      })
-      .afterClosed()
-      .subscribe((result: KycDocumentUpdateResult | undefined) => {
-        if (result) {
-          this.persistKycDocument(result);
-        }
-      });
-  }
-
-  /**
-   * Saves the corrected details, then uploads whichever sides were re-scanned.
-   *
-   * The details go first: they are the record, and a scan attached to a document whose number was
-   * never corrected would file the new image under the old identity.
-   */
-  private persistKycDocument(result: KycDocumentUpdateResult): void {
-    this.saving = true;
-    this.docScanError = null;
-    this.docScanSuccess = null;
-
-    const dateFormat = 'dd MMMM yyyy';
-    const payload: any = {
-      locale: 'en',
-      dateFormat,
-      kycDocumentName: this.kycData?.kycDocumentName || null,
-      kycDocumentNumber: result.documentNumber || null,
-      kycDocIssueDate: result.issueDate ? this.dateUtils.formatDate(result.issueDate, dateFormat) : null,
-      kycDocExpiryDate: result.expiryDate ? this.dateUtils.formatDate(result.expiryDate, dateFormat) : null
-    };
-    // The server refuses an amendment to a verified record without one, and records it as the
-    // reason the document changed.
-    if (result.remarks) {
-      payload.remarks = result.remarks;
-    }
-
-    this.clientsService.updateClientKyc(this.clientId, this.kycId!, payload).subscribe({
-      next: () => {
-        this.saving = false;
-        this.docScanSuccess = 'Document updated.';
-        this.loadKycData();
-        this.uploadReplacedSides(result);
-      },
-      error: (err: any) => {
-        this.saving = false;
-        this.docScanError =
-          err?.error?.defaultUserMessage || err?.error?.developerMessage || 'Could not update the document.';
-      }
-    });
-  }
-
-  /** Sends each re-scanned side through the same upload path the panel below uses. */
-  private uploadReplacedSides(result: KycDocumentUpdateResult): void {
-    if (!this.docIdentifierId) {
-      return;
-    }
-    const sides: { slot: 'front' | 'back'; file: File }[] = [];
-    if (result.front) {
-      sides.push({ slot: 'front', file: result.front });
-    }
-    if (result.back) {
-      sides.push({ slot: 'back', file: result.back });
-    }
-    if (!sides.length) {
-      return;
-    }
-
-    const docName = this.kycData?.kycDocumentName || 'KYC document';
-    forkJoin(
-      sides.map(({ slot, file }) => {
-        const formData = new FormData();
-        formData.append('file', file);
-        formData.append('name', `${docName} — ${slot === 'front' ? 'Front' : 'Back'}`);
-        formData.append('description', `Re-collected on ${new Date().toLocaleDateString('en-IN')}`);
-        return this.clientsService
-          .uploadClientIdentifierDocument(this.docIdentifierId!, formData)
-          .pipe(catchError(() => of(null)));
-      })
-    ).subscribe(() => {
-      this.docScanSuccess = 'Document and scan updated.';
-      this.fetchScansFor(this.docIdentifierIds);
-    });
-  }
-
   /** Handle file selection for signed declaration upload */
   onDeclarationFileSelected(event: Event): void {
     const input = event.target as HTMLInputElement;
@@ -1740,11 +1365,5 @@ I further confirm that:
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
-    // Object URLs are held by the browser until revoked, so the scan blobs would outlive the tab.
-    for (const side of [this.docScans.front, this.docScans.back]) {
-      if (side?.previewUrl) {
-        URL.revokeObjectURL(side.previewUrl);
-      }
-    }
   }
 }

src/app/clients/clients.service.ts

@@ -569,8 +569,19 @@ export class ClientsService {
     return this.http.get(`/clients/${clientId}/documents`);
   }
 
-  downloadClientDocument(parentEntityId: string, documentId: string) {
+  /**
-    return this.http.get(`/clients/${parentEntityId}/documents/${documentId}/attachment`, { responseType: 'blob' });
+   * Fetches a client document's stored file.
+   *
+   * `silent` opts the request out of ErrorHandlerInterceptor's alert. Pass it when the caller
+   * renders its own failure state - notably thumbnail fetches, where a `m_document` row whose file
+   * is no longer in the content store returns 500 and would otherwise pop a modal the user can do
+   * nothing about. The interceptor still rethrows, so the caller's error callback continues to run.
+   */
+  downloadClientDocument(parentEntityId: string, documentId: string, silent = false) {
+    return this.http.get(`/clients/${parentEntityId}/documents/${documentId}/attachment`, {
+      responseType: 'blob',
+      ...(silent ? { context: new HttpContext().set(SILENT_HTTP_ERROR, true) } : {})
+    });
   }
 
   uploadClientDocument(clientId: string, documentData: any) {
@@ -992,12 +1003,28 @@ export class ClientsService {
     return this.http.post(`/clients/${clientId}/entityclassification/${category}`, data);
   }
 
-  getClientCkyc(clientId: string): Observable<any> {
+  /**
-    return this.http.get(`/clients/${clientId}/ckyc`);
+   * Uploads a single CKYC artefact against the client, using the platform's generic document
+   * endpoint (DocumentApiResource, POST /v1/{entityType}/{entityId}/documents). There is no
+   * CKYC-specific document API on the backend - the earlier `/clients/{id}/ckyc/documents` path
+   * was never implemented and returned 404.
+   *
+   * The multipart body must carry `file`, `name` and `description`; the caller builds those so the
+   * stored document stays identifiable by CKYC artefact type. See ckyc-tab.component.ts.
+   */
+  uploadCkycDocument(clientId: string, formData: FormData): Observable<any> {
+    return this.http.post(`/clients/${clientId}/documents`, formData);
   }
 
-  uploadCkycDocument(clientId: string, formData: FormData): Observable<any> {
+  /**
-    return this.http.post(`/clients/${clientId}/ckyc/documents`, formData);
+   * Replaces the content of an existing client document in place (DocumentApiResource PUT
+   * /v1/{entityType}/{entityId}/documents/{documentId}), keeping the same document id.
+   *
+   * Used by the CKYC screen's "Upload new version" so a re-upload updates the existing artefact
+   * rather than adding another row. Takes the same multipart body as the create call.
+   */
+  replaceClientDocument(clientId: string, documentId: string, formData: FormData): Observable<any> {
+    return this.http.put(`/clients/${clientId}/documents/${documentId}`, formData);
   }
 
   /**

src/app/clients/create-client/create-client.component.ts

@@ -840,15 +840,6 @@ export class CreateClientComponent {
     this.saveAddressProof(clientId);
   }
 
-  /** "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" — same convention the CKYC tab and
-   *  client-india-address-step's own "load existing" parsing both read back. */
-  private buildProofDescription(issueDate: string | null | undefined, expiryDate: string | null | undefined): string {
-    const parts: string[] = [];
-    if (issueDate) parts.push(`Issue date: ${issueDate}`);
-    if (expiryDate) parts.push(`Expiry date: ${expiryDate}`);
-    return parts.join(', ');
-  }
-
   /**
    * Save the address-proof picked on the permanent tab as a client identifier
    * + upload each selected file as a document attached to that identifier.
@@ -864,9 +855,9 @@ export class CreateClientComponent {
     const proofName = payload.proof?.name || 'Address Proof';
     const identifierData: any = {
       documentTypeId: payload.proofId,
-      status: 'ACTIVE',
+      status: 'Active',
       documentKey: payload.documentKey || `${proofName} - ${clientId}`,
-      description: this.buildProofDescription(payload.issueDate, payload.expiryDate)
+      description: payload.issueDate ? `Issue date: ${payload.issueDate}` : ''
     };
 
     this.clientsService.addClientIdentifier(clientId, identifierData).subscribe({
@@ -913,7 +904,7 @@ export class CreateClientComponent {
       }
       const identifierData: any = {
         documentTypeId,
-        status: 'ACTIVE',
+        status: 'Active',
         documentKey: payload.documentKey || `${proofName} - ${clientId}`,
         description: 'KYC document'
       };

src/app/clients/edit-client/contact-otp-block/contact-otp-block.component.ts

@@ -164,13 +164,6 @@ export class ContactOtpBlockComponent implements OnChanges, OnDestroy {
     request$.subscribe({
       next: (res: any) => {
         this.sending = false;
-        // The backend reports failure to actually dispatch the OTP (gateway error, flagged
-        // number, SMTP failure...) as a 200 response with success:false and a real reason in
-        // `message` — never a thrown error. Surface that reason instead of treating it as sent.
-        if (res?.success === false) {
-          this.errorMessage = res?.message || 'Could not send OTP.';
-          return;
-        }
         this.otpId = res?.otpId ?? res?.resourceId ?? null;
         this.otpSent = true;
         this.clearAllDigits();

src/app/clients/edit-client/edit-client.component.ts

@@ -1035,15 +1035,6 @@ export class EditClientComponent {
     this.saveAddressProof(clientId);
   }
 
-  /** "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" — same convention the CKYC tab and
-   *  client-india-address-step's own "load existing" parsing both read back. */
-  private buildProofDescription(issueDate: string | null | undefined, expiryDate: string | null | undefined): string {
-    const parts: string[] = [];
-    if (issueDate) parts.push(`Issue date: ${issueDate}`);
-    if (expiryDate) parts.push(`Expiry date: ${expiryDate}`);
-    return parts.join(', ');
-  }
-
   /**
    * Save the address-proof picked on the permanent tab as a client identifier
    * + upload each selected file as a document attached to that identifier.
@@ -1059,9 +1050,9 @@ export class EditClientComponent {
     const proofName = payload.proof?.name || 'Address Proof';
     const identifierData: any = {
       documentTypeId: payload.proofId,
-      status: 'ACTIVE',
+      status: 'Active',
       documentKey: payload.documentKey || `${proofName} - ${clientId}`,
-      description: this.buildProofDescription(payload.issueDate, payload.expiryDate)
+      description: payload.issueDate ? `Issue date: ${payload.issueDate}` : ''
     };
 
     this.clientsService.addClientIdentifier(clientId, identifierData).subscribe({
@@ -1114,7 +1105,7 @@ export class EditClientComponent {
     const existingId = this.clientKycStep?.existingKycIdentifierId;
     if (existingId) {
       this.resolveDocumentTypeId(payload.proofId, proofName).subscribe((documentTypeId: number | null) => {
-        const update: any = { documentKey: payload.documentKey || `${proofName} - ${clientId}`, status: 'ACTIVE' };
+        const update: any = { documentKey: payload.documentKey || `${proofName} - ${clientId}`, status: 'Active' };
         if (documentTypeId != null) {
           update.documentTypeId = documentTypeId;
         }
@@ -1137,7 +1128,7 @@ export class EditClientComponent {
       }
       const identifierData: any = {
         documentTypeId,
-        status: 'ACTIVE',
+        status: 'Active',
         documentKey: payload.documentKey || `${proofName} - ${clientId}`,
         description: 'KYC document'
       };

src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.html

@@ -1,137 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<h2 mat-dialog-title class="kdu-title">
-  <mat-icon>description</mat-icon>
-  Update {{ data.documentName }}
-</h2>
-
-<mat-dialog-content class="kdu-body">
-  <!-- Why this is being asked for, in the words the alert used. -->
-  @if (data.reason) {
-    <div class="kdu-reason">
-      <mat-icon>schedule</mat-icon>
-      <span>{{ data.reason }}</span>
-    </div>
-  }
-
-  <form [formGroup]="form" class="kdu-form">
-    <mat-form-field appearance="outline" class="kdu-field kdu-field--wide">
-      <mat-label>Document Number</mat-label>
-      <input matInput formControlName="documentNumber" autocomplete="off" />
-      @if (form.get('documentNumber')?.hasError('required') && form.get('documentNumber')?.touched) {
-        <mat-error>Document number is required</mat-error>
-      }
-    </mat-form-field>
-
-    <mat-form-field appearance="outline" class="kdu-field">
-      <mat-label>Issued On</mat-label>
-      <input matInput [matDatepicker]="issuePicker" formControlName="issueDate" />
-      <mat-datepicker-toggle matSuffix [for]="issuePicker"></mat-datepicker-toggle>
-      <mat-datepicker #issuePicker></mat-datepicker>
-    </mat-form-field>
-
-    <mat-form-field appearance="outline" class="kdu-field">
-      <mat-label>Valid Till</mat-label>
-      <input matInput [matDatepicker]="expiryPicker" formControlName="expiryDate" />
-      <mat-datepicker-toggle matSuffix [for]="expiryPicker"></mat-datepicker-toggle>
-      <mat-datepicker #expiryPicker></mat-datepicker>
-      <mat-hint>Blank if it does not expire</mat-hint>
-    </mat-form-field>
-
-    <!-- Only where the KYC record is already verified. Changing what a verified record holds is an
-         amendment, and the reason goes on the record with it. -->
-    @if (data.requiresRemarks) {
-      <mat-form-field appearance="outline" class="kdu-field kdu-field--wide">
-        <mat-label>Reason for update</mat-label>
-        <textarea
-          matInput
-          formControlName="remarks"
-          rows="2"
-          placeholder="e.g. Document expired — fresh copy collected from the customer"
-        ></textarea>
-        <mat-hint>Recorded against the verified KYC record</mat-hint>
-        @if (form.get('remarks')?.hasError('required') && form.get('remarks')?.touched) {
-          <mat-error>A reason is required to change a verified KYC record</mat-error>
-        }
-      </mat-form-field>
-    }
-  </form>
-
-  <div class="kdu-scans">
-    <div class="kdu-scans__head">Scanned copy</div>
-    <p class="kdu-scans__hint">
-      Leave a side untouched to keep the scan already on file. The previous copy is kept either way.
-    </p>
-
-    <div class="kdu-sides">
-      @for (slot of slots; track slot) {
-        <div class="kdu-side">
-          <div class="kdu-side__label">
-            {{ slot === 'front' ? 'Front' : 'Back' }}
-            @if (isReplaced(slot)) {
-              <span class="kdu-side__new">New</span>
-            }
-          </div>
-
-          <div class="kdu-side__frame" [class.kdu-side__frame--new]="isReplaced(slot)">
-            @if (previewOf(slot)) {
-              <img [src]="previewOf(slot)" [alt]="slot === 'front' ? 'Front of document' : 'Back of document'" />
-            } @else if (isReplaced(slot)) {
-              <!-- Picked, but not an image (a PDF, say) — named rather than shown. -->
-              <div class="kdu-side__file">
-                <mat-icon>insert_drive_file</mat-icon>
-                <span>{{ pickedName(slot) }}</span>
-              </div>
-            } @else {
-              <div class="kdu-side__none">Not on file</div>
-            }
-          </div>
-
-          <div class="kdu-side__actions">
-            <button type="button" mat-stroked-button class="kdu-side__btn" (click)="sideInput.click()">
-              {{ previewOf(slot) || isReplaced(slot) ? 'Choose new scan' : 'Upload scan' }}
-            </button>
-            @if (isReplaced(slot)) {
-              <button
-                type="button"
-                mat-icon-button
-                class="kdu-side__undo"
-                matTooltip="Keep the scan already on file"
-                (click)="clearPick(slot)"
-              >
-                <mat-icon>undo</mat-icon>
-              </button>
-            }
-          </div>
-          <input
-            #sideInput
-            type="file"
-            hidden
-            accept="image/*,application/pdf"
-            (change)="onFilePicked($event, slot)"
-          />
-        </div>
-      }
-    </div>
-  </div>
-</mat-dialog-content>
-
-<mat-dialog-actions align="end" class="kdu-actions">
-  <button mat-stroked-button type="button" (click)="cancel()">Cancel</button>
-  <button
-    mat-flat-button
-    color="primary"
-    type="button"
-    [disabled]="form.invalid || !hasChanges"
-    [matTooltip]="!hasChanges ? 'Change a detail or add a scan first' : ''"
-    (click)="submit()"
-  >
-    Save Document
-  </button>
-</mat-dialog-actions>

src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.scss

@@ -1,172 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-.kdu-title {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-
-  mat-icon {
-    color: #64748b;
-  }
-}
-
-.kdu-body {
-  padding-top: 4px;
-}
-
-.kdu-reason {
-  display: flex;
-  align-items: flex-start;
-  gap: 8px;
-  margin-bottom: 16px;
-  padding: 10px 12px;
-  border: 1px solid #fde68a;
-  border-radius: 6px;
-  background: #fffbeb;
-  color: #92400e;
-  font-size: 13px;
-  line-height: 1.5;
-
-  mat-icon {
-    flex: 0 0 auto;
-    font-size: 18px;
-    width: 18px;
-    height: 18px;
-    color: #d97706;
-  }
-}
-
-.kdu-form {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 12px;
-}
-
-.kdu-field {
-  flex: 1 1 180px;
-}
-
-.kdu-field--wide {
-  flex: 1 1 100%;
-}
-
-.kdu-scans {
-  margin-top: 8px;
-  padding: 12px;
-  border: 1px solid #e2e8f0;
-  border-radius: 8px;
-  background: #f8fafc;
-}
-
-.kdu-scans__head {
-  font-size: 12px;
-  font-weight: 700;
-  letter-spacing: 0.03em;
-  text-transform: uppercase;
-  color: #475569;
-}
-
-.kdu-scans__hint {
-  margin: 4px 0 12px;
-  font-size: 12px;
-  color: #64748b;
-}
-
-.kdu-sides {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 16px;
-}
-
-.kdu-side {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  width: 210px;
-}
-
-.kdu-side__label {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  font-size: 12px;
-  font-weight: 700;
-  color: #334155;
-}
-
-/* Marks the side the officer has just re-scanned, so it is obvious what will change on save. */
-.kdu-side__new {
-  padding: 1px 7px;
-  border-radius: 999px;
-  background: #dcfce7;
-  color: #15803d;
-  font-size: 10.5px;
-  font-weight: 700;
-}
-
-.kdu-side__frame {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 132px;
-  padding: 6px;
-  border: 1px solid #e2e8f0;
-  border-radius: 6px;
-  background: #fff;
-  overflow: hidden;
-
-  img {
-    max-width: 100%;
-    max-height: 100%;
-    object-fit: contain;
-    border-radius: 3px;
-  }
-
-  &--new {
-    border-color: #86efac;
-    box-shadow: 0 0 0 1px #86efac;
-  }
-}
-
-.kdu-side__none {
-  font-size: 12px;
-  color: #94a3b8;
-}
-
-.kdu-side__file {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 4px;
-  padding: 0 6px;
-  font-size: 11px;
-  color: #475569;
-  text-align: center;
-  word-break: break-word;
-
-  mat-icon {
-    color: #64748b;
-  }
-}
-
-.kdu-side__actions {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-}
-
-.kdu-side__btn {
-  flex: 1;
-  font-size: 12px;
-}
-
-.kdu-actions {
-  padding: 8px 24px 20px;
-  gap: 8px;
-}

src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.ts

@@ -1,215 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/** Angular Imports */
-import { Component, OnDestroy, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { UntypedFormBuilder, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
-import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { MatButtonModule } from '@angular/material/button';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatIconModule } from '@angular/material/icon';
-import { MatInputModule } from '@angular/material/input';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-
-/** What the caller hands in: the document as it stands, and the scans already on file. */
-export interface KycDocumentUpdateData {
-  documentName: string;
-  documentNumber: string;
-  issueDate: Date | string | null;
-  expiryDate: Date | string | null;
-  /** Why the document is being asked for, shown at the top so the officer sees the reason. */
-  reason: string;
-  /** Previews of what is currently held, so the officer can see what they are replacing. */
-  currentFront: string | null;
-  currentBack: string | null;
-  /**
-   * True when the KYC record is already verified. Changing data on one of those needs a reason on
-   * the record, which the server enforces - so the dialog asks for it rather than letting the
-   * officer fill the whole form in and be refused on submit.
-   */
-  requiresRemarks: boolean;
-}
-
-/** What the caller gets back: the corrected details, plus whichever sides were re-scanned. */
-export interface KycDocumentUpdateResult {
-  documentNumber: string;
-  issueDate: Date | null;
-  expiryDate: Date | null;
-  front: File | null;
-  back: File | null;
-  /** Why the document was re-collected. Blank unless the record was already verified. */
-  remarks: string;
-}
-
-/**
- * Re-collects an officially valid document without leaving the KYC record.
- *
- * PAN and Aadhaar are each dealt with on their own row of the verification table. The OVD was the
- * exception: its Update button put the whole KYC form into edit mode, so re-collecting one expiring
- * document meant scrolling a form of unrelated fields and finding the same document again. The work
- * is the same either way - a new number, new dates, a fresh scan of each side - so it is asked for
- * in one place.
- */
-@Component({
-  selector: 'mifosx-kyc-document-update-dialog',
-  templateUrl: './kyc-document-update-dialog.component.html',
-  styleUrls: ['./kyc-document-update-dialog.component.scss'],
-  standalone: true,
-  // The shared set carries the date adapter the two datepickers below need; the sibling dialogs
-  // pull it in the same way.
-  imports: [
-    ...STANDALONE_SHARED_IMPORTS,
-    CommonModule,
-    ReactiveFormsModule,
-    MatDialogModule,
-    MatButtonModule,
-    MatDatepickerModule,
-    MatFormFieldModule,
-    MatIconModule,
-    MatInputModule,
-    MatProgressSpinnerModule,
-    MatTooltipModule
-  ]
-})
-export class KycDocumentUpdateDialogComponent implements OnDestroy {
-  private formBuilder = inject(UntypedFormBuilder);
-  private dialogRef = inject<MatDialogRef<KycDocumentUpdateDialogComponent>>(MatDialogRef);
-  data = inject<KycDocumentUpdateData>(MAT_DIALOG_DATA);
-
-  form: UntypedFormGroup;
-
-  /** Newly chosen files, with a local preview so the officer sees what they picked. */
-  picked: { front: File | null; back: File | null } = { front: null, back: null };
-  pickedPreview: { front: string | null; back: string | null } = { front: null, back: null };
-
-  readonly slots: ('front' | 'back')[] = [
-    'front',
-    'back'
-  ];
-
-  constructor() {
-    this.form = this.formBuilder.group({
-      documentNumber: [
-        this.data.documentNumber || '',
-        [Validators.required]
-      ],
-      issueDate: [this.toDate(this.data.issueDate)],
-      // Left free rather than required: a passport expires, a PAN card does not.
-      expiryDate: [this.toDate(this.data.expiryDate)],
-      // Required only where the server requires it, so completing a record that was never verified
-      // does not demand a justification for filling in blanks.
-      remarks: [
-        '',
-        this.data.requiresRemarks ? [Validators.required] : []
-      ]
-    });
-  }
-
-  private toDate(value: Date | string | null): Date | null {
-    if (!value) {
-      return null;
-    }
-    const d = value instanceof Date ? value : new Date(value);
-    return isNaN(d.getTime()) ? null : d;
-  }
-
-  previewOf(slot: 'front' | 'back'): string | null {
-    return this.pickedPreview[slot] || (slot === 'front' ? this.data.currentFront : this.data.currentBack);
-  }
-
-  /** True once this side has been re-scanned in this dialog, so the label can say so. */
-  isReplaced(slot: 'front' | 'back'): boolean {
-    return !!this.picked[slot];
-  }
-
-  pickedName(slot: 'front' | 'back'): string {
-    return this.picked[slot]?.name || '';
-  }
-
-  onFilePicked(event: Event, slot: 'front' | 'back'): void {
-    const input = event.target as HTMLInputElement;
-    const file = input.files?.[0] || null;
-    // Cleared so re-picking the same filename still fires a change event.
-    input.value = '';
-    if (!file) {
-      return;
-    }
-    if (this.pickedPreview[slot]) {
-      URL.revokeObjectURL(this.pickedPreview[slot]!);
-    }
-    this.picked[slot] = file;
-    this.pickedPreview[slot] = file.type.startsWith('image/') ? URL.createObjectURL(file) : null;
-  }
-
-  clearPick(slot: 'front' | 'back'): void {
-    if (this.pickedPreview[slot]) {
-      URL.revokeObjectURL(this.pickedPreview[slot]!);
-    }
-    this.picked[slot] = null;
-    this.pickedPreview[slot] = null;
-  }
-
-  /**
-   * Something has to change for the update to mean anything - either a corrected detail or a fresh
-   * scan. Submitting an untouched form would reopen a verified KYC record for no reason.
-   */
-  get hasChanges(): boolean {
-    if (this.picked.front || this.picked.back) {
-      return true;
-    }
-    const v = this.form.value;
-    const sameNumber = (v.documentNumber || '').trim() === (this.data.documentNumber || '').trim();
-    const sameIssue = this.sameDay(v.issueDate, this.toDate(this.data.issueDate));
-    const sameExpiry = this.sameDay(v.expiryDate, this.toDate(this.data.expiryDate));
-    return !(sameNumber && sameIssue && sameExpiry);
-  }
-
-  private sameDay(a: Date | null, b: Date | null): boolean {
-    if (!a && !b) {
-      return true;
-    }
-    if (!a || !b) {
-      return false;
-    }
-    return a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate();
-  }
-
-  submit(): void {
-    if (this.form.invalid || !this.hasChanges) {
-      this.form.markAllAsTouched();
-      return;
-    }
-    const v = this.form.value;
-    const result: KycDocumentUpdateResult = {
-      documentNumber: (v.documentNumber || '').trim(),
-      issueDate: v.issueDate || null,
-      expiryDate: v.expiryDate || null,
-      front: this.picked.front,
-      back: this.picked.back,
-      remarks: (v.remarks || '').trim()
-    };
-    this.dialogRef.close(result);
-  }
-
-  cancel(): void {
-    this.dialogRef.close();
-  }
-
-  ngOnDestroy(): void {
-    // Only the previews this dialog created; the caller owns the ones it passed in.
-    for (const slot of this.slots) {
-      if (this.pickedPreview[slot]) {
-        URL.revokeObjectURL(this.pickedPreview[slot]!);
-      }
-    }
-  }
-}

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

@@ -310,6 +310,41 @@
         </nav>
       }
     }
+
+    <!-- Live KPI ticker items — referenced twice below for seamless marquee loop -->
+    <ng-template #kpiTickerItems>
+      <span class="ti"><span class="ti-k">CASH</span><span class="ti-v amber">₹14,82,500</span></span>
+      <span class="ti-d">│</span>
+      <span class="ti">
+        <span class="ti-k">TXN TODAY</span>
+        <span class="ti-v">1,247</span>
+        <span class="ti-v up">↑ 8.2%</span>
+      </span>
+      <span class="ti-d">│</span>
+      <span class="ti"><span class="ti-k">CLEARING IN</span><span class="ti-v">42</span></span>
+      <span class="ti-d">│</span>
+      <span class="ti"><span class="ti-k">CLEARING OUT</span><span class="ti-v">38</span></span>
+      <span class="ti-d">│</span>
+      <span class="ti">
+        <span class="ti-k">NPA·GROSS</span>
+        <span class="ti-v amber">3.47%</span>
+        <span class="ti-v down">↑ 0.12</span>
+      </span>
+      <span class="ti-d">│</span>
+      <span class="ti"><span class="ti-k">CASA</span><span class="ti-v">58.2%</span></span>
+      <span class="ti-d">│</span>
+      <span class="ti"><span class="ti-k">CD RATIO</span><span class="ti-v">71.8%</span></span>
+      <span class="ti-d">│</span>
+      <span class="ti">
+        <span class="ti-k">RBI CIRC</span>
+        <span class="ti-v">DBR.AML.NO.4/14.01.001</span>
+        <span class="ti-v amber">NEW</span>
+      </span>
+      <span class="ti-d">│</span>
+      <span class="ti"><span class="ti-k">REPO</span><span class="ti-v">6.50%</span></span>
+      <span class="ti-d">│</span>
+    </ng-template>
+
     <!-- ============================================================
          Main Header — 2-Row Navigation
          ============================================================
@@ -588,11 +623,18 @@
         </div>
       </div>
 
-      <!-- The KPI ticker that sat here has been removed. Every figure in it was written into the template — cash on
+      <!-- LIVE KPI TICKER (below the menu — pauses on hover) -->
-           hand, transactions today, CASA, CD ratio, gross NPA, a circular reference — and none came from the bank's
+      <div class="kpi-ticker" role="marquee" aria-label="Live key-performance ticker">
-           own books. Under a "LIVE" badge on every screen in the application, that is not decoration: a figure a
+        <span class="kpi-live">
-           branch manager can read as the day's cash position, or an inspector as the NPA ratio, has to be the real
+          <span class="kpi-live-dot"></span>
-           one or must not be shown. The band returns when there is a source behind it. -->
+          LIVE
+        </span>
+        <div class="kpi-track">
+          <!-- Render the item block twice so the marquee loops seamlessly. -->
+          <ng-container *ngTemplateOutlet="kpiTickerItems"></ng-container>
+          <ng-container *ngTemplateOutlet="kpiTickerItems"></ng-container>
+        </div>
+      </div>
     }
     <!-- end @if (!hideShellLayout) -->
 
@@ -671,9 +713,6 @@
       <button mat-menu-item routerLink="/reports/tds-remittance" tabindex="0">
         <i class="fa fa-landmark menu-item-icon"></i> TDS Remitted to Government
       </button>
-      <button mat-menu-item routerLink="/reports/bor" tabindex="0">
-        <i class="fa fa-gavel menu-item-icon"></i> BOR Register &mdash; Share Capital
-      </button>
     </mat-menu>
 
     <!-- Admin Mega Menu — 3-column rectangular panel grouping Setup,
@@ -883,11 +922,7 @@
               (click)="subLedgerOpen = false"
               ><fa-icon icon="balance-scale" class="gl-icon"></fa-icon> Suit File Entry</a
             >
-            <a
+            <a class="gl-link" [class.hidden]="!matchesSubLedgerSearch('Locker Entry')" (click)="subLedgerOpen = false"
-              class="gl-link"
-              [class.hidden]="!matchesSubLedgerSearch('Locker Entry')"
-              routerLink="/locker"
-              (click)="subLedgerOpen = false"
               ><fa-icon icon="lock" class="gl-icon"></fa-icon> Locker Entry</a
             >
             <a
@@ -1179,29 +1214,14 @@
           <button mat-menu-item tabindex="0" [routerLink]="['/accounts/recurring-deposits']">
             <fa-icon icon="sync" class="menu-item-icon"></fa-icon> Recurring
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/accounts/dds']" (click)="depositsMenu.closed.emit()">
+          <button mat-menu-item tabindex="0"><fa-icon icon="coins" class="menu-item-icon"></fa-icon> DDS</button>
-            <fa-icon icon="coins" class="menu-item-icon"></fa-icon> DDS Party Master
-          </button>
-          <button
-            mat-menu-item
-            tabindex="0"
-            [routerLink]="['/accounts/dds-accounts']"
-            (click)="depositsMenu.closed.emit()"
-          >
-            <fa-icon icon="list-alt" class="menu-item-icon"></fa-icon> DDS Accounts
-          </button>
         </div>
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Agent</div>
           <button mat-menu-item tabindex="0">
             <fa-icon icon="hand-holding-usd" class="menu-item-icon"></fa-icon> Agent Commission
           </button>
-          <button
+          <button mat-menu-item tabindex="0">
-            mat-menu-item
-            tabindex="0"
-            [routerLink]="['/accounts/dds-collection']"
-            (click)="depositsMenu.closed.emit()"
-          >
             <fa-icon icon="calendar-check" class="menu-item-icon"></fa-icon> Today Collection
           </button>
           <button mat-menu-item tabindex="0">
@@ -1216,14 +1236,6 @@
         </div>
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Reports</div>
-          <button
-            mat-menu-item
-            tabindex="0"
-            [routerLink]="['/accounts/dds-reports']"
-            (click)="depositsMenu.closed.emit()"
-          >
-            <fa-icon icon="coins" class="menu-item-icon"></fa-icon> DDS Reports
-          </button>
           <button mat-menu-item tabindex="0" [routerLink]="['/savings-daily-interest']">
             <fa-icon icon="chart-line" class="menu-item-icon"></fa-icon> Savings Daily Interest
           </button>
@@ -1327,79 +1339,72 @@
         <!-- Share Operations -->
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Share Operations</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/nominal-shares']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="coins" class="menu-item-icon"></fa-icon> Nominal Share Report
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/share-wise']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="file-alt" class="menu-item-icon"></fa-icon> Share Wise Report
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/guarantor-detail']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="user-shield" class="menu-item-icon"></fa-icon> Guarantor Detail
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/member-interest']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="calculator" class="menu-item-icon"></fa-icon> Total Int Rec
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/enquiry']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="search" class="menu-item-icon"></fa-icon> Share Enquiry
           </button>
         </div>
         <!-- Share Documents -->
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Share Documents</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/payment-certificate']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="file-signature" class="menu-item-icon"></fa-icon> Share Payment Certificate
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/share-detail']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="list-alt" class="menu-item-icon"></fa-icon> Share Detail
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/dividend-statement']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="dollar-sign" class="menu-item-icon"></fa-icon> Dividend Statement
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/transfers']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="exchange" class="menu-item-icon"></fa-icon> Share Transfer
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/folio-statement']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="file-alt" class="menu-item-icon"></fa-icon> Folio Statement
           </button>
         </div>
         <!-- Share Reports -->
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Share Reports</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/final-balance']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="chart-line" class="menu-item-icon"></fa-icon> Final Balance
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/account-statement']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="file-invoice" class="menu-item-icon"></fa-icon> Account Statement
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/share-issued']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="check-circle" class="menu-item-icon"></fa-icon> Share Issued
           </button>
           <button mat-menu-item tabindex="0" [routerLink]="['/shares/share-holders']">
             <fa-icon icon="users" class="menu-item-icon"></fa-icon> Share Holder
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/share-status']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="info-circle" class="menu-item-icon"></fa-icon> Share Status
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/product-summary']">
-            <fa-icon icon="layer-group" class="menu-item-icon"></fa-icon> Product Summary
-          </button>
         </div>
         <!-- Share Admin -->
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Share Admin</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/distinctive-numbers']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="tag" class="menu-item-icon"></fa-icon> Share Devede No Detail
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/area-wise']">
+          <button mat-menu-item tabindex="0"><fa-icon icon="map" class="menu-item-icon"></fa-icon> Area Wise</button>
-            <fa-icon icon="map" class="menu-item-icon"></fa-icon> Area Wise
+          <button mat-menu-item tabindex="0"><fa-icon icon="tag" class="menu-item-icon"></fa-icon> Share Label</button>
-          </button>
+          <button mat-menu-item tabindex="0">
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/labels']">
-            <fa-icon icon="tag" class="menu-item-icon"></fa-icon> Share Label
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/shares/reports/letters']">
             <fa-icon icon="envelope" class="menu-item-icon"></fa-icon> Share Letter
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/letter-mgmt/share-member']">
+          <button mat-menu-item tabindex="0">
             <fa-icon icon="id-card" class="menu-item-icon"></fa-icon> Share Member Details
           </button>
         </div>
@@ -1421,9 +1426,7 @@
           <button mat-menu-item tabindex="0">
             <fa-icon icon="user-slash" class="menu-item-icon" style="color: #c2410c"></fa-icon> Non-Customer Entry
           </button>
-          <button mat-menu-item routerLink="/locker" tabindex="0">
+          <button mat-menu-item tabindex="0"><fa-icon icon="lock" class="menu-item-icon"></fa-icon> Locker</button>
-            <fa-icon icon="lock" class="menu-item-icon"></fa-icon> Locker
-          </button>
           <button mat-menu-item routerLink="/investment/bonds" tabindex="0">
             <fa-icon icon="chart-line" class="menu-item-icon"></fa-icon> SLR and Non SLR Investment Report
           </button>

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

@@ -299,38 +299,32 @@
           </mat-icon>
           <a matLine>{{ 'labels.menus.Notifications' | translate }}</a>
         </mat-list-item>
-        <!-- Frequent Postings / Create Journal Entry — hidden while disabled, see
+        <mat-list-item
-             accounting/disabled-features.ts -->
+          [routerLink]="['/accounting/journal-entries/frequent-postings']"
-        @if (!disabledFeatures.frequentPostings) {
+          [matTooltipPosition]="tooltipPosition"
-          <mat-list-item
+          matTooltip="{{ 'tooltips.Frequent Postings' | translate }}"
-            [routerLink]="['/accounting/journal-entries/frequent-postings']"
+          routerLinkActive="active-menu"
-            [matTooltipPosition]="tooltipPosition"
+          [routerLinkActiveOptions]="{ exact: false }"
-            matTooltip="{{ 'tooltips.Frequent Postings' | translate }}"
+          *mifosxHasPermission="'SIDEBAR_FREQUENT_POSTINGS'"
-            routerLinkActive="active-menu"
+        >
-            [routerLinkActiveOptions]="{ exact: false }"
+          <mat-icon matListIcon>
-            *mifosxHasPermission="'SIDEBAR_FREQUENT_POSTINGS'"
+            <fa-icon icon="sync" size="sm"></fa-icon>
-          >
+          </mat-icon>
-            <mat-icon matListIcon>
+          <a matLine #frequentPostings>{{ 'labels.menus.Frequent Postings' | translate }}</a>
-              <fa-icon icon="sync" size="sm"></fa-icon>
+        </mat-list-item>
-            </mat-icon>
+        <mat-list-item
-            <a matLine #frequentPostings>{{ 'labels.menus.Frequent Postings' | translate }}</a>
+          [routerLink]="['/accounting/journal-entries/create']"
-          </mat-list-item>
+          [matTooltipPosition]="tooltipPosition"
-        }
+          matTooltip="{{ 'tooltips.Create Journal Entry' | translate }}"
-        @if (!disabledFeatures.createJournalEntries) {
+          routerLinkActive="active-menu"
-          <mat-list-item
+          [routerLinkActiveOptions]="{ exact: false }"
-            [routerLink]="['/accounting/journal-entries/create']"
+          *mifosxHasPermission="'SIDEBAR_JOURNAL_ENTRY'"
-            [matTooltipPosition]="tooltipPosition"
+        >
-            matTooltip="{{ 'tooltips.Create Journal Entry' | translate }}"
+          <mat-icon matListIcon>
-            routerLinkActive="active-menu"
+            <fa-icon icon="plus" size="sm"></fa-icon>
-            [routerLinkActiveOptions]="{ exact: false }"
+          </mat-icon>
-            *mifosxHasPermission="'SIDEBAR_JOURNAL_ENTRY'"
+          <a matLine #createJournalEntry>{{ 'labels.menus.Create Journal Entry' | translate }}</a>
-          >
+        </mat-list-item>
-            <mat-icon matListIcon>
-              <fa-icon icon="plus" size="sm"></fa-icon>
-            </mat-icon>
-            <a matLine #createJournalEntry>{{ 'labels.menus.Create Journal Entry' | translate }}</a>
-          </mat-list-item>
-        }
         <mat-list-item
           [routerLink]="['/accounting/chart-of-accounts']"
           [matTooltipPosition]="tooltipPosition"

src/app/core/shell/sidenav/sidenav.component.ts

@@ -33,7 +33,6 @@ import { MatIcon } from '@angular/material/icon';
 import { MatLine } from '@angular/material/grid-list';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { remittanceConfig } from '../../../remittances/remittance.config';
-import { DISABLED_ACCOUNTING_FEATURES } from '../../../accounting/disabled-features';
 import { environment } from '../../../../environments/environment';
 
 import { catchError, finalize, of, take } from 'rxjs';
@@ -82,8 +81,6 @@ export class SidenavComponent implements OnInit, AfterViewInit {
   frequentActivities: any[] = frequentActivities;
   /** Whether remittance feature is enabled */
   mifosRemittanceEnabled = remittanceConfig.isRemittanceEnabled;
-  /** Accounting features switched off for this installation — see accounting/disabled-features.ts. */
-  disabledFeatures = DISABLED_ACCOUNTING_FEATURES;
   /** Whether Superset Analytics is enabled */
   supersetEnabled = environment.supersetEnabled;
 

src/app/core/utils/api-date.ts

@@ -35,32 +35,3 @@ export function toIsoDate(value: any): string {
   }
   return String(value).slice(0, 10);
 }
-
-/**
- * A Fineract timestamp as a real Date, so Angular's `date` pipe can format it.
- *
- * LocalDateTime arrives as [y, M, d, H, m, s] — an array the pipe renders as nothing at all, which
- * is how a "Raised On" column came to sit empty next to an alert that plainly had been raised.
- * Month is 1-based on the wire and 0-based in Date, hence the shift.
- */
-export function toApiDate(value: any): Date | null {
-  if (!value) {
-    return null;
-  }
-  if (Array.isArray(value)) {
-    const [
-      year,
-      month,
-      day,
-      hour = 0,
-      minute = 0,
-      second = 0
-    ] = value;
-    if (!year || !month || !day) {
-      return null;
-    }
-    return new Date(year, month - 1, day, hour, minute, second);
-  }
-  const parsed = new Date(value);
-  return isNaN(parsed.getTime()) ? null : parsed;
-}

src/app/deposits/daily-transaction-entry/apply-dds-receipt-dialog/apply-dds-receipt-dialog.component.html

@@ -1,381 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<div class="dialog-wrapper">
-  <div class="dialog-header">
-    <div class="header-icon">
-      <mat-icon>account_balance_wallet</mat-icon>
-    </div>
-    <div class="header-text">
-      <h2>Apply DDS Receipt</h2>
-      <p>
-        Agent <strong class="mono">{{ data.agentCode }}</strong> · {{ data.agentName }}
-        @if (data.glCode) {
-          · GL <strong class="mono">{{ data.glCode }}</strong>
-        }
-      </p>
-    </div>
-    <button type="button" mat-icon-button class="header-close" [mat-dialog-close]="false" aria-label="Close">
-      <mat-icon>close</mat-icon>
-    </button>
-  </div>
-
-  <mat-dialog-content class="dialog-body">
-    @if (loading) {
-      <div class="state-block">
-        <mat-spinner diameter="30"></mat-spinner>
-        <span>Loading entries and receipts…</span>
-      </div>
-    } @else {
-      <!-- What the picked vouchers have to cover, and whether they do. -->
-      <div class="sc-card">
-        <div class="sc-row" [class.sc-ok]="canApply" [class.sc-bad]="pickedReceipts.size > 0 && difference !== 0">
-          <div class="sc-left">
-            <span class="sc-label">Collections up to {{ data.entryDate | date: 'dd/MM/yyyy' }}</span>
-            <span class="sc-sub"
-              >{{ pickedEntryCount }} {{ pickedEntryCount === 1 ? 'entry' : 'entries' }} to settle</span
-            >
-          </div>
-          <div class="sc-right">
-            <span class="sc-val">{{ required | number: '1.2-2' }}</span>
-          </div>
-        </div>
-        <div
-          class="sc-row sc-sep"
-          [class.sc-ok]="canApply"
-          [class.sc-bad]="pickedReceipts.size > 0 && difference !== 0"
-        >
-          <div class="sc-left">
-            <span class="sc-label">Vouchers picked</span>
-            <span class="sc-sub"
-              >{{ pickedReceipts.size }} {{ pickedReceipts.size === 1 ? 'voucher' : 'vouchers' }}</span
-            >
-          </div>
-          <div class="sc-right">
-            <span
-              class="sc-val"
-              [class.sc-val-ok]="canApply"
-              [class.sc-val-bad]="pickedReceipts.size > 0 && difference !== 0"
-            >
-              {{ received | number: '1.2-2' }}
-            </span>
-            @if (pickedReceipts.size > 0 && pickedDays.size > 0 && difference < 0) {
-              <span class="sc-tag sc-tag-bad">Short {{ -difference | number: '1.2-2' }}</span>
-            } @else if (pickedReceipts.size > 0 && pickedDays.size > 0 && difference > 0) {
-              <span class="sc-tag sc-tag-bad">Over {{ difference | number: '1.2-2' }}</span>
-            } @else if (canApply) {
-              <span class="sc-tag sc-tag-ok">✓ Matches</span>
-            }
-          </div>
-        </div>
-
-        <div class="sc-total-row" [class.sc-total-ok]="canApply">
-          <span class="sc-total-lbl">Total to Apply</span>
-          <div class="sc-total-nums">
-            <span class="sc-total-req mono">{{ required | number: '1.2-2' }}</span>
-            <span class="sc-arrow">→</span>
-            <span class="sc-total-got mono" [class.sc-total-got-ok]="canApply">{{ received | number: '1.2-2' }}</span>
-            <span class="sc-status-pill" [class.sc-pill-ok]="canApply" [class.sc-pill-pending]="!canApply">
-              {{ canApply ? '✓ Ready' : 'Pending' }}
-            </span>
-          </div>
-        </div>
-      </div>
-
-      <!-- ── 1: the days the agent wrote down ──────────────────────────────────── -->
-      <section class="slot">
-        <header class="slot-head">
-          <span class="slot-step">1</span>
-          <div class="slot-title">
-            <h3>Outstanding up to {{ data.entryDate | date: 'dd/MM/yyyy' }}</h3>
-            <p>Everything the agent wrote down and has not handed in, day by day. Open a day to see its lines.</p>
-          </div>
-        </header>
-
-        @if (days.length) {
-          <ul class="options">
-            @for (day of days; track day.date) {
-              <li class="option" (click)="toggleOpen(day, $event)">
-                <div class="option-main">
-                  <span class="option-voucher mono">{{ day.date | date: 'dd/MM/yyyy' }}</span>
-                  <span class="option-meta"
-                    >{{ day.entries.length }} {{ day.entries.length === 1 ? 'entry' : 'entries' }}</span
-                  >
-                </div>
-                <span class="option-amount mono">{{ day.total | number: '1.2-2' }}</span>
-                <button
-                  type="button"
-                  class="option-info"
-                  (click)="toggleOpen(day, $event)"
-                  aria-label="Show the day's lines"
-                >
-                  <mat-icon>{{ openDay === day.date ? 'expand_less' : 'expand_more' }}</mat-icon>
-                </button>
-              </li>
-              @if (openDay === day.date) {
-                <li class="day-lines">
-                  @if (day.entries.length > 8) {
-                    <input
-                      class="day-search"
-                      type="text"
-                      [(ngModel)]="daySearch"
-                      placeholder="Search party code or name"
-                      autocomplete="off"
-                    />
-                  }
-                  <div class="day-scroll">
-                    <table class="entries">
-                      <tbody>
-                        @for (entry of visibleEntries(day); track entry.id) {
-                          <tr>
-                            <td class="entry-code">{{ entry.partyCode }}</td>
-                            <td class="entry-name">{{ entry.partyName }}</td>
-                            <td>
-                              {{ entry.transactionMode }}
-                              @if (entry.advanceDays) {
-                                · {{ entry.advanceDays }}d advance
-                              }
-                              @if (entry.arrearsDays) {
-                                · {{ entry.arrearsDays }}d previous
-                              }
-                            </td>
-                            <td class="num mono">{{ entry.amount | number: '1.2-2' }}</td>
-                          </tr>
-                        } @empty {
-                          <tr>
-                            <td colspan="4" class="entry-name">No line matches.</td>
-                          </tr>
-                        }
-                      </tbody>
-                    </table>
-                  </div>
-                </li>
-              }
-            }
-          </ul>
-        } @else {
-          <p class="slot-empty">
-            {{ data.agentName }} has nothing outstanding for {{ data.entryDate | date: 'dd/MM/yyyy' }}. Change the date
-            on the screen to the day the entries were written.
-          </p>
-        }
-      </section>
-
-      <!-- ── 2: the cashier's receipts ─────────────────────────────────────────── -->
-      <section class="slot">
-        <header class="slot-head">
-          <span class="slot-step">2</span>
-          <div class="slot-title">
-            <h3>DDS Cash Receipts</h3>
-            <p>Tick the vouchers. Posts Dr Agent GL / Cr DDS Customer Deposits.</p>
-          </div>
-          <button type="button" class="slot-search" (click)="openSearch()">
-            <mat-icon>search</mat-icon>
-            <span>Find by voucher</span>
-          </button>
-        </header>
-
-        @if (available.length) {
-          <ul class="options">
-            @for (option of available; track option.id) {
-              <li class="option" [class.option-picked]="pickedReceipts.has(option.id)" (click)="toggleReceipt(option)">
-                <mat-icon class="option-check">{{
-                  pickedReceipts.has(option.id) ? 'check_box' : 'check_box_outline_blank'
-                }}</mat-icon>
-                <div class="option-main">
-                  <span class="option-voucher mono">{{ option.voucherNo }}</span>
-                  <span class="option-meta">{{ option.txnDate }} · {{ glLabel(option) }}</span>
-                  @if (option.description) {
-                    <span class="option-desc">{{ option.description }}</span>
-                  }
-                </div>
-                <span class="option-amount mono">{{ option.amount | number: '1.2-2' }}</span>
-                <button type="button" class="option-info" (click)="openDetail(option, $event)" aria-label="GL entries">
-                  <mat-icon>receipt_long</mat-icon>
-                </button>
-              </li>
-            }
-          </ul>
-        } @else {
-          <p class="slot-empty">
-            No DDS receipt is waiting on this agent's GL account. Collect the cash at
-            <em>Cashier › Transaction Entry</em> with entry type <strong>DDS</strong> and have the manager approve it,
-            or find an earlier voucher by number.
-          </p>
-        }
-
-        @if (pickedReceipts.size > 0 && pickedDays.size > 0 && difference !== 0) {
-          <p class="slot-note note-bad">
-            The vouchers ({{ received | number: '1.2-2' }}) have to match the day's entries ({{
-              required | number: '1.2-2'
-            }}) exactly, so every customer is credited what the agent wrote down.
-          </p>
-        }
-      </section>
-
-      @if (errorMsg && !searchOpen) {
-        <div class="alert">
-          <mat-icon>error_outline</mat-icon>
-          <span>{{ errorMsg }}</span>
-        </div>
-      }
-    }
-  </mat-dialog-content>
-
-  <mat-dialog-actions class="dialog-actions">
-    <button type="button" mat-stroked-button [mat-dialog-close]="false" [disabled]="submitting">Cancel</button>
-    <button type="button" mat-flat-button color="primary" [disabled]="!canApply" (click)="apply()">
-      @if (submitting) {
-        <mat-spinner diameter="16"></mat-spinner>
-        <span>Applying…</span>
-      } @else {
-        <mat-icon>check</mat-icon>
-        <span>Apply Receipt</span>
-      }
-    </button>
-  </mat-dialog-actions>
-</div>
-
-<!-- ── Find a voucher the list does not carry ───────────────────────────────── -->
-@if (searchOpen) {
-  <div class="overlay" (click)="closeSearch()">
-    <div class="popup" (click)="$event.stopPropagation()">
-      <header class="popup-head">
-        <h3>Find a DDS receipt</h3>
-        <button type="button" mat-icon-button (click)="closeSearch()" aria-label="Close">
-          <mat-icon>close</mat-icon>
-        </button>
-      </header>
-
-      <div class="popup-body">
-        <label class="field">
-          <span>GL Account</span>
-          <div class="field-readonly mono">{{ data.glCode || '—' }} · {{ data.agentCode }}</div>
-        </label>
-
-        <label class="field">
-          <span>Voucher No.</span>
-          <input
-            type="text"
-            [(ngModel)]="searchVoucherNo"
-            placeholder="CR/24092026/0001"
-            (keyup.enter)="runSearch()"
-            autocomplete="off"
-          />
-        </label>
-
-        @if (errorMsg) {
-          <div class="alert">
-            <mat-icon>error_outline</mat-icon>
-            <span>{{ errorMsg }}</span>
-          </div>
-        }
-      </div>
-
-      <footer class="popup-foot">
-        <button type="button" mat-stroked-button (click)="closeSearch()">Cancel</button>
-        <button
-          type="button"
-          mat-flat-button
-          color="primary"
-          [disabled]="!searchVoucherNo.trim() || searching"
-          (click)="runSearch()"
-        >
-          @if (searching) {
-            <mat-spinner diameter="16"></mat-spinner>
-          } @else {
-            <span>Find &amp; Use</span>
-          }
-        </button>
-      </footer>
-    </div>
-  </div>
-}
-
-<!-- ── A receipt's own GL entries ───────────────────────────────────────────── -->
-@if (viewing) {
-  <div class="overlay" (click)="closeDetail()">
-    <div class="popup" (click)="$event.stopPropagation()">
-      <header class="popup-head">
-        <h3>
-          Voucher <span class="mono">{{ viewing.voucherNo }}</span>
-        </h3>
-        <button type="button" mat-icon-button (click)="closeDetail()" aria-label="Close">
-          <mat-icon>close</mat-icon>
-        </button>
-      </header>
-
-      <div class="popup-body">
-        <dl class="detail-list">
-          <div>
-            <dt>Date</dt>
-            <dd class="mono">{{ viewing.txnDate }}</dd>
-          </div>
-          <div>
-            <dt>Amount</dt>
-            <dd class="mono">{{ viewing.amount | number: '1.2-2' }}</dd>
-          </div>
-          <div>
-            <dt>GL Account</dt>
-            <dd>{{ glLabel(viewing) }}</dd>
-          </div>
-          @if (viewing.cashierName) {
-            <div>
-              <dt>Collected By</dt>
-              <dd>{{ viewing.cashierName }}</dd>
-            </div>
-          }
-          @if (viewing.managerName) {
-            <div>
-              <dt>Approved By</dt>
-              <dd>{{ viewing.managerName }}</dd>
-            </div>
-          }
-          @if (viewing.description) {
-            <div>
-              <dt>Description</dt>
-              <dd>{{ viewing.description }}</dd>
-            </div>
-          }
-        </dl>
-
-        <h4 class="detail-heading">Journal Entries</h4>
-        @if (loadingGlEntries) {
-          <div class="state-block"><mat-spinner diameter="22"></mat-spinner></div>
-        } @else if (viewingGlEntries?.length) {
-          <table class="gl-table">
-            <thead>
-              <tr>
-                <th>Account</th>
-                <th class="num">Debit</th>
-                <th class="num">Credit</th>
-              </tr>
-            </thead>
-            <tbody>
-              @for (entry of viewingGlEntries; track entry.id) {
-                <tr>
-                  <td>
-                    <span class="mono">{{ entry.glCode }}</span> {{ entry.glName }}
-                  </td>
-                  <td class="num mono">{{ entry.drCr === 'DR' ? (entry.amount | number: '1.2-2') : '' }}</td>
-                  <td class="num mono">{{ entry.drCr === 'CR' ? (entry.amount | number: '1.2-2') : '' }}</td>
-                </tr>
-              }
-            </tbody>
-          </table>
-        } @else {
-          <p class="slot-empty">No journal entries are recorded against this receipt.</p>
-        }
-      </div>
-
-      <footer class="popup-foot">
-        <button type="button" mat-stroked-button (click)="closeDetail()">Close</button>
-      </footer>
-    </div>
-  </div>
-}

src/app/deposits/daily-transaction-entry/apply-dds-receipt-dialog/apply-dds-receipt-dialog.component.scss

@@ -1,95 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-// The same look as Apply Additional Shares, on purpose: both apply a cashier's receipt to what it was
-// collected for, and the counter should meet one screen, not two. Used as it is, never changed here.
-@use '../../../shares/share-dialog.shared' as *;
-
-:host {
-  display: block;
-  width: 100%;
-}
-
-// The agent's outstanding lines - read only, what the receipt has to cover.
-.entries {
-  width: 100%;
-  border-collapse: collapse;
-  font-size: 13px;
-
-  td {
-    padding: 7px 4px;
-    border-bottom: 1px solid #eef2f7;
-  }
-
-  tr:last-child td {
-    border-bottom: none;
-  }
-
-  .entry-date {
-    color: #64748b;
-    white-space: nowrap;
-  }
-
-  .entry-code {
-    font-weight: 600;
-    white-space: nowrap;
-  }
-
-  .entry-name {
-    color: #475569;
-  }
-
-  .num {
-    text-align: right;
-    white-space: nowrap;
-  }
-}
-
-// Days and vouchers are ticked, any number of each - a check box where the share dialog has a radio.
-.option-check {
-  color: #94a3b8;
-  flex-shrink: 0;
-}
-
-.option-picked {
-  border-color: #2563eb !important;
-  background: #eff6ff !important;
-
-  .option-check {
-    color: #2563eb;
-  }
-}
-
-// A day's own lines, opened under it. Scrolls inside itself, so a thousand customers do not make the
-// dialog a thousand lines tall.
-.day-lines {
-  list-style: none;
-  padding: 6px 10px 10px 42px;
-}
-
-.day-search {
-  width: 100%;
-  margin-bottom: 6px;
-  padding: 6px 10px;
-  border: 1px solid #e2e8f0;
-  border-radius: 6px;
-  font: inherit;
-  font-size: 13px;
-}
-
-.day-scroll {
-  max-height: 240px;
-  overflow-y: auto;
-}
-
-.field-readonly {
-  padding: 8px 10px;
-  border: 1px solid #e2e8f0;
-  border-radius: 6px;
-  background: #f8fafc;
-}

src/app/deposits/daily-transaction-entry/apply-dds-receipt-dialog/apply-dds-receipt-dialog.component.ts

@@ -1,351 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { Component, OnInit, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { MAT_DIALOG_DATA, MatDialogRef, MatDialogModule } from '@angular/material/dialog';
-import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { catchError } from 'rxjs/operators';
-import { of } from 'rxjs';
-import { OrganizationService } from 'app/organization/organization.service';
-import { SettingsService } from 'app/settings/settings.service';
-
-/** One day of an agent's outstanding entries, as the dialog lists them. */
-export interface EntryDay {
-  date: string;
-  entries: any[];
-  total: number;
-}
-
-/**
- * Applies the cashier's DDS receipts to an agent's outstanding collections.
- *
- * The agent's cash is already in the bank: the cashier took it at the counter into the agent's own GL
- * account, tagged DDS, and the manager approved it. Applying it here hands the money on to the
- * customers the agent wrote down - Dr the agent's GL, Cr DDS Customer Deposits - and each entry is
- * settled against the application. The same screen as Apply Additional Shares.
- *
- * Everything outstanding up to the day chosen on the screen, shown a day at a time - nothing to tick,
- * because what the agent wrote down is settled whole, and an agent who comes in after several days
- * brings several days' cash. The vouchers are ticked, since a day's
- * cash can come in more than one visit. They have to agree exactly: what the agent wrote down is what
- * each customer is owed, so vouchers short of it leave somebody uncredited and vouchers over it leave
- * money nobody can place.
- *
- * The day is shown totalled and its lines opened only when asked for - an agent with a thousand
- * customers is a thousand lines, and the day's total is what the counter is checking.
- */
-@Component({
-  selector: 'mifosx-apply-dds-receipt-dialog',
-  templateUrl: './apply-dds-receipt-dialog.component.html',
-  styleUrls: ['./apply-dds-receipt-dialog.component.scss'],
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    MatDialogModule,
-    MatButtonModule,
-    MatIconModule,
-    MatProgressSpinnerModule
-  ]
-})
-export class ApplyDdsReceiptDialogComponent implements OnInit {
-  private organizationService = inject(OrganizationService);
-  private settingsService = inject(SettingsService);
-
-  public dialogRef = inject(MatDialogRef<ApplyDdsReceiptDialogComponent>);
-  public data = inject<{
-    agentId: number;
-    agentCode: string;
-    agentName: string;
-    glCode: string | null;
-    entryDate: string;
-  }>(MAT_DIALOG_DATA);
-
-  loadingEntries = true;
-  loadingReceipts = true;
-  submitting = false;
-  errorMsg = '';
-
-  /** The chosen day's outstanding entries - one day, or none when nothing is outstanding on it. */
-  days: EntryDay[] = [];
-
-  /** DDS receipts on the agent's GL account, approved and not yet applied. */
-  available: any[] = [];
-
-  /**
-   * The day is settled whole, so it is always included. The vouchers are the clerk's choice, and none
-   * is picked for them even when only one is listed.
-   */
-  pickedDays = new Set<string>();
-  pickedReceipts = new Set<number>();
-
-  /** The day whose lines are open, and the search within it. */
-  openDay: string | null = null;
-  daySearch = '';
-
-  get loading(): boolean {
-    return this.loadingEntries || this.loadingReceipts;
-  }
-
-  ngOnInit(): void {
-    // Everything outstanding up to the chosen date, whatever day it was written - an agent's cash for
-    // several days arrives in one visit, and all of it is settled together.
-    this.organizationService
-      .getAgentPendingCollections(this.data.agentId)
-      .pipe(
-        catchError((err) => {
-          this.errorMsg = this.readError(err, "Could not load the agent's entries.");
-          return of(null);
-        })
-      )
-      .subscribe((res: any) => {
-        this.days = groupByDay(
-          (res?.entries || []).filter(
-            (entry: any) => entry.status === 'PENDING' && String(entry.entryDate) <= this.data.entryDate
-          )
-        );
-        this.pickedDays = new Set(this.days.map((day) => day.date));
-        this.loadingEntries = false;
-      });
-
-    this.organizationService
-      .getAgentCashReceipts(this.data.agentId)
-      .pipe(
-        catchError((err) => {
-          this.errorMsg = this.readError(err, 'Could not load the available receipts.');
-          return of([]);
-        })
-      )
-      .subscribe((rows: any) => {
-        this.available = Array.isArray(rows) ? rows : [];
-        this.loadingReceipts = false;
-      });
-  }
-
-  // ── Picking ─────────────────────────────────────────────────────────────────────────────────
-
-  toggleReceipt(receipt: any): void {
-    if (this.submitting) {
-      return;
-    }
-    this.pickedReceipts.has(receipt.id) ? this.pickedReceipts.delete(receipt.id) : this.pickedReceipts.add(receipt.id);
-  }
-
-  toggleOpen(day: EntryDay, event: Event): void {
-    event.stopPropagation();
-    this.openDay = this.openDay === day.date ? null : day.date;
-    this.daySearch = '';
-  }
-
-  /** The open day's lines, narrowed by party code or name. */
-  visibleEntries(day: EntryDay): any[] {
-    const term = this.daySearch.trim().toLowerCase();
-    if (!term) {
-      return day.entries;
-    }
-    return day.entries.filter(
-      (entry: any) =>
-        String(entry.partyCode || '')
-          .toLowerCase()
-          .includes(term) ||
-        String(entry.partyName || '')
-          .toLowerCase()
-          .includes(term)
-    );
-  }
-
-  // ── What has to be covered ──────────────────────────────────────────────────────────────────
-
-  get entryCount(): number {
-    return this.days.reduce((sum, day) => sum + day.entries.length, 0);
-  }
-
-  get outstandingTotal(): number {
-    return this.days.reduce((sum, day) => sum + day.total, 0);
-  }
-
-  get pickedEntryCount(): number {
-    return this.days.filter((day) => this.pickedDays.has(day.date)).reduce((sum, day) => sum + day.entries.length, 0);
-  }
-
-  get required(): number {
-    return round2(this.days.filter((day) => this.pickedDays.has(day.date)).reduce((sum, day) => sum + day.total, 0));
-  }
-
-  get received(): number {
-    return round2(
-      this.available.filter((r) => this.pickedReceipts.has(r.id)).reduce((sum, r) => sum + Number(r.amount || 0), 0)
-    );
-  }
-
-  /** Vouchers less entries: below zero they are short, above zero they are over. */
-  get difference(): number {
-    return round2(this.received - this.required);
-  }
-
-  get canApply(): boolean {
-    return this.pickedDays.size > 0 && this.pickedReceipts.size > 0 && this.difference === 0 && !this.submitting;
-  }
-
-  glLabel(option: any): string {
-    return [
-      option?.glCode,
-      option?.glName
-    ]
-      .filter(Boolean)
-      .join(' — ');
-  }
-
-  // ── Voucher search, for a receipt the list does not carry ───────────────────────────────────
-
-  searching = false;
-  searchOpen = false;
-  searchVoucherNo = '';
-
-  openSearch(): void {
-    this.searchOpen = true;
-    this.searchVoucherNo = '';
-    this.errorMsg = '';
-  }
-
-  closeSearch(): void {
-    this.searchOpen = false;
-    this.errorMsg = '';
-  }
-
-  /**
-   * Finds one voucher on the agent's GL account and, when it cannot be used, says why - not taken as
-   * DDS, not approved yet, or already applied - rather than simply not finding it.
-   */
-  runSearch(): void {
-    const voucher = this.searchVoucherNo.trim();
-    if (!voucher || this.searching) {
-      return;
-    }
-    this.searching = true;
-    this.errorMsg = '';
-    this.organizationService
-      .getAgentCashReceipts(this.data.agentId, voucher)
-      .pipe(
-        catchError((err) => {
-          this.errorMsg = this.readError(err, `Voucher ${voucher} could not be looked up.`);
-          return of(null);
-        })
-      )
-      .subscribe((rows: any) => {
-        this.searching = false;
-        if (rows === null) {
-          return;
-        }
-        const found = (Array.isArray(rows) ? rows : [])[0];
-        if (!found) {
-          this.errorMsg = `Voucher ${voucher} is not on ${this.data.agentCode}'s GL account ${this.data.glCode || ''}.`;
-        } else if (found.entryType !== 'DDS') {
-          this.errorMsg = `Voucher ${voucher} was taken as "${found.entryType || 'untagged'}", not DDS. Ask the cashier to correct the entry type.`;
-        } else if (found.status !== 'APPROVED') {
-          this.errorMsg = `Voucher ${voucher} is ${found.status}. It can be applied once the manager approves it.`;
-        } else if (found.applied) {
-          this.errorMsg = `Voucher ${voucher} has already been applied.`;
-        } else {
-          this.available = [
-            found,
-            ...this.available.filter((entry) => entry.id !== found.id)
-          ];
-          this.pickedReceipts.add(found.id);
-          this.searchOpen = false;
-        }
-      });
-  }
-
-  // ── A receipt's own GL entries ──────────────────────────────────────────────────────────────
-
-  viewing: any = null;
-  viewingGlEntries: any[] | null = null;
-  loadingGlEntries = false;
-
-  openDetail(option: any, event: Event): void {
-    event.stopPropagation();
-    this.viewing = option;
-    this.viewingGlEntries = null;
-    this.loadingGlEntries = true;
-    this.organizationService
-      .getCashReceiptGlEntries(option.id)
-      .pipe(catchError(() => of([])))
-      .subscribe((rows: any) => {
-        this.viewingGlEntries = Array.isArray(rows) ? rows : [];
-        this.loadingGlEntries = false;
-      });
-  }
-
-  closeDetail(): void {
-    this.viewing = null;
-    this.viewingGlEntries = null;
-  }
-
-  // ── Submission ──────────────────────────────────────────────────────────────────────────────
-
-  apply(): void {
-    if (!this.canApply) {
-      return;
-    }
-    this.submitting = true;
-    this.errorMsg = '';
-    const vouchers = this.available.filter((r) => this.pickedReceipts.has(r.id)).map((r) => r.voucherNo);
-    const entries = this.pickedEntryCount;
-    const amount = this.required;
-    this.organizationService
-      .settleAgentCollections({
-        agentId: Number(this.data.agentId),
-        cashierDepositRequestIds: Array.from(this.pickedReceipts),
-        entryDates: Array.from(this.pickedDays),
-        locale: this.settingsService.language.code
-      })
-      .pipe(
-        catchError((err) => {
-          this.errorMsg = this.readError(err, 'The receipts could not be applied.');
-          this.submitting = false;
-          return of(null);
-        })
-      )
-      .subscribe((res: any) => {
-        if (res) {
-          this.dialogRef.close({ vouchers, entries, amount, response: res });
-        }
-      });
-  }
-
-  private readError(err: any, fallback: string): string {
-    return (
-      err?.error?.errors?.[0]?.defaultUserMessage ??
-      err?.error?.defaultUserMessage ??
-      err?.error?.developerMessage ??
-      fallback
-    );
-  }
-}
-
-/** Entries grouped by the day they were collected, oldest first, each day totalled. */
-export function groupByDay(entries: any[]): EntryDay[] {
-  const byDay = new Map<string, EntryDay>();
-  for (const entry of entries) {
-    const date = String(entry.entryDate);
-    const day = byDay.get(date) ?? { date, entries: [], total: 0 };
-    day.entries.push(entry);
-    day.total = round2(day.total + Number(entry.amount || 0));
-    byDay.set(date, day);
-  }
-  return Array.from(byDay.values()).sort((a, b) => a.date.localeCompare(b.date));
-}
-
-function round2(value: number): number {
-  return Math.round(value * 100) / 100;
-}

src/app/deposits/daily-transaction-entry/daily-transaction-entry.component.html

@@ -1,468 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<div class="dte-container">
-  <div class="dte-header">
-    <button mat-stroked-button [routerLink]="['../']" class="dte-back">
-      <i class="fas fa-arrow-left"></i> Deposits
-    </button>
-    <h2 class="dte-header__title">Daily Transaction Detail</h2>
-  </div>
-
-  <div class="dte-card">
-    <form [formGroup]="entryForm">
-      <div class="dte-info-panels">
-        <div class="dte-info-panel">
-          <div class="dte-info-panel__title">Agent Information</div>
-          <dl>
-            <dt>Name</dt>
-            <dd>{{ agentInfo.name || '—' }}</dd>
-            <dt>Address</dt>
-            <dd>{{ agentInfo.address || '—' }}</dd>
-            <dt>City</dt>
-            <dd>{{ agentInfo.city || '—' }}</dd>
-            <dt>A/C</dt>
-            <dd>{{ agentInfo.accountNo || '—' }}</dd>
-            <dt>Guarantor</dt>
-            <dd>{{ agentInfo.guarantor1 || '—' }}</dd>
-            <dt>Guarantor</dt>
-            <dd>{{ agentInfo.guarantor2 || '—' }}</dd>
-            <dt>Curr Bal</dt>
-            <dd>{{ agentInfo.currentBalance | number: '1.2-2' }}</dd>
-          </dl>
-        </div>
-
-        <div class="dte-info-panel">
-          <div class="dte-info-panel__title">Party Information</div>
-          @if (partyInfo) {
-            <dl>
-              <dt>Client Id</dt>
-              <dd>{{ partyInfo.clientId }}</dd>
-              <dt>Name</dt>
-              <dd>{{ partyInfo.partyName }}</dd>
-              <dt>Address</dt>
-              <dd>{{ partyInfo.address1 || '—' }}</dd>
-              <dt>City</dt>
-              <dd>{{ partyInfo.city || '—' }}</dd>
-              <dt>Op. Date</dt>
-              <dd>{{ partyInfo.openingDate ? (partyInfo.openingDate | dateFormat) : '—' }}</dd>
-              <dt>Maturity</dt>
-              <dd>{{ partyInfo.maturityDate ? (partyInfo.maturityDate | dateFormat) : '—' }}</dd>
-              <dt>Daily Depo</dt>
-              <dd>{{ partyInfo.dailyDepositAmount | number: '1.2-2' }}</dd>
-              <dt>Ledger</dt>
-              <dd>{{ partyInfo.ledgerNo || '—' }}</dd>
-              <dt>Aadhar No</dt>
-              <dd>{{ partyInfo.aadharNo || '—' }}</dd>
-              <dt>Curr Bal</dt>
-              <dd>{{ partyInfo.currentBalance | number: '1.2-2' }}</dd>
-              <!--
-                What should have been collected by today against what has been. Beside the balance
-                rather than instead of it: the balance is what the customer holds, this is whether
-                they have kept to the scheme.
-              -->
-              <dt>Due So Far</dt>
-              <dd>{{ partyInfo.expectedToDate | number: '1.2-2' }}</dd>
-              <dt>Collected</dt>
-              <dd>{{ partyInfo.collectedToDate | number: '1.2-2' }}</dd>
-              @if (schedule(partyInfo); as sched) {
-                <dt [class]="'dte-sched dte-sched--' + sched.state">Schedule</dt>
-                <dd [class]="'dte-sched dte-sched--' + sched.state">{{ sched.text }}</dd>
-              }
-              <dt class="dte-after">Bal. After This Tr</dt>
-              <dd class="dte-after">{{ partyBalanceAfter | number: '1.2-2' }}</dd>
-            </dl>
-          } @else {
-            <p class="dte-info-panel__hint">
-              Pick a party in a collection row below — this panel shows whose account it is and what the balance
-              becomes.
-            </p>
-          }
-        </div>
-      </div>
-
-      <div class="dte-controls">
-        <mat-form-field appearance="outline" class="dte-field dte-field--agent">
-          <mat-label>Agent</mat-label>
-          <mat-select required formControlName="agentId" (selectionChange)="loadAgent()">
-            @for (agent of selectableAgents; track agent.id) {
-              <mat-option [value]="agent.id">
-                {{ agent.agentCode }} · {{ agent.agentNameId }}
-                @if (!agent.active) {
-                  <span class="dte-agent-off">— not collecting</span>
-                }
-              </mat-option>
-            }
-          </mat-select>
-          @if (selectableAgents.length === 0) {
-            <mat-hint class="dte-hint--missing">No active agent on file</mat-hint>
-          } @else if (pickedAgentIsInactive) {
-            <!-- Only reachable on a settlement: this agent no longer collects, but the cash they
-                 already hold still has to be able to reach a branch. -->
-            <mat-hint class="dte-hint--missing">This agent no longer collects — settling held cash only</mat-hint>
-          } @else if (agentInfo.name) {
-            <mat-hint class="dte-hint--found">
-              {{ agentParties.length }} {{ agentParties.length === 1 ? 'party' : 'parties' }} to collect from
-            </mat-hint>
-          }
-        </mat-form-field>
-
-        <mat-form-field appearance="outline" class="dte-field">
-          <mat-label>Date</mat-label>
-          <!-- The date picks out a round, not just a posting date: a Party Tran settles whatever
-               the agent wrote down for that day, so changing it has to fetch that day's list. -->
-          <input
-            matInput
-            required
-            [matDatepicker]="txnDatePicker"
-            formControlName="transactionDate"
-            (dateChange)="loadPendingEntries(); loadAgentMoney()"
-          />
-          <mat-datepicker-toggle matIconSuffix [for]="txnDatePicker"></mat-datepicker-toggle>
-          <mat-datepicker #txnDatePicker></mat-datepicker>
-        </mat-form-field>
-
-        <mat-form-field appearance="outline" class="dte-field">
-          <mat-label>Tran. Type</mat-label>
-          <mat-select required formControlName="transactionType">
-            @for (type of transactionTypes; track type.label) {
-              <mat-option [value]="type.label" [disabled]="!type.supported">
-                {{ type.label }}
-                @if (!type.supported) {
-                  <span class="dte-soon"> — not available yet</span>
-                }
-              </mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-      </div>
-
-      <!--
-        What the agent wrote down on their round, waiting to be counted.
-
-        This used to be an empty grid the clerk typed the round into, and typing it posted it: a
-        customer was credited the moment a line was keyed, whether or not the cash behind it ever
-        reached the branch. The agent records their own collections now, and what the clerk does here
-        is agree with them - so there is nothing to type, only a list to check against a bag of cash.
-      -->
-      @if (isPartyTran && agentInfo.name) {
-        <div class="dte-section">
-          <div class="dte-section__header">
-            <i class="fas fa-list"></i>
-            <h3>Collections up to {{ entryForm.get('transactionDate')?.value | dateFormat }}</h3>
-            <button mat-stroked-button type="button" class="dte-add-row" (click)="loadPendingEntries()">
-              <i class="fas fa-sync"></i> Refresh
-            </button>
-          </div>
-
-          @if (pendingLoading) {
-            <p class="dte-empty">Reading this agent's entries...</p>
-          } @else if (pendingEntries.length === 0) {
-            <p class="dte-empty">{{ agentInfo.name }} has nothing outstanding up to this date.</p>
-          } @else {
-            @for (entry of pendingEntries; track entry.id) {
-              <div class="dte-pending-row">
-                <!-- The day the agent took it, on the line itself. All the lines carry the date
-                     chosen above, but a row that says so can be read, printed or shown to the agent
-                     on its own without the header to explain it. -->
-                <span class="dte-pending-row__date">{{ entry.entryDate | dateFormat }}</span>
-                <span class="dte-pending-row__code">{{ entry.partyCode }}</span>
-                <span class="dte-pending-row__name">{{ entry.partyName }}</span>
-                <span class="dte-pending-row__mode"
-                  >{{ entry.transactionMode }}
-                  @if (entry.advanceDays) {
-                    · {{ entry.advanceDays }}d advance
-                  }
-                  @if (entry.arrearsDays) {
-                    · {{ entry.arrearsDays }}d previous
-                  }
-                </span>
-                <span class="dte-pending-row__amount">{{ entry.amount | number: '1.2-2' }}</span>
-              </div>
-            }
-
-            <div class="dte-total">
-              <span>{{ pendingEntries.length }} {{ pendingEntries.length === 1 ? 'entry' : 'entries' }}</span>
-              <strong>{{ pendingTotal | number: '1.2-2' }}</strong>
-            </div>
-
-            <!--
-              The figure the clerk counts against, said in words rather than left as a column total -
-              it is the one number they are acting on, and the rest of the panel is working out.
-
-              It says what the agent wrote down and stops there. The money side - what is owed, what the
-              cashier has taken in, and applying it - is Agent Tran, so each type has one job.
-            -->
-            <p class="dte-expected dte-expected--note">
-              Everything {{ agentInfo.name }} wrote down and has not handed in yet, up to this date, customer by
-              customer. The cash and its receipts are under Agent Tran.
-            </p>
-          }
-        </div>
-      }
-
-      <!--
-        The agent's money: what they owe on everything written down, what the cashier has taken in
-        against it, and what is left.
-
-        This used to be a form the clerk typed an amount into to take the agent's cash in here. The
-        cash is taken at the cashier's counter now, into the agent's own GL account, and one way to take
-        the same cash in is the only safe number of ways - so there is nothing to type. What is done here
-        is applying the cashier's receipts to the customers, in Apply DDS Receipt.
-      -->
-      @if (isAgentTran && agentInfo.name) {
-        <div class="dte-section">
-          <div class="dte-section__header">
-            <i class="fas fa-hand-holding-usd"></i>
-            <h3>Agent's cash</h3>
-            <button mat-stroked-button type="button" class="dte-add-row" (click)="loadAgentMoney()">
-              <i class="fas fa-sync"></i> Refresh
-            </button>
-            <button
-              mat-raised-button
-              color="primary"
-              type="button"
-              class="dte-apply-receipt"
-              (click)="openApplyReceipt()"
-            >
-              <i class="fas fa-receipt"></i> Apply DDS Receipt
-            </button>
-          </div>
-
-          @if (!agentGlCode) {
-            <p class="dte-expected dte-expected--note">
-              {{ agentInfo.name }} has no GL account, so the cashier has nowhere to take their cash. Set one on Agent
-              Master.
-            </p>
-          } @else {
-            <!-- The GL the cashier takes this agent's cash into - the code to key at Transaction Entry. -->
-            <p class="dte-expected">
-              Agent GL: <strong>{{ agentGlCode }}{{ agentGlName ? ' · ' + agentGlName : '' }}</strong> — the cashier
-              takes {{ agentInfo.name }}'s cash into this GL (Entry Type DDS).
-            </p>
-          }
-
-          <div class="dte-money">
-            <div class="dte-money__box">
-              <span class="dte-money__label">To take</span>
-              <strong>{{ agentOwed | number: '1.2-2' }}</strong>
-            </div>
-            <div class="dte-money__box">
-              <span class="dte-money__label">Received (approved)</span>
-              <strong>{{ agentReceived | number: '1.2-2' }}</strong>
-            </div>
-            <div class="dte-money__box" [class.dte-money__box--due]="agentBalance > 0">
-              <span class="dte-money__label">Still to take</span>
-              <strong>{{ agentBalance | number: '1.2-2' }}</strong>
-            </div>
-          </div>
-          @if (agentReceivedBeyondDay > 0) {
-            <p class="dte-expected dte-expected--note">
-              {{ agentReceivedBeyondDay | number: '1.2-2' }} received at the counter is more than everything outstanding
-              up to {{ entryForm.get('transactionDate')?.value | dateFormat }}. Check the voucher was taken for the
-              right agent.
-            </p>
-          }
-          @if (agentWaiting > 0) {
-            <p class="dte-expected dte-expected--note">
-              {{ agentWaiting | number: '1.2-2' }} more is at the counter awaiting the manager's approval.
-            </p>
-          }
-
-          <h4 class="dte-subhead">
-            Outstanding entries up to {{ entryForm.get('transactionDate')?.value | dateFormat }}
-          </h4>
-          @if (agentMoneyLoading) {
-            <p class="dte-empty">Reading this agent's entries...</p>
-          } @else if (agentDays.length === 0) {
-            <p class="dte-empty">{{ agentInfo.name }} has nothing outstanding.</p>
-          } @else {
-            @for (day of agentDays; track day.date) {
-              <div class="dte-pending-row dte-pending-row--day" (click)="toggleAgentDay(day.date)">
-                <span class="dte-pending-row__date">{{ day.date | dateFormat }}</span>
-                <span class="dte-pending-row__name">
-                  {{ day.entries.length }} {{ day.entries.length === 1 ? 'entry' : 'entries' }}
-                </span>
-                <span class="dte-pending-row__amount">{{ day.total | number: '1.2-2' }}</span>
-                <i [class]="agentOpenDay === day.date ? 'fas fa-chevron-up' : 'fas fa-chevron-down'"></i>
-              </div>
-              @if (agentOpenDay === day.date) {
-                <div class="dte-day-lines">
-                  @for (entry of day.entries; track entry.id) {
-                    <div class="dte-pending-row">
-                      <span class="dte-pending-row__code">{{ entry.partyCode }}</span>
-                      <span class="dte-pending-row__name">{{ entry.partyName }}</span>
-                      <span class="dte-pending-row__mode"
-                        >{{ entry.transactionMode }}
-                        @if (entry.advanceDays) {
-                          · {{ entry.advanceDays }}d advance
-                        }
-                        @if (entry.arrearsDays) {
-                          · {{ entry.arrearsDays }}d previous
-                        }
-                      </span>
-                      <span class="dte-pending-row__amount">{{ entry.amount | number: '1.2-2' }}</span>
-                    </div>
-                  }
-                </div>
-              }
-            }
-          }
-
-          <h4 class="dte-subhead">Cashier receipts</h4>
-          @if (agentReceipts.length === 0) {
-            <p class="dte-empty">
-              No DDS receipt on {{ agentInfo.name }}'s GL account{{ agentGlCode ? ' ' + agentGlCode : '' }} waiting to
-              be applied.
-            </p>
-          } @else {
-            @for (receipt of agentReceipts; track receipt.id) {
-              <div class="dte-pending-row">
-                <span class="dte-pending-row__code">{{ receipt.voucherNo }}</span>
-                <span class="dte-pending-row__date">{{ receipt.txnDate | dateFormat }}</span>
-                <span class="dte-pending-row__name">{{ receipt.cashierName || '—' }}</span>
-                <span class="dte-status" [class.dte-status--ok]="receipt.status === 'APPROVED'">
-                  {{ receipt.status === 'APPROVED' ? 'Approved' : 'Awaiting manager' }}
-                </span>
-                <span class="dte-pending-row__amount">{{ receipt.amount | number: '1.2-2' }}</span>
-              </div>
-            }
-          }
-        </div>
-      }
-
-      @if (isWithdrawDeposite) {
-        <div class="dte-section">
-          <div class="dte-section__header">
-            <i class="fas fa-exchange-alt"></i>
-            <h3>Withdraw Deposite</h3>
-          </div>
-          <div class="dte-grid">
-            <mat-form-field appearance="outline" class="dte-field">
-              <mat-label>Creditor Party Code</mat-label>
-              <input
-                matInput
-                formControlName="creditorPartyCode"
-                [matAutocomplete]="creditorAuto"
-                #creditorTrigger="matAutocompleteTrigger"
-                (click)="creditorTrigger.openPanel()"
-                (focus)="creditorTrigger.openPanel()"
-                (blur)="settleTransferParty('creditor')"
-                placeholder="Search by code or name…"
-                autocomplete="off"
-              />
-              <mat-icon matSuffix class="dte-list-arrow" (click)="$event.stopPropagation(); creditorTrigger.openPanel()"
-                >arrow_drop_down</mat-icon
-              >
-              <mat-autocomplete #creditorAuto="matAutocomplete" panelWidth="min(30rem, 92vw)">
-                @for (party of transferPartyOptions('creditor'); track party.id) {
-                  <mat-option [value]="party.partyCode">
-                    {{ party.partyCode }} · {{ party.partyName }} · ₹{{ party.currentBalance | number: '1.2-2' }}
-                  </mat-option>
-                }
-                @if (transferPartyOptions('creditor').length === 0) {
-                  <mat-option disabled>No open DDS account matches</mat-option>
-                }
-              </mat-autocomplete>
-              <mat-hint>Account the money goes into</mat-hint>
-            </mat-form-field>
-            <mat-form-field appearance="outline" class="dte-field">
-              <mat-label>Creditor Party Name</mat-label>
-              <input matInput formControlName="creditorPartyName" readonly />
-            </mat-form-field>
-            <mat-form-field appearance="outline" class="dte-field">
-              <mat-label>Creditor Curr Bal</mat-label>
-              <input matInput formControlName="creditorPartyBalance" readonly />
-            </mat-form-field>
-
-            <mat-form-field appearance="outline" class="dte-field">
-              <mat-label>Debit Party Code</mat-label>
-              <input
-                matInput
-                formControlName="debitPartyCode"
-                [matAutocomplete]="debitAuto"
-                #debitTrigger="matAutocompleteTrigger"
-                (click)="debitTrigger.openPanel()"
-                (focus)="debitTrigger.openPanel()"
-                (blur)="settleTransferParty('debit')"
-                placeholder="Search by code or name…"
-                autocomplete="off"
-              />
-              <mat-icon matSuffix class="dte-list-arrow" (click)="$event.stopPropagation(); debitTrigger.openPanel()"
-                >arrow_drop_down</mat-icon
-              >
-              <mat-autocomplete #debitAuto="matAutocomplete" panelWidth="min(30rem, 92vw)">
-                @for (party of transferPartyOptions('debit'); track party.id) {
-                  <mat-option [value]="party.partyCode">
-                    {{ party.partyCode }} · {{ party.partyName }} · ₹{{ party.currentBalance | number: '1.2-2' }}
-                  </mat-option>
-                }
-                @if (transferPartyOptions('debit').length === 0) {
-                  <mat-option disabled>No open DDS account matches</mat-option>
-                }
-              </mat-autocomplete>
-              @if (transferToItself) {
-                <mat-hint class="dte-same-party">Pick a different account - it cannot transfer to itself</mat-hint>
-              } @else {
-                <mat-hint>Account the money is taken from</mat-hint>
-              }
-            </mat-form-field>
-            <mat-form-field appearance="outline" class="dte-field">
-              <mat-label>Debit Party Name</mat-label>
-              <input matInput formControlName="debitPartyName" readonly />
-            </mat-form-field>
-            <mat-form-field appearance="outline" class="dte-field">
-              <mat-label>Debit Curr Bal</mat-label>
-              <input matInput formControlName="debitPartyBalance" readonly />
-            </mat-form-field>
-
-            <mat-form-field appearance="outline" class="dte-field">
-              <mat-label>Amount</mat-label>
-              <input matInput type="number" formControlName="withdrawAmount" />
-            </mat-form-field>
-            <mat-form-field appearance="outline" class="dte-field dte-field--wide">
-              <mat-label>Description</mat-label>
-              <input matInput formControlName="withdrawDescription" />
-            </mat-form-field>
-          </div>
-        </div>
-      }
-
-      @if (!isPartyTran && !isWithdrawDeposite && !isAgentTran) {
-        <div class="dte-section">
-          <p class="dte-empty">
-            "{{ entryForm.get('transactionType').value }}" entry screen — same shape as Party Tran, to be filled in once
-            the backend distinguishes these transaction types.
-          </p>
-        </div>
-      }
-
-      <div class="dte-action-bar">
-        <button mat-raised-button type="button" (click)="exit()">Exit</button>
-        <button mat-stroked-button type="button" (click)="cancel()">Cancel</button>
-        <button mat-stroked-button type="button" (click)="retrieve()">Retrieve</button>
-        <button mat-stroked-button type="button" (click)="viewLedger()">View Ledger</button>
-        <button mat-stroked-button type="button" (click)="signature()">Signature</button>
-        <!-- Party Tran and Agent Tran are read here, never saved: the agent writes the round down on
-             their own screen and the cash is taken in at the cashier's counter. Agent Tran applies the
-             cashier's receipts from its own Apply DDS Receipt. Only Withdraw Deposite still saves. -->
-        @if (!isPartyTran && !isAgentTran) {
-          <button
-            mat-raised-button
-            color="primary"
-            type="button"
-            [disabled]="entryForm.invalid || transferToItself"
-            (click)="save()"
-          >
-            Save
-          </button>
-        }
-      </div>
-    </form>
-  </div>
-</div>

src/app/deposits/daily-transaction-entry/daily-transaction-entry.component.scss

@@ -1,488 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-$primary: #0f766e;
-
-.dte-container {
-  // Wider than a normal form page: a collection row carries six fields side by side, and a clerk
-  // keying a round should see the whole of it.
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 20px 16px;
-}
-
-.dte-header {
-  display: flex;
-  align-items: center;
-  gap: 16px;
-  margin-bottom: 20px;
-
-  &__title {
-    margin: 0;
-    font-size: 22px;
-    font-weight: 500;
-  }
-}
-
-.dte-back {
-  color: $primary;
-}
-
-.dte-card {
-  background: var(--md-sys-color-surface, #fff);
-  border-radius: 8px;
-  box-shadow: 0 2px 8px rgb(0 0 0 / 8%);
-  padding: 20px 24px 24px;
-}
-
-.dte-info-panels {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 16px;
-  margin-bottom: 20px;
-}
-
-.dte-info-panel {
-  border: 1px solid rgb(0 0 0 / 10%);
-  border-radius: 8px;
-  padding: 12px 16px;
-  background: rgb(15 118 110 / 4%);
-
-  &__title {
-    font-weight: 600;
-    font-size: 13px;
-    text-transform: uppercase;
-    letter-spacing: 0.04em;
-    color: $primary;
-    margin-bottom: 8px;
-  }
-
-  &__hint {
-    margin: 0;
-    color: rgb(0 0 0 / 50%);
-    font-size: 13px;
-  }
-
-  dl {
-    display: grid;
-    grid-template-columns: auto 1fr;
-    gap: 4px 12px;
-    margin: 0;
-  }
-
-  dt {
-    font-weight: 500;
-    color: rgb(0 0 0 / 60%);
-    font-size: 13px;
-  }
-
-  dd {
-    margin: 0;
-    font-size: 13px;
-  }
-}
-
-.dte-controls {
-  display: flex;
-  align-items: flex-start;
-  gap: 12px;
-  flex-wrap: wrap;
-  margin-bottom: 12px;
-}
-
-// A sensible floor for the fields laid out with flex in .dte-controls, where there is room to spare.
-.dte-field {
-  min-width: 180px;
-
-  &--wide {
-    grid-column: span 2;
-  }
-}
-
-// Inside the collection grid the track decides the width, not the field. Left to its own 180px
-// floor a field refuses to shrink into a narrower track and overruns the one beside it.
-.dte-collection-row .dte-field {
-  width: 100%;
-  min-width: 0;
-}
-
-.dte-section {
-  padding: 16px 0;
-  border-top: 1px solid rgb(0 0 0 / 8%);
-  // A very narrow window scrolls the grid sideways rather than the whole page.
-  overflow-x: auto;
-
-  &__header {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    margin-bottom: 16px;
-
-    i {
-      color: $primary;
-    }
-
-    h3 {
-      margin: 0;
-      font-size: 16px;
-      font-weight: 600;
-      flex: 1;
-    }
-  }
-}
-
-.dte-add-row {
-  color: $primary;
-}
-
-.dte-empty {
-  color: rgb(0 0 0 / 50%);
-  font-size: 14px;
-  margin: 0;
-}
-
-.dte-grid {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 8px 16px;
-}
-
-/*
- * One collection per row. Fixed columns rather than an even split, so the row holds its shape as
- * fields come and go - Cheque No and Token No only appear for a non-cash entry - and the party
- * picker gets the width its "code · name · daily amount" needs.
- */
-.dte-collection-row {
-  display: grid;
-  grid-template-columns:
-    minmax(0, 2.2fr) /* Party       */
-    minmax(0, 1fr) /* TRTP        */
-    minmax(0, 1fr) /* AC Type     */
-    minmax(0, 1.4fr) /* A/C No.     */
-    minmax(0, 1fr) /* Amount      */
-    minmax(0, 1.6fr) /* Description */
-    auto; /* remove      */
-
-  gap: 8px 12px;
-  align-items: start;
-  padding: 10px 0;
-  border-top: 1px dashed rgb(0 0 0 / 10%);
-
-  &:first-of-type {
-    border-top: none;
-  }
-
-  // Cheque No and Token No push Description and the remove button onto a second line, which is
-  // what a non-cash entry should look like rather than a row running off the screen.
-  &:has(.dte-field--instrument) {
-    grid-template-columns:
-      minmax(0, 2.2fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1.4fr) minmax(0, 1fr)
-      minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1.6fr) auto;
-  }
-}
-
-.dte-collection-row .dte-field--wide {
-  grid-column: span 2;
-}
-
-@media (width <= 1200px) {
-  .dte-collection-row,
-  .dte-collection-row:has(.dte-field--instrument) {
-    grid-template-columns: repeat(3, minmax(0, 1fr)) auto;
-  }
-}
-
-.dte-remove-row {
-  color: #b91c1c;
-  margin-top: 8px;
-}
-
-.dte-action-bar {
-  display: flex;
-  justify-content: flex-end;
-  gap: 12px;
-  margin-top: 20px;
-  padding-top: 16px;
-  border-top: 1px solid rgb(0 0 0 / 8%);
-  flex-wrap: wrap;
-}
-
-@media (width <= 1000px) {
-  .dte-info-panels {
-    grid-template-columns: 1fr;
-  }
-
-  .dte-grid {
-    grid-template-columns: repeat(2, 1fr);
-  }
-
-  .dte-collection-row {
-    grid-template-columns: repeat(2, 1fr);
-  }
-}
-
-/* Resolved name under an Agent / Party Code field — the check that the right record was found. */
-.dte-hint--found {
-  color: #15803d;
-  font-weight: 500;
-}
-
-.dte-hint--missing {
-  color: #b91c1c;
-  font-weight: 500;
-}
-
-/* Marks an agent in the list who is no longer collecting - only offered for settlement. */
-.dte-agent-off {
-  color: #b45309;
-  font-size: 12px;
-  font-style: italic;
-  margin-left: 6px;
-}
-
-/* The figure the clerk actually verifies against the passbook before saving. */
-.dte-after {
-  font-weight: 600;
-  color: #0f766e;
-}
-
-/* What the agent should be handing over for this round. */
-.dte-total {
-  display: flex;
-  justify-content: flex-end;
-  align-items: baseline;
-  gap: 14px;
-  padding: 10px 4px 2px;
-  border-top: 1px solid rgb(0 0 0 / 10%);
-  font-size: 0.88rem;
-  color: rgb(0 0 0 / 60%);
-
-  strong {
-    font-size: 1.1rem;
-    color: rgb(0 0 0 / 85%);
-    font-variant-numeric: tabular-nums;
-  }
-}
-
-/* Marks a transaction type the system does not handle yet, so it reads as pending rather than broken. */
-.dte-soon {
-  font-size: 0.78rem;
-  font-style: italic;
-  color: rgb(0 0 0 / 45%);
-}
-
-/*
- * Marks a party this agent has already collected from today, on the row where it is picked.
- *
- * Amber, not red: a customer paying twice in a day is legitimate - arrears, or two days at once -
- * so this is a second look, not an error. Blocking it would stop real work; saying nothing lets a
- * whole round be credited twice.
- */
-.dte-hint--again {
-  color: #b45309;
-  font-weight: 500;
-}
-
-/*
- * Where a party stands against its instalments. Three states rather than one colour, because they
- * call for three different things from the clerk: ahead means take nothing, behind means take more
- * than the daily amount, level means take the daily amount as usual.
- *
- * Behind is amber, not red - falling a few days behind is ordinary in daily collection and is the
- * agent's job to recover, not an error. Red here would cry wolf on most rows.
- */
-.dte-hint--ahead,
-.dte-sched--ahead {
-  color: #15803d;
-  font-weight: 500;
-}
-
-.dte-hint--behind,
-.dte-sched--behind {
-  color: #b45309;
-  font-weight: 500;
-}
-
-.dte-hint--level,
-.dte-sched--level {
-  color: rgb(0 0 0 / 55%);
-}
-
-/* In the party panel the schedule line carries more weight than the fields around it. */
-.dte-sched {
-  font-weight: 500;
-}
-
-/* Says why a party in the list cannot be picked, beside the party rather than in a tooltip. */
-.dte-covered {
-  color: #15803d;
-  font-size: 0.8rem;
-}
-
-/*
- * An amount that looks like a slip. Red rather than the amber used for arrears: arrears are ordinary
- * and the agent's job to recover, while this is a figure that probably was not handed over at all,
- * and once saved it cannot be taken back. It still does not block - the clerk decides.
- */
-.dte-hint--overpay {
-  color: #b91c1c;
-  font-weight: 500;
-}
-
-/*
-  The agent's written-down round, as the counter reads it.
-
-  Laid out as lines rather than as the input grid this replaced: there is nothing to fill in here,
-  only a list to check a bag of cash against, and controls would invite editing something the clerk
-  has no business editing.
-*/
-.dte-pending-row {
-  display: flex;
-  align-items: baseline;
-  gap: 12px;
-  padding: 10px 2px;
-  border-bottom: 1px solid rgb(0 0 0 / 8%);
-
-  &:last-of-type {
-    border-bottom: none;
-  }
-
-  /* First, and in the quieter weight: the date is context for the line, not what is being read. */
-  &__date {
-    min-width: 96px;
-    opacity: 0.7;
-    font-variant-numeric: tabular-nums;
-  }
-
-  &__code {
-    font-weight: 600;
-    min-width: 84px;
-  }
-
-  &__name {
-    flex: 1;
-    min-width: 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    opacity: 0.75;
-  }
-
-  &__mode {
-    font-size: 12px;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    opacity: 0.6;
-  }
-
-  /* Amounts are read down the column and compared, so the digits have to line up. */
-  &__amount {
-    font-variant-numeric: tabular-nums;
-    font-weight: 600;
-    min-width: 96px;
-    text-align: right;
-  }
-}
-
-/* The one figure the clerk acts on, said as a sentence so it is not read as another column total. */
-.dte-expected {
-  margin: 14px 2px 0;
-  font-size: 14px;
-  line-height: 1.5;
-
-  strong {
-    font-variant-numeric: tabular-nums;
-  }
-}
-
-/* Quieter than the figure above it: a note about how the screen behaves, not part of the count. */
-.dte-expected--note {
-  font-size: 13px;
-  opacity: 0.65;
-  margin-top: 4px;
-}
-
-.dte-apply-receipt {
-  margin-left: 8px;
-}
-
-/* Agent Tran: what the agent owes, what the cashier has taken in, and what is left. */
-.dte-money {
-  display: flex;
-  gap: 12px;
-  margin: 8px 0 12px;
-  flex-wrap: wrap;
-
-  &__box {
-    flex: 1;
-    min-width: 160px;
-    padding: 10px 14px;
-    border: 1px solid rgb(0 0 0 / 10%);
-    border-radius: 8px;
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    font-variant-numeric: tabular-nums;
-
-    strong {
-      font-size: 18px;
-    }
-
-    &--due {
-      border-color: rgb(198 40 40 / 40%);
-      background: rgb(198 40 40 / 4%);
-    }
-  }
-
-  &__label {
-    font-size: 12px;
-    opacity: 0.7;
-    text-transform: uppercase;
-    letter-spacing: 0.04em;
-  }
-}
-
-.dte-subhead {
-  margin: 16px 0 4px;
-  font-size: 14px;
-  font-weight: 600;
-}
-
-.dte-pending-row--day {
-  cursor: pointer;
-}
-
-.dte-day-lines {
-  margin-left: 24px;
-  max-height: 280px;
-  overflow-y: auto;
-  border-left: 3px solid rgb(25 118 210 / 30%);
-  padding-left: 10px;
-}
-
-.dte-status {
-  font-size: 12px;
-  padding: 2px 8px;
-  border-radius: 10px;
-  background: rgb(237 108 2 / 12%);
-  color: #b45309;
-
-  &--ok {
-    background: rgb(46 125 50 / 12%);
-    color: #2e7d32;
-  }
-}
-
-.dte-list-arrow {
-  cursor: pointer;
-}
-
-.dte-same-party {
-  color: #c62828;
-  font-weight: 600;
-}

src/app/deposits/daily-transaction-entry/day-collection-dialog/day-collection-dialog.component.html

@@ -1,58 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<h2 mat-dialog-title>{{ title }}</h2>
-
-<mat-dialog-content>
-  <mat-form-field appearance="outline" class="dcd-field">
-    <mat-label>Party</mat-label>
-    <mat-select [(ngModel)]="partyCode" (selectionChange)="partyChanged()">
-      @for (p of eligibleParties; track p.id) {
-        <mat-option [value]="p.partyCode">
-          {{ p.partyCode }} · {{ p.partyName }} · Daily {{ p.dailyDepositAmount | number: '1.0-0' }}
-        </mat-option>
-      }
-    </mat-select>
-    @if (eligibleParties.length === 0) {
-      <!-- Only reachable on the arrears side: nobody is behind within the window. -->
-      <mat-hint class="dcd-none">No party has recoverable days</mat-hint>
-    }
-  </mat-form-field>
-
-  <mat-form-field appearance="outline" class="dcd-field">
-    <mat-label>Days</mat-label>
-    <mat-select [(ngModel)]="days" [disabled]="!partyCode">
-      @for (d of dayOptions; track d) {
-        <mat-option [value]="d">{{ d }} {{ d === 1 ? 'day' : 'days' }}</mat-option>
-      }
-    </mat-select>
-    @if (isAdvance) {
-      <mat-hint>Up to 5 days</mat-hint>
-    } @else if (partyCode) {
-      <mat-hint>Only days still within the catch-up window</mat-hint>
-    }
-  </mat-form-field>
-
-  <!--
-    What it comes to, shown before it is added rather than after. The clerk quotes this to the
-    customer, so it has to be the scheme's own figure and has to be visible while deciding.
-  -->
-  @if (amount > 0) {
-    <div class="dcd-amount">
-      <span class="dcd-amount__figure">{{ amount | number: '1.2-2' }}</span>
-      <span class="dcd-amount__basis">
-        {{ days }} × {{ party?.dailyDepositAmount | number: '1.2-2' }} daily
-      </span>
-    </div>
-  }
-</mat-dialog-content>
-
-<mat-dialog-actions align="end">
-  <button mat-button mat-dialog-close type="button">Cancel</button>
-  <button mat-raised-button color="primary" type="button" [disabled]="!canAdd" (click)="add()">Add</button>
-</mat-dialog-actions>

src/app/deposits/daily-transaction-entry/day-collection-dialog/day-collection-dialog.component.scss

@@ -1,42 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-.dcd-field {
-  width: 100%;
-}
-
-.dcd-none {
-  color: #b45309;
-}
-
-/*
- * The figure the clerk quotes at the counter. Larger than the fields above it because it is the one
- * thing the customer is told, and it is shown with its basis so the clerk can say where it came from
- * rather than just naming a number.
- */
-.dcd-amount {
-  display: flex;
-  align-items: baseline;
-  gap: 10px;
-  margin-top: 6px;
-  padding: 12px 14px;
-  border-radius: 6px;
-  background: rgb(15 118 110 / 8%);
-
-  &__figure {
-    font-size: 1.3rem;
-    font-weight: 600;
-    color: #0f766e;
-    font-variant-numeric: tabular-nums;
-  }
-
-  &__basis {
-    font-size: 0.8rem;
-    color: rgb(0 0 0 / 60%);
-  }
-}

src/app/deposits/daily-transaction-entry/day-collection-dialog/day-collection-dialog.component.ts

@@ -1,117 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/** Angular Imports */
-import { Component, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { MatButtonModule } from '@angular/material/button';
-import { MatSelectModule } from '@angular/material/select';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-
-/**
- * Collecting for days other than today - either paid ahead, or owed from days gone by.
- *
- * Both are the same act from the counter's side: the customer is paying for a number of days, and
- * what that comes to is the scheme's business, not the clerk's. So the clerk picks days and the
- * amount follows. Typing an amount instead would let the daily figure be worked around a little at a
- * time, and would quote the customer something the scheme does not charge.
- *
- * The two differ only in how many days are on offer. Paying ahead is capped by the bank's allowance.
- * Paying arrears is capped by what is still inside the catch-up window - older instalments are gone,
- * and offering them would have the clerk asking for money the bank has already written off.
- */
-@Component({
-  selector: 'mifosx-day-collection-dialog',
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    MatDialogModule,
-    MatButtonModule,
-    MatSelectModule,
-    MatFormFieldModule,
-    MatInputModule
-  ],
-  templateUrl: './day-collection-dialog.component.html',
-  styleUrls: ['./day-collection-dialog.component.scss']
-})
-export class DayCollectionDialogComponent {
-  private dialogRef = inject(MatDialogRef<DayCollectionDialogComponent>);
-  /** { mode: 'advance' | 'previous', parties: [] } - the agent's parties, as the screen already has them. */
-  data = inject<any>(MAT_DIALOG_DATA);
-
-  partyCode = '';
-  days: number | '' = '';
-
-  get isAdvance(): boolean {
-    return this.data?.mode === 'advance';
-  }
-
-  get title(): string {
-    return this.isAdvance ? 'Collect in advance' : 'Collect previous days';
-  }
-
-  get party(): any {
-    return (this.data?.parties || []).find((p: any) => String(p.partyCode) === this.partyCode) || null;
-  }
-
-  /**
-   * The parties this can be used on.
-   *
-   * Paying ahead is offered to anyone. Paying arrears is offered only where there are arrears still
-   * inside the window - on an account that is up to date there is nothing to collect for past days,
-   * and listing it would invite an entry that is really an advance in disguise.
-   */
-  get eligibleParties(): any[] {
-    const parties = this.data?.parties || [];
-    return this.isAdvance ? parties : parties.filter((p: any) => Number(p.recoverableAmount || 0) > 0);
-  }
-
-  /**
-   * How many days may be picked. Five ahead, matching the bank's allowance and the server's own
-   * check; for arrears, only what has not yet fallen out of the catch-up window.
-   */
-  get dayOptions(): number[] {
-    const daily = Number(this.party?.dailyDepositAmount || 0);
-    if (!this.party || daily <= 0) {
-      return [];
-    }
-    const limit = this.isAdvance
-      ? 5
-      : Math.floor(Number(this.party.recoverableAmount || 0) / daily);
-    return Array.from({ length: Math.max(0, limit) }, (_, index) => index + 1);
-  }
-
-  get amount(): number {
-    return Number(this.party?.dailyDepositAmount || 0) * Number(this.days || 0);
-  }
-
-  /** Clearing the days when the party changes - a count valid for one account is not for another. */
-  partyChanged(): void {
-    this.days = '';
-  }
-
-  get canAdd(): boolean {
-    return !!this.partyCode && Number(this.days) > 0 && this.amount > 0;
-  }
-
-  add(): void {
-    this.dialogRef.close({
-      partyCode: this.partyCode,
-      days: Number(this.days),
-      amount: this.amount,
-      // Sent as days, not just an amount: the server recomputes what they come to and checks it
-      // against this account, so the figure quoted here is the one that gets posted.
-      advanceDays: this.isAdvance ? Number(this.days) : undefined,
-      arrearsDays: this.isAdvance ? undefined : Number(this.days)
-    });
-  }
-}

src/app/deposits/daily-transaction-entry/notice-dialog/notice-dialog.component.html

@@ -1,21 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<div class="nd-head">
-  <span class="nd-head__ic"><fa-icon icon="info-circle"></fa-icon></span>
-  <h2 class="nd-head__title">{{ data.heading }}</h2>
-</div>
-
-<mat-dialog-content>
-  <p class="nd-message">{{ data.message }}</p>
-</mat-dialog-content>
-
-<!-- One button, because there is nothing here to agree to or call off. -->
-<mat-dialog-actions align="end">
-  <button mat-flat-button color="primary" mat-dialog-close>OK</button>
-</mat-dialog-actions>

src/app/deposits/daily-transaction-entry/notice-dialog/notice-dialog.component.scss

@@ -1,44 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-.nd-head {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  padding: 18px 24px 4px;
-
-  /*
-   * Teal rather than the amber or red the platform's other dialogs use. Nothing has gone wrong here
-   * and nothing is at risk - the clerk is being told a fact about the agent they picked, and a
-   * warning colour would send them looking for a fault that is not there.
-   */
-  &__ic {
-    display: grid;
-    place-items: center;
-    width: 34px;
-    height: 34px;
-    border-radius: 8px;
-    background: rgb(15 118 110 / 10%);
-    color: #0f766e;
-    flex: none;
-  }
-
-  &__title {
-    margin: 0;
-    font-size: 1.05rem;
-    font-weight: 600;
-  }
-}
-
-.nd-message {
-  margin: 0;
-  max-width: 44ch;
-  font-size: 0.9rem;
-  line-height: 1.55;
-  color: rgb(0 0 0 / 70%);
-}

src/app/deposits/daily-transaction-entry/notice-dialog/notice-dialog.component.ts

@@ -1,39 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/** Angular Imports */
-import { Component, inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
-import { MatButtonModule } from '@angular/material/button';
-import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-
-/**
- * Something the clerk needs told, with nothing to decide.
- *
- * The platform's confirmation dialog asks a question - Cancel or Confirm - and its buttons imply a
- * choice. Used for a plain statement it leaves the clerk hunting for what they are agreeing to, and
- * "Cancel" reads as though the thing being described could be undone. The error dialog has the right
- * single button but dresses the message in red, which turns "this agent has no parties" into a fault.
- *
- * So: one button, and the message stands on its own.
- */
-@Component({
-  selector: 'mifosx-notice-dialog',
-  standalone: true,
-  imports: [
-    MatDialogModule,
-    MatButtonModule,
-    FaIconComponent
-  ],
-  templateUrl: './notice-dialog.component.html',
-  styleUrls: ['./notice-dialog.component.scss']
-})
-export class NoticeDialogComponent {
-  /** { heading, message } */
-  data = inject<any>(MAT_DIALOG_DATA);
-}

src/app/deposits/dds-accounts/dds-account-view/dds-account-view.component.html

@@ -1,557 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<div class="dav-page">
-  @if (isLoading) {
-    <div class="dav-card dav-state">
-      <mat-spinner diameter="32"></mat-spinner>
-      <span>Loading account…</span>
-    </div>
-  } @else if (!account) {
-    <div class="dav-card dav-state">
-      <fa-icon icon="inbox" size="2x"></fa-icon>
-      <span>DDS account not found</span>
-      <button class="dav-btn" (click)="back()"><fa-icon icon="arrow-left"></fa-icon> DDS Accounts</button>
-    </div>
-  } @else {
-    <!-- Banner, as the savings account page opens -->
-    <div class="dav-banner">
-      <div class="dav-banner__icon"><fa-icon icon="coins"></fa-icon></div>
-      <div class="dav-banner__text">
-        <span class="dav-pill" [ngClass]="'dav-pill--' + (account.status || '').toLowerCase()"
-          >● {{ account.status }}</span
-        >
-        <h2 class="dav-banner__title">{{ account.subType }}</h2>
-        <div class="dav-banner__meta">
-          <span class="dav-banner__label">Account Number</span>
-          <span class="dav-banner__value dav-mono">{{ account.accountNo }}</span>
-          <span class="dav-banner__label">Client Name</span>
-          <span class="dav-banner__value">{{ account.clientName || account.partyName }}</span>
-        </div>
-      </div>
-      <div class="dav-banner__boxes">
-        <div class="dav-box">
-          <span class="dav-box__label">Current Balance</span>
-          <span class="dav-box__value">₹{{ account.currentBalance || 0 | formatNumber }}</span>
-        </div>
-        <div class="dav-box">
-          <span class="dav-box__label">Maturity Amount</span>
-          <span class="dav-box__value">₹{{ account.maturityAmount || 0 | formatNumber }}</span>
-        </div>
-      </div>
-      <div class="dav-banner__actions">
-        <button class="dav-icon-btn" (click)="back()" matTooltip="Back to DDS Accounts">
-          <fa-icon icon="arrow-left"></fa-icon>
-        </button>
-        <button class="dav-icon-btn" (click)="openInPartyMaster()" matTooltip="Open in DDS Party Master">
-          <fa-icon icon="pen"></fa-icon>
-        </button>
-      </div>
-    </div>
-
-    <!-- Tabs -->
-    <div class="dav-tabs">
-      <button class="dav-tab" [class.dav-tab--on]="tab === 'general'" (click)="tab = 'general'">
-        <fa-icon icon="info-circle"></fa-icon> General
-      </button>
-      <button class="dav-tab" [class.dav-tab--on]="tab === 'transactions'" (click)="tab = 'transactions'">
-        <fa-icon icon="exchange-alt"></fa-icon> Transactions
-      </button>
-      <button class="dav-tab" [class.dav-tab--on]="tab === 'passbook'" (click)="tab = 'passbook'">
-        <fa-icon icon="book"></fa-icon> Passbook
-      </button>
-      <button class="dav-tab" [class.dav-tab--on]="tab === 'nominees'" (click)="tab = 'nominees'">
-        <fa-icon icon="user"></fa-icon> Nominees
-      </button>
-      @if (account.status === 'CLOSED') {
-        <button class="dav-tab" [class.dav-tab--on]="tab === 'closure'" (click)="tab = 'closure'">
-          <fa-icon icon="lock"></fa-icon> Closure
-        </button>
-      }
-    </div>
-
-    <!-- Closure: how a closed account was closed and where its money went -->
-    @if (tab === 'closure') {
-      @if (!closure) {
-        <div class="dav-card">
-          <div class="dav-row"><span>Loading closure details…</span></div>
-        </div>
-      } @else {
-        <div class="dav-columns">
-          <div class="dav-column">
-            <div class="dav-card">
-              <div class="dav-card__head"><span class="dav-card__dot"></span> How It Closed</div>
-              <div class="dav-row">
-                <span>Type</span>
-                <strong>
-                  {{ closureLabels[closure.closureType] || closure.closureType }}
-                  @if (closure.withinLockin) {
-                    <em class="dav-closure-tag">within lock-in</em>
-                  }
-                </strong>
-              </div>
-              <div class="dav-row">
-                <span>Closed On</span><strong>{{ closure.closeDate | date: 'dd MMMM yyyy' }}</strong>
-              </div>
-              @if (closure.paidOutBy) {
-                <div class="dav-row">
-                  <span>Paid Out By</span><strong>{{ closure.paidOutBy }}</strong>
-                </div>
-              }
-              <div class="dav-row">
-                <span>Closed By</span><strong>{{ closure.closedBy || '—' }}</strong>
-              </div>
-              <div class="dav-row">
-                <span>Approved By</span><strong>{{ closure.approvedBy || '—' }}</strong>
-              </div>
-              @if (closure.lockinOverrideReason) {
-                <div class="dav-row">
-                  <span>Reason</span><strong>{{ closure.lockinOverrideReason }}</strong>
-                </div>
-              }
-              @if (closure.shortfallBorneBy) {
-                <div class="dav-row">
-                  <span>Cost Borne By</span>
-                  <strong>{{
-                    closure.shortfallBorneBy === 'AGENT' ? 'Agent — ' + closure.agentCode : 'Customer'
-                  }}</strong>
-                </div>
-              }
-            </div>
-
-            <div class="dav-card">
-              <div class="dav-card__head"><span class="dav-card__dot"></span> The Money</div>
-              <div class="dav-row">
-                <span>Balance at Close</span><strong>₹{{ closure.balanceAtClose || 0 | formatNumber }}</strong>
-              </div>
-              @if (closure.interestRecovered > 0) {
-                <div class="dav-row">
-                  <span>Interest Recovered</span
-                  ><strong class="dav-dr">− ₹{{ closure.interestRecovered | formatNumber }}</strong>
-                </div>
-              }
-              @if (closure.interestToppedUpByAgent > 0) {
-                <div class="dav-row">
-                  <span>Interest Funded by Agent</span
-                  ><strong class="dav-cr">+ ₹{{ closure.interestToppedUpByAgent | formatNumber }}</strong>
-                </div>
-              }
-              <div class="dav-row dav-closure-total">
-                <span>Paid Out</span><strong>₹{{ closure.paidOut || 0 | formatNumber }}</strong>
-              </div>
-              @if (closure.closureType === 'PREMATURE') {
-                <div class="dav-row">
-                  <span>Agent Penalty ({{ closure.agentCode }})</span
-                  ><strong>₹{{ closure.agentCommissionPenalty || 0 | formatNumber }}</strong>
-                </div>
-              }
-            </div>
-          </div>
-
-          <div class="dav-column">
-            <div class="dav-card">
-              <div class="dav-card__head"><span class="dav-card__dot"></span> Where It Went</div>
-              @if (closure.destination === 'OWN_ACCOUNT') {
-                <div class="dav-row"><span>Paid Into</span><strong>Customer's own account</strong></div>
-                <div class="dav-row">
-                  <span>Account</span><strong class="dav-mono">{{ closure.creditedAccount?.accountNo }}</strong>
-                </div>
-                @if (closure.creditedAccount?.productName) {
-                  <div class="dav-row">
-                    <span>Product</span><strong>{{ closure.creditedAccount.productName }}</strong>
-                  </div>
-                }
-                @if (closure.creditedAccount?.owner) {
-                  <div class="dav-row">
-                    <span>Holder</span><strong>{{ closure.creditedAccount.owner }}</strong>
-                  </div>
-                }
-              } @else if (closure.destination === 'SUNDRY') {
-                <div class="dav-row"><span>Parked In</span><strong>Sundry (customer has no account here)</strong></div>
-                <div class="dav-row">
-                  <span>GL Account</span
-                  ><strong class="dav-mono">{{ closure.sundryGl?.glCode }} · {{ closure.sundryGl?.glName }}</strong>
-                </div>
-              } @else {
-                <div class="dav-row"><span>Paid Out</span><strong>Nothing - the balance was nil</strong></div>
-              }
-              @if (closure.voucherNo) {
-                <div class="dav-row">
-                  <span>Voucher</span><strong class="dav-mono">{{ closure.voucherNo }}</strong>
-                </div>
-              }
-              @if (closure.payoutDate) {
-                <div class="dav-row">
-                  <span>Paid On</span><strong>{{ closure.payoutDate | date: 'dd MMMM yyyy' }}</strong>
-                </div>
-              }
-              @if (closure.passbookNote) {
-                <div class="dav-row">
-                  <span>Passbook Note</span><strong>{{ closure.passbookNote }}</strong>
-                </div>
-              }
-            </div>
-
-            @if (closure.ledgerEntries?.length) {
-              <div class="dav-card">
-                <div class="dav-card__head"><span class="dav-card__dot"></span> Ledger Entry</div>
-                <div class="dav-row">
-                  <span>Transaction ID</span><strong class="dav-mono">{{ closure.ledgerTransactionId }}</strong>
-                </div>
-                @for (leg of closure.ledgerEntries; track $index) {
-                  <div class="dav-row">
-                    <span>{{ leg.glCode }} · {{ leg.glName }}</span>
-                    <strong [class.dav-dr]="leg.side === 'DR'" [class.dav-cr]="leg.side === 'CR'">
-                      {{ leg.side }} ₹{{ leg.amount | formatNumber }}
-                    </strong>
-                  </div>
-                }
-              </div>
-            }
-          </div>
-        </div>
-      }
-    }
-
-    <!-- General -->
-    @if (tab === 'general') {
-      <div class="dav-columns">
-        <div class="dav-column">
-          <div class="dav-card">
-            <div class="dav-card__head"><span class="dav-card__dot"></span> DDS Details</div>
-            <div class="dav-row">
-              <span>Account Number</span><strong class="dav-mono">{{ account.accountNo }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Party Code</span><strong>{{ account.partyCode }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Client Name</span><strong>{{ account.clientName }} ({{ account.clientId }})</strong>
-            </div>
-            <div class="dav-row">
-              <span>Agent</span><strong>{{ account.agentCode }} · {{ account.agentName }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Branch</span><strong>{{ account.officeName }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Product</span><strong>{{ account.subType }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Opened On</span><strong>{{ account.openingDate | date: 'dd MMMM yyyy' }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Matures On</span><strong>{{ account.maturityDate | date: 'dd MMMM yyyy' }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Daily Deposit</span><strong>₹{{ account.dailyDepositAmount || 0 | formatNumber }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Term</span><strong>{{ account.month }} months · {{ account.days }} days</strong>
-            </div>
-            <div class="dav-row">
-              <span>Interest Rate</span><strong>{{ account.interestRate }} %</strong>
-            </div>
-            <div class="dav-row">
-              <span>Currency</span><strong>Indian Rupee <em class="dav-mono">[INR]</em></strong>
-            </div>
-          </div>
-
-          <div class="dav-card">
-            <div class="dav-card__head"><span class="dav-card__dot"></span> Performance History</div>
-            <div class="dav-row">
-              <span>Total Collected</span><strong class="dav-cr">₹{{ totalOf('PARTY_TRAN') | formatNumber }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Total Interest Earned</span><strong>₹{{ interestEarned | formatNumber }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Total Paid Out</span><strong class="dav-dr">₹{{ totalDebitsAll | formatNumber }}</strong>
-            </div>
-          </div>
-        </div>
-
-        <div class="dav-column">
-          <div class="dav-card">
-            <div class="dav-card__head"><span class="dav-card__dot"></span> Account Summary</div>
-            <div class="dav-row">
-              <span>Collected to Date</span><strong>₹{{ account.collectedToDate || 0 | formatNumber }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Expected to Date</span><strong>₹{{ account.expectedToDate || 0 | formatNumber }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Standing</span>
-              <strong>
-                @if (account.advanceDays > 0) {
-                  {{ account.advanceDays }} days ahead
-                } @else if (account.arrearsDays > 0) {
-                  <span class="dav-dr">{{ account.arrearsDays }} days behind</span>
-                } @else {
-                  Up to date
-                }
-              </strong>
-            </div>
-            <div class="dav-row">
-              <span>Instalments Due</span><strong>{{ account.instalmentsDue ?? 0 }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Interest Earned</span><strong>₹{{ interestEarned | formatNumber }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Interest Calculated, Not Posted</span
-              ><strong>₹{{ account.interestCalc || 0 | formatNumber }}</strong>
-            </div>
-            <div class="dav-row"><span>Interest Calculated Using</span><strong>Daily Balance</strong></div>
-            <div class="dav-row"><span>Days in Year</span><strong>365 Days</strong></div>
-            <div class="dav-row">
-              <span>Last Interest Date</span
-              ><strong>{{ account.interestDate ? (account.interestDate | date: 'dd MMMM yyyy') : '—' }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Last Transaction Date</span
-              ><strong>{{ lastTransactionDate ? (lastTransactionDate | date: 'dd MMMM yyyy') : '—' }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Maturity Amount</span><strong>₹{{ account.maturityAmount || 0 | formatNumber }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Lien</span>
-              <strong>{{ account.lien ? 'Yes — ₹' + (account.amountHeldUnderLien || 0) : 'No' }}</strong>
-            </div>
-            <div class="dav-row">
-              <span>Freeze</span><strong>{{ account.freezeCode || 'Normal' }}</strong>
-            </div>
-            @if (account.closeDate) {
-              <div class="dav-row">
-                <span>Closed On</span><strong>{{ account.closeDate | date: 'dd MMMM yyyy' }}</strong>
-              </div>
-            }
-          </div>
-        </div>
-      </div>
-    }
-
-    <!-- Transactions -->
-    @if (tab === 'transactions') {
-      <div class="dav-card">
-        <div class="dav-toolbar">
-          <div class="dav-datepick">
-            <span>From</span>
-            <input type="date" [formControl]="fromDateControl" [max]="today" />
-          </div>
-          <div class="dav-datepick">
-            <span>To</span>
-            <input type="date" [formControl]="toDateControl" [max]="today" />
-          </div>
-          <button class="dav-btn" (click)="showToday()"><fa-icon icon="clock"></fa-icon> Today</button>
-          @if (hasDateFilters) {
-            <button class="dav-btn" (click)="clearDateFilters()"><fa-icon icon="times"></fa-icon> Clear</button>
-          }
-          <div class="dav-totals">
-            <span class="dav-cr">Credits ₹{{ totalCredits | formatNumber }}</span>
-            <span class="dav-dr">Debits ₹{{ totalDebits | formatNumber }}</span>
-          </div>
-          <button class="dav-btn dav-btn--primary" (click)="exportCsv()" [disabled]="shownTransactions.length === 0">
-            Export
-          </button>
-        </div>
-
-        @if (shownTransactions.length === 0) {
-          <div class="dav-state">
-            <fa-icon icon="inbox" size="2x"></fa-icon>
-            <span>{{
-              hasDateFilters
-                ? 'Nothing moved on this account in these dates'
-                : 'Nothing has been credited to this account yet'
-            }}</span>
-          </div>
-        } @else {
-          <div class="dav-table-wrap">
-            <table class="dav-table">
-              <thead>
-                <tr>
-                  <th>#</th>
-                  <th>ID</th>
-                  <th>Transaction Date</th>
-                  <th>Transaction Type</th>
-                  <th>Voucher</th>
-                  <th>Description</th>
-                  <th class="dav-right">Debit</th>
-                  <th class="dav-right">Credit</th>
-                  <th class="dav-right">Balance</th>
-                </tr>
-              </thead>
-              <tbody>
-                @for (txn of shownTransactions; track txn.id; let i = $index) {
-                  <tr>
-                    <td>{{ i + 1 }}</td>
-                    <td>{{ txn.id }}</td>
-                    <td>{{ txn.transactionDate | date: 'dd MMMM yyyy' }}</td>
-                    <td>{{ label(txn.transactionType) }}</td>
-                    <td class="dav-mono">{{ txn.voucherNo || '—' }}</td>
-                    <td class="dav-desc">{{ txn.description }}</td>
-                    <td class="dav-right">
-                      {{ txn.direction === 'DEBIT' ? '₹' + (txn.amount | formatNumber) : 'N/A' }}
-                    </td>
-                    <td class="dav-right">
-                      {{ txn.direction === 'CREDIT' ? '₹' + (txn.amount | formatNumber) : 'N/A' }}
-                    </td>
-                    <td class="dav-right">
-                      <strong>₹{{ txn.balanceAfterTransaction || 0 | formatNumber }}</strong>
-                    </td>
-                  </tr>
-                }
-              </tbody>
-            </table>
-          </div>
-        }
-      </div>
-    }
-
-    <!-- Passbook: the same entries oldest first, the way a passbook is written up, and printable -->
-    @if (tab === 'passbook') {
-      <div class="dav-card">
-        <div class="dav-toolbar dav-noprint">
-          <div class="dav-datepick">
-            <span>From</span>
-            <input type="date" [formControl]="fromDateControl" [max]="today" />
-          </div>
-          <div class="dav-datepick">
-            <span>To</span>
-            <input type="date" [formControl]="toDateControl" [max]="today" />
-          </div>
-          @if (hasDateFilters) {
-            <button class="dav-btn" (click)="clearDateFilters()"><fa-icon icon="times"></fa-icon> Clear</button>
-          }
-          <button class="dav-btn dav-btn--primary dav-push" (click)="printPassbook()">
-            <fa-icon icon="print"></fa-icon> Print
-          </button>
-        </div>
-
-        <div class="dav-passbook" id="dds-passbook">
-          <div class="dav-pb-head">
-            <div>
-              <div class="dav-pb-title">DDS Passbook</div>
-              <div class="dav-pb-sub">{{ account.officeName }}</div>
-            </div>
-            <div class="dav-pb-grid">
-              <span>Account No</span><strong class="dav-mono">{{ account.accountNo }}</strong> <span>Party Code</span
-              ><strong>{{ account.partyCode }}</strong> <span>Name</span
-              ><strong>{{ account.clientName || account.partyName }}</strong> <span>Product</span
-              ><strong>{{ account.subType }} · {{ account.interestRate }} %</strong> <span>Opened On</span
-              ><strong>{{ account.openingDate | date: 'dd/MM/yyyy' }}</strong> <span>Agent</span
-              ><strong>{{ account.agentCode }}</strong>
-            </div>
-          </div>
-
-          @if (passbookEntries.length === 0) {
-            <div class="dav-state">
-              <span>{{ hasDateFilters ? 'No entries in these dates' : 'No entries yet' }}</span>
-            </div>
-          } @else {
-            <table class="dav-table dav-pb-table">
-              <thead>
-                <tr>
-                  <th>Date</th>
-                  <th>Voucher</th>
-                  <th>Particulars</th>
-                  <th class="dav-right">Withdrawals</th>
-                  <th class="dav-right">Deposits</th>
-                  <th class="dav-right">Balance</th>
-                </tr>
-              </thead>
-              <tbody>
-                @for (txn of passbookEntries; track txn.id) {
-                  <tr>
-                    <td>{{ txn.transactionDate | date: 'dd/MM/yyyy' }}</td>
-                    <td class="dav-mono">{{ txn.voucherNo || '' }}</td>
-                    <td>
-                      {{ label(txn.transactionType) }}
-                      @if (txn.description) {
-                        <span class="dav-pb-note">{{ txn.description }}</span>
-                      }
-                    </td>
-                    <td class="dav-right">{{ txn.direction === 'DEBIT' ? (txn.amount | formatNumber) : '' }}</td>
-                    <td class="dav-right">{{ txn.direction === 'CREDIT' ? (txn.amount | formatNumber) : '' }}</td>
-                    <td class="dav-right">
-                      <strong>{{ txn.balanceAfterTransaction || 0 | formatNumber }}</strong>
-                    </td>
-                  </tr>
-                }
-              </tbody>
-              <tfoot>
-                <tr>
-                  <td colspan="3"><strong>Total</strong></td>
-                  <td class="dav-right">
-                    <strong>{{ totalDebits | formatNumber }}</strong>
-                  </td>
-                  <td class="dav-right">
-                    <strong>{{ totalCredits | formatNumber }}</strong>
-                  </td>
-                  <td class="dav-right">
-                    <strong>{{ passbookClosingBalance | formatNumber }}</strong>
-                  </td>
-                </tr>
-              </tfoot>
-            </table>
-          }
-        </div>
-      </div>
-    }
-
-    <!-- Nominees -->
-    @if (tab === 'nominees') {
-      <div class="dav-card">
-        @if (!account.nominees || account.nominees.length === 0) {
-          <div class="dav-state">
-            <fa-icon icon="user" size="2x"></fa-icon>
-            <span>No nominee on this account</span>
-          </div>
-        } @else {
-          <div class="dav-table-wrap">
-            <table class="dav-table">
-              <thead>
-                <tr>
-                  <th>#</th>
-                  <th>Name</th>
-                  <th>Relation</th>
-                  <th>Gender</th>
-                  <th>Mobile</th>
-                  <th>Birth Date</th>
-                  <th>Nominated On</th>
-                  <th>Guardian</th>
-                  <th class="dav-right">{{ account.nomineeSplitMode === 'Sequence' ? 'Order' : 'Share %' }}</th>
-                </tr>
-              </thead>
-              <tbody>
-                @for (nominee of account.nominees; track nominee.id; let i = $index) {
-                  <tr>
-                    <td>{{ i + 1 }}</td>
-                    <td>
-                      <strong>{{ nominee.name }}</strong>
-                    </td>
-                    <td>{{ nominee.relation }}</td>
-                    <td>{{ nominee.gender }}</td>
-                    <td>{{ nominee.mobileNo || '—' }}</td>
-                    <td>{{ nominee.birthDate ? (nominee.birthDate | date: 'dd MMM yyyy') : '—' }}</td>
-                    <td>{{ nominee.nominationDate ? (nominee.nominationDate | date: 'dd MMM yyyy') : '—' }}</td>
-                    <td>{{ nominee.guardianName || '—' }}</td>
-                    <td class="dav-right">
-                      {{ account.nomineeSplitMode === 'Sequence' ? nominee.sequenceNo : (nominee.sharePercent ?? '—') }}
-                    </td>
-                  </tr>
-                }
-              </tbody>
-            </table>
-          </div>
-        }
-      </div>
-    }
-  }
-</div>

src/app/deposits/dds-accounts/dds-account-view/dds-account-view.component.scss

@@ -1,459 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/* One DDS account's page, laid out the way the savings account page is: a banner, tabs, cards. */
-
-.dav-page {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-  padding: 24px 32px;
-}
-
-.dav-mono {
-  font-family: ui-monospace, 'SF Mono', 'Cascadia Mono', monospace;
-  font-style: normal;
-}
-
-.dav-cr {
-  color: #047857;
-}
-
-.dav-dr {
-  color: #b91c1c;
-}
-
-.dav-right {
-  text-align: right !important;
-}
-
-/* ── Banner ───────────────────────────────────────────────────────────── */
-
-.dav-banner {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 16px;
-  padding: 16px 24px;
-  border-radius: 16px;
-  color: #fff;
-  background: linear-gradient(90deg, #1e3a8a 0%, #2d3fb4 55%, #5b47d6 100%);
-  box-shadow: 0 8px 24px rgb(30 58 138 / 25%);
-}
-
-.dav-banner__icon {
-  width: 48px;
-  height: 48px;
-  border-radius: 12px;
-  display: grid;
-  place-items: center;
-  font-size: 1.3rem;
-  background: rgb(255 255 255 / 16%);
-  border: 1px solid rgb(255 255 255 / 25%);
-}
-
-.dav-banner__text {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-  min-width: 0;
-}
-
-.dav-pill {
-  align-self: flex-start;
-  padding: 2px 10px;
-  border-radius: 999px;
-  font-size: 0.7rem;
-  font-weight: 700;
-  letter-spacing: 0.04em;
-  background: rgb(16 185 129 / 25%);
-  color: #a7f3d0;
-  border: 1px solid rgb(167 243 208 / 40%);
-}
-
-.dav-pill--closed {
-  background: rgb(148 163 184 / 25%);
-  color: #e2e8f0;
-  border-color: rgb(226 232 240 / 40%);
-}
-
-.dav-banner__title {
-  margin: 0;
-  font-size: 1.25rem;
-  font-weight: 700;
-}
-
-.dav-banner__meta {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: baseline;
-  gap: 6px 12px;
-}
-
-.dav-banner__label {
-  font-size: 0.7rem;
-  font-weight: 700;
-  letter-spacing: 0.06em;
-  text-transform: uppercase;
-  color: rgb(255 255 255 / 60%);
-}
-
-.dav-banner__value {
-  font-size: 0.9rem;
-  font-weight: 600;
-}
-
-.dav-banner__boxes {
-  margin-left: auto;
-  display: flex;
-  gap: 12px;
-}
-
-.dav-box {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-  padding: 10px 18px;
-  border-radius: 12px;
-  background: rgb(255 255 255 / 12%);
-  border: 1px solid rgb(255 255 255 / 25%);
-}
-
-.dav-box__label {
-  font-size: 0.68rem;
-  font-weight: 700;
-  letter-spacing: 0.06em;
-  text-transform: uppercase;
-  color: rgb(255 255 255 / 70%);
-}
-
-.dav-box__value {
-  font-size: 1.15rem;
-  font-weight: 700;
-  font-variant-numeric: tabular-nums;
-}
-
-.dav-banner__actions {
-  display: flex;
-  gap: 8px;
-}
-
-.dav-icon-btn {
-  width: 38px;
-  height: 38px;
-  border-radius: 50%;
-  border: 1px solid rgb(255 255 255 / 35%);
-  background: rgb(255 255 255 / 12%);
-  color: #fff;
-  cursor: pointer;
-
-  &:hover {
-    background: rgb(255 255 255 / 22%);
-  }
-}
-
-/* ── Tabs ─────────────────────────────────────────────────────────────── */
-
-.dav-tabs {
-  display: flex;
-  gap: 8px;
-  padding: 8px;
-  border-radius: 14px;
-  background: #fff;
-  border: 1px solid rgb(0 0 0 / 7%);
-}
-
-.dav-tab {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  padding: 10px 16px;
-  border: 0;
-  border-radius: 10px;
-  background: transparent;
-  font-size: 0.95rem;
-  font-weight: 600;
-  color: #475569;
-  cursor: pointer;
-
-  &:hover {
-    background: #f1f5f9;
-  }
-}
-
-.dav-tab--on {
-  color: #fff;
-  background: linear-gradient(90deg, #1d4ed8, #2563eb);
-  box-shadow: 0 4px 12px rgb(37 99 235 / 30%);
-
-  &:hover {
-    background: linear-gradient(90deg, #1d4ed8, #2563eb);
-  }
-}
-
-/* ── Cards ────────────────────────────────────────────────────────────── */
-
-.dav-columns {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(380px, 1fr));
-  gap: 16px;
-  align-items: start;
-}
-
-.dav-column {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-}
-
-.dav-card {
-  border-radius: 14px;
-  background: #fff;
-  border: 1px solid rgb(0 0 0 / 7%);
-  overflow: hidden;
-}
-
-.dav-card__head {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  padding: 14px 20px;
-  font-size: 1rem;
-  font-weight: 700;
-  background: #f8fafc;
-  border-bottom: 1px solid rgb(0 0 0 / 7%);
-}
-
-.dav-card__dot {
-  width: 30px;
-  height: 30px;
-  border-radius: 8px;
-  background: linear-gradient(135deg, #2563eb, #1e40af);
-}
-
-.dav-row {
-  display: flex;
-  justify-content: space-between;
-  gap: 16px;
-  padding: 12px 20px;
-  border-bottom: 1px dashed rgb(0 0 0 / 7%);
-  font-size: 0.92rem;
-
-  &:last-child {
-    border-bottom: 0;
-  }
-
-  span {
-    color: #334155;
-  }
-
-  strong {
-    text-align: right;
-    font-weight: 600;
-  }
-}
-
-.dav-state {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 10px;
-  padding: 48px 16px;
-  color: rgb(0 0 0 / 50%);
-}
-
-/* ── Transactions ─────────────────────────────────────────────────────── */
-
-.dav-toolbar {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 12px;
-  padding: 14px 20px;
-  background: #f8fafc;
-  border-bottom: 1px solid rgb(0 0 0 / 7%);
-}
-
-.dav-datepick {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-
-  span {
-    font-size: 0.68rem;
-    font-weight: 700;
-    letter-spacing: 0.06em;
-    text-transform: uppercase;
-    color: rgb(0 0 0 / 45%);
-  }
-
-  input {
-    padding: 6px 10px;
-    border-radius: 8px;
-    border: 1px solid rgb(0 0 0 / 15%);
-    font: inherit;
-  }
-}
-
-.dav-btn {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  padding: 8px 14px;
-  border-radius: 8px;
-  border: 1px solid rgb(0 0 0 / 15%);
-  background: #fff;
-  font-weight: 600;
-  cursor: pointer;
-
-  &:disabled {
-    opacity: 0.5;
-    cursor: default;
-  }
-}
-
-.dav-btn--primary {
-  color: #fff;
-  border-color: transparent;
-  background: linear-gradient(90deg, #1d4ed8, #2563eb);
-}
-
-.dav-totals {
-  margin-left: auto;
-  display: flex;
-  gap: 16px;
-  font-size: 0.88rem;
-  font-weight: 700;
-  font-variant-numeric: tabular-nums;
-}
-
-.dav-table-wrap {
-  overflow-x: auto;
-}
-
-.dav-table {
-  width: 100%;
-  border-collapse: collapse;
-  font-size: 0.92rem;
-
-  th {
-    padding: 14px 16px;
-    text-align: left;
-    font-size: 0.72rem;
-    font-weight: 700;
-    letter-spacing: 0.06em;
-    text-transform: uppercase;
-    color: #475569;
-    border-bottom: 1px solid rgb(0 0 0 / 8%);
-    white-space: nowrap;
-  }
-
-  td {
-    padding: 16px;
-    border-bottom: 1px solid rgb(0 0 0 / 5%);
-    font-variant-numeric: tabular-nums;
-  }
-
-  tbody tr:nth-child(odd) {
-    background: #f8fafc;
-  }
-}
-
-.dav-desc {
-  max-width: 320px;
-  color: rgb(0 0 0 / 65%);
-}
-
-@media (width <= 720px) {
-  .dav-page {
-    padding: 16px;
-  }
-
-  .dav-banner__boxes {
-    margin-left: 0;
-    width: 100%;
-  }
-
-  .dav-tab {
-    font-size: 0.85rem;
-    padding: 8px;
-  }
-}
-
-/* ── Passbook ─────────────────────────────────────────────────────────── */
-
-.dav-push {
-  margin-left: auto;
-}
-
-.dav-passbook {
-  padding: 20px;
-}
-
-.dav-pb-head {
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  gap: 16px 32px;
-  margin-bottom: 16px;
-  padding-bottom: 16px;
-  border-bottom: 2px solid #1e3a8a;
-}
-
-.dav-pb-title {
-  font-size: 1.2rem;
-  font-weight: 700;
-  color: #1e3a8a;
-}
-
-.dav-pb-sub {
-  font-size: 0.85rem;
-  color: rgb(0 0 0 / 55%);
-}
-
-.dav-pb-grid {
-  display: grid;
-  grid-template-columns: auto auto;
-  gap: 4px 16px;
-  font-size: 0.88rem;
-
-  span {
-    color: rgb(0 0 0 / 55%);
-  }
-}
-
-.dav-pb-table {
-  tfoot td {
-    padding: 14px 16px;
-    border-top: 2px solid rgb(0 0 0 / 15%);
-  }
-}
-
-.dav-pb-note {
-  display: block;
-  font-size: 0.78rem;
-  color: rgb(0 0 0 / 50%);
-}
-
-/* Closure tab */
-.dav-closure-tag {
-  margin-left: 8px;
-  padding: 1px 8px;
-  border-radius: 999px;
-  background: #fff3e0;
-  color: #e65100;
-  font-size: 0.75rem;
-  font-style: normal;
-}
-
-.dav-closure-total {
-  border-top: 1px solid rgb(0 0 0 / 10%);
-  font-weight: 600;
-}

src/app/deposits/dds-accounts/dds-account-view/dds-account-view.component.ts

@@ -1,297 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { Component, OnInit, inject } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { FormControl, ReactiveFormsModule } from '@angular/forms';
-import { NgClass } from '@angular/common';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-import { forkJoin, of } from 'rxjs';
-import { catchError } from 'rxjs/operators';
-import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { FormatNumberPipe } from 'app/pipes/format-number.pipe';
-import { OrganizationService } from 'app/organization/organization.service';
-
-/** What each DDS transaction type is called on screen. */
-const TRANSACTION_LABELS: Record<string, string> = {
-  PARTY_TRAN: 'Collection',
-  INTEREST_POST: 'Interest',
-  OD_INTEREST_POST: 'OD Interest',
-  MATURITY_PAYOUT: 'Maturity Payout',
-  PREMATURE_PAYOUT: 'Premature Payout',
-  PREMATURE_INT_RECOVERY: 'Interest Recovered (Premature)',
-  PREMATURE_AGENT_TOP_UP: 'Interest Funded by Agent',
-  WITHDRAW_DEPOSITE: 'Transfer (Withdraw Deposite)',
-  TRANSFER: 'Transfer'
-};
-
-/**
- * One DDS account and everything that has moved on it, as the savings account page shows a savings
- * account: the account's terms and where it stands, then its transactions with the balance after
- * each, narrowed to a day or a range.
- *
- * Read-only. The account is changed from DDS Party Master; its money moves through collections, the
- * cashier and the batch runs.
- */
-@Component({
-  selector: 'mifosx-dds-account-view',
-  templateUrl: './dds-account-view.component.html',
-  styleUrls: ['./dds-account-view.component.scss'],
-  standalone: true,
-  imports: [
-    ...STANDALONE_SHARED_IMPORTS,
-    ReactiveFormsModule,
-    NgClass,
-    FaIconComponent,
-    MatTooltipModule,
-    MatProgressSpinnerModule,
-    FormatNumberPipe
-  ]
-})
-export class DdsAccountViewComponent implements OnInit {
-  private route = inject(ActivatedRoute);
-  private router = inject(Router);
-  private organizationService = inject(OrganizationService);
-
-  isLoading = true;
-  account: any = null;
-  private transactions: any[] = [];
-
-  /** The page's tabs, as the savings account page has them - only those that apply to DDS. */
-  tab: 'general' | 'transactions' | 'passbook' | 'nominees' | 'closure' = 'general';
-
-  /** How a closed account was closed - read only for closed accounts, for the Closure tab. */
-  closure: any = null;
-
-  /** What each kind of closure is called on screen. */
-  readonly closureLabels: Record<string, string> = {
-    PREMATURE: 'Premature Close',
-    MATURITY_PAYOUT_AND_CLOSE: 'Maturity Payout & Close',
-    MATURITY_PAYOUT_THEN_CLOSE: 'Maturity Payout, then Closed',
-    MATURITY_AUTO_CLOSE: 'Maturity Auto Close (night job)',
-    CLOSED_NIL_BALANCE: 'Closed with nil balance'
-  };
-
-  /** The passbook reads oldest first, as it is written up. */
-  get passbookEntries(): any[] {
-    return [...this.shownTransactions].reverse();
-  }
-
-  /** The balance after the last entry shown. */
-  get passbookClosingBalance(): number {
-    const entries = this.passbookEntries;
-    return entries.length > 0 ? Number(entries[entries.length - 1].balanceAfterTransaction || 0) : 0;
-  }
-
-  /**
-   * Prints the passbook alone. It is copied into a window of its own with only its own styles, so the
-   * page's menus, banner and tabs do not come out on the paper.
-   */
-  printPassbook(): void {
-    const passbook = document.getElementById('dds-passbook');
-    const popup = window.open('', '_blank', 'width=900,height=700');
-    if (!passbook || !popup) {
-      return;
-    }
-    popup.document.write(`<html><head><title>${this.account?.accountNo || 'DDS'} Passbook</title><style>
-      body { font-family: Arial, sans-serif; margin: 24px; color: #111; }
-      .dav-pb-head { display: flex; justify-content: space-between; gap: 24px; margin-bottom: 16px; }
-      .dav-pb-title { font-size: 20px; font-weight: 700; }
-      .dav-pb-sub { color: #555; }
-      .dav-pb-grid { display: grid; grid-template-columns: auto auto; gap: 2px 12px; font-size: 13px; }
-      .dav-pb-grid span { color: #555; }
-      table { width: 100%; border-collapse: collapse; font-size: 13px; }
-      th, td { border: 1px solid #999; padding: 6px 8px; text-align: left; }
-      .dav-right { text-align: right; }
-      .dav-pb-note { display: block; font-size: 11px; color: #555; }
-    </style></head><body>${passbook.innerHTML}</body></html>`);
-    popup.document.close();
-    popup.focus();
-    popup.print();
-  }
-
-  fromDateControl = new FormControl('');
-  toDateControl = new FormControl('');
-
-  readonly today = new Date().toISOString().split('T')[0];
-
-  ngOnInit(): void {
-    const partyId = this.route.snapshot.paramMap.get('partyId');
-    if (!partyId) {
-      this.isLoading = false;
-      return;
-    }
-    forkJoin({
-      account: this.organizationService.getParty(partyId).pipe(catchError(() => of(null))),
-      transactions: this.organizationService.getPartyTransactionsOfParty(partyId).pipe(catchError(() => of([])))
-    }).subscribe(({ account, transactions }) => {
-      this.account = account;
-      if (account?.status === 'CLOSED') {
-        this.organizationService.getPartyClosure(partyId).subscribe({
-          next: (closure: any) => (this.closure = closure),
-          error: () => (this.closure = null)
-        });
-      }
-      // Newest first, and within a day the later entry first - the order a passbook is read back in.
-      this.transactions = (Array.isArray(transactions) ? transactions : []).sort(
-        (a: any, b: any) =>
-          String(b.transactionDate).localeCompare(String(a.transactionDate)) || Number(b.id) - Number(a.id)
-      );
-      this.isLoading = false;
-    });
-  }
-
-  /** The transactions in the chosen range - all of them when no range is set. */
-  get shownTransactions(): any[] {
-    const from = this.fromDateControl.value;
-    const to = this.toDateControl.value;
-    return this.transactions.filter((txn: any) => {
-      const day = String(txn.transactionDate || '');
-      if (from && day < String(from)) {
-        return false;
-      }
-      if (to && day > String(to)) {
-        return false;
-      }
-      return true;
-    });
-  }
-
-  get totalCredits(): number {
-    return this.sumOf('CREDIT');
-  }
-
-  get totalDebits(): number {
-    return this.sumOf('DEBIT');
-  }
-
-  private sumOf(direction: string): number {
-    return this.shownTransactions
-      .filter((txn: any) => txn.direction === direction)
-      .reduce((sum: number, txn: any) => sum + Number(txn.amount || 0), 0);
-  }
-
-  /** Everything of one type ever credited, whatever the date filter says - for the summary cards. */
-  totalOf(type: string): number {
-    return this.transactions
-      .filter((txn: any) => txn.transactionType === type && txn.direction === 'CREDIT')
-      .reduce((sum: number, txn: any) => sum + Number(txn.amount || 0), 0);
-  }
-
-  /** Interest credited, less any taken back on an early closure. */
-  get interestEarned(): number {
-    const recovered = this.transactions
-      .filter((txn: any) => txn.transactionType === 'PREMATURE_INT_RECOVERY')
-      .reduce((sum: number, txn: any) => sum + Number(txn.amount || 0), 0);
-    return (
-      this.totalOf('INTEREST_POST') +
-      this.totalOf('OD_INTEREST_POST') +
-      this.totalOf('PREMATURE_AGENT_TOP_UP') -
-      recovered
-    );
-  }
-
-  /** Money that has left the account - payouts, withdrawals, transfers out. */
-  get totalDebitsAll(): number {
-    return this.transactions
-      .filter((txn: any) => txn.direction === 'DEBIT' && txn.transactionType !== 'PREMATURE_INT_RECOVERY')
-      .reduce((sum: number, txn: any) => sum + Number(txn.amount || 0), 0);
-  }
-
-  get lastTransactionDate(): string | null {
-    return this.transactions.length > 0 ? this.transactions[0].transactionDate : null;
-  }
-
-  /** The rows on screen, as a spreadsheet the branch can keep or send on. */
-  exportCsv(): void {
-    const header = [
-      '#',
-      'ID',
-      'Transaction Date',
-      'Transaction Type',
-      'Voucher',
-      'Description',
-      'Account',
-      'Debit',
-      'Credit',
-      'Balance'
-    ];
-    const quote = (value: any) => `"${String(value ?? '').replace(/"/g, '""')}"`;
-    const lines = this.shownTransactions.map((txn: any, index: number) =>
-      [
-        index + 1,
-        txn.id,
-        txn.transactionDate,
-        this.label(txn.transactionType),
-        txn.voucherNo,
-        txn.description,
-        txn.accountNo,
-        txn.direction === 'DEBIT' ? txn.amount : '',
-        txn.direction === 'CREDIT' ? txn.amount : '',
-        txn.balanceAfterTransaction
-      ]
-        .map(quote)
-        .join(',')
-    );
-    const blob = new Blob(
-      [[
-          header.map(quote).join(','),
-          ...lines
-        ].join('\r\n')],
-      { type: 'text/csv;charset=utf-8' }
-    );
-    const link = document.createElement('a');
-    link.href = URL.createObjectURL(blob);
-    link.download = `${this.account?.accountNo || 'dds-account'}-transactions.csv`;
-    link.click();
-    URL.revokeObjectURL(link.href);
-  }
-
-  get hasDateFilters(): boolean {
-    return !!(this.fromDateControl.value || this.toDateControl.value);
-  }
-
-  showToday(): void {
-    this.fromDateControl.setValue(this.today);
-    this.toDateControl.setValue(this.today);
-  }
-
-  clearDateFilters(): void {
-    this.fromDateControl.setValue('');
-    this.toDateControl.setValue('');
-  }
-
-  label(type: string): string {
-    return TRANSACTION_LABELS[type] || String(type || '').replace(/_/g, ' ');
-  }
-
-  statusClass(): string {
-    switch (this.account?.status) {
-      case 'ACTIVE':
-        return 'status--active';
-      case 'CLOSED':
-        return 'status--closed';
-      default:
-        return 'status--default';
-    }
-  }
-
-  back(): void {
-    this.router.navigate(['/accounts/dds-accounts']);
-  }
-
-  openInPartyMaster(): void {
-    this.router.navigate([
-      '/accounts/dds',
-      this.account.id,
-      'edit'
-    ]);
-  }
-}

src/app/deposits/dds-accounts/dds-accounts.component.html

@@ -1,211 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<div class="acl-page">
-  <!-- Header -->
-  <div class="acl-header accent--rd">
-    <div class="acl-header__icon">
-      <fa-icon icon="coins"></fa-icon>
-    </div>
-    <div class="acl-header__text">
-      <h2 class="acl-header__title">DDS Accounts</h2>
-      <span class="acl-header__count">
-        @if (isLoading) {
-          Loading...
-        } @else {
-          {{ allCount }} accounts · {{ activeCount }} active · {{ closedCount }} closed
-        }
-      </span>
-    </div>
-  </div>
-
-  <!-- Search Bar -->
-  <div class="acl-search-wrap">
-    <div class="acl-search">
-      <fa-icon icon="search" class="acl-search__icon"></fa-icon>
-      <input
-        [formControl]="searchControl"
-        class="acl-search__input"
-        [placeholder]="
-          searchType === 'accountNo' ? 'Search by account number or party code…' : 'Search by client name…'
-        "
-      />
-      @if (searchControl.value) {
-        <button class="acl-search__clear" (click)="clearSearch()">
-          <fa-icon icon="times"></fa-icon>
-        </button>
-      }
-    </div>
-    <button
-      class="acl-btn acl-btn--toggle"
-      (click)="toggleSearchType()"
-      [matTooltip]="'Switch to ' + (searchType === 'accountNo' ? 'client name' : 'account number') + ' search'"
-    >
-      <fa-icon icon="exchange-alt"></fa-icon>
-      {{ searchType === 'accountNo' ? 'Acct No' : 'Client' }}
-    </button>
-    <button class="acl-btn acl-btn--icon" (click)="loadAccounts()" matTooltip="Refresh">
-      <fa-icon icon="sync-alt"></fa-icon>
-    </button>
-  </div>
-
-  <!-- Status: all accounts, only the open ones, or only the closed -->
-  <div class="dds-status-filter" role="tablist">
-    <button
-      type="button"
-      class="dds-status-filter__btn"
-      [class.is-on]="statusFilter === 'ALL'"
-      (click)="setStatusFilter('ALL')"
-    >
-      All <span class="dds-status-filter__count">{{ allCount }}</span>
-    </button>
-    <button
-      type="button"
-      class="dds-status-filter__btn dds-status-filter__btn--active"
-      [class.is-on]="statusFilter === 'ACTIVE'"
-      (click)="setStatusFilter('ACTIVE')"
-    >
-      Active <span class="dds-status-filter__count">{{ activeCount }}</span>
-    </button>
-    <button
-      type="button"
-      class="dds-status-filter__btn dds-status-filter__btn--closed"
-      [class.is-on]="statusFilter === 'CLOSED'"
-      (click)="setStatusFilter('CLOSED')"
-    >
-      Closed <span class="dds-status-filter__count">{{ closedCount }}</span>
-    </button>
-  </div>
-
-  <!-- Date Filters: by the day the account was opened -->
-  <div class="acl-filters">
-    <div class="acl-filters__group">
-      <div class="acl-datepick">
-        <span class="acl-datepick__label">Opened From</span>
-        <input type="date" class="acl-datepick__input" [formControl]="fromDateControl" [max]="today" />
-      </div>
-      <div class="acl-filters__arrow">
-        <fa-icon icon="arrow-right"></fa-icon>
-      </div>
-      <div class="acl-datepick">
-        <span class="acl-datepick__label">To</span>
-        <input type="date" class="acl-datepick__input" [formControl]="toDateControl" [max]="today" />
-      </div>
-    </div>
-
-    <div class="acl-filters__sep"></div>
-
-    <div class="acl-datepick acl-datepick--ason">
-      <span class="acl-datepick__label">
-        <fa-icon icon="clock"></fa-icon>
-        As On Date
-      </span>
-      <input type="date" class="acl-datepick__input" [formControl]="asOnDateControl" [max]="today" />
-    </div>
-
-    @if (hasDateFilters) {
-      <button class="acl-filters__clear" (click)="clearDateFilters()">
-        <fa-icon icon="times"></fa-icon>
-        Clear
-      </button>
-    }
-  </div>
-
-  <!-- Table -->
-  <div class="acl-card">
-    @if (isLoading) {
-      <div class="acl-state acl-state--loading">
-        <mat-spinner diameter="32"></mat-spinner>
-        <span>Loading accounts…</span>
-      </div>
-    }
-
-    @if (!isLoading && rows.length === 0) {
-      <div class="acl-state acl-state--empty">
-        <div class="acl-state__icon">
-          <fa-icon icon="inbox"></fa-icon>
-        </div>
-        <p class="acl-state__title">No DDS accounts found</p>
-        <p class="acl-state__sub">Try adjusting your search</p>
-      </div>
-    }
-
-    @if (!isLoading && rows.length > 0) {
-      <div class="acl-table-wrap">
-        <table mat-table [dataSource]="rows" class="acl-table">
-          <ng-container matColumnDef="accountNo">
-            <th mat-header-cell *matHeaderCellDef class="acl-th">Account No</th>
-            <td mat-cell *matCellDef="let row" class="acl-td">
-              <span class="acl-acct-no">{{ row.accountNo }}</span>
-            </td>
-          </ng-container>
-
-          <ng-container matColumnDef="depositType">
-            <th mat-header-cell *matHeaderCellDef class="acl-th acl-th--center">Type</th>
-            <td mat-cell *matCellDef="let row" class="acl-td acl-td--center">
-              <span class="acl-type-badge dtype--rd">DDS</span>
-            </td>
-          </ng-container>
-
-          <ng-container matColumnDef="clientName">
-            <th mat-header-cell *matHeaderCellDef class="acl-th">Client</th>
-            <td mat-cell *matCellDef="let row" class="acl-td">
-              <div class="acl-client">
-                <div class="acl-client__avatar">{{ (row.clientName || row.partyName || '?')[0] }}</div>
-                <span class="acl-client__name">{{ row.clientName || row.partyName }}</span>
-              </div>
-            </td>
-          </ng-container>
-
-          <ng-container matColumnDef="productName">
-            <th mat-header-cell *matHeaderCellDef class="acl-th">Product</th>
-            <td mat-cell *matCellDef="let row" class="acl-td">
-              <span class="acl-product">{{ row.subType }}</span>
-            </td>
-          </ng-container>
-
-          <ng-container matColumnDef="balance">
-            <th mat-header-cell *matHeaderCellDef class="acl-th acl-th--right">Balance</th>
-            <td mat-cell *matCellDef="let row" class="acl-td acl-td--right">
-              <span class="acl-balance">₹ {{ row.currentBalance || 0 | formatNumber }}</span>
-            </td>
-          </ng-container>
-
-          <ng-container matColumnDef="status">
-            <th mat-header-cell *matHeaderCellDef class="acl-th acl-th--center">Status</th>
-            <td mat-cell *matCellDef="let row" class="acl-td acl-td--center">
-              <span class="acl-status" [ngClass]="getStatusClass(row)">{{ row.status }}</span>
-            </td>
-          </ng-container>
-
-          <ng-container matColumnDef="actions">
-            <th mat-header-cell *matHeaderCellDef class="acl-th acl-th--center">Actions</th>
-            <td mat-cell *matCellDef="let row" class="acl-td acl-td--center">
-              <button class="acl-view-btn" (click)="$event.stopPropagation(); viewAccount(row)" matTooltip="View">
-                <fa-icon icon="eye"></fa-icon>
-              </button>
-            </td>
-          </ng-container>
-
-          <tr mat-header-row *matHeaderRowDef="displayedColumns" class="acl-header-row"></tr>
-          <tr mat-row *matRowDef="let row; columns: displayedColumns" class="acl-row" (click)="viewAccount(row)"></tr>
-        </table>
-      </div>
-
-      <mat-paginator
-        [length]="totalRecords"
-        [pageSize]="pageSize"
-        [pageIndex]="pageIndex"
-        [pageSizeOptions]="[10, 20, 50, 100]"
-        (page)="onPageChange($event)"
-        class="acl-paginator"
-        showFirstLastButtons
-      ></mat-paginator>
-    }
-  </div>
-</div>

src/app/deposits/dds-accounts/dds-accounts.component.scss

@@ -1,56 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/* All / Active / Closed - which DDS accounts the list shows. */
-.dds-status-filter {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  margin: 0 0 12px;
-
-  &__btn {
-    display: inline-flex;
-    align-items: center;
-    gap: 8px;
-    padding: 6px 14px;
-    border: 1px solid rgb(0 0 0 / 12%);
-    border-radius: 999px;
-    background: #fff;
-    color: rgb(0 0 0 / 70%);
-    font-size: 0.85rem;
-    font-weight: 500;
-    cursor: pointer;
-
-    &.is-on {
-      border-color: #1565c0;
-      background: #e3f2fd;
-      color: #0d47a1;
-    }
-
-    &--active.is-on {
-      border-color: #2e7d32;
-      background: #e8f5e9;
-      color: #1b5e20;
-    }
-
-    &--closed.is-on {
-      border-color: #c62828;
-      background: #ffebee;
-      color: #b71c1c;
-    }
-  }
-
-  &__count {
-    min-width: 22px;
-    padding: 0 6px;
-    border-radius: 999px;
-    background: rgb(0 0 0 / 8%);
-    font-size: 0.75rem;
-    text-align: center;
-  }
-}

src/app/deposits/dds-accounts/dds-accounts.component.ts

@@ -1,265 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { Component, OnDestroy, OnInit, inject } from '@angular/core';
-import { Router } from '@angular/router';
-import { FormControl, ReactiveFormsModule } from '@angular/forms';
-import { NgClass } from '@angular/common';
-import { MatPaginator, PageEvent } from '@angular/material/paginator';
-import {
-  MatCell,
-  MatCellDef,
-  MatColumnDef,
-  MatHeaderCell,
-  MatHeaderCellDef,
-  MatHeaderRow,
-  MatHeaderRowDef,
-  MatRow,
-  MatRowDef,
-  MatTable
-} from '@angular/material/table';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-import { Subject, merge } from 'rxjs';
-import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators';
-import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { FormatNumberPipe } from 'app/pipes/format-number.pipe';
-import { OrganizationService } from 'app/organization/organization.service';
-
-/**
- * The DDS accounts, listed the way Savings Accounts lists savings: account number, client, product,
- * balance and status, searched by account number or client and narrowed by opening date. Each opens
- * onto the account's own page and its transactions.
- *
- * Read-only. Accounts are opened and changed from DDS Party Master; money moves through collections,
- * the cashier and the batch runs.
- */
-@Component({
-  selector: 'mifosx-dds-accounts',
-  templateUrl: './dds-accounts.component.html',
-  // The Savings Accounts list's own look, so the two screens read as one family.
-  styleUrls: [
-    '../../accounts/accounts-list/accounts-list.component.scss',
-    './dds-accounts.component.scss'
-  ],
-  standalone: true,
-  imports: [
-    ...STANDALONE_SHARED_IMPORTS,
-    ReactiveFormsModule,
-    NgClass,
-    FaIconComponent,
-    MatTable,
-    MatColumnDef,
-    MatHeaderCellDef,
-    MatHeaderCell,
-    MatCellDef,
-    MatCell,
-    MatHeaderRowDef,
-    MatHeaderRow,
-    MatRowDef,
-    MatRow,
-    MatPaginator,
-    MatTooltipModule,
-    MatProgressSpinnerModule,
-    FormatNumberPipe
-  ]
-})
-export class DdsAccountsComponent implements OnInit, OnDestroy {
-  private organizationService = inject(OrganizationService);
-  private router = inject(Router);
-  private destroy$ = new Subject<void>();
-
-  displayedColumns = [
-    'accountNo',
-    'depositType',
-    'clientName',
-    'productName',
-    'balance',
-    'status',
-    'actions'
-  ];
-
-  /** Every DDS account, fetched once; search, dates and paging work on this. */
-  private allAccounts: any[] = [];
-  /** The accounts matching the search and dates, whatever their status - what the status counts read. */
-  private beforeStatus: any[] = [];
-  /** The accounts matching the search, dates and status, before paging. */
-  private matching: any[] = [];
-
-  /** Which accounts are shown: all of them, only the open ones, or only the closed. */
-  statusFilter: 'ALL' | 'ACTIVE' | 'CLOSED' = 'ALL';
-  /** The page on screen. */
-  rows: any[] = [];
-
-  pageSize = 20;
-  pageIndex = 0;
-  isLoading = false;
-
-  searchControl = new FormControl('');
-  searchType: 'accountNo' | 'clientName' = 'accountNo';
-  fromDateControl = new FormControl('');
-  toDateControl = new FormControl('');
-  asOnDateControl = new FormControl('');
-
-  readonly today = new Date().toISOString().split('T')[0];
-
-  get totalRecords(): number {
-    return this.matching.length;
-  }
-
-  get activeCount(): number {
-    return this.beforeStatus.filter((account) => account.status === 'ACTIVE').length;
-  }
-
-  get closedCount(): number {
-    return this.beforeStatus.filter((account) => account.status === 'CLOSED').length;
-  }
-
-  get allCount(): number {
-    return this.beforeStatus.length;
-  }
-
-  setStatusFilter(status: 'ALL' | 'ACTIVE' | 'CLOSED'): void {
-    this.statusFilter = status;
-    this.pageIndex = 0;
-    this.applyFilters();
-  }
-
-  get hasDateFilters(): boolean {
-    return !!((this.fromDateControl.value && this.toDateControl.value) || this.asOnDateControl.value);
-  }
-
-  ngOnInit(): void {
-    this.loadAccounts();
-
-    this.searchControl.valueChanges
-      .pipe(debounceTime(300), distinctUntilChanged(), takeUntil(this.destroy$))
-      .subscribe(() => {
-        this.pageIndex = 0;
-        this.applyFilters();
-      });
-    merge(this.fromDateControl.valueChanges, this.toDateControl.valueChanges, this.asOnDateControl.valueChanges)
-      .pipe(debounceTime(300), takeUntil(this.destroy$))
-      .subscribe(() => {
-        this.pageIndex = 0;
-        this.applyFilters();
-      });
-  }
-
-  ngOnDestroy(): void {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
-
-  loadAccounts(): void {
-    this.isLoading = true;
-    this.organizationService
-      .getParties()
-      .pipe(takeUntil(this.destroy$))
-      .subscribe({
-        next: (parties: any) => {
-          // Newest first, as the savings list shows them.
-          this.allAccounts = (Array.isArray(parties) ? parties : parties?.pageItems || []).sort(
-            (a: any, b: any) => Number(b.id) - Number(a.id)
-          );
-          this.isLoading = false;
-          this.applyFilters();
-        },
-        error: () => {
-          this.allAccounts = [];
-          this.isLoading = false;
-          this.applyFilters();
-        }
-      });
-  }
-
-  /** Search by account number or client, and by the day the account was opened. */
-  private applyFilters(): void {
-    const term = String(this.searchControl.value || '')
-      .trim()
-      .toLowerCase();
-    const fromVal = this.fromDateControl.value;
-    const toVal = this.toDateControl.value;
-    const bothDates = !!(fromVal && toVal);
-    const asOn = this.asOnDateControl.value;
-
-    this.beforeStatus = this.allAccounts.filter((account: any) => {
-      if (term) {
-        const haystack =
-          this.searchType === 'accountNo'
-            ? `${account.accountNo || ''} ${account.partyCode || ''}`
-            : `${account.clientName || ''} ${account.partyName || ''}`;
-        if (!haystack.toLowerCase().includes(term)) {
-          return false;
-        }
-      }
-      const opened = String(account.openingDate || '');
-      if (bothDates && opened && (opened < String(fromVal) || opened > String(toVal))) {
-        return false;
-      }
-      // As on a date: the accounts that had been opened by then.
-      if (asOn && opened && opened > String(asOn)) {
-        return false;
-      }
-      return true;
-    });
-    this.matching =
-      this.statusFilter === 'ALL'
-        ? this.beforeStatus
-        : this.beforeStatus.filter((account: any) => account.status === this.statusFilter);
-    this.showPage();
-  }
-
-  private showPage(): void {
-    const start = this.pageIndex * this.pageSize;
-    this.rows = this.matching.slice(start, start + this.pageSize);
-  }
-
-  onPageChange(event: PageEvent): void {
-    this.pageIndex = event.pageIndex;
-    this.pageSize = event.pageSize;
-    this.showPage();
-  }
-
-  toggleSearchType(): void {
-    this.searchType = this.searchType === 'accountNo' ? 'clientName' : 'accountNo';
-    this.pageIndex = 0;
-    this.applyFilters();
-  }
-
-  clearSearch(): void {
-    this.searchControl.setValue('');
-  }
-
-  clearDateFilters(): void {
-    this.fromDateControl.setValue('', { emitEvent: false });
-    this.toDateControl.setValue('', { emitEvent: false });
-    this.asOnDateControl.setValue('', { emitEvent: false });
-    this.pageIndex = 0;
-    this.applyFilters();
-  }
-
-  viewAccount(account: any): void {
-    this.router.navigate([
-      '/accounts/dds-accounts',
-      account.id
-    ]);
-  }
-
-  getStatusClass(account: any): string {
-    switch (account?.status) {
-      case 'ACTIVE':
-        return 'status--active';
-      case 'CLOSED':
-        return 'status--closed';
-      default:
-        return 'status--default';
-    }
-  }
-}

src/app/deposits/dds-approvals/dds-approval-notice.ts

@@ -1,46 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { OrganizationService } from 'app/organization/organization.service';
-import { AlertService } from 'app/core/alert/alert.service';
-
-/**
- * Whether the server held a DDS entry for a checker rather than carrying it out. The reply then
- * names the entry (commandId) and asks for the work to be rolled back, and carries no result of its own.
- */
-export function heldForApproval(response: any): boolean {
-  return !!response?.rollbackTransaction || (!!response?.commandId && response?.resourceId == null);
-}
-
-/**
- * Tells the clerk their entry went to a checker - with the voucher it will move under - instead of
- * saying it was done. Nothing has moved yet, and a message that read as though it had would send them
- * looking for money that is still waiting on a manager.
- */
-export function announceHeldForApproval(
-  response: any,
-  what: string,
-  organizationService: OrganizationService,
-  alertService: AlertService
-): void {
-  const say = (voucherNo?: string) =>
-    alertService.alert({
-      type: 'Sent for Approval',
-      message:
-        `${what} sent for approval${voucherNo ? ' under voucher ' + voucherNo : ''}. ` +
-        'It takes effect once a checker approves it in Approval Center › DDS Approvals.'
-    });
-  if (!response?.commandId) {
-    say();
-    return;
-  }
-  organizationService.getDdsApproval(response.commandId).subscribe({
-    next: (entry: any) => say(entry?.voucherNo),
-    error: () => say()
-  });
-}

src/app/deposits/dds-approvals/dds-approval-review/dds-approval-review.component.html

@@ -1,265 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<!-- Laid out as Disbursement & Transfers reviews its requests, and styled by the same sheet. -->
-<div class="dri dri--dialog">
-  <nav class="cashier-nav cashier-nav--clerk">
-    <span class="dri-header-title">DDS {{ entry.type }} Review</span>
-    <span class="cashier-nav__esc-hint" (click)="close()">✕ Close</span>
-  </nav>
-
-  @if (loading) {
-    <div class="dri-loading">
-      <mat-icon class="dri-loading__icon">hourglass_empty</mat-icon>
-      <span>Loading entry…</span>
-    </div>
-  } @else {
-    <div class="dri-body">
-      <!-- Header card: the voucher it moves under, its status, who made it and when -->
-      <div class="dri-card dri-card--header">
-        <div class="dri-card-header">
-          <div class="dri-card-header__left">
-            <span class="dri-voucher">{{ voucherNo || '—' }}</span>
-            <span class="dri-status" [ngClass]="statusClass(entry.status)">
-              {{ entry.status }}{{ entry.voucherCancelled ? ' · VOUCHER CANCELLED' : '' }}
-            </span>
-          </div>
-          <div class="dri-card-header__meta">
-            <span class="dri-meta-item">
-              <mat-icon>person</mat-icon>
-              {{ entry.makerName || entry.maker }} ({{ entry.maker }})
-            </span>
-            <span class="dri-meta-item">
-              <mat-icon>schedule</mat-icon>
-              {{ formatDateTime(entry.madeOn) }}
-            </span>
-            @if (entry.status !== 'PENDING' && entry.checker) {
-              <span class="dri-meta-item">
-                <mat-icon>check_circle</mat-icon>
-                Actioned by: {{ entry.checkerName || entry.checker }}
-              </span>
-            }
-          </div>
-        </div>
-      </div>
-
-      <!-- Summary -->
-      <div class="dri-card">
-        <div class="dri-section-title">
-          <mat-icon>swap_horiz</mat-icon>
-          {{ entry.type }} Summary
-        </div>
-        <div class="dri-detail-grid">
-          <div class="dri-detail-item">
-            <span class="dri-detail-label">Total Amount</span>
-            <span class="dri-detail-value dri-amount">
-              {{ entry.amount !== null && entry.amount !== undefined ? '₹' + (entry.amount | number: '1.2-2') : '—' }}
-            </span>
-          </div>
-          <div class="dri-detail-item">
-            <span class="dri-detail-label">DR Accounts</span>
-            <span class="dri-detail-value"
-              >{{ debitLines.length }} account{{ debitLines.length !== 1 ? 's' : '' }}</span
-            >
-          </div>
-          <div class="dri-detail-item">
-            <span class="dri-detail-label">CR Accounts</span>
-            <span class="dri-detail-value"
-              >{{ creditLines.length }} account{{ creditLines.length !== 1 ? 's' : '' }}</span
-            >
-          </div>
-          <div class="dri-detail-item dri-detail-item--full">
-            <span class="dri-detail-label">Details</span>
-            <span class="dri-detail-value">{{ entry.details || '—' }}</span>
-          </div>
-          @if (detail?.description) {
-            <div class="dri-detail-item dri-detail-item--full">
-              <span class="dri-detail-label">Description</span>
-              <span class="dri-detail-value">{{ detail.description }}</span>
-            </div>
-          }
-        </div>
-      </div>
-
-      <!-- Debit entries -->
-      @if (debitLines.length) {
-        <div class="dri-card">
-          <div class="dri-section-title">
-            <mat-icon>arrow_upward</mat-icon>
-            Debit Entries ({{ debitLines.length }} account{{ debitLines.length !== 1 ? 's' : '' }} — funds out)
-          </div>
-          <table class="dri-cr-table">
-            <thead>
-              <tr>
-                <th>#</th>
-                <th>Account No</th>
-                <th>Account Name</th>
-                <th>Type</th>
-                <th class="num">Amount (DR)</th>
-              </tr>
-            </thead>
-            <tbody>
-              @for (line of debitLines; track $index; let i = $index) {
-                <tr>
-                  <td class="dri-cr-idx">{{ i + 1 }}</td>
-                  <td class="cell-mono">{{ line.accountNo || '—' }}</td>
-                  <td>{{ line.accountName || '—' }}</td>
-                  <td>
-                    <span class="dri-type-badge">{{ line.type || '—' }}</span>
-                  </td>
-                  <td class="num dri-cr-amount">₹{{ line.amount | number: '1.2-2' }}</td>
-                </tr>
-              }
-              <tr class="dri-cr-total-row">
-                <td colspan="4" class="dri-cr-total-label">Total Debit</td>
-                <td class="num dri-cr-total-amount">₹{{ total(debitLines) | number: '1.2-2' }}</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      }
-
-      <!-- Credit entries -->
-      @if (creditLines.length) {
-        <div class="dri-card">
-          <div class="dri-section-title">
-            <mat-icon>arrow_downward</mat-icon>
-            Credit Entries ({{ creditLines.length }} account{{ creditLines.length !== 1 ? 's' : '' }} — funds in)
-          </div>
-          <table class="dri-cr-table">
-            <thead>
-              <tr>
-                <th>#</th>
-                <th>Account No</th>
-                <th>Account Name</th>
-                <th>Type</th>
-                <th class="num">Amount (CR)</th>
-              </tr>
-            </thead>
-            <tbody>
-              @for (line of creditLines; track $index; let i = $index) {
-                <tr>
-                  <td class="dri-cr-idx">{{ i + 1 }}</td>
-                  <td class="cell-mono">{{ line.accountNo || '—' }}</td>
-                  <td>{{ line.accountName || '—' }}</td>
-                  <td>
-                    <span class="dri-type-badge">{{ line.type || '—' }}</span>
-                  </td>
-                  <td class="num dri-cr-amount">₹{{ line.amount | number: '1.2-2' }}</td>
-                </tr>
-              }
-              <tr class="dri-cr-total-row">
-                <td colspan="4" class="dri-cr-total-label">Total Credit</td>
-                <td class="num dri-cr-total-amount">₹{{ total(creditLines) | number: '1.2-2' }}</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      }
-
-      @if (entry.status === 'PENDING' && isMine && !done) {
-        <div class="dri-card dri-card--processing">
-          <div class="dri-section-title">
-            <mat-icon>info</mat-icon>
-            Your own entry
-          </div>
-          <p class="dri-processing-text">
-            You made this entry, so another user with checker rights has to approve or reject it.
-          </p>
-        </div>
-      }
-
-      @if (entry.status === 'REJECTED') {
-        <div class="dri-card dri-card--rejected">
-          <div class="dri-section-title">
-            <mat-icon>cancel</mat-icon>
-            Rejected
-          </div>
-          <p class="dri-rejection-text">
-            Nothing was done{{ voucherNo ? '. Voucher ' + voucherNo + ' is cancelled and will not be used' : '' }}.
-          </p>
-          @if (entry.checker) {
-            <div class="dri-meta-item" style="margin-top: 8px">
-              <mat-icon>manage_accounts</mat-icon>
-              {{ entry.checker }}
-            </div>
-          }
-        </div>
-      }
-
-      @if (entry.status === 'APPROVED') {
-        <div class="dri-card dri-card--approved">
-          <div class="dri-section-title">
-            <mat-icon>check_circle</mat-icon>
-            Approved and carried out
-          </div>
-          <p class="dri-txn-refs cell-mono">
-            {{
-              voucherNo
-                ? 'Voucher ' + voucherNo
-                : entry.entity === 'DDSBATCH'
-                  ? 'Posting is running - refresh for its voucher'
-                  : '—'
-            }}
-          </p>
-          <div class="dri-meta-item" style="margin-top: 8px">
-            <mat-icon>manage_accounts</mat-icon>
-            Approved by: {{ entry.checker || '—' }}
-          </div>
-        </div>
-      }
-
-      @if (error) {
-        <div class="dri-card dri-card--failed">
-          <div class="dri-section-title">
-            <mat-icon>error</mat-icon>
-            Could not complete
-          </div>
-          <p class="dri-rejection-text">{{ error }}</p>
-        </div>
-      }
-
-      @if (entry.status === 'PENDING' && !done) {
-        <div class="dri-actions">
-          @if (!confirmReject) {
-            <button type="button" class="dri-btn dri-btn--approve" [disabled]="!canAct" (click)="act('approve')">
-              <mat-icon>check_circle</mat-icon>
-              {{ working ? 'Processing…' : 'Approve ' + entry.type }}
-            </button>
-            <button type="button" class="dri-btn dri-btn--reject" [disabled]="!canAct" (click)="confirmReject = true">
-              <mat-icon>cancel</mat-icon>
-              Reject
-            </button>
-          } @else {
-            <div class="dri-reject-form">
-              <label class="dri-reject-label">
-                Reject this entry? Nothing will be done{{
-                  voucherNo ? ' and voucher ' + voucherNo + ' will be cancelled' : ''
-                }}.
-              </label>
-              <div class="dri-reject-actions">
-                <button type="button" class="dri-btn dri-btn--reject" [disabled]="!canAct" (click)="act('reject')">
-                  <mat-icon>cancel</mat-icon>
-                  {{ working ? 'Processing…' : 'Confirm Rejection' }}
-                </button>
-                <button
-                  type="button"
-                  class="dri-btn dri-btn--ghost"
-                  [disabled]="working"
-                  (click)="confirmReject = false"
-                >
-                  Cancel
-                </button>
-              </div>
-            </div>
-          }
-        </div>
-      }
-    </div>
-  }
-</div>

src/app/deposits/dds-approvals/dds-approval-review/dds-approval-review.component.ts

@@ -1,148 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { Component, OnInit, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { MatIconModule } from '@angular/material/icon';
-
-import { OrganizationService } from 'app/organization/organization.service';
-
-/**
- * One DDS entry, laid out the way Disbursement & Transfers reviews a request - voucher and status on
- * top, who made it and when, then the debit and credit entries it moves - and styled by the same
- * sheet, so a checker reads both queues the same way.
- *
- * The checker approves it, which carries it out under the voucher numbered when it was sent, or
- * rejects it, which leaves nothing done and cancels that number. Neither is offered to the user who
- * made the entry, and the server refuses it as well.
- */
-@Component({
-  selector: 'mifosx-dds-approval-review',
-  templateUrl: './dds-approval-review.component.html',
-  styleUrls: ['../../../clerk/disbursement-review/disbursement-review.component.scss'],
-  standalone: true,
-  imports: [
-    CommonModule,
-    MatDialogModule,
-    MatIconModule
-  ]
-})
-export class DdsApprovalReviewComponent implements OnInit {
-  private organizationService = inject(OrganizationService);
-  private dialogRef = inject(MatDialogRef<DdsApprovalReviewComponent>);
-  data = inject<any>(MAT_DIALOG_DATA);
-
-  entry: any = this.data.entry;
-  /** The entry in full, with the debit and credit sides it moves. */
-  detail: any = null;
-  loading = true;
-  working = false;
-  confirmReject = false;
-  done = false;
-  error = '';
-  /** Set by an approval, in case the list row did not carry the number yet. */
-  approvedVoucher = '';
-
-  ngOnInit(): void {
-    this.load();
-  }
-
-  private load(): void {
-    this.organizationService.getDdsApproval(this.entry.id).subscribe({
-      next: (detail: any) => {
-        this.detail = detail;
-        this.entry = { ...this.entry, ...detail };
-        this.loading = false;
-      },
-      error: () => (this.loading = false)
-    });
-  }
-
-  get voucherNo(): string {
-    return this.approvedVoucher || this.entry?.voucherNo || '';
-  }
-
-  get debitLines(): any[] {
-    return (this.detail?.lines || []).filter((line: any) => line.side === 'DR');
-  }
-
-  get creditLines(): any[] {
-    return (this.detail?.lines || []).filter((line: any) => line.side === 'CR');
-  }
-
-  total(lines: any[]): number {
-    return lines.reduce((sum: number, line: any) => sum + Number(line.amount || 0), 0);
-  }
-
-  get isMine(): boolean {
-    return !!this.data.currentUserId && Number(this.entry.makerId) === Number(this.data.currentUserId);
-  }
-
-  get canAct(): boolean {
-    return this.entry.status === 'PENDING' && !this.isMine && !this.done && !this.working;
-  }
-
-  statusClass(status: string): string {
-    const map: Record<string, string> = {
-      PENDING: 'dri-status--pending',
-      APPROVED: 'dri-status--approved',
-      REJECTED: 'dri-status--rejected'
-    };
-    return map[status] ?? '';
-  }
-
-  act(command: 'approve' | 'reject'): void {
-    this.working = true;
-    this.error = '';
-    this.organizationService.actOnDdsApproval(this.entry.id, command).subscribe({
-      next: (result: any) => {
-        this.working = false;
-        this.done = true;
-        this.approvedVoucher = result?.voucherNo || '';
-        this.entry = {
-          ...this.entry,
-          status: command === 'approve' ? 'APPROVED' : 'REJECTED',
-          voucherCancelled: command === 'reject' && !!this.voucherNo
-        };
-        // The approved entry's sides are now the voucher's own lines.
-        this.load();
-      },
-      error: (err: any) => {
-        this.working = false;
-        const body = err?.error;
-        this.error =
-          body?.errors?.[0]?.defaultUserMessage ||
-          body?.defaultUserMessage ||
-          body?.developerMessage ||
-          'Could not complete this.';
-      }
-    });
-  }
-
-  /** The same form Disbursement & Transfers prints its times in: 29 Sept 2026, 01:25 pm. */
-  formatDateTime(val: any): string {
-    if (!val) {
-      return '—';
-    }
-    const d = new Date(String(val).replace(' ', 'T'));
-    return isNaN(d.getTime())
-      ? String(val)
-      : d.toLocaleString('en-IN', {
-          day: '2-digit',
-          month: 'short',
-          year: 'numeric',
-          hour: '2-digit',
-          minute: '2-digit'
-        });
-  }
-
-  close(): void {
-    this.dialogRef.close(this.done);
-  }
-}

src/app/deposits/dds-approvals/dds-approvals.component.html

@@ -1,176 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<div class="cv-tab-content wri-tab">
-  <div class="wri-action-bar">
-    <div class="wri-action-bar__left">
-      <mat-icon class="wri-action-bar__icon">savings</mat-icon>
-      <div>
-        <div class="wri-action-bar__title">DDS Approvals</div>
-        <div class="wri-action-bar__sub">
-          Review, approve or reject DDS entries - transfers, payouts, early closures, receipts applied and postings.
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div class="wri-filter-bar">
-    <select class="wri-filter-select" [(ngModel)]="filterStatus" (change)="onFilterChange()">
-      @for (opt of statusOptions; track opt.value) {
-        <option [value]="opt.value">{{ opt.label }}</option>
-      }
-    </select>
-
-    <span class="wri-fb-sep"></span>
-
-    <div class="wri-presets">
-      @for (p of datePresets; track p.key) {
-        <button
-          type="button"
-          class="wri-preset-chip"
-          [class.wri-preset-chip--active]="activePreset === p.key"
-          (click)="applyPreset(p.key)"
-        >
-          {{ p.label }}
-        </button>
-      }
-    </div>
-
-    <span class="wri-fb-sep"></span>
-
-    <div class="wri-date-range">
-      <div class="wri-date-box">
-        <span class="wri-date-box__lbl">From</span>
-        <input
-          class="wri-date-box__input"
-          [matDatepicker]="fromPicker"
-          [(ngModel)]="fromDate"
-          [max]="maxDate"
-          (dateChange)="onFromDateChange()"
-          readonly
-        />
-        <button type="button" class="wri-date-box__btn" (click)="fromPicker.open()">
-          <mat-icon>event</mat-icon>
-        </button>
-        <mat-datepicker #fromPicker></mat-datepicker>
-      </div>
-      <span class="wri-date-range__sep">—</span>
-      <div class="wri-date-box">
-        <span class="wri-date-box__lbl">To</span>
-        <input
-          class="wri-date-box__input"
-          [matDatepicker]="toPicker"
-          [(ngModel)]="toDate"
-          [min]="fromDate"
-          [max]="maxDate"
-          (dateChange)="onToDateChange()"
-          readonly
-        />
-        <button type="button" class="wri-date-box__btn" (click)="toPicker.open()">
-          <mat-icon>event</mat-icon>
-        </button>
-        <mat-datepicker #toPicker></mat-datepicker>
-      </div>
-    </div>
-
-    <button type="button" class="wri-btn wri-btn--refresh" (click)="load()" [disabled]="loading">
-      <mat-icon>refresh</mat-icon>
-    </button>
-  </div>
-
-  @if (loading) {
-    <div class="empty-state">
-      <p class="empty-title">Loading…</p>
-    </div>
-  } @else if (loaded && entries.length === 0) {
-    <div class="empty-state">
-      <i class="fas fa-inbox empty-icon"></i>
-      <p class="empty-title">No DDS entries</p>
-      <p class="empty-text">
-        @if (filterStatus === 'PENDING') {
-          There are no DDS entries waiting for approval.
-        } @else {
-          No {{ filterStatus | lowercase }} DDS entries found.
-        }
-      </p>
-    </div>
-  } @else {
-    <div class="wri-table-wrap">
-      <table class="wri-table">
-        <thead>
-          <tr>
-            <th class="wri-th-id">Voucher No</th>
-            <th>Type</th>
-            <th>Account / Details</th>
-            <th class="num">Amount</th>
-            <th>Entries</th>
-            <th>Clerk</th>
-            <th>Reviewed By</th>
-            <th>Submitted At</th>
-            <th>Status</th>
-            <th class="wri-th-action">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (e of pagedEntries; track e.id) {
-            <tr class="wri-row" (click)="review(e)">
-              <td class="cell-mono wri-voucher">
-                {{ e.voucherNo || '—' }}
-                @if (e.voucherCancelled) {
-                  <span class="wri-gl-name">(cancelled)</span>
-                }
-              </td>
-              <td>
-                <span class="wri-credit-badge" [style.background]="typeColor(e)">{{ e.type }}</span>
-              </td>
-              <td>
-                <span class="wri-gl-name">{{ e.details || '—' }}</span>
-              </td>
-              <td class="num wri-amount">
-                {{ e.amount !== null && e.amount !== undefined ? '₹' + (e.amount | number: '1.2-2') : '—' }}
-              </td>
-              <td class="wri-credit-count">
-                @if (e.entries) {
-                  <span class="wri-credit-badge">{{ e.entries }} account{{ e.entries !== 1 ? 's' : '' }}</span>
-                } @else {
-                  —
-                }
-              </td>
-              <td>
-                {{ e.makerName || e.maker || '—' }}
-                @if (isMine(e) && e.status === 'PENDING') {
-                  <span class="wri-gl-name">(you)</span>
-                }
-              </td>
-              <td>{{ e.status === 'PENDING' ? '—' : e.checkerName || e.checker || '—' }}</td>
-              <td class="wri-dt">{{ formatDateTime(e.madeOn) }}</td>
-              <td>
-                <span class="wri-status" [ngClass]="statusClass(e.status)">{{ e.status | titlecase }}</span>
-              </td>
-              <td class="wri-action-cell" (click)="$event.stopPropagation()">
-                <button type="button" class="wri-btn wri-btn--review" (click)="review(e)">
-                  <mat-icon>rate_review</mat-icon>
-                  Review
-                </button>
-              </td>
-            </tr>
-          }
-        </tbody>
-      </table>
-    </div>
-
-    <mat-paginator
-      [length]="entries.length"
-      [pageSize]="pageSize"
-      [pageSizeOptions]="pageSizeOptions"
-      [pageIndex]="pageIndex"
-      showFirstLastButtons
-      (page)="onPageChange($event)"
-    ></mat-paginator>
-  }
-</div>

src/app/deposits/dds-approvals/dds-approvals.component.ts

@@ -1,215 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { Component, OnInit, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { MatIconModule } from '@angular/material/icon';
-import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
-import { MatDialog } from '@angular/material/dialog';
-import { MatNativeDateModule } from '@angular/material/core';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-import { catchError } from 'rxjs/operators';
-import { of } from 'rxjs';
-
-import { OrganizationService } from 'app/organization/organization.service';
-import { SettingsService } from 'app/settings/settings.service';
-import { AuthenticationService } from 'app/core/authentication/authentication.service';
-import { DdsApprovalReviewComponent } from './dds-approval-review/dds-approval-review.component';
-
-/**
- * Approval Center › DDS Approvals: every DDS entry waiting on a checker, in the clerk's terms - what
- * it does, on which accounts, for how much - and, once approved, the voucher it moved under.
- *
- * Laid out like Disbursement & Transfers beside it, and sharing its styles, so the two queues read the
- * same way. The entries are the platform's own maker-checker entries; approving one here carries it out.
- */
-@Component({
-  selector: 'mifosx-dds-approvals',
-  templateUrl: './dds-approvals.component.html',
-  styleUrls: ['../../tasks/checker-inbox-and-tasks-tabs/disbursement-requests/disbursement-requests.component.scss'],
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    MatIconModule,
-    MatPaginatorModule,
-    MatNativeDateModule,
-    MatDatepickerModule
-  ]
-})
-export class DdsApprovalsComponent implements OnInit {
-  private organizationService = inject(OrganizationService);
-  private settingsService = inject(SettingsService);
-  private authenticationService = inject(AuthenticationService);
-  private dialog = inject(MatDialog);
-
-  entries: any[] = [];
-  pageSize = 20;
-  pageIndex = 0;
-  readonly pageSizeOptions = [
-    10,
-    20,
-    50
-  ];
-
-  /** The page of entries on screen. */
-  get pagedEntries(): any[] {
-    const start = this.pageIndex * this.pageSize;
-    return this.entries.slice(start, start + this.pageSize);
-  }
-
-  onPageChange(event: PageEvent): void {
-    this.pageSize = event.pageSize;
-    this.pageIndex = event.pageIndex;
-  }
-  filterStatus = 'PENDING';
-  fromDate: Date | null = null;
-  toDate: Date | null = null;
-  maxDate!: Date;
-  activePreset = 'today';
-  loading = false;
-  loaded = false;
-
-  readonly currentUserId = this.authenticationService.getCredentials()?.userId;
-
-  readonly statusOptions = [
-    { value: 'PENDING', label: 'Pending' },
-    { value: 'APPROVED', label: 'Approved' },
-    { value: 'REJECTED', label: 'Rejected' }
-  ];
-
-  readonly datePresets = [
-    { key: 'today', label: 'Today' },
-    { key: 'week', label: 'This Week' },
-    { key: 'month', label: 'This Month' },
-    { key: 'all', label: 'All' }
-  ];
-
-  ngOnInit(): void {
-    const today = new Date(this.settingsService.businessDate || new Date());
-    today.setHours(0, 0, 0, 0);
-    this.maxDate = today;
-    this.applyPreset('today');
-  }
-
-  load(): void {
-    this.loading = true;
-    this.organizationService
-      .getDdsApprovals(this.filterStatus, this.isoDate(this.fromDate), this.isoDate(this.toDate))
-      .pipe(catchError(() => of([])))
-      .subscribe((rows: any) => {
-        this.entries = Array.isArray(rows) ? rows : [];
-        this.pageIndex = 0;
-        this.loading = false;
-        this.loaded = true;
-      });
-  }
-
-  onFilterChange(): void {
-    this.load();
-  }
-
-  onFromDateChange(): void {
-    this.activePreset = '';
-    if (this.fromDate && this.toDate && this.fromDate > this.toDate) {
-      this.toDate = new Date(this.fromDate);
-    }
-    this.load();
-  }
-
-  onToDateChange(): void {
-    this.activePreset = '';
-    this.load();
-  }
-
-  applyPreset(key: string): void {
-    this.activePreset = key;
-    const today = new Date(this.settingsService.businessDate || new Date());
-    today.setHours(0, 0, 0, 0);
-    if (key === 'today') {
-      this.fromDate = new Date(today);
-      this.toDate = new Date(today);
-    } else if (key === 'week') {
-      const start = new Date(today);
-      start.setDate(today.getDate() - today.getDay());
-      this.fromDate = start;
-      this.toDate = new Date(today);
-    } else if (key === 'month') {
-      this.fromDate = new Date(today.getFullYear(), today.getMonth(), 1);
-      this.toDate = new Date(today);
-    } else {
-      this.fromDate = null;
-      this.toDate = null;
-    }
-    this.load();
-  }
-
-  review(entry: any): void {
-    this.dialog
-      .open(DdsApprovalReviewComponent, { data: { entry, currentUserId: this.currentUserId }, autoFocus: false })
-      .afterClosed()
-      // However the dialog was closed - its Close button, a click outside, Esc - the list is read
-      // again, so an entry just approved or rejected leaves the Pending list at once.
-      .subscribe(() => this.load());
-  }
-
-  /** Whose entry it is - a checker cannot pass their own. */
-  isMine(entry: any): boolean {
-    return !!this.currentUserId && Number(entry.makerId) === Number(this.currentUserId);
-  }
-
-  statusClass(status: string): string {
-    const map: Record<string, string> = {
-      PENDING: 'wri-status--pending',
-      APPROVED: 'wri-status--approved',
-      REJECTED: 'wri-status--rejected'
-    };
-    return map[status] ?? '';
-  }
-
-  typeColor(entry: any): string {
-    const map: Record<string, string> = {
-      Transfer: '#e3f2fd',
-      'Apply Receipt': '#fce4ec'
-    };
-    if (String(entry.type).startsWith('Premature')) {
-      return '#fff3e0';
-    }
-    if (String(entry.type).startsWith('Maturity')) {
-      return '#e8f5e9';
-    }
-    if (String(entry.type).startsWith('Post')) {
-      return '#ede7f6';
-    }
-    return map[entry.type] ?? '#f5f5f5';
-  }
-
-  formatDateTime(val: any): string {
-    if (!val) {
-      return '—';
-    }
-    const d = new Date(String(val).replace(' ', 'T'));
-    return isNaN(d.getTime())
-      ? String(val)
-      : d.toLocaleString('en-IN', {
-          day: '2-digit',
-          month: 'short',
-          year: 'numeric',
-          hour: '2-digit',
-          minute: '2-digit'
-        });
-  }
-
-  private isoDate(d: Date | null): string | undefined {
-    if (!d) {
-      return undefined;
-    }
-    return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
-  }
-}

src/app/deposits/dds-reports/dds-reports.component.html

@@ -1,33 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<div class="dr-container">
-  <div class="dr-header">
-    <button mat-stroked-button [routerLink]="['../']" class="dr-back">
-      <i class="fas fa-arrow-left"></i> Deposits
-    </button>
-    <h2 class="dr-header__title">DDS Reports</h2>
-  </div>
-
-  @for (group of reportGroups; track group.title) {
-    <div class="dr-group">
-      <div class="dr-group__title">{{ group.title }}</div>
-      <div class="dr-grid">
-        @for (report of group.reports; track report) {
-          <a class="dr-card" [routerLink]="['view', report]">
-            <div class="dr-card__icon">
-              <i class="fas fa-file-alt"></i>
-            </div>
-            <div class="dr-card__title">{{ report }}</div>
-            <i class="fas fa-chevron-right dr-card__arrow"></i>
-          </a>
-        }
-      </div>
-    </div>
-  }
-</div>

src/app/deposits/dds-reports/dds-reports.component.scss

@@ -1,97 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-$primary: #0f766e;
-
-.dr-container {
-  max-width: 1080px;
-  margin: 0 auto;
-  padding: 24px 16px;
-}
-
-.dr-header {
-  display: flex;
-  align-items: center;
-  gap: 16px;
-  margin-bottom: 24px;
-
-  &__title {
-    margin: 0;
-    font-size: 22px;
-    font-weight: 500;
-  }
-}
-
-.dr-back {
-  color: $primary;
-}
-
-.dr-group {
-  margin-bottom: 24px;
-
-  &__title {
-    font-size: 13px;
-    text-transform: uppercase;
-    letter-spacing: 0.05em;
-    color: $primary;
-    font-weight: 700;
-    margin-bottom: 10px;
-  }
-}
-
-.dr-grid {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 12px;
-}
-
-.dr-card {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  background: var(--md-sys-color-surface, #fff);
-  border: 1px solid rgb(0 0 0 / 8%);
-  border-radius: 8px;
-  padding: 12px 14px;
-  text-decoration: none;
-  color: inherit;
-  transition: box-shadow 0.15s ease;
-
-  &:hover {
-    box-shadow: 0 2px 8px rgb(0 0 0 / 10%);
-  }
-
-  &__icon {
-    color: $primary;
-    font-size: 16px;
-    flex: none;
-  }
-
-  &__title {
-    flex: 1;
-    font-size: 13px;
-    font-weight: 500;
-  }
-
-  &__arrow {
-    color: rgb(0 0 0 / 30%);
-    font-size: 12px;
-  }
-}
-
-@media (width <= 900px) {
-  .dr-grid {
-    grid-template-columns: repeat(2, 1fr);
-  }
-}
-
-@media (width <= 600px) {
-  .dr-grid {
-    grid-template-columns: 1fr;
-  }
-}