diff --git a/src/components/Expenses/ExpenseStatusLogs.jsx b/src/components/Expenses/ExpenseStatusLogs.jsx index 575508db..d04796fc 100644 --- a/src/components/Expenses/ExpenseStatusLogs.jsx +++ b/src/components/Expenses/ExpenseStatusLogs.jsx @@ -7,11 +7,11 @@ const ExpenseStatusLogs = ({ data }) => { const [visibleCount, setVisibleCount] = useState(4); const sortedLogs = useMemo(() => { - if (!data?.expenseLogs) return []; - return [...data.expenseLogs].sort( + if (!data?.updateLogs) return []; + return [...data.updateLogs].sort( (a, b) => new Date(b.updateAt) - new Date(a.updateAt) ); - }, [data?.expenseLogs]); + }, [data?.updateLogs]); const logsToShow = sortedLogs.slice(0, visibleCount); diff --git a/src/components/PaymentRequest/PaymentRequestFilterPanel.jsx b/src/components/PaymentRequest/PaymentRequestFilterPanel.jsx index 84375874..5aaa894e 100644 --- a/src/components/PaymentRequest/PaymentRequestFilterPanel.jsx +++ b/src/components/PaymentRequest/PaymentRequestFilterPanel.jsx @@ -38,7 +38,6 @@ const PaymentRequestFilterPanel = ({ onApply, handleGroupBy }) => { const [selectedGroup, setSelectedGroup] = useState(groupByList[6]); const [resetKey, setResetKey] = useState(0); -console.log("Kartik",data) const methods = useForm({ resolver: zodResolver(SearchPaymentRequestSchema), diff --git a/src/components/PaymentRequest/PaymentRequestList.jsx b/src/components/PaymentRequest/PaymentRequestList.jsx index 0f3a8d66..3c823f92 100644 --- a/src/components/PaymentRequest/PaymentRequestList.jsx +++ b/src/components/PaymentRequest/PaymentRequestList.jsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { EXPENSE_DRAFT, ITEMS_PER_PAGE } from "../../utils/constants"; +import { EXPENSE_DRAFT, EXPENSE_REJECTEDBY, ITEMS_PER_PAGE } from "../../utils/constants"; import { formatCurrency, getColorNameFromHex, @@ -12,12 +12,16 @@ import { usePaymentRequestContext } from "../../pages/PaymentRequest/PaymentRequ import { ExpenseTableSkeleton } from "../Expenses/ExpenseSkeleton"; import ConfirmModal from "../common/ConfirmModal"; import { useNavigate } from "react-router-dom"; +import { useSelector } from "react-redux"; const PaymentRequestList = ({filters, groupBy = "submittedBy", search }) => { - const { setManageRequest } = usePaymentRequestContext(); + const { setManageRequest,setVieRequest } = usePaymentRequestContext(); const navigate = useNavigate(); const [IsDeleteModalOpen, setIsDeleteModalOpen] = useState(false); const [deletingId, setDeletingId] = useState(null); + const SelfId = useSelector( + (store) => store?.globalVariables?.loginUser?.employeeInfo?.id + ); const groupByField = (items, field) => { return items.reduce((acc, item) => { let key; @@ -180,14 +184,14 @@ const PaymentRequestList = ({filters, groupBy = "submittedBy", search }) => { const canEditExpense = (paymentRequest) => { return ( - (paymentRequest?.status?.id === EXPENSE_DRAFT || - EXPENSE_REJECTEDBY.includes(paymentRequest?.status?.id)) && + (paymentRequest?.expenseStatus?.id === EXPENSE_DRAFT || + EXPENSE_REJECTEDBY.includes(paymentRequest?.expenseStatus?.id)) && paymentRequest?.createdBy?.id === SelfId ); }; - const canDetetExpense = (expense) => { + const canDetetExpense = (request) => { return ( - expense?.status?.id === EXPENSE_DRAFT && expense?.createdBy?.id === SelfId + request?.expenseStatus?.id === EXPENSE_DRAFT && request?.createdBy?.id === SelfId ); }; @@ -269,13 +273,14 @@ const PaymentRequestList = ({filters, groupBy = "submittedBy", search }) => { - setViewExpense({ - expenseId: paymentRequest.id, + setVieRequest({ + requestId: paymentRequest.id, view: true, }) } > - + {canDetetExpense(paymentRequest) && + canEditExpense(paymentRequest) && (