From a40d0b7e58e7e7e8287a9cf71a0b5f5a8b9b26ae Mon Sep 17 00:00:00 2001 From: pramod mahajan Date: Wed, 30 Jul 2025 18:26:01 +0530 Subject: [PATCH] fixed : feature date not allow --- src/components/Expenses/ExpenseSchema.js | 14 +++++++++++++- src/components/Expenses/ManageExpense.jsx | 5 +++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/components/Expenses/ExpenseSchema.js b/src/components/Expenses/ExpenseSchema.js index 8d06ee89..901239ad 100644 --- a/src/components/Expenses/ExpenseSchema.js +++ b/src/components/Expenses/ExpenseSchema.js @@ -16,7 +16,19 @@ export const ExpenseSchema = (expenseTypes) => { expensesTypeId: z.string().min(1, { message: "Expense type is required" }), paymentModeId: z.string().min(1, { message: "Payment mode is required" }), paidById: z.string().min(1, { message: "Employee name is required" }), - transactionDate: z.string().min(1, { message: "Date is required" }), + transactionDate: z + .string() + .min(1, { message: "Date is required" }) + .refine((val) => { + const selected = new Date(val); + const today = new Date(); + + // Set both to midnight to avoid time-related issues + selected.setHours(0, 0, 0, 0); + today.setHours(0, 0, 0, 0); + + return selected <= today; + }, { message: "Future dates are not allowed" }), transactionId: z.string().optional(), description: z.string().min(1, { message: "Description is required" }), location: z.string().min(1, { message: "Location is required" }), diff --git a/src/components/Expenses/ManageExpense.jsx b/src/components/Expenses/ManageExpense.jsx index f33fb2f7..5cbf3faa 100644 --- a/src/components/Expenses/ManageExpense.jsx +++ b/src/components/Expenses/ManageExpense.jsx @@ -22,6 +22,7 @@ import { useUpdateExpense, } from "../../hooks/useExpense"; import ExpenseSkeleton from "./ExpenseSkeleton"; +import moment from "moment"; const ManageExpense = ({ closeModal, expenseToEdit = null }) => { const { @@ -169,8 +170,8 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => { handleClose(); } ); - const onSubmit = (payload) => { - debugger + const onSubmit = (fromdata) => { + let payload = {...fromdata,transactionDate: moment.utc(fromdata.transactionDate, 'YYYY-MM-DD').toISOString()} if (expenseToEdit) { const editPayload = { ...payload, id: data.id }; ExpenseUpdate({ id: data.id, payload: editPayload }); -- 2.43.0