diff --git a/src/components/Expenses/ExpenseSchema.js b/src/components/Expenses/ExpenseSchema.js index 44f787c0..cad4cb31 100644 --- a/src/components/Expenses/ExpenseSchema.js +++ b/src/components/Expenses/ExpenseSchema.js @@ -10,7 +10,7 @@ const ALLOWED_TYPES = [ "image/jpeg", ]; -export const ExpenseSchema = (expenseTypes) => { +export const ExpenseSchema = (ExpenseCategories) => { return z .object({ projectId: z.string().min(1, { message: "Project is required" }), @@ -70,11 +70,11 @@ export const ExpenseSchema = (expenseTypes) => { } ) .superRefine((data, ctx) => { - const expenseType = expenseTypes.find( - (et) => et.id === data.expensesCategoryId + const ExpenseCategory = ExpenseCategories.find( + (et) => et.id === data.expenseCategoryId ); if ( - expenseType?.noOfPersonsRequired && + ExpenseCategory?.noOfPersonsRequired && (!data.noOfPersons || data.noOfPersons < 1) ) { ctx.addIssue({ @@ -177,7 +177,7 @@ export const SearchSchema = z.object({ statusIds: z.array(z.string()).optional(), createdByIds: z.array(z.string()).optional(), paidById: z.array(z.string()).optional(), - ExpenseTypeIds: z.array(z.string()).optional(), + ExpenseCategoryIds: z.array(z.string()).optional(), startDate: z.string().optional(), endDate: z.string().optional(), isTransactionDate: z.boolean().default(true), @@ -188,7 +188,7 @@ export const defaultFilter = { statusIds: [], createdByIds: [], paidById: [], - ExpenseTypeIds: [], + ExpenseCategoryIds: [], isTransactionDate: true, startDate: null, endDate: null, diff --git a/src/components/Expenses/ManageExpense.jsx b/src/components/Expenses/ManageExpense.jsx index a2426636..f01eb4c0 100644 --- a/src/components/Expenses/ManageExpense.jsx +++ b/src/components/Expenses/ManageExpense.jsx @@ -153,7 +153,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => { if (expenseToEdit && data) { reset({ projectId: data.project.id || "", - expenseCategoryId: data.expenseType.id || "", + expenseCategoryId: data?.expenseCategory?.id || "", paymentModeId: data.paymentMode.id || "", paidById: data.paidBy.id || "", transactionDate: data.transactionDate?.slice(0, 10) || "", @@ -200,7 +200,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => { CreateExpense(payload); } }; - const ExpenseTypeId = watch("expensesCategoryId"); + const ExpenseTypeId = watch("expenseCategoryId"); useEffect(() => { setExpenseType( @@ -306,7 +306,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => { )}
- + { {errors.gstNumber.message} )}
- - {ExpenseType?.noOfPersonsRequired && ( -
- - - {errors.noOfPersons && ( - - {errors.noOfPersons.message} - - )} -
- )} + -
- - + + {currencyLoading ? ( + + ) : ( + currencies?.map((currency) => ( + + )) + )} + + {errors.currencyId && ( + {errors.currencyId.message} )} - - {errors.currencyId && ( - {errors.currencyId.message} - )} -
+ + {ExpenseType?.noOfPersonsRequired && ( +
+ + + {errors.noOfPersons && ( + + {errors.noOfPersons.message} + + )} +
+ )} +