Fixed Deposit account Transaction tab

openMF · Nov 30, 2023 · 6083af0 · 6083af0
1 parent 4271ca9
commit 6083af0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/...osits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html b/...osits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html
@@ -90,10 +90,12 @@ <h3> {{"labels.heading.Account Overview" | translate}} </h3>
       [active]="IRC.isActive">
       {{"labels.inputs.Interest Rate Chart" | translate }}
       </a>
-      <a mat-tab-link [routerLink]="['./transactions']" routerLinkActive #transactions="routerLinkActive"
-      [active]="transactions.isActive">
-      {{"labels.inputs.Transactions" | translate }}
-      </a>
+      <span *ngIf="showTransactions">
+        <a mat-tab-link [routerLink]="['./transactions']" routerLinkActive #transactions="routerLinkActive"
+        [active]="transactions.isActive">
+        {{"labels.inputs.Transactions" | translate }}
+        </a>
+      </span>
       <a mat-tab-link [routerLink]="['./charges']" routerLinkActive #charges="routerLinkActive"
       [active]="charges.isActive">
       {{"labels.inputs.Charges" | translate }}

diff --git a/...eposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts b/...eposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts
@@ -36,6 +36,7 @@ export class FixedDepositAccountViewComponent implements OnInit {
   /** Entity Type */
   entityType: string;
   currency: Currency;
+  showTransactions = false;
 
   /**
    * Fetches fixed deposits account data from `resolve`
@@ -54,6 +55,8 @@ export class FixedDepositAccountViewComponent implements OnInit {
       this.fixedDepositsAccountData = data.fixedDepositsAccountData;
       this.savingsDatatables = data.savingsDatatables;
       this.currency = this.fixedDepositsAccountData.currency;
+      const status: any = data.fixedDepositsAccountData.status;
+      this.showTransactions = (status.id >= 300);
     });
     if (this.router.url.includes('clients')) {
       this.entityType = 'Client';

diff --git a/...ixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html b/...ixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html
@@ -1,4 +1,4 @@
-<div class="tab-container mat-typography" *ngIf="showTransactionsData">
+<div class="tab-container mat-typography">
 
   <div fxLayoutAlign="start">
     <div class="m-b-20">

diff --git a/.../fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts b/.../fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts
@@ -13,9 +13,6 @@ import { ActivatedRoute, Router } from '@angular/router';
 })
 export class TransactionsTabComponent implements OnInit {
 
-  /** Fixed Deposits Account Status */
-  status: string;
-  showTransactionsData = false;
   /** Transactions Data */
   transactionsData: any;
   /** Columns to be displayed in transactions table. */
@@ -32,8 +29,6 @@ export class TransactionsTabComponent implements OnInit {
               private router: Router) {
     this.route.parent.data.subscribe((data: { fixedDepositsAccountData: any }) => {
       this.transactionsData = data.fixedDepositsAccountData.transactions;
-      this.status = data.fixedDepositsAccountData.status.value;
-      this.showTransactionsData = (this.status === 'Active');
     });
   }
 

diff --git a/src/assets/images/recurring-deposits_account_placeholder.png b/src/assets/images/recurring-deposits_account_placeholder.png