diff --git a/src/app/payment-hub/paymenthub.component.html b/src/app/payment-hub/paymenthub.component.html
index d0e271c0..7f5c33d7 100644
--- a/src/app/payment-hub/paymenthub.component.html
+++ b/src/app/payment-hub/paymenthub.component.html
@@ -1,13 +1,8 @@
-
-
-
-
+
-
-
@@ -23,15 +18,11 @@ Search Incoming Transactions
Search Outgoing Transactions
Advanced search option for outgoing transactions
-
-
-
-
@@ -47,14 +38,10 @@ Search Incoming Request to Pay
Search Outgoing Request to Pay
Advanced search option for outgoing request to pays
-
-
-
-
@@ -68,13 +55,8 @@ Export Incoming Request to Pay
Export Outgoing Request to Pay
-
-
-
-
-
diff --git a/src/app/payment-hub/paymenthub.component.scss b/src/app/payment-hub/paymenthub.component.scss
index e54fa2e0..e68a6305 100644
--- a/src/app/payment-hub/paymenthub.component.scss
+++ b/src/app/payment-hub/paymenthub.component.scss
@@ -1,7 +1,14 @@
.green {
- color: green;
- }
-
- .red { color:red;}
-
- .orange { color:orange;}
\ No newline at end of file
+ color: green;
+}
+
+.red {
+ color: red;
+}
+
+.orange {
+ color: orange;
+}
+.payment-hub-ee-wrap {
+ flex-wrap: wrap;
+}
diff --git a/src/app/payment-hub/request-to-pay/bulk-batch-export/bulk-batch-export.component.html b/src/app/payment-hub/request-to-pay/bulk-batch-export/bulk-batch-export.component.html
new file mode 100644
index 00000000..3081bf1c
--- /dev/null
+++ b/src/app/payment-hub/request-to-pay/bulk-batch-export/bulk-batch-export.component.html
@@ -0,0 +1,104 @@
+
+
+
+ Choose an Option
+
+ {{ templateItem }}
+
+
+
+
+
+
+
+
+
+ No. |
+ {{ element.position }} |
+
+
+
+ Transaction Id |
+ {{ element.transactionId }} |
+
+
+
+ Started At |
+ {{ element.startedAt }} |
+
+
+
+ Completed At |
+ {{ element.completedAt }} |
+
+
+ Status |
+ {{ element.status }} |
+
+
+
+
+
+
+
+
Batch summary
+
+
+
Batch Id : {{ batches.batch_id }}
+ Request Id : {{ batches.request_id }}
+ Total : {{ batches.total }}
+ Amount Total : {{ batches.totalAmount }}
+ Status : {{ batches.status }}
+ Successful : {{ batches.successful }}
+ Failed : {{ batches.failed }}
+ Ongoing : {{ batches.ongoing }}
+
+
diff --git a/src/app/payment-hub/request-to-pay/bulk-batch-export/bulk-batch-export.component.scss b/src/app/payment-hub/request-to-pay/bulk-batch-export/bulk-batch-export.component.scss
new file mode 100644
index 00000000..38c4a81b
--- /dev/null
+++ b/src/app/payment-hub/request-to-pay/bulk-batch-export/bulk-batch-export.component.scss
@@ -0,0 +1,6 @@
+.bulk-btn {
+ margin-bottom: 20px;
+}
+.file-input {
+ display: none;
+}
diff --git a/src/app/payment-hub/request-to-pay/bulk-batch-export/bulk-batch-export.component.ts b/src/app/payment-hub/request-to-pay/bulk-batch-export/bulk-batch-export.component.ts
new file mode 100644
index 00000000..9e278747
--- /dev/null
+++ b/src/app/payment-hub/request-to-pay/bulk-batch-export/bulk-batch-export.component.ts
@@ -0,0 +1,82 @@
+import { Component } from "@angular/core";
+import {
+ HttpClient,
+ HttpParams,
+ HttpHeaders,
+ JsonpClientBackend,
+} from "@angular/common/http";
+import { FormControl } from "@angular/forms";
+export interface PeriodicElement {
+ position: number;
+ transactionId: string;
+ status: string;
+ completedAt: number;
+ startedAt: number;
+}
+const ELEMENT_DATA: PeriodicElement[] = [
+ {
+ position: 1,
+ transactionId: "e5eea064-1445-4d32-bc55-bd9826c779a0",
+ startedAt: 1629130966000,
+ completedAt: 1629130967000,
+ status: "IN_PROGRESS",
+ },
+ {
+ position: 2,
+ transactionId: "3cc88b24-1df6-48e2-8b1f-5dbd02ba96b7",
+ startedAt: 1629130966000,
+ completedAt: 1629150766000,
+ status: "IN_PROGRESS",
+ },
+];
+
+@Component({
+ selector: "mifosx-bulk-batch-export",
+ templateUrl: "./bulk-batch-export.component.html",
+ styleUrls: ["./bulk-batch-export.component.scss"],
+})
+export class BulkBatchExportComponent {
+ template = new FormControl("");
+ templates: string[] = ["Mojaloo", "Program"];
+ fileToUpload: File | null = null;
+ displayedColumns: string[] = [
+ "position",
+ "transactionId",
+ "completedAt",
+ "startedAt",
+ "status",
+ ];
+ BatchSummaryData: any[] = [];
+ batchId: string;
+ dataSource = ELEMENT_DATA;
+ handleFileInput(files: FileList) {
+ this.fileToUpload = files.item(0);
+ }
+ fileName = "";
+
+ constructor(private http: HttpClient) {}
+
+ onFileSelected(event: any) {
+ const file: File = event.target.files[0];
+
+ if (file) {
+ this.fileName = file.name;
+
+ const formData = new FormData();
+
+ formData.append("thumbnail", file);
+
+ const upload$ = this.http.post("/api/thumbnail-upload", formData);
+
+ upload$.subscribe();
+ }
+ }
+
+ getBatchSummary(batchIdName: any) {
+ const url = `/api/v1/batch?batchId=${batchIdName.batchid}`;
+ console.log(url);
+ this.http.get(url).subscribe((data) => {
+ this.BatchSummaryData.push(data);
+ });
+ }
+}
diff --git a/src/app/payment-hub/request-to-pay/incoming-request-export/incoming-request-export.component.html b/src/app/payment-hub/request-to-pay/incoming-request-export/incoming-request-export.component.html
index d9d9b500..83dca880 100644
--- a/src/app/payment-hub/request-to-pay/incoming-request-export/incoming-request-export.component.html
+++ b/src/app/payment-hub/request-to-pay/incoming-request-export/incoming-request-export.component.html
@@ -25,7 +25,6 @@
name="transactionid"
placeholder="comma-separated-list"
id="transactionid"
- (keyup)="arrayConvert($event)"
/>
@@ -38,7 +37,6 @@
name="externalid"
placeholder="comma-separated-list"
id="externalid"
- (keyup)="arrayConvert($event)"
/>
@@ -51,7 +49,6 @@
name="workflowinstancekey"
placeholder="comma-separated-list"
id="workflowinstancekey"
- (keyup)="arrayConvert($event)"
/>
@@ -64,7 +61,18 @@
name="startdate"
placeholder="comma-separated-list"
id="startdate"
- (keyup)="arrayConvert($event)"
+ />
+
+
+ END DATE
+
@@ -79,8 +87,45 @@
+
+
+ Error Description
+
+
+
+ Payer Id
+
+
+
+ Payee Id
+
+