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

Refactor_Expenses #317

Closed
pramod.mahajan wants to merge 247 commits from Refactor_Expenses into Feature_Expense
pull from: Refactor_Expenses
merge into: admin:Feature_Expense
Conversation 0 Commits 247 Files Changed 53 +3 -1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 653051919c - Show all commits

2
src/components/Expenses/ExpenseSchema.js
View File

@ -35,7 +35,7 @@ export const ExpenseSchema = (expenseTypes) => {
.array(
z.object({
fileName: z.string().min(1, { message: "Filename is required" }),
base64Data: z.string().min(1, { message: "File data is required" }),
base64Data: z.string().nullable(),
contentType: z.string().refine((val) => ALLOWED_TYPES.includes(val), {
message: "Only PDF, PNG, JPG, or JPEG files are allowed",
}),

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

@ -71,6 +71,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
error: EmpError,
} = useEmployeesByProject(selectedproject);
const files = watch("billAttachments");
const onFileChange = async (e) => {
const newFiles = Array.from(e.target.files);
@ -181,6 +182,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
useEffect(() => {
setExpenseType(ExpenseTypes?.find((type) => type.id === ExpenseTypeId));
return () => reset(defaultExpense);
}, [ExpenseTypeId]);
const handleClose = () => {