merging dev into openapi-integration (#2600)

Author: gkbishnoi07

src/app/accounting/create-journal-entry/create-journal-entry.component.ts

@@ -196,17 +196,15 @@ export class CreateJournalEntryComponent implements OnInit, AfterViewInit {
     if (!journalEntry['externalAssetOwner']) {
       delete journalEntry['externalAssetOwner'];
     }
-    this.journalEntriesService
-      .createGLJournalEntry({ journalEntryCommand: journalEntry })
-      .subscribe((response: any) => {
-        this.router.navigate(
-          [
-            '../transactions/view',
-            response.transactionId
-          ],
-          { relativeTo: this.route }
-        );
-      });
+    this.journalEntriesService.createGLJournalEntry(journalEntry).subscribe((response) => {
+      this.router.navigate(
+        [
+          '../transactions/view',
+          response.transactionId
+        ],
+        { relativeTo: this.route }
+      );
+    });
   }
 
   /**

src/app/customApis.service.ts

@@ -82,6 +82,10 @@ export class LoansService {
   deleteLoanNote(loanId: string, noteId: string) {
     return this.http.delete(`/loans/${loanId}/notes/${noteId}`);
   }
+
+  getBuyDownFeeData(loanId: string): Observable<any> {
+    return this.http.get(`/loans/${loanId}/buydown-fees`);
+  }
 }
 
 @Injectable({

src/app/loans/common-resolvers/loan-buy-down-fees-data.resolver.ts

@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { LoansService } from 'app/customApis.service';
+
+@Injectable()
+export class LoanBuyDownFeesDataResolver implements Resolve<Object> {
+  constructor(private loansService: LoansService) {}
+
+  resolve(route: ActivatedRouteSnapshot): Observable<any> {
+    const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
+
+    if (!loanId) {
+      console.error('LoanBuyDownFeesDataResolver: Could not find loanId in route parameters');
+      return new Observable((observer) => {
+        observer.next([]);
+        observer.complete();
+      });
+    }
+
+    return this.loansService.getBuyDownFeeData(loanId);
+  }
+}

src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts

@@ -357,20 +357,16 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
     this.setLoanTermListener();
 
     this.loansAccountTermsForm.removeControl('maxOutstandingLoanBalance');
-    const maxOutstandingLoanBalance =
-      this.loansAccountTermsData && this.loansAccountTermsData.maxOutstandingLoanBalance != null
-        ? this.loansAccountTermsData.maxOutstandingLoanBalance
-        : '';
     if (this.allowAddDisbursementDetails()) {
       this.loansAccountTermsForm.removeControl('maxOutstandingLoanBalance');
       this.loansAccountTermsForm.addControl(
         'maxOutstandingLoanBalance',
-        new UntypedFormControl(maxOutstandingLoanBalance, Validators.required)
+        new UntypedFormControl(this.loansAccountTermsData.maxOutstandingLoanBalance, Validators.required)
       );
     } else {
       this.loansAccountTermsForm.addControl(
         'maxOutstandingLoanBalance',
-        new UntypedFormControl(maxOutstandingLoanBalance)
+        new UntypedFormControl(this.loansAccountTermsData.maxOutstandingLoanBalance)
       );
     }
   }

src/app/loans/loans-account-stepper/loans-active-client-members/loans-active-client-members.component.ts

@@ -65,13 +65,10 @@ export class LoansActiveClientMembersComponent implements OnInit {
   ];
 
   ngOnInit(): void {
-    // console.log("Active Client Members in LoansActiveClientMembersComponent:", this.activeClientMembers);
-
     this.dataSource = new MatTableDataSource<any>(this.activeClientMembers);
   }
 
   get isValid() {
-    // console.log("LoansActiveClientMembersComponent isValid:", this.selectedClientMembers?.selectedMembers?.reduce((acc: any, cur: any) => acc + (cur.principal ?? 0), 0) > 0);
     return (
       !this.activeClientMembers ||
       this.selectedClientMembers?.selectedMembers?.reduce((acc: any, cur: any) => acc + (cur.principal ?? 0), 0) > 0

src/app/loans/loans-routing.module.ts

@@ -28,6 +28,7 @@ import { ViewRecieptComponent } from './loans-view/transactions/view-reciept/vie
 import { ExportTransactionsComponent } from './loans-view/transactions/export-transactions/export-transactions.component';
 import { GlimAccountComponent } from './glim-account/glim-account.component';
 import { CreateGlimAccountComponent } from './glim-account/create-glim-account/create-glim-account.component';
+import { LoanBuyDownFeesTabComponent } from './loans-view/loan-buy-down-fees-tab/loan-buy-down-fees-tab.component';
 
 /** Custom Resolvers */
 import { LoanDetailsResolver } from './common-resolvers/loan-details.resolver';
@@ -64,6 +65,7 @@ import { LoanTermVariationsTabComponent } from './loans-view/loan-term-variation
 import { LoanTermVariationsResolver } from './common-resolvers/loan-term-variations.resolver';
 import { LoanDeferredIncomeTabComponent } from './loans-view/loan-deferred-income-tab/loan-deferred-income-tab.component';
 import { LoanDeferredIncomeDataResolver } from './common-resolvers/loan-deferred-income-data.resolver';
+import { LoanBuyDownFeesDataResolver } from './common-resolvers/loan-buy-down-fees-data.resolver';
 
 /** Loans Route. */
 const routes: Routes = [
@@ -260,6 +262,14 @@ const routes: Routes = [
                 }
               }
             ]
