diff --git a/src/app/clients/clients-view/general-tab/general-tab.component.html b/src/app/clients/clients-view/general-tab/general-tab.component.html index 461b246c8..0da32a41a 100644 --- a/src/app/clients/clients-view/general-tab/general-tab.component.html +++ b/src/app/clients/clients-view/general-tab/general-tab.component.html @@ -7,7 +7,6 @@ -->
-

{{ 'labels.heading.Performance History' | translate }}

@@ -164,7 +163,9 @@
-

{{ 'labels.messages.No Active Saving Accounts Available' | translate }}

+

+ {{ 'labels.messages.No Active Saving Accounts Available' | translate }} +

@@ -211,7 +212,9 @@
-

{{ 'labels.messages.No Closed Saving Accounts Available' | translate }}

+

+ {{ 'labels.messages.No Closed Saving Accounts Available' | translate }} +

@@ -233,6 +236,89 @@ }
+ + @if (currentAccounts?.length > 0) { +
+
+
+ +

Current Accounts

+ {{ currentAccounts?.length || 0 }} +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ 'labels.inputs.Account No' | translate }} + + + Current Account Product + + {{ 'labels.inputs.Last Active' | translate }}{{ element.lastActiveTransactionDate | dateFormat }}{{ 'labels.inputs.Balance' | translate }} + {{ element.accountBalance | currency: element.currency?.code || 'INR' : 'symbol-narrow' : '1.2-2' }} + {{ 'labels.inputs.Actions' | translate }} + @if (element.status.submittedAndPendingApproval) { + + } + + +
+ +

No Active Current Accounts Available

+
+
+
+
+ } +
@@ -258,7 +344,8 @@ {{ 'labels.inputs.name' | translate }} - {{ element.name }} + + {{ element.name }} @@ -322,7 +409,11 @@ - +
@@ -407,7 +498,9 @@
-

{{ 'labels.messages.No Active Fixed Deposit Accounts Available' | translate }}

+

+ {{ 'labels.messages.No Active Fixed Deposit Accounts Available' | translate }} +

@@ -454,7 +547,9 @@
-

{{ 'labels.messages.No Closed Fixed Deposit Accounts Available' | translate }}

+

+ {{ 'labels.messages.No Closed Fixed Deposit Accounts Available' | translate }} +

@@ -559,7 +654,9 @@
-

{{ 'labels.messages.No Active Recurring Deposit Accounts Available' | translate }}

+

+ {{ 'labels.messages.No Active Recurring Deposit Accounts Available' | translate }} +

@@ -607,7 +704,9 @@
-

{{ 'labels.messages.No Closed Recurring Deposit Accounts Available' | translate }}

+

+ {{ 'labels.messages.No Closed Recurring Deposit Accounts Available' | translate }} +

@@ -775,7 +874,9 @@
-

{{ 'labels.messages.No Active Loan Accounts Available' | translate }}

+

+ {{ 'labels.messages.No Active Loan Accounts Available' | translate }} +

@@ -867,7 +968,9 @@
-

{{ 'labels.messages.No Closed Loan Accounts Available' | translate }}

+

+ {{ 'labels.messages.No Closed Loan Accounts Available' | translate }} +

@@ -924,7 +1027,8 @@ {{ 'labels.inputs.Total Value' | translate }} {{ - element.basePrice * element.quantity | currency: element.currency?.code || 'USD' : 'symbol-narrow' : '1.2-2' + element.basePrice * element.quantity + | currency: element.currency?.code || 'USD' : 'symbol-narrow' : '1.2-2' }} @@ -1043,7 +1147,9 @@
-

{{ 'labels.messages.No Active Share Accounts Available' | translate }}

+

+ {{ 'labels.messages.No Active Share Accounts Available' | translate }} +

@@ -1094,7 +1200,9 @@
-

{{ 'labels.messages.No Closed Share Accounts Available' | translate }}

+

+ {{ 'labels.messages.No Closed Share Accounts Available' | translate }} +

