From 7b9e036f012945c668c0d219ce9751c12242b29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Alberto=20Hern=C3=A1ndez?= <44206706+josehernandezfintecheandomx@users.noreply.github.com> Date: Tue, 14 Mar 2023 16:30:19 -0600 Subject: [PATCH] Loan product accounting mappings to Income from Goodwill Credit (#1709) Co-authored-by: Jose Alberto Hernandez --- .../create-loan-product.component.scss | 4 ++ .../edit-loan-product.component.scss | 3 ++ ...oan-product-accounting-step.component.html | 40 +++++++++++++++++-- .../loan-product-accounting-step.component.ts | 9 +++++ .../loan-product-preview-step.component.html | 6 +++ 5 files changed, 59 insertions(+), 3 deletions(-) diff --git a/src/app/products/loan-products/create-loan-product/create-loan-product.component.scss b/src/app/products/loan-products/create-loan-product/create-loan-product.component.scss index fbc6592ec..6f3af3941 100644 --- a/src/app/products/loan-products/create-loan-product/create-loan-product.component.scss +++ b/src/app/products/loan-products/create-loan-product/create-loan-product.component.scss @@ -1,3 +1,7 @@ +.container { + padding-bottom: 30px; +} + fa-icon { position: relative; left: 5%; diff --git a/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.scss b/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.scss index e69de29bb..e1b888d16 100644 --- a/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.scss +++ b/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.scss @@ -0,0 +1,3 @@ +.container { + padding-bottom: 30px; +} diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.html index 862176bdf..69dc25cc4 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.html +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.html @@ -180,6 +180,42 @@ + + Income from Goodwill Credit Interest + + + ({{ incomeAccount.glCode }}) {{ incomeAccount.name }} + + + + Income from Goodwill Credit Interest is required + + + + + Income from Goodwill Credit Fees + + + ({{ incomeAccount.glCode }}) {{ incomeAccount.name }} + + + + Income from Goodwill Credit Fees is required + + + + + Income from Goodwill Credit Penalty + + + ({{ incomeAccount.glCode }}) {{ incomeAccount.name }} + + + + Income from Goodwill Credit Penalty is required + + +

Expenses

@@ -250,9 +286,7 @@ -

Advanced Accounting Rules

- - + Advanced Accounting Rules
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts index 89a20fb74..f632efbb4 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts @@ -82,6 +82,9 @@ export class LoanProductAccountingStepComponent implements OnInit { 'incomeFromChargeOffPenaltyAccountId': accountingMappings.incomeFromChargeOffPenaltyAccount ? accountingMappings.incomeFromChargeOffPenaltyAccount.id : '', 'incomeFromChargeOffFeesAccountId': accountingMappings.incomeFromChargeOffFeesAccount ? accountingMappings.incomeFromChargeOffFeesAccount.id : '', 'incomeFromChargeOffInterestAccountId': accountingMappings.incomeFromChargeOffInterestAccount ? accountingMappings.incomeFromChargeOffInterestAccount.id : '', + 'incomeFromGoodwillCreditInterestAccountId': accountingMappings.incomeFromGoodwillCreditInterestAccount ? accountingMappings.incomeFromGoodwillCreditInterestAccount.id : '', + 'incomeFromGoodwillCreditFeesAccountId': accountingMappings.incomeFromGoodwillCreditFeesAccount ? accountingMappings.incomeFromGoodwillCreditFeesAccount.id : '', + 'incomeFromGoodwillCreditPenaltyAccountId': accountingMappings.incomeFromGoodwillCreditPenaltyAccount ? accountingMappings.incomeFromGoodwillCreditPenaltyAccount.id : '', 'advancedAccountingRules': (this.loanProductsTemplate.paymentChannelToFundSourceMappings || this.loanProductsTemplate.feeToIncomeAccountMappings || this.loanProductsTemplate.penaltyToIncomeAccountMappings) ? true : false }); @@ -123,6 +126,9 @@ export class LoanProductAccountingStepComponent implements OnInit { this.loanProductAccountingForm.addControl('incomeFromChargeOffPenaltyAccountId', new FormControl('', Validators.required)); this.loanProductAccountingForm.addControl('incomeFromChargeOffFeesAccountId', new FormControl('', Validators.required)); this.loanProductAccountingForm.addControl('incomeFromChargeOffInterestAccountId', new FormControl('', Validators.required)); + this.loanProductAccountingForm.addControl('incomeFromGoodwillCreditInterestAccountId', new FormControl('', Validators.required)); + this.loanProductAccountingForm.addControl('incomeFromGoodwillCreditFeesAccountId', new FormControl('', Validators.required)); + this.loanProductAccountingForm.addControl('incomeFromGoodwillCreditPenaltyAccountId', new FormControl('', Validators.required)); this.loanProductAccountingForm.get('advancedAccountingRules').valueChanges .subscribe((advancedAccountingRules: boolean) => { @@ -153,6 +159,9 @@ export class LoanProductAccountingStepComponent implements OnInit { this.loanProductAccountingForm.removeControl('incomeFromChargeOffPenaltyAccountId'); this.loanProductAccountingForm.removeControl('incomeFromChargeOffFeesAccountId'); this.loanProductAccountingForm.removeControl('incomeFromChargeOffInterestAccountId'); + this.loanProductAccountingForm.removeControl('incomeFromGoodwillCreditInterestAccountId'); + this.loanProductAccountingForm.removeControl('incomeFromGoodwillCreditFeesAccountId'); + this.loanProductAccountingForm.removeControl('incomeFromGoodwillCreditPenaltyAccountId'); } if (accountingRule === 3 || accountingRule === 4) { diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-preview-step/loan-product-preview-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-preview-step/loan-product-preview-step.component.html index 4816c9475..5882538d3 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-preview-step/loan-product-preview-step.component.html +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-preview-step/loan-product-preview-step.component.html @@ -635,6 +635,12 @@ {{ loanProduct.incomeFromChargeOffFeesAccountId | find:loanProductsTemplate.accountingMappingOptions.incomeAccountOptions:'id':'name' }} Income from ChargeOff Penalty: {{ loanProduct.incomeFromChargeOffPenaltyAccountId | find:loanProductsTemplate.accountingMappingOptions.incomeAccountOptions:'id':'name' }} + Income from Goodwill Credit Interest: + {{ loanProduct.incomeFromGoodwillCreditInterestAccountId | find:loanProductsTemplate.accountingMappingOptions.incomeAccountOptions:'id':'name' }} + Income from Goodwill Credit Fees: + {{ loanProduct.incomeFromGoodwillCreditFeesAccountId | find:loanProductsTemplate.accountingMappingOptions.incomeAccountOptions:'id':'name' }} + Income from Goodwill Credit Penalty: + {{ loanProduct.incomeFromGoodwillCreditPenaltyAccountId | find:loanProductsTemplate.accountingMappingOptions.incomeAccountOptions:'id':'name' }}

Expenses