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

fixed going wrong request for Expense payload - Transaction

Browse Source
This commit is contained in:
pramod mahajan 2025-09-15 17:00:36 +05:30
parent 94eb283b2d
commit 4927680fe3
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/Expenses/ManageExpense.jsx
View File

@ -2,7 +2,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { defaultExpense, ExpenseSchema } from "./ExpenseSchema"; import { defaultExpense, ExpenseSchema } from "./ExpenseSchema";
import { formatFileSize } from "../../utils/appUtils"; import { formatFileSize, localToUtc } from "../../utils/appUtils";
import { useProjectName } from "../../hooks/useProjects"; import { useProjectName } from "../../hooks/useProjects";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { changeMaster } from "../../slices/localVariablesSlice"; import { changeMaster } from "../../slices/localVariablesSlice";
@ -183,9 +183,8 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
const onSubmit = (fromdata) => { const onSubmit = (fromdata) => {
let payload = { let payload = {
...fromdata, ...fromdata,
transactionDate: moment transactionDate: localToUtc(fromdata.transactionDate)
.utc(fromdata.transactionDate, "DD-MM-YYYY")
.toISOString(),
}; };
if (expenseToEdit) { if (expenseToEdit) {
const editPayload = { ...payload, id: data.id }; const editPayload = { ...payload, id: data.id };
@ -331,7 +330,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
<Label htmlFor="transactionDate" className="form-label" required> <Label htmlFor="transactionDate" className="form-label" required>
Transaction Date Transaction Date
</Label> </Label>
<DatePicker name="transactionDate" control={control} /> <DatePicker name="transactionDate" control={control} maxDate={new Date()}/>
{errors.transactionDate && ( {errors.transactionDate && (
<small className="danger-text"> <small className="danger-text">

10
src/utils/appUtils.js
View File

@ -1,5 +1,5 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { format, parseISO } from "date-fns";
export const formatFileSize=(bytes)=> { export const formatFileSize=(bytes)=> {
if (bytes < 1024) return bytes + " B"; if (bytes < 1024) return bytes + " B";
else if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(2) + " KB"; else if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(2) + " KB";
@ -68,4 +68,10 @@ export const normalizeAllowedContentTypes = (allowedContentType) => {
if (Array.isArray(allowedContentType)) return allowedContentType; if (Array.isArray(allowedContentType)) return allowedContentType;
if (typeof allowedContentType === "string") return allowedContentType.split(","); if (typeof allowedContentType === "string") return allowedContentType.split(",");
return []; return [];
}; };
export function localToUtc(localDateString) {
const date = new Date(localDateString);
return date.toISOString();
}