Merge branch 'master' into fix/glentries_accounting

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();
+  });
+});

src/app/core/utils/dates.ts

@@ -20,4 +20,3 @@ export class Dates {
   }
 
 }
-

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') {

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>

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();
   }
 
   /**