diff --git a/src/components/PaymentRequest/PaymentRequestList.jsx b/src/components/PaymentRequest/PaymentRequestList.jsx
index d7143939..f97171b4 100644
--- a/src/components/PaymentRequest/PaymentRequestList.jsx
+++ b/src/components/PaymentRequest/PaymentRequestList.jsx
@@ -44,9 +44,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
displayField = "Status";
break;
case "submittedBy":
- key = `${item?.createdBy?.firstName ?? ""} ${
- item.createdBy?.lastName ?? ""
- }`.trim();
+ key = `${item?.createdBy?.firstName ?? ""} ${item.createdBy?.lastName ?? ""
+ }`.trim();
displayField = "Submitted By";
break;
case "project":
@@ -93,40 +92,52 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
align: "text-start",
getValue: (e) => e.title || "N/A",
},
- // { key: "payee", label: "Payee", align: "text-start" },
- {
- key: "SubmittedBy",
- label: "Submitted By",
- align: "text-start",
- getValue: (e) =>
- `${e.createdBy?.firstName ?? ""} ${
- e.createdBy?.lastName ?? ""
- }`.trim() || "N/A",
- customRender: (e) => (
-
navigate(`/employee/${e.createdBy?.id}`)}
- >
-
-
- {`${e.createdBy?.firstName ?? ""} ${
- e.createdBy?.lastName ?? ""
- }`.trim() || "N/A"}
-
-
- ),
- },
+ // {
+ // key: "SubmittedBy",
+ // label: "Submitted By",
+ // align: "text-start",
+ // getValue: (e) =>
+ // `${e.createdBy?.firstName ?? ""} ${
+ // e.createdBy?.lastName ?? ""
+ // }`.trim() || "N/A",
+ // customRender: (e) => (
+ // navigate(`/employee/${e.createdBy?.id}`)}
+ // >
+ //
+ //
+ // {`${e.createdBy?.firstName ?? ""} ${
+ // e.createdBy?.lastName ?? ""
+ // }`.trim() || "N/A"}
+ //
+ //
+ // ),
+ // },
{
key: "createdAt",
- label: "Submitted On",
+ label: "Created At",
align: "text-start",
getValue: (e) => formatUTCToLocalTime(e?.createdAt),
},
+ {
+ key: "payee",
+ label: "Payee",
+ align: "text-start",
+ getValue: (e) => e.payee || "N/A",
+ },
+ {
+ key: "dueDate",
+ label: "Due Date",
+ align: "text-start",
+ getValue: (e) => formatUTCToLocalTime(e?.dueDate),
+ },
+
{
key: "amount",
label: "Amount",
@@ -143,9 +154,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
align: "text-center",
getValue: (e) => (
{e?.expenseStatus?.name || "Unknown"}
@@ -171,8 +181,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
const header = [
"Request ID",
"Request Title",
- "Submitted By",
- "Submitted On",
+ "Created At",
+ "Due Date",
"Amount",
"Status",
"Action",
@@ -181,10 +191,10 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
const grouped = groupBy
? Object.fromEntries(
- Object.entries(groupByField(data?.data ?? [], groupBy)).sort(
- ([keyA], [keyB]) => keyA.localeCompare(keyB)
- )
+ Object.entries(groupByField(data?.data ?? [], groupBy)).sort(
+ ([keyA], [keyB]) => keyA.localeCompare(keyB)
)
+ )
: { All: data?.data ?? [] };
const IsGroupedByDate = [
diff --git a/src/components/PaymentRequest/ViewPaymentRequest.jsx b/src/components/PaymentRequest/ViewPaymentRequest.jsx
index c1e6170e..878b37fb 100644
--- a/src/components/PaymentRequest/ViewPaymentRequest.jsx
+++ b/src/components/PaymentRequest/ViewPaymentRequest.jsx
@@ -199,7 +199,7 @@ const ViewPaymentRequest = ({ requestId }) => {