+          },
+          {
+            path: 'buy-down-fees',
+            component: LoanBuyDownFeesTabComponent,
+            data: { title: 'Buy Down Fees', breadcrumb: 'Buy Down Fees', routeParamBreadcrumb: false },
+            resolve: {
+              loanBuyDownFeesData: LoanBuyDownFeesDataResolver
+            }
           }
         ]
       },
@@ -407,7 +417,8 @@ const routes: Routes = [
     ExternalAssetOwnerResolver,
     LoanDelinquencyDataResolver,
     LoanTermVariationsResolver,
-    LoanDeferredIncomeDataResolver
+    LoanDeferredIncomeDataResolver,
+    LoanBuyDownFeesDataResolver
   ]
 })
 export class LoansRoutingModule {}

src/app/loans/loans-view/account-details/account-details.component.html

@@ -123,6 +123,11 @@ <h3>{{ 'labels.heading.Loan Details' | translate }}</h3>
       <span class="flex-50"> {{ loanDetails.buyDownFeeIncomeType?.value | translateKey: 'catalogs' }} </span>
     </div>
 
+    <div class="flex-fill layout-row" *ngIf="loanDetails.enableBuyDownFee">
+      <span class="flex-50"> {{ 'labels.inputs.Merchant Buy down fee' | translate }}</span>
+      <span class="flex-50"> {{ loanDetails.merchantBuyDownFee | yesNo }} </span>
+    </div>
+
     <div class="flex-fill layout-row">
       <span class="flex-50"> {{ 'labels.inputs.Grace: On Principal Payment' | translate }}</span>
       <span class="flex-50"> {{ loanDetails.graceOnPrincipalPayment }} </span>

src/app/loans/loans-view/loan-buy-down-fees-tab/loan-buy-down-fees-tab.component.html

@@ -0,0 +1,60 @@
+<div class="container">
+  <h3>{{ 'labels.heading.Buy Down Fees' | translate }}</h3>
+
+  <div *ngIf="isLoading" class="loading-indicator">
+    <mat-spinner diameter="30"></mat-spinner>
+  </div>
+
+  <div *ngIf="!isLoading">
+    <div *ngIf="buyDownFeeData.length === 0" class="no-data">
+      {{ 'labels.messages.No Data Found' | translate }}
+    </div>
+
+    <table mat-table [dataSource]="buyDownFeeData" *ngIf="buyDownFeeData.length > 0">
+      <ng-container matColumnDef="buyDownFeeDate">
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.heading.Date' | translate }}</th>
+        <td mat-cell *matCellDef="let item">
+          {{ item.buyDownFeeDate | dateFormat }}
+        </td>
+      </ng-container>
+
+      <ng-container matColumnDef="buyDownFeeAmount">
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.heading.Fee Amount' | translate }}</th>
+        <td mat-cell class="r-amount" *matCellDef="let item">
+          {{ item.buyDownFeeAmount | formatNumber: '0.00' }}
+        </td>
+      </ng-container>
+
+      <ng-container matColumnDef="amortizedAmount">
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.heading.Amortized Amount' | translate }}</th>
+        <td mat-cell class="r-amount" *matCellDef="let item">
+          {{ item.amortizedAmount | formatNumber: '0.00' }}
+        </td>
+      </ng-container>
+
+      <ng-container matColumnDef="notYetAmortizedAmount">
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.heading.Not Yet Amortized Amount' | translate }}</th>
+        <td mat-cell class="r-amount" *matCellDef="let item">
+          {{ item.notYetAmortizedAmount | formatNumber: '0.00' }}
+        </td>
+      </ng-container>
+
+      <ng-container matColumnDef="adjustedAmount">
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.heading.Adjusted Amount' | translate }}</th>
+        <td mat-cell class="r-amount" *matCellDef="let item">
+          {{ item.adjustedAmount | formatNumber: '0.00' }}
+        </td>
+      </ng-container>
+
+      <ng-container matColumnDef="chargedOffAmount">
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.heading.Charged Off Amount' | translate }}</th>
+        <td mat-cell class="r-amount" *matCellDef="let item">
+          {{ item.chargedOffAmount | formatNumber: '0.00' }}
+        </td>
+      </ng-container>
+
+      <tr mat-header-row *matHeaderRowDef="buyDownFeeColumns"></tr>
+      <tr mat-row *matRowDef="let row; columns: buyDownFeeColumns"></tr>
+    </table>
+  </div>
+</div>

