@@ -52,24 +52,30 @@
| Actions |
-
-
-
-
-
+ |
+
+
+
+
+
+
|
|
- |
+ |
diff --git a/src/app/loans/loans-view/charges-tab/charges-tab.component.scss b/src/app/loans/loans-view/charges-tab/charges-tab.component.scss
index ca97dafbe..558da7bc2 100644
--- a/src/app/loans/loans-view/charges-tab/charges-tab.component.scss
+++ b/src/app/loans/loans-view/charges-tab/charges-tab.component.scss
@@ -1,4 +1,20 @@
-table {
+.tab-container {
+ padding: 1%;
+ margin: 1%;
+ h3 {
+ margin:1% auto;
+ }
+ table {
width: 100%;
margin-top: 3%;
+ .account-action-button{
+ min-width: 26px;
+ padding: 0 6px;
+ margin: 4px;
+ line-height: 25px;
+ }
+ .select-row:hover {
+ cursor: pointer;
+ }
+ }
}
diff --git a/src/app/loans/loans-view/charges-tab/charges-tab.component.ts b/src/app/loans/loans-view/charges-tab/charges-tab.component.ts
index b1e77a783..1a4f290c1 100644
--- a/src/app/loans/loans-view/charges-tab/charges-tab.component.ts
+++ b/src/app/loans/loans-view/charges-tab/charges-tab.component.ts
@@ -1,7 +1,21 @@
/** Angular Imports */
import { Component, OnInit, ViewChild } from '@angular/core';
-import { MatTableDataSource, MatPaginator, MatSort } from '@angular/material';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
+import { MatDialog, MatTableDataSource, MatTable, MatPaginator, MatSort } from '@angular/material';
+import { DatePipe } from '@angular/common';
+
+/** Custom Services */
+import { LoansService } from 'app/loans/loans.service';
+
+/** Custom Dialogs */
+import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
+import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
+import { ConfirmationDialogComponent } from 'app/shared/confirmation-dialog/confirmation-dialog.component';
+
+/** Custom Models */
+import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base';
+import { InputBase } from 'app/shared/form-dialog/formfield/model/input-base';
+import { DatepickerBase } from 'app/shared/form-dialog/formfield/model/datepicker-base';
@Component({
selector: 'mifosx-charges-tab',
@@ -30,7 +44,11 @@ export class ChargesTabComponent implements OnInit {
* Retrieves the loans data from `resolve`.
* @param {ActivatedRoute} route Activated Route.
*/
- constructor(private route: ActivatedRoute) {
+ constructor(private loansService: LoansService,
+ private route: ActivatedRoute,
+ private datePipe: DatePipe,
+ private router: Router,
+ public dialog: MatDialog) {
this.route.data.subscribe(( data: { loanDetailsAssociationData: any }) => {
this.loanDetails = data.loanDetailsAssociationData;
});
@@ -54,4 +72,139 @@ export class ChargesTabComponent implements OnInit {
this.dataSource.sort = this.sort;
}
+ /**
+ * Pays the charge.
+ * @param {any} chargeId Charge Id
+ */
+ payCharge(chargeId: any) {
+ const formfields: FormfieldBase[] = [
+ new InputBase({
+ controlName: 'amount',
+ label: 'Amount',
+ value: '',
+ type: 'number',
+ required: true
+ }),
+ new DatepickerBase({
+ controlName: 'dueDate',
+ label: 'Payment Date',
+ value: '',
+ type: 'date',
+ required: true
+ })
+ ];
+ const data = {
+ title: `Pay Charge ${chargeId}`,
+ layout: { addButtonText: 'Confirm' },
+ formfields: formfields
+ };
+ const payChargeDialogRef = this.dialog.open(FormDialogComponent, { data });
+ payChargeDialogRef.afterClosed().subscribe((response: any) => {
+ if (response.data) {
+ const locale = 'en';
+ const dateFormat = 'dd MMMM yyyy';
+ const dataObject = {
+ ...response.data.value,
+ dueDate: this.datePipe.transform(response.data.value.dueDate, dateFormat),
+ dateFormat,
+ locale
+ };
+ this.loansService.executeLoansAccountChargesCommand(this.loanDetails.id, 'paycharge', dataObject, chargeId)
+ .subscribe(() => {
+ this.reload();
+ });
+ }
+ });
+ }
+
+ /**
+ * Waive's the charge
+ * @param {any} chargeId Charge Id
+ */
+ waiveCharge(chargeId: any) {
+ const waiveChargeDialogRef = this.dialog.open(ConfirmationDialogComponent, { data: { heading: 'Waive Charge', dialogContext: `Are you sure you want to waive charge with id: ${chargeId}`, type: 'Basic' } });
+ waiveChargeDialogRef.afterClosed().subscribe((response: any) => {
+ if (response.confirm) {
+ this.loansService.executeLoansAccountChargesCommand(this.loanDetails.id, 'waive', {}, chargeId)
+ .subscribe(() => {
+ this.reload();
+ });
+ }
+ });
+ }
+
+ /**
+ * Edits the charge
+ * @param {any} charge Charge
+ */
+ editCharge(charge: any) {
+ const formfields: FormfieldBase[] = [
+ new InputBase({
+ controlName: 'amount',
+ label: 'Amount',
+ value: charge.amount || charge.amountOrPercentage,
+ type: 'number',
+ required: true
+ })
+ ];
+ const data = {
+ title: `Edit Charge ${charge.id}`,
+ layout: { addButtonText: 'Confirm' },
+ formfields: formfields
+ };
+ const editChargeDialogRef = this.dialog.open(FormDialogComponent, { data });
+ editChargeDialogRef.afterClosed().subscribe((response: any) => {
+ if (response.data) {
+ const locale = 'en';
+ const dateFormat = 'dd MMMM yyyy';
+ const dataObject = {
+ ...response.data.value,
+ dateFormat,
+ locale
+ };
+ this.loansService.editLoansAccountCharge(this.loanDetails.id, dataObject, charge.id)
+ .subscribe(() => {
+ this.reload();
+ });
+ }
+ });
+ }
+
+ /**
+ * Deletes the charge
+ * @param {any} chargeId Charge Id
+ */
+ deleteCharge(chargeId: any) {
+ const deleteChargeDialogRef = this.dialog.open(DeleteDialogComponent, {
+ data: { deleteContext: `charge id:${chargeId}` }
+ });
+ deleteChargeDialogRef.afterClosed().subscribe((response: any) => {
+ if (response.delete) {
+ this.loansService.deleteLoansAccountCharge(this.loanDetails.id, chargeId)
+ .subscribe(() => {
+ this.reload();
+ });
+ }
+ });
+ }
+
+ /**
+ * Stops the propagation to view charge page.
+ * @param $event Mouse Event
+ */
+ routeEdit($event: MouseEvent) {
+ $event.stopPropagation();
+ }
+
+ /**
+ * Refetches data fot the component
+ * TODO: Replace by a custom reload component instead of hard-coded back-routing.
+ */
+ private reload() {
+ const clientId = this.loanDetails.clientId;
+ const url: string = this.router.url;
+ this.router.navigateByUrl(`/clients/${clientId}/loans`, { skipLocationChange: true })
+ .then(() => this.router.navigate([url]));
+ }
+
}
diff --git a/src/app/loans/loans-view/loan-account-actions/add-loan-charge/add-loan-charge.component.html b/src/app/loans/loans-view/loan-account-actions/add-loan-charge/add-loan-charge.component.html
index 1e064b05f..a87f96b61 100644
--- a/src/app/loans/loans-view/loan-account-actions/add-loan-charge/add-loan-charge.component.html
+++ b/src/app/loans/loans-view/loan-account-actions/add-loan-charge/add-loan-charge.component.html
@@ -48,7 +48,7 @@
-
+
diff --git a/src/app/loans/loans-view/loan-account-actions/view-guarantors/view-guarantors.component.html b/src/app/loans/loans-view/loan-account-actions/view-guarantors/view-guarantors.component.html
index a6c0e717d..a831a6a6e 100644
--- a/src/app/loans/loans-view/loan-account-actions/view-guarantors/view-guarantors.component.html
+++ b/src/app/loans/loans-view/loan-account-actions/view-guarantors/view-guarantors.component.html
@@ -150,7 +150,7 @@
Action |
- |