From 4069720ed003d3cd1ae2671ae73292d2ba6d8cd5 Mon Sep 17 00:00:00 2001 From: "pramod.mahajan" Date: Wed, 5 Nov 2025 11:48:03 +0530 Subject: [PATCH] changed currency format in list --- src/components/Expenses/ExpenseList.jsx | 9 +-- src/components/Expenses/Filelist.jsx | 61 +++++++++++++++---- src/components/Expenses/ManageExpense.jsx | 2 +- src/components/Expenses/ViewExpense.jsx | 4 +- .../PaymentRequest/ManagePaymentRequest.jsx | 7 ++- .../PaymentRequest/PaymentRequestList.jsx | 3 +- .../PaymentRequest/ViewPaymentRequest.jsx | 14 +++-- src/utils/appUtils.js | 2 +- 8 files changed, 75 insertions(+), 27 deletions(-) diff --git a/src/components/Expenses/ExpenseList.jsx b/src/components/Expenses/ExpenseList.jsx index d4ad8eb4..a56d340b 100644 --- a/src/components/Expenses/ExpenseList.jsx +++ b/src/components/Expenses/ExpenseList.jsx @@ -12,6 +12,7 @@ import { } from "../../utils/constants"; import { formatCurrency, + formatFigure, getColorNameFromHex, useDebounce, } from "../../utils/appUtils"; @@ -166,7 +167,7 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => { { key: "amount", label: "Amount", - getValue: (e) => <>{formatCurrency(e?.amount)}, + getValue: (e) => <>{formatFigure(e?.amount,{type:"currency",currency : e?.currency?.currencyCode ?? "INR"} )}, isAlwaysVisible: true, align: "text-end", }, @@ -288,11 +289,11 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => { (col.isAlwaysVisible || groupBy !== col.key) && ( - {col.customRender +
{col.customRender ? col.customRender(expense) - : col.getValue(expense)} + : col.getValue(expense)}
) )} diff --git a/src/components/Expenses/Filelist.jsx b/src/components/Expenses/Filelist.jsx index 41f52bd2..208a596b 100644 --- a/src/components/Expenses/Filelist.jsx +++ b/src/components/Expenses/Filelist.jsx @@ -18,9 +18,7 @@ const Filelist = ({ files, removeFile, expenseToEdit }) => { {/* File icon and info */}
@@ -37,15 +35,15 @@ const Filelist = ({ files, removeFile, expenseToEdit }) => {
{ - e.preventDefault(); - removeFile(expenseToEdit ? file.documentId : idx); - }} - > + className="bx bx-trash fs-4 cursor-pointer text-danger bx-sm " + role="button" + onClick={(e) => { + e.preventDefault(); + debugger; + removeFile(expenseToEdit ? file.documentId : idx); + }} + > -
@@ -55,3 +53,44 @@ const Filelist = ({ files, removeFile, expenseToEdit }) => { }; export default Filelist; + +export const FilelistView = ({ files, viewFile }) => { + return ( +
+ {files?.map((file, idx) => ( +
+
+ {/* File icon and info */} +
+ + +
{ + e.preventDefault(); + viewFile({ + IsOpen: true, + Image: file.preSignedUrl, + }); + }} + > + + {file.fileName} + + + + {" "} + {file.fileSize ? formatFileSize(file.fileSize) : ""} + + +
+
+
+
+ ))} +
+ ); +}; diff --git a/src/components/Expenses/ManageExpense.jsx b/src/components/Expenses/ManageExpense.jsx index c2e4077c..4ee1679c 100644 --- a/src/components/Expenses/ManageExpense.jsx +++ b/src/components/Expenses/ManageExpense.jsx @@ -129,7 +129,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => { reader.onload = () => resolve(reader.result.split(",")[1]); reader.onerror = (error) => reject(error); }); - const removeFile = (index) => { + const removeFile = (index) => {documentId if (expenseToEdit) { const newFiles = files.map((file, i) => { if (file.documentId !== index) return file; diff --git a/src/components/Expenses/ViewExpense.jsx b/src/components/Expenses/ViewExpense.jsx index b6099b26..6b6f06f6 100644 --- a/src/components/Expenses/ViewExpense.jsx +++ b/src/components/Expenses/ViewExpense.jsx @@ -10,6 +10,7 @@ import { zodResolver } from "@hookform/resolvers/zod"; import { defaultActionValues, ExpenseActionScheam } from "./ExpenseSchema"; import { useExpenseContext } from "../../pages/Expense/ExpensePage"; import { + formatCurrency, getColorNameFromHex, getIconByFileType, localToUtc, @@ -165,7 +166,7 @@ const ViewExpense = ({ ExpenseId }) => { -
₹ {data.amount}
+
{formatCurrency(data.amount,data.curency.currencyCode)}
@@ -289,6 +290,7 @@ const ViewExpense = ({ ExpenseId }) => { ); })} + diff --git a/src/components/PaymentRequest/ManagePaymentRequest.jsx b/src/components/PaymentRequest/ManagePaymentRequest.jsx index a6fee2a8..066a41fb 100644 --- a/src/components/PaymentRequest/ManagePaymentRequest.jsx +++ b/src/components/PaymentRequest/ManagePaymentRequest.jsx @@ -113,6 +113,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) { reader.onerror = (error) => reject(error); }); const removeFile = (index) => { + debugger if (requestToEdit) { const newFiles = files.map((file, i) => { if (file.documentId !== index) return file; @@ -153,12 +154,12 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) { projectId: data.project.id || "", expenseCategoryId: data.expenseCategory.id || "", isAdvancePayment: data.isAdvancePayment || false, - billAttachments: data.attc - ? data.documents.map((doc) => ({ + billAttachments: data.attachments + ? data?.attachments?.map((doc) => ({ fileName: doc.fileName, base64Data: null, contentType: doc.contentType, - documentId: doc.documentId, + documentId: doc.id, fileSize: 0, description: "", preSignedUrl: doc.preSignedUrl, diff --git a/src/components/PaymentRequest/PaymentRequestList.jsx b/src/components/PaymentRequest/PaymentRequestList.jsx index 9e5f351d..53380bc9 100644 --- a/src/components/PaymentRequest/PaymentRequestList.jsx +++ b/src/components/PaymentRequest/PaymentRequestList.jsx @@ -6,6 +6,7 @@ import { } from "../../utils/constants"; import { formatCurrency, + formatFigure, getColorNameFromHex, useDebounce, } from "../../utils/appUtils"; @@ -131,7 +132,7 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => { align: "text-start", getValue: (e) => ( <> - {formatCurrency(e?.amount)} {e.currency.currencyCode} + {formatFigure(e?.amount,{type:"currency",currency : e?.currency?.currencyCode})} ), diff --git a/src/components/PaymentRequest/ViewPaymentRequest.jsx b/src/components/PaymentRequest/ViewPaymentRequest.jsx index becf950f..b20291fd 100644 --- a/src/components/PaymentRequest/ViewPaymentRequest.jsx +++ b/src/components/PaymentRequest/ViewPaymentRequest.jsx @@ -39,6 +39,7 @@ import { PaymentRequestActionScheam, } from "./PaymentRequestSchema"; import PaymentStatusLogs from "./PaymentStatusLogs"; +import { FilelistView } from "../Expenses/Filelist"; const ViewPaymentRequest = ({ requestId }) => { const { data, isLoading, isError, error, isFetching } = @@ -299,13 +300,13 @@ const ViewPaymentRequest = ({ requestId }) => {
{data?.description}
-
-
-
+
{" "}

TimeLine

diff --git a/src/utils/appUtils.js b/src/utils/appUtils.js index b3a884fd..62ac15d4 100644 --- a/src/utils/appUtils.js +++ b/src/utils/appUtils.js @@ -108,7 +108,7 @@ export function localToUtc(dateString) { export const formatCurrency = (amount, currency = "INR", locale = "en-US") => { return new Intl.NumberFormat(locale, { style: "currency", - notation: "compact", + notation: "compact", // standard or compact compactDisplay: "short", currency: currency, minimumFractionDigits: 0,