feat: add client charge payment component (#690)

Fixes: #689

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

@@ -45,6 +45,8 @@ import { ClientActionsResolver } from './common-resolvers/client-actions.resolve
 import { TakeSurveyResolver } from './common-resolvers/take-survey.resolver';
 import { ViewChargeComponent } from './clients-view/view-charge/view-charge.component';
 import { ClientChargeViewResolver } from './common-resolvers/client-charge-view.resolver';
+import { ClientPayChargesComponent } from './clients-view/client-pay-charges/client-pay-charges.component';
+import { ClientTransactionPayResolver } from './common-resolvers/client-transaction-pay.resolver';
 
 const routes: Routes = [
   Route.withShell([{
@@ -246,7 +248,8 @@ const routes: Routes = [
     ClientChargeOverviewResolver,
     ClientActionsResolver,
     TakeSurveyResolver,
-    ClientChargeViewResolver
+    ClientChargeViewResolver,
+    ClientTransactionPayResolver
   ]
 })
 export class ClientsRoutingModule { }

src/app/clients/clients-view/client-pay-charges/client-pay-charges.component.html

@@ -0,0 +1,34 @@
+<div class="tab-container mat-typography">
+
+  <form [formGroup]="transactionForm" (ngSubmit)="submit()">
+
+    <div fxLayout="column">
+
+      <mat-form-field>
+        <mat-label> Amount </mat-label>
+        <input matInput required autofocus formControlName="amount">
+        <mat-error *ngIf="transactionForm.controls.amount.hasError('required')">
+          Amount <strong>is required</strong>
+        </mat-error>
+      </mat-form-field>
+
+      <mat-form-field>
+        <mat-label> Transaction date </mat-label>
+        <input matInput [min]="minDate" [matDatepicker]="transactionDatePicker" required formControlName="transactionDate">
+        <mat-datepicker-toggle matSuffix [for]="transactionDatePicker"></mat-datepicker-toggle>
+        <mat-datepicker #transactionDatePicker></mat-datepicker>
+        <mat-error *ngIf="transactionForm.controls.transactionDate.hasError('required')">
+          Transaction date <strong>is required</strong>
+        </mat-error>
+      </mat-form-field>
+
+    </div>
+
+    <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
+      <button type="button" mat-raised-button [routerLink]="['../','general']">Cancel</button>
+      <button mat-raised-button color="primary" [disabled]="!transactionForm.valid">Submit</button>
+    </div>
+
+  </form>
+
+</div>

src/app/clients/clients-view/client-pay-charges/client-pay-charges.component.scss

@@ -0,0 +1,4 @@
+.tab-container {
+    padding: 1%;
+    margin: 1%;
+}

src/app/clients/clients-view/client-pay-charges/client-pay-charges.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ClientPayChargesComponent } from './client-pay-charges.component';
+
+describe('ClientPayChargesComponent', () => {
+  let component: ClientPayChargesComponent;
+  let fixture: ComponentFixture<ClientPayChargesComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ClientPayChargesComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ClientPayChargesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/clients/clients-view/client-pay-charges/client-pay-charges.component.ts

@@ -0,0 +1,77 @@
+/** Angular Imports */
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder, Validators } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import { DatePipe } from '@angular/common';
+
+/** Custom Services. */
+import { ClientsService } from 'app/clients/clients.service';
+
+/**
+ * Client Pay Charge component.
+ */
+@Component({
+  selector: 'mifosx-client-pay-charges',
+  templateUrl: './client-pay-charges.component.html',
+  styleUrls: ['./client-pay-charges.component.scss']
+})
+export class ClientPayChargesComponent implements OnInit {
+
+  /** Transaction Form. */
+  transactionForm: any;
+  /** Transaction Data. */
+  transactionData: any;
+  /** Minimum Date allowed. */
+  minDate = new Date(2000, 0, 1);
+
+    /**
+     * Retrieves the charge data from `resolve`.
+     * @param {ClientService} clientService Products Service.
+     * @param {FormBuilder} formBuilder Form Builder.
+     * @param {ActivatedRoute} route Activated Route.
+     * @param {Router} router Router for navigation.
+     */
+  constructor(
+    private clientsService: ClientsService,
+    private formBuilder: FormBuilder,
+    private route: ActivatedRoute,
+    private router: Router,
+    private datePipe: DatePipe
+  ) {
+    this.route.data.subscribe((data: { transactionData: any }) => {
+      this.transactionData = data.transactionData;
+    });
+  }
+
+  ngOnInit() {
+    this.setTransactionForm();
+  }
+
+  /**
+   * Set Transaction Form.
+   */
+  setTransactionForm() {
+    this.transactionForm = this.formBuilder.group({
+      'amount': [this.transactionData.amount, Validators.required],
+      'transactionDate': [new Date(), Validators.required]
+    });
+  }
+
+  /**
+   * Submits Transaction form.
+   */
+  submit() {
+    const transactionDate = this.transactionForm.value.transactionDate;
+    const dateFormat = 'yyyy-MM-dd';
+    this.transactionForm.patchValue({
+      transactionDate: this.datePipe.transform(transactionDate, dateFormat)
+    });
+    const transactions = this.transactionForm.value;
+    transactions.locale = 'en';
+    transactions.dateFormat = dateFormat;
+    this.clientsService.payClientCharge(this.transactionData.clientId, this.transactionData.id, transactions).subscribe(() => {
+      this.router.navigate(['../', 'general']);
+    });
+  }
+
+}

src/app/clients/clients-view/general-tab/general-tab.component.html

@@ -157,6 +157,7 @@
     <tr mat-header-row *matHeaderRowDef="openLoansColumns"></tr>
     <tr mat-row *matRowDef="let row; columns: openLoansColumns;"
       [routerLink]="['../', 'loans', row.id, 'general']" class="select-row"></tr>
+    <tr mat-row *matRowDef="let row; columns: openLoansColumns;" [routerLink]="['../paycharge',row.id]"></tr>
   </table>
 
   <!-- Closed Loan Accounts -->

src/app/clients/clients.module.ts

@@ -43,6 +43,7 @@ import { ReactivateClientComponent } from './clients-view/client-actions/reactiv
 import { UndoClientRejectionComponent } from './clients-view/client-actions/undo-client-rejection/undo-client-rejection.component';
 import { AddClientChargeComponent } from './clients-view/client-actions/add-client-charge/add-client-charge.component';
 import { ViewChargeComponent } from './clients-view/view-charge/view-charge.component';
+import { ClientPayChargesComponent } from './clients-view/client-pay-charges/client-pay-charges.component';
 
 
 /**
@@ -91,7 +92,8 @@ import { ViewChargeComponent } from './clients-view/view-charge/view-charge.comp
     ReactivateClientComponent,
     UndoClientRejectionComponent,
     AddClientChargeComponent,
-    ViewChargeComponent
+    ViewChargeComponent,
+    ClientPayChargesComponent
   ],
   entryComponents: [
     UploadDocumentDialogComponent,

src/app/clients/clients.service.ts

@@ -122,6 +122,24 @@ export class ClientsService {
     return this.http.delete(`/clients/${clientId}/charges/${chargeId}?associations=all`);
   }
 
+  /*
+   * @param clientId Client Id of payer.
+   * @param chargeId Charge Id of the charge to be paid.
+   */
+  getClientTransactionPay(clientId: string, chargeId: string) {
+    return this.http.get(`/clients/${clientId}/charges/${chargeId}`);
+  }
+
+  /**
+   * @param clientId Client Id of the payment.
+   * @param chargeId Charge Id of the payment.
+   * @param payment  Client Payment data.
+   */
+  payClientCharge(clientId: string, chargeId: string, payment: any) {
+    const httpParams = new HttpParams().set('command', 'paycharge');
+    return this.http.post(`/clients/${clientId}/charges/${chargeId}?command=paycharge`, payment, { params: httpParams });
+  }
+
   getClientSummary(clientId: string) {
     const httpParams = new HttpParams().set('R_clientId', clientId)
       .set('genericResultSet', 'false');

src/app/clients/common-resolvers/client-transaction-pay.resolver.ts

@@ -0,0 +1,32 @@
+/** Angular Imports */
+import { Injectable } from '@angular/core';
+import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
+
+/** rxjs Imports */
+import { Observable } from 'rxjs';
+
+/** Custom Services */
+import { ClientsService } from '../clients.service';
+
+/**
+ * Client Transaction data resolver.
+ */
+@Injectable()
+export class ClientTransactionPayResolver implements Resolve<Object> {
+
+    /**
+     * @param {ClientsService} ClientsService Clients service.
+     */
+    constructor(private clientsService: ClientsService) { }
+
+    /**
+     * Returns the Client Transaction data.
+     * @returns {Observable<any>}
+     */
+    resolve(route: ActivatedRouteSnapshot): Observable<any> {
+        const clientId = route.parent.parent.parent.paramMap.get('clientId');
+        const chargeId = route.paramMap.get('chargeId');
+      return this.clientsService.getClientTransactionPay(clientId, chargeId);
+    }
+
+}