CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fixed Deposit account request fixes

Browse Source
This commit is contained in:
Jose Alberto Hernandez
2023-12-12 10:01:55 +01:00
committed by Adam Saghy
parent 363806286a
commit 76bdff35dc
15 changed files with 75 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/deposits/fixed-deposits/edit-fixed-deposit-account/edit-fixed-deposit-account.component.html
+1 -13
View File
@@ -33,17 +33,6 @@
</mat-step>
<mat-step [stepControl]="fixedDepositAccountDetailsForm.get('productId')">
<ng-template matStepLabel>{{"labels.inputs.CURRENCY" | translate }}</ng-template>
<mifosx-fixed-deposit-account-currency-step
[fixedDepositsAccountTemplate]="fixedDepositsAccountAndTemplate"
[fixedDepositsAccountProductTemplate]="fixedDepositsAccountProductTemplate">
</mifosx-fixed-deposit-account-currency-step>
</mat-step>
<mat-step [stepControl]="fixedDepositAccountTermsForm">
<ng-template matStepLabel>{{"labels.inputs.TERMS" | translate }}</ng-template>
@@ -84,8 +73,7 @@
<mifosx-fixed-deposit-account-charges-step
[fixedDepositsAccountTemplate]="fixedDepositsAccountAndTemplate"
[fixedDepositsAccountProductTemplate]="fixedDepositsAccountProductTemplate"
[fixedDepositAccountFormValid]="fixedDepositAccountFormValidAndNotPristine"
[currencyCode]="fixedDepositAccountCurrencyForm.get('currencyCode')">
[fixedDepositAccountFormValid]="fixedDepositAccountFormValidAndNotPristine">
</mifosx-fixed-deposit-account-charges-step>
</mat-step>
src/app/deposits/fixed-deposits/edit-fixed-deposit-account/edit-fixed-deposit-account.component.ts
+5 -1
View File
@@ -13,6 +13,7 @@ import { FixedDepositAccountTermsStepComponent } from '../fixed-deposit-account-
import { FixedDepositAccountSettingsStepComponent } from '../fixed-deposit-account-stepper/fixed-deposit-account-settings-step/fixed-deposit-account-settings-step.component';
import { FixedDepositAccountChargesStepComponent } from '../fixed-deposit-account-stepper/fixed-deposit-account-charges-step/fixed-deposit-account-charges-step.component';
import { Dates } from 'app/core/utils/dates';
import { Currency } from 'app/shared/models/general.model';
/**
* Edit Fixed Deposit Account Component
@@ -40,6 +41,8 @@ export class EditFixedDepositAccountComponent {
/** Fixed Deposit Account Product Template */
fixedDepositsAccountProductTemplate: any;
currency: Currency;
/**
* Fetches FD account template from `resolve`
* @param {ActivatedRoute} route Activated Route
@@ -64,6 +67,7 @@ export class EditFixedDepositAccountComponent {
*/
setTemplate($event: any) {
this.fixedDepositsAccountProductTemplate = $event;
this.currency = this.fixedDepositsAccountAndTemplate.currency;
}
/**
@@ -119,7 +123,7 @@ export class EditFixedDepositAccountComponent {
...this.fixedDepositsAccountDetailsStep.fixedDepositAccountDetails,
...this.fixedDepositAccountTermsStep.fixedDepositAccountTerms,
...this.fixedDepositAccountSettingsStep.fixedDepositAccountSettings,
...this.fixedDepositAccountChargesStep.fixedDepositAccountCharges,
...this.fixedDepositAccountChargesStep?.fixedDepositAccountCharges
};
}