diff --git a/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html b/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html index 97fab4701..691e0f0b6 100644 --- a/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html +++ b/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html @@ -52,6 +52,16 @@ > + + +

{{ 'labels.heading.Liabilities' | translate }}

@@ -153,7 +163,7 @@

@@ -215,7 +225,7 @@

-
+

{{ 'labels.heading.Map Fees to Specific Income Accounts' | translate }}

@@ -267,7 +277,7 @@
-
+

{{ 'labels.heading.Map Penalties to Specific Income Accounts' | translate }}

diff --git a/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.ts b/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.ts index 400b8ce2b..2fb2b268a 100644 --- a/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.ts +++ b/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.ts @@ -157,6 +157,10 @@ export class SavingProductAccountingStepComponent implements OnInit { this.savingProductAccountingForm.patchValue({ feesReceivableAccountId: this.savingProductsTemplate.accountingMappings.feeReceivableAccount.id, penaltiesReceivableAccountId: this.savingProductsTemplate.accountingMappings.penaltyReceivableAccount.id, + interestReceivableAccountId: + this.savingProductsTemplate.accountingMappings.interestReceivableAccount == null || undefined + ? '' + : this.savingProductsTemplate.accountingMappings.interestReceivableAccount.id, interestPayableAccountId: this.savingProductsTemplate.accountingMappings.interestPayableAccount.id }); } @@ -252,6 +256,10 @@ export class SavingProductAccountingStepComponent implements OnInit { 'penaltiesReceivableAccountId', new UntypedFormControl('', Validators.required) ); + this.savingProductAccountingForm.addControl( + 'interestReceivableAccountId', + new UntypedFormControl('', Validators.required) + ); this.savingProductAccountingForm.addControl( 'interestPayableAccountId', new UntypedFormControl('', Validators.required) @@ -311,6 +319,7 @@ export class SavingProductAccountingStepComponent implements OnInit { this.savingProductAccountingForm.removeControl('escheatLiabilityId'); this.savingProductAccountingForm.removeControl('feesReceivableAccountId'); this.savingProductAccountingForm.removeControl('penaltiesReceivableAccountId'); + this.savingProductAccountingForm.removeControl('interestReceivableAccountId'); this.savingProductAccountingForm.removeControl('interestPayableAccountId'); } }); diff --git a/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html b/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html index 2ff910bf4..7756a9a62 100644 --- a/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html +++ b/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html @@ -45,97 +45,105 @@ [withTitle]="'40%'" > -
- -

{{ 'labels.heading.Liabilities' | translate }}

-
- -
-
- - -
-
- -
-
- - -
-

{{ 'labels.heading.Income' | translate }}

-
- - -
-
- - -
-
- - -
+

{{ 'labels.heading.Liabilities' | translate }}

+
+ + +
+
+ + +
+
+ + +
+
+ + +
-

{{ 'labels.heading.Expenses' | translate }}

-
- - -
-
- - +

{{ 'labels.heading.Income' | translate }}

+
+ + +
+
+ + +
+
+ + +
+ +

{{ 'labels.heading.Expenses' | translate }}

+
+ + +
+
+ + +