From 2ff463438c31254a490974ea93072fe04db2b251 Mon Sep 17 00:00:00 2001
From: Jose Alberto Hernandez <alberto@MacBook-Pro.local>
Date: Wed, 25 May 2022 15:16:19 -0500
Subject: [PATCH] Fix for Loan repayment issues

---
 src/app/core/utils/dates.spec.ts                |  7 +++++++
 src/app/core/utils/dates.ts                     | 17 +++++++++++++++++
 .../loan-action-button.resolver.ts              |  4 ++--
 .../make-repayment.component.html               |  2 +-
 .../make-repayment/make-repayment.component.ts  |  2 +-
 5 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 src/app/core/utils/dates.spec.ts
 create mode 100644 src/app/core/utils/dates.ts

diff --git a/src/app/core/utils/dates.spec.ts b/src/app/core/utils/dates.spec.ts
new file mode 100644
index 000000000..972af6bdc
--- /dev/null
+++ b/src/app/core/utils/dates.spec.ts
@@ -0,0 +1,7 @@
+import { Dates } from './dates';
+
+describe('Dates', () => {
+  it('should create an instance', () => {
+    expect(new Dates()).toBeTruthy();
+  });
+});
diff --git a/src/app/core/utils/dates.ts b/src/app/core/utils/dates.ts
new file mode 100644
index 000000000..4641858ca
--- /dev/null
+++ b/src/app/core/utils/dates.ts
@@ -0,0 +1,17 @@
+import { DatePipe } from '@angular/common';
+import { Injectable } from '@angular/core';
+import { SettingsService } from 'app/settings/settings.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class Dates {
+
+  constructor(private settingsService: SettingsService,
+      private datePipe: DatePipe) {}
+
+  public getDate(timestamp: any) {
+    const dateFormat = this.settingsService.dateFormat;
+    return this.datePipe.transform(timestamp, dateFormat);
+  }
+}
diff --git a/src/app/loans/common-resolvers/loan-action-button.resolver.ts b/src/app/loans/common-resolvers/loan-action-button.resolver.ts
index 2707c64ea..48c306823 100644
--- a/src/app/loans/common-resolvers/loan-action-button.resolver.ts
+++ b/src/app/loans/common-resolvers/loan-action-button.resolver.ts
@@ -28,8 +28,8 @@ export class LoanActionButtonResolver implements Resolve<Object> {
         const loanActionButton = route.paramMap.get('action');
         if (loanActionButton === 'Assign Loan Officer' || loanActionButton === 'Change Loan Officer') {
             return this.loansService.getLoanTemplate(loanId);
-        // } else if (loanActionButton === 'make-repayment') {
-        //     return this.loansService.getLoanActionTemplate(loanId, 'repayment');
+        } else if (loanActionButton === 'Make Repayment') {
+            return this.loansService.getLoanActionTemplate(loanId, 'repayment');
         } else if (loanActionButton === 'Waive Interest') {
             return this.loansService.getLoanActionTemplate(loanId, 'waiveinterest');
         } else if (loanActionButton === 'Write Off') {
diff --git a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html
index 7370ca86b..535f45827 100644
--- a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html
+++ b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html
@@ -83,7 +83,7 @@
         </div>
 
         <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
-          <button type="button" mat-raised-button [routerLink]="['../../../general']">Cancel</button>
+          <button type="button" mat-raised-button [routerLink]="['../../general']">Cancel</button>
           <button mat-raised-button color="primary" [disabled]="!repaymentLoanForm.valid"
             *mifosxHasPermission="'REPAYMENT_LOAN'">Submit</button>
         </mat-card-actions>
diff --git a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts
index ff1206640..8d83328e2 100644
--- a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts
+++ b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts
@@ -55,7 +55,7 @@ export class MakeRepaymentComponent implements OnInit {
    */
   ngOnInit() {
     this.createRepaymentLoanForm();
-    // this.setRepaymentLoanDetails();
+    this.setRepaymentLoanDetails();
   }
 
   /**