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

Incorrect Currency Symbol Displayed for USD in Payment Request Form #500

Closed
kartik.sharma wants to merge 1 commits from Kartik_Bug#1657 into Issues_Expense
pull from: Kartik_Bug#1657
merge into: admin:Issues_Expense
Conversation 1 Commits 1 Files Changed 2 +17 -26
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,8 @@ 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;
case "project": case "project":
@ -91,15 +90,13 @@ 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
className="d-flex align-items-center cursor-pointer" className="d-flex align-items-center cursor-pointer"
@ -112,9 +109,8 @@ 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,9 +136,8 @@ 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"}
</span> </span>
@ -367,9 +359,8 @@ 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
className="page-link" className="page-link"

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",
}, },
{ {