feat(shares): close share account directly on withdrawal approval; drop separate closure-request flow

Replaces the auto-submit-closure-request behavior with an immediate
account close, in the same approval action, when a withdrawal brings
shares to zero — matching the backend's new single-step close-on-
approval flow. Removes the now-unneeded Share Closure Request feature
entirely: dedicated create/list components (Clerk Dashboard + Approval
Center), routes, nav links, and the "eligible for closure" banner on
the Share Account view.

Also adds a clear "this will close the account" notice wherever a
withdrawal would zero out the account's shares — the standalone Share
Withdrawal Request page (submit + review) and Transaction Entry's
Share Redemption Transfer confirm dialog — styled as an amber warning
callout rather than a plain info line. Trims that confirm dialog to
just the required details (dropped the redundant ECS A/C No. line and
the validation-checklist block) and compacts its overall size.

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

@@ -78,22 +78,6 @@ const routes: Routes = [
             ),
           data: { title: 'My Share Requests', breadcrumb: 'My Share Requests' }
         },
-        {
-          path: 'share-closure-request',
-          loadComponent: () =>
-            import('../clerk/share-closure-request/share-closure-request.component').then(
-              (m) => m.ShareClosureRequestComponent
-            ),
-          data: { title: 'New Share Closure Request', breadcrumb: 'New Share Closure Request', mode: 'create' }
-        },
-        {
-          path: 'share-closure-requests',
-          loadComponent: () =>
-            import('../clerk/my-share-closure-requests/my-share-closure-requests.component').then(
-              (m) => m.MyShareClosureRequestsComponent
-            ),
-          data: { title: 'My Share Closure Requests', breadcrumb: 'My Share Closure Requests' }
-        },
         {
           path: 'account-facilities',
           loadComponent: () =>

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

@@ -1,53 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { Injectable, inject } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
-import { Observable } from 'rxjs';
-
-/** HTTP service for the Share Closure maker-checker workflow — mirrors
- *  ClerkShareWithdrawalService, adapted for closing an already-zero-share account. */
-@Injectable({ providedIn: 'root' })
-export class ClerkShareClosureService {
-  private http = inject(HttpClient);
-
-  submit(data: any): Observable<any> {
-    return this.http.post('/clerk/share-closure-requests', data);
-  }
-
-  getMyRequests(status?: string, offset = 0, limit = 20, fromDate?: string, toDate?: string): Observable<any> {
-    let params = new HttpParams().set('offset', String(offset)).set('limit', String(limit));
-    if (status) params = params.set('status', status);
-    if (fromDate) params = params.set('fromDate', fromDate);
-    if (toDate) params = params.set('toDate', toDate);
-    return this.http.get('/clerk/share-closure-requests/my', { params });
-  }
-
-  getPendingRequests(status = 'PENDING', offset = 0, limit = 20, fromDate?: string, toDate?: string): Observable<any> {
-    let params = new HttpParams().set('status', status).set('offset', String(offset)).set('limit', String(limit));
-    if (fromDate) params = params.set('fromDate', fromDate);
-    if (toDate) params = params.set('toDate', toDate);
-    return this.http.get('/clerk/share-closure-requests', { params });
-  }
-
-  getById(id: number): Observable<any> {
-    return this.http.get(`/clerk/share-closure-requests/${id}`);
-  }
-
-  validate(id: number): Observable<any> {
-    return this.http.post(`/clerk/share-closure-requests/${id}/validate`, {});
-  }
-
-  approve(id: number): Observable<any> {
-    return this.http.post(`/clerk/share-closure-requests/${id}/approve`, {});
-  }
-
-  reject(id: number, reason: string): Observable<any> {
-    return this.http.post(`/clerk/share-closure-requests/${id}/reject`, { reason });
-  }
-}

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

@@ -1924,6 +1924,15 @@
           @for (line of alertModal.lines; track $index) {
             @if ($index === 0) {
               <p class="te-alert-box__desc">{{ line }}</p>
+            } @else if (line.startsWith('⚠')) {
+              <div class="te-alert-box__callout">
+                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round">
+                  <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z" />
+                  <line x1="12" y1="9" x2="12" y2="13" />
+                  <line x1="12" y1="17" x2="12.01" y2="17" />
+                </svg>
+                <span>{{ line.slice(1).trim() }}</span>
+              </div>
             } @else if (line.includes(':') && $index < alertModal.lines.length - 1) {
               <div class="te-alert-box__kv">
                 <span class="te-alert-box__kv-k">{{ line.split(':')[0].trim() }}</span>

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

@@ -2003,12 +2003,12 @@ select.te-cell {
 
 .te-alert-box {
   display: flex;
-  width: 480px;
-  max-width: 96vw;
-  border-radius: 16px;
+  width: 400px;
+  max-width: 94vw;
+  border-radius: 14px;
   overflow: hidden;
   box-shadow:
-    0 32px 80px rgb(0 0 0 / 35%),
+    0 24px 60px rgb(0 0 0 / 32%),
     0 0 0 1px rgb(255 255 255 / 8%);
   animation: te-pop-in 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
 
@@ -2018,32 +2018,35 @@ select.te-cell {
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    gap: 10px;
-    width: 76px;
+    gap: 8px;
+    width: 56px;
     flex-shrink: 0;
-    padding: 24px 0;
+    padding: 16px 0;
   }
 
   &__sidebar-icon {
-    width: 40px;
-    height: 40px;
+    width: 32px;
+    height: 32px;
     border-radius: 50%;
     display: flex;
     align-items: center;
     justify-content: center;
     background: rgb(255 255 255 / 20%);
+    box-shadow:
+      0 0 0 1px rgb(255 255 255 / 15%),
+      inset 0 1px 2px rgb(255 255 255 / 25%);
 
     svg {
-      width: 22px;
-      height: 22px;
+      width: 17px;
+      height: 17px;
       stroke: #fff;
     }
   }
 
   &__sidebar-type {
-    font-size: 8px;
+    font-size: 7px;
     font-weight: 900;
-    letter-spacing: 0.12em;
+    letter-spacing: 0.1em;
     color: rgb(255 255 255 / 70%);
     text-transform: uppercase;
     writing-mode: vertical-lr;
@@ -2053,6 +2056,7 @@ select.te-cell {
   // ── Right content ─────────────────────────────────────────────────────────
   &__content {
     flex: 1;
+    min-width: 0;
     background: #fff;
     display: flex;
     flex-direction: column;
@@ -2062,12 +2066,12 @@ select.te-cell {
     display: flex;
     align-items: flex-start;
     justify-content: space-between;
-    padding: 20px 20px 12px;
+    padding: 14px 16px 8px;
     border-bottom: 1px solid #f1f5f9;
 
     h3 {
       margin: 0;
-      font-size: 15px;
+      font-size: 13.5px;
       font-weight: 800;
       color: #0f172a;
       letter-spacing: -0.02em;
@@ -2091,52 +2095,87 @@ select.te-cell {
 
   &__lines {
     flex: 1;
-    padding: 14px 20px;
+    max-height: 60vh;
+    overflow-y: auto;
+    padding: 10px 16px;
   }
 
   &__desc {
-    margin: 0 0 10px;
-    font-size: 12.5px;
+    margin: 0 0 8px;
+    font-size: 11.5px;
     color: #64748b;
-    line-height: 1.55;
+    line-height: 1.5;
   }
 
   &__kv {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 7px 12px;
-    margin: 4px 0;
+    gap: 10px;
+    padding: 5px 10px;
+    margin: 3px 0;
     background: #f8fafc;
-    border-radius: 8px;
+    border-radius: 7px;
     border-left: 3px solid #e2e8f0;
+    transition: background-color 0.15s;
+
+    &:hover {
+      background: #f1f5f9;
+    }
   }
 
   &__kv-k {
-    font-size: 12px;
+    font-size: 11px;
     font-weight: 700;
     color: #334155;
   }
 
   &__kv-v {
-    font-size: 12px;
+    font-size: 11px;
     font-weight: 600;
     color: #475569;
     font-variant-numeric: tabular-nums;
+    text-align: right;
   }
 
   &__foot {
-    margin: 10px 0 0;
-    font-size: 11px;
+    margin: 8px 0 0;
+    font-size: 10px;
     color: #94a3b8;
     font-style: italic;
+    line-height: 1.4;
+  }
+
+  &__callout {
+    display: flex;
+    align-items: flex-start;
+    gap: 8px;
+    margin: 8px 0;
+    padding: 8px 10px;
+    background: #fffbeb;
+    border: 1px solid #fde68a;
+    border-left: 3px solid #d97706;
+    border-radius: 9px;
+    font-size: 11px;
+    font-weight: 600;
+    color: #92400e;
+    line-height: 1.45;
+    animation: te-pop-in 0.25s cubic-bezier(0.34, 1.56, 0.64, 1);
+
+    svg {
+      width: 14px;
+      height: 14px;
+      flex-shrink: 0;
+      margin-top: 1px;
+      color: #d97706;
+    }
   }
 
   &__actions {
     display: flex;
     justify-content: flex-end;
     gap: 8px;
-    padding: 14px 20px;
+    padding: 10px 16px;
     border-top: 1px solid #f1f5f9;
     background: #fafafa;
   }
@@ -2204,11 +2243,11 @@ select.te-cell {
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  padding: 8px 20px;
-  min-width: 90px;
-  border-radius: 8px;
+  padding: 7px 16px;
+  min-width: 76px;
+  border-radius: 7px;
   border: none;
-  font-size: 12.5px;
+  font-size: 12px;
   font-weight: 700;
   cursor: pointer;
   transition:

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

@@ -807,6 +807,9 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   // Per-row linked savings account number, keyed by the Share account's own acNo — used to make
   // sure a Share-to-linked-account Bank Transfer actually credits the right account.
   rowLinkedSavingsAcNo: Record<string, string> = {};
+  // Per-row shares currently held, keyed by acNo — lets submitShareRedemptionTransfer() warn the
+  // clerk when a withdrawal will bring the account's holding to zero (closing it on approval).
+  rowShareHoldings: Record<string, number> = {};
 
   // Full account + client data
   accountDetails: any = null;
@@ -1645,26 +1648,31 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     };
 
     const sharePrice = this.rowSharePrices[shareRow.acNo] ?? 0;
+    const currentHolding = this.rowShareHoldings[shareRow.acNo] ?? 0;
+    const remainingShares = currentHolding - shares;
+    const willCloseAccount = remainingShares <= 0;
     const confirmLines = [
       `Share Account: ${shareRow.acNo}  ·  Client: ${this.rowAccountNames[shareRow.acNo] ?? '—'}`,
       `Shares to Withdraw: ${shares} @ ₹${sharePrice.toLocaleString('en-IN', { minimumFractionDigits: 2 })} = ₹${(shares * sharePrice).toLocaleString('en-IN', { minimumFractionDigits: 2 })}`,
+      `Remaining Shares After Withdrawal: ${Math.max(remainingShares, 0)}`,
+      ...(willCloseAccount
+        ? ['⚠ All shares withdrawn — this account will be CLOSED automatically when the Manager approves.']
+        : []),
       `Board Resolution No.: ${payload.resolutionNumber}`,
       `Date of Meeting: ${payload.meetingDate}`,
       `Settlement Credit To: ${linkedAcNo}`,
       `Settlement Payment Type: ${settlementPaymentType?.name ?? '—'}`,
-      ...(settlementRowSnapshot.ecsAccountNo ? [`ECS A/C No.: ${settlementRowSnapshot.ecsAccountNo}`] : []),
+      ...(settlementRowSnapshot.ecsAccountNo && settlementRowSnapshot.ecsAccountNo !== linkedAcNo
+        ? [`ECS A/C No.: ${settlementRowSnapshot.ecsAccountNo}`]
+        : []),
       ...(settlementRowSnapshot.chequeNo ? [`Cheque No.: ${settlementRowSnapshot.chequeNo}`] : []),
       ...(settlementRowSnapshot.chequeDate ? [`Cheque Date: ${settlementRowSnapshot.chequeDate}`] : []),
       ...(settlementRowSnapshot.tokenNo ? [`Token No.: ${settlementRowSnapshot.tokenNo}`] : []),
       ...(settlementRowSnapshot.description ? [`CR Row Remarks: ${settlementRowSnapshot.description}`] : []),
       '',
-      'Validation checks:',
-      `  ✓ Share account and linked savings account both loaded`,
-      `  ✓ CR account matches this Share account's linked savings account`,
-      `  ✓ Settlement Payment Type is non-cash`,
-      `  ✓ Board Resolution Number and Date of Meeting provided`,
-      '',
-      'Pending Manager approval — redemption and settlement both post together on approval.'
+      willCloseAccount
+        ? 'Pending Manager approval — redemption, settlement and account closure all post together on approval.'
+        : 'Pending Manager approval — redemption and settlement both post together on approval.'
     ];
     this.showConfirmAlert('info', 'Confirm Share Withdrawal Request', confirmLines, 'Submit for Approval', () =>
       this.doSubmitShareRedemptionTransfer(payload, shareRow, shares, linkedAcNo)
@@ -1695,9 +1703,12 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.saving = false;
         if (res) {
+          const willCloseAccount = (this.rowShareHoldings[shareRow.acNo] ?? 0) - shares <= 0;
           this.showAlert('success', 'Share Withdrawal Submitted', [
             `${shares} share(s) from ${shareRow.acNo} → settlement to ${linkedAcNo} on approval.`,
-            'Pending Manager approval. Track status in "My Share Requests".'
+            willCloseAccount
+              ? 'Pending Manager approval — this will close the share account, since all shares will be withdrawn. Track status in "My Share Requests".'
+              : 'Pending Manager approval. Track status in "My Share Requests".'
           ]);
           this.rows = [];
           this.rowAccountIds = {};
@@ -1705,6 +1716,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
           this.rowSharePrices = {};
           this.rowClientIds = {};
           this.rowLinkedSavingsAcNo = {};
+          this.rowShareHoldings = {};
           this.addRow();
           this.selectedRow = this.rows[0];
           this.accountDetails = null;
@@ -2108,6 +2120,9 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         // rowSharePrices[row.acNo]) reads via row.acNo, so this must match or every lookup misses.
         this.rowSharePrices[this.selectedRow.acNo] = Number(acc.currentMarketPrice) || 0;
         this.rowLinkedSavingsAcNo[this.selectedRow.acNo] = acc.savingsAccountNumber ?? '';
+        this.rowShareHoldings[this.selectedRow.acNo] = Number(
+          acc.summary?.totalApprovedShares ?? acc.totalApprovedShares ?? 0
+        );
         this.syncShareLinkedAmounts();
       }
       return true;