WEB-1271: Working Capital Loan discount fee uses the active disbursement and shows its date

Author: oleksii-novikov-onix

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

@@ -19,6 +19,11 @@
           >
           </mifosx-input-amount>
 
+          <mat-form-field>
+            <mat-label>{{ 'labels.inputs.Transaction Date' | translate }}</mat-label>
+            <input matInput [value]="disbursementDate | dateFormat" readonly />
+          </mat-form-field>
+
           <mat-form-field>
             <mat-label>{{ 'labels.inputs.External Id' | translate }}</mat-label>
             <input matInput formControlName="externalId" />

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

@@ -20,7 +20,10 @@ import { CdkTextareaAutosize } from '@angular/cdk/text-field';
 import { LoanAccountActionsBaseComponent } from '../loan-account-actions-base.component';
 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';
+import {
+  WorkingCapitalLoanDiscountUpdateRequest,
+  WorkingCapitalLoanTransaction
+} from 'app/loans/models/working-capital/working-capital-loan-account.model';
 
 /**
  * Discount Fee action for Working Capital Loan.
@@ -48,6 +51,7 @@ export class UpdateDiscountComponent extends LoanAccountActionsBaseComponent imp
 
   currency: Currency | null = null;
   disbursementTransactionId: number = 0;
+  disbursementDate: number[] | string | null = null;
 
   constructor() {
     super();
@@ -58,10 +62,14 @@ export class UpdateDiscountComponent extends LoanAccountActionsBaseComponent imp
   isSubmitting = false;
 
   ngOnInit(): void {
-    if (this.dataObject?.content && this.dataObject?.content.length > 0) {
-      const disburseTransaction = this.dataObject?.content[0];
+    const transactions: WorkingCapitalLoanTransaction[] = this.dataObject?.content ?? [];
+    const disburseTransaction = transactions.find(
+      (transaction) => transaction.type?.disbursement && !transaction.reversed
+    );
+    if (disburseTransaction) {
       this.currency = disburseTransaction.currency;
       this.disbursementTransactionId = disburseTransaction.id;
+      this.disbursementDate = disburseTransaction.transactionDate;
     }
     this.updateDiscountForm = this.formBuilder.group({
       transactionAmount: [

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

@@ -7,6 +7,7 @@
  */
 
 import { Currency, PaymentType } from 'app/shared/models/general.model';
+import { LoanTransactionType } from 'app/loans/models/loan-transaction-type.model';
 
 /** Code value option used to populate the charge-off reason dropdown. */
 export interface WorkingCapitalChargeOffReasonOption {
@@ -107,6 +108,14 @@ export interface WorkingCapitalBalances {
   writtenOffOutstanding?: number;
 }
 
+export interface WorkingCapitalLoanTransaction {
+  id: number;
+  type: LoanTransactionType;
+  transactionDate: number[] | string;
+  reversed: boolean;
+  currency: Currency;
+}
+
 export interface WorkingCapitalLoanDiscountUpdateRequest {
   transactionAmount: number;
   relatedResourceId: number;