diff --git a/src/app/loans/loans-view/loans-view.component.html b/src/app/loans/loans-view/loans-view.component.html index e34c56430..3aa702eb5 100644 --- a/src/app/loans/loans-view/loans-view.component.html +++ b/src/app/loans/loans-view/loans-view.component.html @@ -25,13 +25,13 @@ Group Name: {{loanDetailsData.group.name}} Loan Account Classification : {{loanDetailsData?.delinquencyRange.classification}} - - +
+ Past Due Days : {{loanDetailsData?.delinquent.pastDueDays | number}} - - - Delinquent Days : {{loanDetailsData?.delinquent.delinquentDays}} + Delinquent Days : {{loanDetailsData?.delinquent.delinquentDays | number}} diff --git a/src/app/loans/loans-view/loans-view.component.ts b/src/app/loans/loans-view/loans-view.component.ts index 1a87331be..09c6fabdf 100644 --- a/src/app/loans/loans-view/loans-view.component.ts +++ b/src/app/loans/loans-view/loans-view.component.ts @@ -48,7 +48,6 @@ export class LoansViewComponent implements OnInit { } ngOnInit() { - this.recalculateInterest = this.loanDetailsData.recalculateInterest || true; this.status = this.loanDetailsData.status.value; this.setConditionalButtons(); @@ -81,13 +80,14 @@ export class LoansViewComponent implements OnInit { }); } else if (this.status === 'Active') { - - if (this.loanDetailsData.canDisburse) { + if (this.loanDetailsData.canDisburse || this.loanDetailsData.multiDisburseLoan) { this.buttonConfig.addButton({ name: 'Disburse', icon: 'fa fa-flag', taskPermissionName: 'DISBURSE_LOAN' }); + } + if (this.loanDetailsData.canDisburse) { this.buttonConfig.addButton({ name: 'Disburse To Savings', icon: 'fa fa-flag', diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-currency-step/loan-product-currency-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-currency-step/loan-product-currency-step.component.ts index 464f397d7..7d1361673 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-currency-step/loan-product-currency-step.component.ts +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-currency-step/loan-product-currency-step.component.ts @@ -20,21 +20,20 @@ export class LoanProductCurrencyStepComponent implements OnInit { ngOnInit() { this.currencyData = this.loanProductsTemplate.currencyOptions; - this.loanProductCurrencyForm.patchValue({ 'currencyCode': this.loanProductsTemplate.currency.code || this.currencyData[0].code, - 'digitsAfterDecimal': this.loanProductsTemplate.installmentAmountInMultiplesOf ? this.loanProductsTemplate.currency.decimalPlaces : 2, - 'inMultiplesOf': this.loanProductsTemplate.currency.inMultiplesOf, - 'installmentAmountInMultiplesOf': this.loanProductsTemplate.installmentAmountInMultiplesOf + 'digitsAfterDecimal': this.loanProductsTemplate.currency.decimalPlaces ? this.loanProductsTemplate.currency.decimalPlaces : 2, + 'inMultiplesOf': this.loanProductsTemplate.currency.inMultiplesOf ? this.loanProductsTemplate.currency.inMultiplesOf : 1, + 'installmentAmountInMultiplesOf': this.loanProductsTemplate.installmentAmountInMultiplesOf ? this.loanProductsTemplate.installmentAmountInMultiplesOf : 1 }); } createLoanProductCurrencyForm() { this.loanProductCurrencyForm = this.formBuilder.group({ 'currencyCode': ['', Validators.required], - 'digitsAfterDecimal': ['', Validators.required], - 'inMultiplesOf': ['', Validators.required], - 'installmentAmountInMultiplesOf': ['', Validators.required] + 'digitsAfterDecimal': [2, Validators.required], + 'inMultiplesOf': [1, Validators.required], + 'installmentAmountInMultiplesOf': [1, Validators.required] }); }