@@ -1123,4 +1231,4 @@
- \ No newline at end of file + diff --git a/src/app/clients/clients-view/general-tab/general-tab.component.ts b/src/app/clients/clients-view/general-tab/general-tab.component.ts index ed9585096..dbbd1538d 100644 --- a/src/app/clients/clients-view/general-tab/general-tab.component.ts +++ b/src/app/clients/clients-view/general-tab/general-tab.component.ts @@ -228,6 +228,8 @@ export class GeneralTabComponent implements OnDestroy { loanAccounts: any[] = []; /** Savings Accounts Data */ savingAccounts: any[] = []; + /** Current Accounts Data */ + currentAccounts: any[] = []; /** Shares Accounts Data */ shareAccounts: any[] = []; /** Upcoming Charges Data */ @@ -273,6 +275,7 @@ export class GeneralTabComponent implements OnDestroy { (data: { clientAccountsData: any; clientChargesData: any; clientSummary: any; clientCollateralData: any }) => { this.clientAccountData = data.clientAccountsData; this.savingAccounts = data.clientAccountsData?.savingsAccounts ?? []; + this.currentAccounts = data.clientAccountsData?.currentAccounts ?? []; this.loanAccounts = data.clientAccountsData?.loanAccounts ?? []; this.shareAccounts = data.clientAccountsData?.shareAccounts ?? []; diff --git a/src/app/current-accounts/current-account-stepper/current-account-details-step/current-account-details-step.component.ts b/src/app/current-accounts/current-account-stepper/current-account-details-step/current-account-details-step.component.ts index cd2f8d1e4..cc44792be 100644 --- a/src/app/current-accounts/current-account-stepper/current-account-details-step/current-account-details-step.component.ts +++ b/src/app/current-accounts/current-account-stepper/current-account-details-step/current-account-details-step.component.ts @@ -472,10 +472,18 @@ export class CurrentAccountDetailsStepComponent implements OnInit { if (this.introducerId) { value.introducerId = this.introducerId; value.introducerName = this.introducerName; - value.introducerCif = this.introducerCif; + value.introducerCifNumber = this.introducerCif; } value.isNonIndividualClient = this.isNonIndividualClient; + // Product classification fields + if (this.selectedAccountType) { + value.accountType = this.selectedAccountType; + } + if (this.selectedCustomerSegment) { + value.customerSegment = this.selectedCustomerSegment; + } + // accountStatus applies to all client types value.accountStatus = this.selectedAccountStatus || null; if (this.selectedAccountStatus === 'INDIVIDUAL_MALE' && this.selectedSpecialCategory) @@ -487,8 +495,8 @@ export class CurrentAccountDetailsStepComponent implements OnInit { value.jointHolders = [ { clientId: this.primaryClientId, - clientName: this.primaryClientName, - clientCif: this.primaryClientCif, + displayName: this.primaryClientName, + cifNumber: this.primaryClientCif, sharePercentage: this.primaryHolderShare, isMandatory: true, isPrimary: true, @@ -497,8 +505,8 @@ export class CurrentAccountDetailsStepComponent implements OnInit { }, ...this.jointHolders.map((h) => ({ clientId: h.clientId, - clientName: h.clientName, - clientCif: h.clientCif, + displayName: h.clientName, + cifNumber: h.clientCif, sharePercentage: h.sharePercentage, isMandatory: h.isMandatory, isPrimary: false, @@ -510,9 +518,9 @@ export class CurrentAccountDetailsStepComponent implements OnInit { if (this.selectedAccountStatus === 'MINOR') { value.guardianClientId = this.guardianClientId; value.guardianName = this.guardianName; - value.guardianCif = this.guardianCif; + value.guardianCifNumber = this.guardianCif; value.guardianRelationship = this.guardianRelationship; - value.minorDob = this.minorDob ? this.dateUtils.formatDate(this.minorDob, 'yyyy-MM-dd') : null; + value.minorDateOfBirth = this.minorDob ? this.dateUtils.formatDate(this.minorDob, 'yyyy-MM-dd') : null; } // non-individual: partners are a separate dataset diff --git a/src/app/pipes/accounts-filter.pipe.ts b/src/app/pipes/accounts-filter.pipe.ts index a9f3a02b1..3b7363383 100644 --- a/src/app/pipes/accounts-filter.pipe.ts +++ b/src/app/pipes/accounts-filter.pipe.ts @@ -48,6 +48,10 @@ export class AccountsFilterPipe implements PipeTransform { accounts = accounts.filter((account: any) => { return account.depositType.value === 'Savings'; }); + } else if (checkSavings === 'isCurrent') { + accounts = accounts.filter((account: any) => { + return account.depositType.id === 400 || account.depositType.value === 'Current Deposit'; + }); } if (status === 'closed') { accounts = accounts.filter((account: any) => { diff --git a/src/environments/.env.ts b/src/environments/.env.ts index e826c099c..2a3c8fdfb 100644 --- a/src/environments/.env.ts +++ b/src/environments/.env.ts @@ -5,13 +5,12 @@ * 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/. */ - // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN! /* tslint:disable */ export default { 'mifos_x': { - 'version': '260428', - 'hash': '31b2490f' + 'version': '260429', + 'hash': '0d3d8379' }, 'allow_switching_backend_instance': true };