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 78f6c3275..390e9cb71 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 @@ -107,7 +107,7 @@ export class LoanProductAccountingStepComponent implements OnInit { this.formBuilder.array((this.loanProductsTemplate.penaltyToIncomeAccountMappings || []).map((penaltyIncome: any) => ({ chargeId: penaltyIncome.charge.id, incomeAccountId: penaltyIncome.incomeAccount.id })))); this.loanProductAccountingForm.setControl('chargeOffReasonsToExpenseMappings', - this.formBuilder.array((this.loanProductsTemplate.chargeOffReasonsToExpenseMappings || []).map((m: ChargeOffReasonsToGLAccountMapping) => + this.formBuilder.array((this.loanProductsTemplate.chargeOffReasonToGLAccountMappings || []).map((m: ChargeOffReasonsToGLAccountMapping) => ({ chargeOffReasonCodeValueId: m.chargeOffReasonsCodeValue.id, expenseGLAccountId: m.chargeOffExpenseAccount.id })))); } } @@ -324,27 +324,25 @@ export class LoanProductAccountingStepComponent implements OnInit { } getChargeOffReasonExpenseFormfields(values?: any) { - if (values != null) { - const formfields: FormfieldBase[] = [ - new SelectBase({ - controlName: 'chargeOffReasonCodeValueId', - label: 'Charge-off reason', - value: values ? values.chargeOffReasonCodeValueId : this.chargeOffReasonOptions[0].id, - options: { label: 'name', value: 'id', data: this.chargeOffReasonOptions }, - required: true, - order: 1 - }), - new SelectBase({ - controlName: 'expenseGLAccountId', - label: 'Expense Account', - value: values ? values.expenseGLAccountId : this.expenseAccountData[0].id, - options: { label: 'name', value: 'id', data: this.expenseAccountData }, - required: true, - order: 2 - }) - ]; - return formfields; - } + const formfields: FormfieldBase[] = [ + new SelectBase({ + controlName: 'chargeOffReasonCodeValueId', + label: 'Charge-off reason', + value: values ? values.chargeOffReasonCodeValueId : this.chargeOffReasonOptions[0].id, + options: { label: 'name', value: 'id', data: this.chargeOffReasonOptions }, + required: true, + order: 1 + }), + new SelectBase({ + controlName: 'expenseGLAccountId', + label: 'Expense Account', + value: values ? values.expenseGLAccountId : this.expenseAccountData[0].id, + options: { label: 'name', value: 'id', data: this.expenseAccountData }, + required: true, + order: 2 + }) + ]; + return formfields; } get isAccountingAccrualBased() { diff --git a/src/app/savings/savings-account-view/transactions/view-transaction/savings-transaction-general-tab/savings-transaction-general-tab.component.html b/src/app/savings/savings-account-view/transactions/view-transaction/savings-transaction-general-tab/savings-transaction-general-tab.component.html index ded96a790..2ee09e3eb 100644 --- a/src/app/savings/savings-account-view/transactions/view-transaction/savings-transaction-general-tab/savings-transaction-general-tab.component.html +++ b/src/app/savings/savings-account-view/transactions/view-transaction/savings-transaction-general-tab/savings-transaction-general-tab.component.html @@ -45,7 +45,7 @@