Skip to content

Dev #2512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamesPasta merged 2 commits into from
May 29, 2026
Merged

Dev #2512

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f91b744
bugfix/AB#33258-Refactor Payment Requests table rendering and update …
JamesPasta May 29, 2026
1250c14
Merge pull request #2511 from bcgov/bugfix/AB#33258-FixExportCSVPayments
JamesPasta May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 38 additions & 12 deletions ...GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@ $(function () {
}
}
}
},

}
];

let responseCallback = function (result) {
Expand Down Expand Up @@ -390,11 +389,11 @@ $(function () {
const safeApplicantName = $.fn.dataTable.render.text().display(applicantName);

if (type === 'display' && abp.auth.isGranted('GrantApplicationManagement.Applicants.ViewList')) {
const applicantId = row?.correlationId;
const applicantId = row?.id;
const isGuid = applicantId && guidPattern.test(applicantId);

if (row?.correlationProvider === 'Application' && isGuid) {
return `<a href="/GrantApplicants/Details?ApplicationId=${encodeURIComponent(applicantId)}">${safeApplicantName}</a>`;
if (isGuid) {
return `<a href="/GrantApplicants/Details?ApplicantId=${encodeURIComponent(applicantId)}">${safeApplicantName}</a>`;
}

return safeApplicantName;
Expand All @@ -413,11 +412,26 @@ $(function () {
className: 'data-table-header text-nowrap',
index: columnIndex,
render: function (data, type, row) {
if (row.correlationProvider === 'Application' && data?.length > 0) {
return `<a href="/GrantApplications/Details?ApplicationId=${row.correlationId}">${data}</a>`;
let code = (typeof data !== 'string' || data.trim() === '') ? '' : data;

if (type === 'sort' || type === 'filter') {
return code;
}

return data || null;
const safeCode = $.fn.dataTable.render.text().display(code);

if (type === 'display' && abp.auth.isGranted('GrantApplicationManagement.Applicants.ViewList')) {
const applicantId = row?.id;
const isGuid = applicantId && guidPattern.test(applicantId);

if (isGuid) {
return `<a href="/GrantApplicants/Details?ApplicantId=${encodeURIComponent(applicantId)}">${safeCode}</a>`;
}

return safeCode;
}

return code || null;
}
};
}
Expand Down Expand Up @@ -518,9 +532,21 @@ $(function () {
data: 'status',
className: 'data-table-header',
index: columnIndex,
render: function (data) {
let statusColor = getStatusTextColor(data);
return `<span style="color:${statusColor};">` + l(`Enum:PaymentRequestStatus.${data}`) + '</span>';
render: function (data, type, row) {
const statusText = data ? l(`Enum:PaymentRequestStatus.${data}`) : '';

if (type === 'sort' || type === 'filter') {
return statusText;
}

const safeStatus = $.fn.dataTable.render.text().display(statusText);

if (type === 'display') {
let statusColor = getStatusTextColor(data);
return `<span style="color:${statusColor};">` + safeStatus + '</span>';
}

return statusText;
}
};
}
Expand Down Expand Up @@ -576,7 +602,7 @@ $(function () {
title: l('ApplicationPaymentListTable:CASResponse'),
name: 'CASResponse',
data: 'casResponse',
className: 'data-table-header',
className: 'data-table-header notexport',
index: columnIndex,
render: function (data) {
if (data + "" !== "undefined" && data?.length > 0) {
Expand Down
Loading