From 30c1085b458f27234dc0ebc3bb703bdb05c2fff5 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: Thu, 13 Apr 2023 14:41:07 -0600 Subject: [PATCH] Fix charge payment method edition (#1738) Co-authored-by: Jose Alberto Hernandez --- .../approve-loan/approve-loan.component.ts | 2 +- .../loan-account-actions/disburse/disburse.component.ts | 2 +- src/app/products/charges/edit-charge/edit-charge.component.ts | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.ts b/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.ts index 190ce96bf..c7e5e0ce7 100644 --- a/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.ts +++ b/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.ts @@ -65,7 +65,7 @@ export class ApproveLoanComponent implements OnInit { */ setApproveLoanForm() { this.approveLoanForm = this.formBuilder.group({ - 'approvedOnDate': [this.loanData.approvalDate && new Date(this.loanData.approvalDate), Validators.required], + 'approvedOnDate': [this.settingsService.businessDate, Validators.required], 'expectedDisbursementDate': [''], 'approvedLoanAmount': [this.loanData.approvalAmount, Validators.required], 'note': [''] diff --git a/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.ts b/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.ts index 8288b4837..bc816cef1 100644 --- a/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.ts +++ b/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.ts @@ -54,7 +54,7 @@ export class DisburseComponent implements OnInit { * and initialize with the required values */ ngOnInit() { - this.maxDate = this.settingsService.businessDate; + this.maxDate = this.settingsService.maxFutureDate; this.createDisbursementLoanForm(); this.setDisbursementLoanDetails(); } diff --git a/src/app/products/charges/edit-charge/edit-charge.component.ts b/src/app/products/charges/edit-charge/edit-charge.component.ts index 426c615f8..59df9aaa8 100644 --- a/src/app/products/charges/edit-charge/edit-charge.component.ts +++ b/src/app/products/charges/edit-charge/edit-charge.component.ts @@ -149,8 +149,7 @@ export class EditChargeComponent implements OnInit { submit() { const charges = this.chargeForm.getRawValue(); charges.locale = this.settingsService.language.code; - charges.chargePaymentMode = this.chargeData.chargePaymentMode.id; - if(charges.taxGroupId.value===''){ + if (charges.taxGroupId.value === '') { delete charges.taxGroupId; } this.productsService.updateCharge(this.chargeData.id.toString(), charges)