diff --git a/src/pages/bill/Create.tsx b/src/pages/bill/Create.tsx index f4fee04..edbaa0e 100644 --- a/src/pages/bill/Create.tsx +++ b/src/pages/bill/Create.tsx @@ -47,6 +47,9 @@ const CreateBill: FC = () => { toast.error('حداقل یک شرکت با مصرف معتبر وارد کنید') return } + + values.dueDays = Number(values.dueDays) + await createBill.mutateAsync( { ...values, values: filteredValues }, { @@ -165,8 +168,8 @@ const CreateBill: FC = () => { onChange={(e) => setWaterUsage(company.id, Number(e.target.value) || 0)} error_text={ Array.isArray(formik.errors.values) && - formik.errors.values[index] && - (formik.errors.values[index] as { waterUsage?: string })?.waterUsage + formik.errors.values[index] && + (formik.errors.values[index] as { waterUsage?: string })?.waterUsage ? (formik.errors.values[index] as { waterUsage: string }).waterUsage : '' } diff --git a/src/pages/company/hooks/useCompanyData.ts b/src/pages/company/hooks/useCompanyData.ts index c4c579f..26eca50 100644 --- a/src/pages/company/hooks/useCompanyData.ts +++ b/src/pages/company/hooks/useCompanyData.ts @@ -4,7 +4,7 @@ import { CreateIndustryType, CreateCompanyType } from "../types/CompanyTypes"; export const useGetIndustries = ( page: number, search: string, - isActive: string + isActive: string, ) => { return useQuery({ queryKey: ["industries", page, search, isActive], @@ -44,6 +44,13 @@ export const useGetIndustryDetail = (id: string) => { }); }; +export const useGetAllCompanies = () => { + return useQuery({ + queryKey: ["all-companies"], + queryFn: () => api.getAllCompanies(), + }); +}; + export const useCreateCompany = () => { return useMutation({ mutationFn: (params: CreateCompanyType) => api.createCompany(params), @@ -57,13 +64,6 @@ export const useGetCompanies = (page: number, perPage?: number) => { }); }; -export const useGetAllCompanies = () => { - return useQuery({ - queryKey: ["companies", "all"], - queryFn: () => api.getCompanies(1, 1000), - }); -}; - export const useDeleteCompany = () => { return useMutation({ mutationFn: (id: string) => api.deleteCompany(id), diff --git a/src/pages/company/service/CompanyService.ts b/src/pages/company/service/CompanyService.ts index 83a19fa..9e87fbc 100644 --- a/src/pages/company/service/CompanyService.ts +++ b/src/pages/company/service/CompanyService.ts @@ -4,7 +4,7 @@ import { CreateCompanyType, CreateIndustryType } from "../types/CompanyTypes"; export const getIndustries = async ( page: number, search: string, - isActive: string + isActive: string, ) => { let query = `?page=${page}&q=${search}`; if (isActive) { @@ -31,7 +31,7 @@ export const changeStatusIndustry = async (id: string) => { export const updateIndustry = async ( id: string, - params: CreateIndustryType + params: CreateIndustryType, ) => { const { data } = await axios.patch(`/industries/${id}`, params); return data; @@ -54,6 +54,11 @@ export const getCompanies = async (page: number, perPage?: number) => { return data; }; +export const getAllCompanies = async () => { + const { data } = await axios.get(`/companies/list/public`); + return data; +}; + export const deleteCompany = async (id: string) => { const { data } = await axios.delete(`/companies/${id}`); return data;