Merge pull request #957 from bcgov/feature/AB#26774-PaymentBatch

feature/AB#26774-BatchPayment
bcgov · Dec 24, 2024 · 9feecc0 · 9feecc0
2 parents 35ab853 + 26d1c3c
commit 9feecc0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/...antManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json b/...antManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json
@@ -29,6 +29,7 @@
     "ApplicationPaymentListTable:L1ApprovalDate": "L1 Approval Date",
     "ApplicationPaymentListTable:L2ApprovalDate": "L2 Approval Date",
     "ApplicationPaymentListTable:L3ApprovalDate": "L3 Approval Date",
+    "ApplicationPaymentListTable:BatchName": "Batch #",
     "ApplicationPaymentListTable:PaymentID": "Payment ID",
     "ApplicationPaymentListTable:ApplicantName": "Applicant Name",
     "ApplicationPaymentListTable:SupplierNumber": "Supplier Number",

diff --git a/...GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js b/...GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
@@ -22,7 +22,8 @@ $(function () {
         'l1Approval',
         'l2Approval',
         'l3Approval',
-        'CASResponse'
+        'CASResponse',
+        'batchName',
     ];
 
     let paymentRequestStatusModal = new abp.ModalManager({
@@ -248,6 +249,7 @@ $(function () {
             getInvoiceStatusColumn(),
             getPaymentStatusColumn(),
             getCASResponseColumn(),
+            getBatchNameColumn(),
         ]
     }
 
@@ -491,6 +493,23 @@ $(function () {
         };
     }
 
+    function getBatchNameColumn() {
+        return {
+            title: l('ApplicationPaymentListTable:BatchName'),
+            name: 'batchName',
+            data: 'batchName',
+            className: 'data-table-header',
+            index: 19,
+            render: function (data) {
+                if (data + "" !== "undefined" && data?.length > 0) {
+                    return data;
+                } else {
+                    return "";
+                }
+            }
+        };
+    }
+
     function getCASResponseColumn() {
         // Add button to view response modal
         return {
@@ -522,8 +541,6 @@ $(function () {
      window.addEventListener('resize', setTableHeighDynamic('PaymentRequestListTable'));
     */
 
-
-
     $('#search').on('input', function () {
         let table = $('#PaymentRequestListTable').DataTable();
         table.search($(this).val()).draw();