WEB-657: Working Capital Loan Discount Fee update

Author: alberto-art3ch

src/app/loans/loans-view/loan-account-actions/update-discount/update-discount.component.html

@@ -14,7 +14,7 @@
           <mifosx-input-amount
             [currency]="currency"
             [isRequired]="true"
-            [inputFormControl]="updateDiscountForm.controls.transactionAmount"
+            [inputFormControl]="updateDiscountForm.controls.discountAmount"
             [inputLabel]="'Discount'"
           >
           </mifosx-input-amount>

src/app/loans/loans-view/loan-account-actions/update-discount/update-discount.component.ts

@@ -18,9 +18,9 @@ import { amountValueValidator } from 'app/shared/validators/amount-value.validat
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { CdkTextareaAutosize } from '@angular/cdk/text-field';
 import { LoanAccountActionsBaseComponent } from '../loan-account-actions-base.component';
-import { WorkingCapitalLoanDiscountUpdateRequest } from 'app/loans/loans.service';
 import { Currency } from 'app/shared/models/general.model';
 import { InputAmountComponent } from 'app/shared/input-amount/input-amount.component';
+import { WorkingCapitalLoanDiscountUpdateRequest } from 'app/loans/models/working-capital/working-capital-loan-account.model';
 
 /**
  * Update discount action for Working Capital Loan.
@@ -60,7 +60,7 @@ export class UpdateDiscountComponent extends LoanAccountActionsBaseComponent imp
       this.disbursementTransactionId = this.dataObject?.transactions?.[0].id;
     }
     this.updateDiscountForm = this.formBuilder.group({
-      transactionAmount: [
+      discountAmount: [
         this.dataObject?.discount ?? this.dataObject?.discountAmount ?? '',
         [
           Validators.required,
@@ -84,14 +84,14 @@ export class UpdateDiscountComponent extends LoanAccountActionsBaseComponent imp
 
     const formValue = this.updateDiscountForm.value;
     const payload: WorkingCapitalLoanDiscountUpdateRequest = {
-      transactionAmount: Number(formValue.transactionAmount),
+      discountAmount: Number(formValue.discountAmount),
       relatedResourceId: this.disbursementTransactionId,
       note: formValue.note,
       locale: this.settingsService.language.code,
       dateFormat: this.settingsService.dateFormat
     };
 
-    this.loanService.applyWorkingCapitalLoanAccountCommand(this.loanId, 'discountfee', payload).subscribe({
+    this.loanService.updateWorkingCapitalDiscount(this.loanId, payload).subscribe({
       next: () => {
         this.alertService.alert({
           type: 'Success',

src/app/loans/loans.service.ts

@@ -16,14 +16,6 @@ import { Dates } from 'app/core/utils/dates';
 import { SettingsService } from 'app/settings/settings.service';
 import { DisbursementData } from './models/loan-account.model';
 
-export interface WorkingCapitalLoanDiscountUpdateRequest {
-  transactionAmount: number;
-  relatedResourceId: number;
-  note?: string;
-  locale: string;
-  dateFormat: string;
-}
-
 /**
  * Loans service.
  */
@@ -859,4 +851,11 @@ export class LoansService {
   addWorkingCapitalPeriodPaymentRate(loanId: any, payload: any) {
     return this.http.put(`/working-capital-loans/${loanId}/payment-rate`, payload);
   }
+
+  /**
+   * Update Working Capital Loan Discount Fee
+   */
+  updateWorkingCapitalDiscount(loanId: any, payload: any) {
+    return this.http.put(`/working-capital-loans/${loanId}/discount`, payload);
+  }
 }

src/app/loans/models/working-capital/working-capital-loan-account.model.ts

@@ -44,3 +44,11 @@ export interface WorkingCapitalBalances {
   unrealizedIncome: number;
   overpaymentAmount: number;
 }
+
+export interface WorkingCapitalLoanDiscountUpdateRequest {
+  discountAmount: number;
+  relatedResourceId: number;
+  note?: string;
+  locale: string;
+  dateFormat: string;
+}