admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Incorrect Currency Symbol Displayed for USD in Payment Request Form

Browse Source
This commit is contained in:
Kartik Sharma 2025-11-06 13:02:55 +05:30
parent f18633b3d5
commit 56d86fcc40
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/components/PaymentRequest/PaymentRequestList.jsx
View File

@ -42,8 +42,7 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
displayField = "Status"; displayField = "Status";
break; break;
case "submittedBy": case "submittedBy":
key = `${item?.createdBy?.firstName ?? ""} ${ key = `${item?.createdBy?.firstName ?? ""} ${item.createdBy?.lastName ?? ""
item.createdBy?.lastName ?? ""
}`.trim(); }`.trim();
displayField = "Submitted By"; displayField = "Submitted By";
break; break;
@ -91,14 +90,12 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
align: "text-start", align: "text-start",
getValue: (e) => e.title || "N/A", getValue: (e) => e.title || "N/A",
}, },
// { key: "payee", label: "Payee", align: "text-start" },
{ {
key: "SubmittedBy", key: "SubmittedBy",
label: "Submitted By", label: "Submitted By",
align: "text-start", align: "text-start",
getValue: (e) => getValue: (e) =>
`${e.createdBy?.firstName ?? ""} ${ `${e.createdBy?.firstName ?? ""} ${e.createdBy?.lastName ?? ""
e.createdBy?.lastName ?? ""
}`.trim() || "N/A", }`.trim() || "N/A",
customRender: (e) => ( customRender: (e) => (
<div <div
@ -112,8 +109,7 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
lastName={e.createdBy?.lastName} lastName={e.createdBy?.lastName}
/> />
<span className="text-truncate"> <span className="text-truncate">
{`${e.createdBy?.firstName ?? ""} ${ {`${e.createdBy?.firstName ?? ""} ${e.createdBy?.lastName ?? ""
e.createdBy?.lastName ?? ""
}`.trim() || "N/A"} }`.trim() || "N/A"}
</span> </span>
</div> </div>
@ -127,15 +123,12 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
}, },
{ {
key: "amount", key: "amount",
label: " Amount", label: "Amount",
align: "text-start", align: "text-end",
getValue: (e) => ( getValue: (e) =>
<> e?.amount
{formatCurrency(e?.amount)}&nbsp;{e.currency.currencyCode} ? `${e?.currency?.symbol ? e.currency.symbol + " " : ""}${e.amount.toLocaleString()}`
</> : "N/A",
),
align: "text-end px-3",
}, },
{ {
key: "expenseStatus", key: "expenseStatus",
@ -143,8 +136,7 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
align: "text-center", align: "text-center",
getValue: (e) => ( getValue: (e) => (
<span <span
className={`badge bg-label-${ className={`badge bg-label-${getColorNameFromHex(e?.expenseStatus?.color) || "secondary"
getColorNameFromHex(e?.expenseStatus?.color) || "secondary"
}`} }`}
> >
{e?.expenseStatus?.name || "Unknown"} {e?.expenseStatus?.name || "Unknown"}
@ -367,8 +359,7 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
{[...Array(totalPages)].map((_, index) => ( {[...Array(totalPages)].map((_, index) => (
<li <li
key={index} key={index}
className={`page-item ${ className={`page-item ${currentPage === index + 1 ? "active" : ""
currentPage === index + 1 ? "active" : ""
}`} }`}
> >
<button <button

2
src/components/RecurringExpense/RecurringExpenseList.jsx
View File

@ -67,7 +67,7 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
align: "text-end", align: "text-end",
getValue: (e) => getValue: (e) =>
e?.amount e?.amount
? `${e?.currency?.symbol || ""}${e.amount.toLocaleString()}` ? `${e?.currency?.symbol ? e.currency.symbol + " " : ""}${e.amount.toLocaleString()}`
: "N/A", : "N/A",
}, },
{ {