src/app/loans/loans-view/loan-buy-down-fees-tab/loan-buy-down-fees-tab.component.scss

@@ -0,0 +1,106 @@
+import { Component, OnInit } from '@angular/core';
+import {
+  MatCell,
+  MatCellDef,
+  MatColumnDef,
+  MatHeaderCell,
+  MatHeaderCellDef,
+  MatHeaderRow,
+  MatHeaderRowDef,
+  MatRow,
+  MatRowDef,
+  MatTable
+} from '@angular/material/table';
+import { ActivatedRoute } from '@angular/router';
+import { FormatNumberPipe } from '@pipes/format-number.pipe';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { LoansService } from 'app/customApis.service';
+import { BuyDownFeeAmortizationDetails } from '../../models/loan-account.model';
+import { DateFormatPipe } from '@pipes/date-format.pipe';
+
+@Component({
+  selector: 'mifosx-loan-buy-down-fees-tab',
+  templateUrl: './loan-buy-down-fees-tab.component.html',
+  styleUrl: './loan-buy-down-fees-tab.component.scss',
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    MatTable,
+    MatColumnDef,
+    MatHeaderCellDef,
+    MatHeaderCell,
+    MatCellDef,
+    MatCell,
+    MatHeaderRowDef,
+    MatHeaderRow,
+    MatRowDef,
+    MatRow,
+    FormatNumberPipe,
+    DateFormatPipe
+  ]
+})
+export class LoanBuyDownFeesTabComponent implements OnInit {
+  buyDownFeeData: BuyDownFeeAmortizationDetails[] = [];
+  loanId: string;
+  isLoading = true;
+
+  buyDownFeeColumns: string[] = [
+    'buyDownFeeDate',
+    'buyDownFeeAmount',
+    'amortizedAmount',
+    'notYetAmortizedAmount',
+    'adjustedAmount',
+    'chargedOffAmount'
+  ];
+
+  constructor(
+    private route: ActivatedRoute,
+    private loansService: LoansService
+  ) {}
+
+  ngOnInit(): void {
+    this.getLoanId();
+    this.loadBuyDownFees();
+  }
+
+  private getLoanId(): void {
+    if (this.route.snapshot.data && this.route.snapshot.data['loanId']) {
+      this.loanId = this.route.snapshot.data['loanId'];
+      return;
+    }
+
+    let currentRoute = this.route;
+    while (currentRoute) {
+      if (currentRoute.snapshot.paramMap.has('loanId')) {
+        this.loanId = currentRoute.snapshot.paramMap.get('loanId');
+        return;
+      }
+      if (currentRoute.parent) {
+        currentRoute = currentRoute.parent;
+      } else {
+        break;
+      }
+    }
+
+    console.error('Could not find loanId in route parameters');
+  }
+
+  private loadBuyDownFees(): void {
+    if (!this.loanId) {
+      console.error('Cannot load buy down fees: loanId is undefined');
+      this.isLoading = false;
+      return;
+    }
+
+    this.isLoading = true;
+    this.loansService.getBuyDownFeeData(this.loanId).subscribe({
+      next: (data: BuyDownFeeAmortizationDetails[]) => {
+        this.buyDownFeeData = data || [];
+        this.isLoading = false;
+      },
+      error: (error) => {
+        console.error('Error loading buy down fees:', error);
+        this.isLoading = false;
+      }
+    });
+  }
+}