diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 33a39f3d..5486e195 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -23,21 +23,24 @@ export class HomeComponent {
routeTo: ['paymenthub'],
roleName: 'operations',
icon: 'money-bill-alt',
- active: false
+ active: false,
+ disabled: false
},
{
label: 'Vouchers',
routeTo: ['vouchers'],
roleName: 'vouchers',
icon: 'ticket',
- active: false
+ active: false,
+ disabled: false
},
{
label: 'Account Management',
routeTo: ['account-mapper'],
roleName: 'account-mapper',
icon: 'users',
- active: false
+ active: false,
+ disabled: false
}
];
}
diff --git a/src/app/payment-hub/filter-selector/filter-selector.component.ts b/src/app/payment-hub/filter-selector/filter-selector.component.ts
index 9fe90192..a45b49ce 100644
--- a/src/app/payment-hub/filter-selector/filter-selector.component.ts
+++ b/src/app/payment-hub/filter-selector/filter-selector.component.ts
@@ -17,10 +17,10 @@ export class FilterSelectorComponent implements OnInit {
ngOnInit(): void {
this.sections = [
- {label: 'Main Batches', routeTo: ['paymenthub', 'batches'], active: true},
- {label: 'Create Batch', routeTo: ['paymenthub', 'bulk-import'], active: false},
- {label: 'Sub Batches', routeTo: ['paymenthub', 'sub-batches'], active: false},
- {label: 'Transfers', routeTo: ['paymenthub', 'transfers'], active: false}
+ {label: 'Main Batches', routeTo: ['paymenthub', 'batches'], active: true, disabled: false},
+ {label: 'Create Batch', routeTo: ['paymenthub', 'bulk-import'], active: false, disabled: false},
+ {label: 'Sub Batches', routeTo: ['paymenthub', 'sub-batches'], active: false, disabled: true},
+ {label: 'Transfers', routeTo: ['paymenthub', 'transfers'], active: false, disabled: false}
];
this.router.events.pipe(
diff --git a/src/app/payment-hub/filter-selector/section-model.ts b/src/app/payment-hub/filter-selector/section-model.ts
index 76cd7661..246453b3 100644
--- a/src/app/payment-hub/filter-selector/section-model.ts
+++ b/src/app/payment-hub/filter-selector/section-model.ts
@@ -4,4 +4,5 @@ export interface Section {
roleName?: string;
icon?: string;
active: boolean;
+ disabled: boolean;
}
diff --git a/src/app/payment-hub/sub-batches/sub-batches.component.ts b/src/app/payment-hub/sub-batches/sub-batches.component.ts
index 765b4eec..0204de0c 100644
--- a/src/app/payment-hub/sub-batches/sub-batches.component.ts
+++ b/src/app/payment-hub/sub-batches/sub-batches.component.ts
@@ -60,6 +60,7 @@ export class SubBatchesComponent implements OnInit {
private subBatchesService: SubBatchesService) {
this.route.params.subscribe(params => {
this.batchId = params['batchId'];
+ console.log(this.batchId);
});
}
diff --git a/src/app/payment-hub/transfers/model/transfer.model.ts b/src/app/payment-hub/transfers/model/transfer.model.ts
index 67e5d43c..198792f6 100644
--- a/src/app/payment-hub/transfers/model/transfer.model.ts
+++ b/src/app/payment-hub/transfers/model/transfer.model.ts
@@ -41,3 +41,55 @@ export interface Transfer {
batchId: string;
clientCorrelationId: string;
}
+
+export interface SubBatchDetail {
+ subBatchId: string;
+ batchId: string;
+ requestId: null;
+ total: null;
+ ongoing: null;
+ successful: null;
+ failed: null;
+ totalAmount: null;
+ pendingAmount: null;
+ successfulAmount: null;
+ failedAmount: null;
+ file: null;
+ notes: null;
+ createdAt: null;
+ status: null;
+ modes: null;
+ purpose: null;
+ failedPercentage: null;
+ successPercentage: null;
+ payerFsp: null;
+ approvedAmount: null;
+ approvedTransactionCount: null;
+ payeeFspSet: null;
+ instructionList: InstructionList[];
+ budgetAccount: null;
+ generatedBy: null;
+ generatedAt: Date;
+ totalInstructionCount: number;
+}
+
+export interface InstructionList {
+ instructionId: string;
+ payerFsp: null | string;
+ payeeFunctionalId: PayeeFunctionalID;
+ amount: number;
+ status: Status;
+ reason: null;
+ startedAt: number;
+ completedAt: number;
+ subBatchId: null;
+}
+
+export enum PayeeFunctionalID {
+ Accountnumber = "accountnumber",
+}
+
+export enum Status {
+ Completed = "COMPLETED",
+ InProgress = "IN_PROGRESS",
+}
\ No newline at end of file
diff --git a/src/app/payment-hub/transfers/transfers.component.html b/src/app/payment-hub/transfers/transfers.component.html
index 94ff2f97..c029aea6 100644
--- a/src/app/payment-hub/transfers/transfers.component.html
+++ b/src/app/payment-hub/transfers/transfers.component.html
@@ -88,7 +88,7 @@
{{"labels.inputs.Filters" | translate }}
-
+
{{"labels.inputs.Batch Reference Number" | translate }} |
@@ -99,13 +99,13 @@ {{"labels.inputs.Filters" | translate }}
{{"labels.inputs.Start Time" | translate }} |
- {{ convertTimestampToUTCDate(transaction.startedAt) | dateFormat }}
+ | {{ convertTimestampToUTCDate(transaction.startedAt) | datetimeFormat }}
|
{{"labels.inputs.Completed Time" | translate }} |
- {{ convertTimestampToUTCDate(transaction.completedAt) | dateFormat }}
+ | {{ convertTimestampToUTCDate(transaction.completedAt) | datetimeFormat }}
|
@@ -138,6 +138,57 @@ {{"labels.inputs.Filters" | translate }}
+
+
+
+
+ {{"labels.inputs.Batch Reference Number" | translate }} |
+
+
+ |
+
+
+
+ {{"labels.inputs.Start Time" | translate }} |
+ {{ transaction.startedAt | datetimeFormat }}
+ |
+
+
+
+ {{"labels.inputs.Completed Time" | translate }} |
+ {{ transaction.completedAt | datetimeFormat }}
+ |
+
+
+
+ {{"labels.inputs.Source Ministry" | translate }} |
+
+
+ |
+
+
+
+ {{"labels.inputs.Bulk Amount" | translate }} |
+ {{ transaction.amount | formatNumber }} |
+
+
+
+ {{"labels.inputs.Payer FSP" | translate }} |
+ {{ transaction.payerFsp }} |
+
+
+
+ {{"labels.inputs.Status" | translate }} |
+
+ {{ transaction.status }} |
+
+
+
+
+
+
+
diff --git a/src/app/payment-hub/transfers/transfers.component.ts b/src/app/payment-hub/transfers/transfers.component.ts
index 4e33edae..318680e2 100644
--- a/src/app/payment-hub/transfers/transfers.component.ts
+++ b/src/app/payment-hub/transfers/transfers.component.ts
@@ -3,7 +3,7 @@ import { MatPaginator, PageEvent } from '@angular/material/paginator';
import { MatTableDataSource } from '@angular/material/table';
import { Dates } from 'app/core/utils/dates';
import { TransfersService } from './transfers.service';
-import { Transfer, TransferData } from './model/transfer.model';
+import { SubBatchDetail, Transfer, TransferData } from './model/transfer.model';
import { UntypedFormControl } from '@angular/forms';
import { MatSort } from '@angular/material/sort';
import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
@@ -76,7 +76,7 @@ export class TransfersComponent implements OnInit {
getBatches(): void {
this.isLoading = true;
- if (this.subBatchId === '') {
+ if (this.subBatchId === null) {
this.transfersService.getTransfers(this.currentPage, this.pageSize)
.subscribe((transfers: TransferData) => {
const content: Transfer[] = [];
@@ -94,7 +94,11 @@ export class TransfersComponent implements OnInit {
});
} else {
this.transfersService.getSubBatchSumaryDetail(this.batchId, this.subBatchId)
- .subscribe((transfers: any) => {
+ .subscribe((subBatchData: SubBatchDetail) => {
+ this.dataSource = new MatTableDataSource(subBatchData.instructionList);
+ this.dataSource.paginator = this.paginator;
+ this.dataSource.sort = this.sort;
+ this.totalRows = subBatchData.totalInstructionCount;
this.isLoading = false;
}, (error: any) => {
this.isLoading = false;
diff --git a/src/app/shared/list-item/list-item.component.html b/src/app/shared/list-item/list-item.component.html
index 5ea937d0..706dcf9d 100644
--- a/src/app/shared/list-item/list-item.component.html
+++ b/src/app/shared/list-item/list-item.component.html
@@ -1,4 +1,10 @@
-