fix: client charges routing and module structure (#1114)

Fixes: #1113

src/app/clients/clients-view/charges/charges-overview/charge-overview.resolver.ts

@@ -6,7 +6,7 @@ import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { ClientsService } from '../../clients.service';
+import { ClientsService } from '../../../clients.service';
 
 /**
  * Client Charges data resolver.

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

@@ -22,7 +22,7 @@
     </div>
     <div fxLayout="column" fxFlex="50%">
       <div fxLayout="row" fxLayoutAlign="flex-end">
-        <button mat-raised-button class="f-right" color="primary" [routerLink]="['../', 'chargeoverview']">Charges
+        <button mat-raised-button class="f-right" color="primary" [routerLink]="['../', 'charges', 'overview']">Charges
           Overview</button>
       </div>
     </div>
@@ -66,11 +66,11 @@
       <th mat-header-cell *matHeaderCellDef> Actions </th>
       <td mat-cell *matCellDef="let element">
         <button class="account-action-button" mat-raised-button color="primary"
-          [routerLink]="['../','paycharge',element.id]">
+          (click)="routeEdit($event)" [routerLink]="['../','charges', element.id, 'pay']">
           <i class="fa fa-dollar"></i>
         </button>
         <button class="account-action-button" mat-raised-button color="primary"
-          (click)="waiveCharge(element.id,element.clientId)">
+          (click)="routeEdit($event); waiveCharge(element.id,element.clientId)">
           <i class="fa fa-flag"></i>
         </button>
       </td>
@@ -78,7 +78,7 @@
     </ng-container>
 
     <tr mat-header-row *matHeaderRowDef="upcomingChargesColumns"></tr>
-    <tr mat-row *matRowDef="let row; columns: upcomingChargesColumns;" [routerLink]="[routeToCharges,row.id]"></tr>
+    <tr mat-row *matRowDef="let row; columns: upcomingChargesColumns;" [routerLink]="['../','charges',row.id]"></tr>
   </table>
 
 
@@ -157,7 +157,6 @@
     <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-view/general-tab/general-tab.component.ts

@@ -35,8 +35,6 @@ export class GeneralTabComponent {
   showClosedFixedAccounts = false;
 
   clientid: any;
-  /** Route to Charges */
-  routeToCharges: any;
 
   constructor(
     private route: ActivatedRoute,
@@ -51,11 +49,6 @@ export class GeneralTabComponent {
       this.clientSummary = data.clientSummary[0];
       this.clientid = this.route.parent.snapshot.params['clientId'];
   });
-
-    /** Get Client Id and generate the route link. */
-    this.route.parent.params.subscribe((params: any) => {
-      this.routeToCharges = '../../' + params.clientId + '/charges';
-    });
   }
 
   toggleLoanAccountsOverview() {