humam/garage-erp
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix many bugs

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
mohammadkhayata
2026-04-30 19:03:31 +03:00
co-authored by Copilot
parent 0c43c8edd2
commit e1ef6fa2ea
24 changed files with 333 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dashboard/modules/appointments/appointment-form.tsx
+5 -4
View File
@@ -11,6 +11,7 @@ import {
RhfTextareaField,
RhfSelectField,
RhfAsyncSelectField,
RhfTimeField,
} from "@/shared/components/form"
import { toast } from "sonner"
import { useAuthApi } from "@/shared/useApi"
@@ -40,8 +41,8 @@ export type AppointmentFormProps = {
const DEFAULT_VALUES: AppointmentFormValues = {
title: "",
date: "",
from_time: "",
to_time: "",
from_time: "00:00:00",
to_time: "00:00:00",
customer: null,
vehicle: null,
service_writer: null,
@@ -157,8 +158,8 @@ export function AppointmentForm({ resourceId, initialData, onSuccess }: Appointm
/>
</div>
<div className="grid grid-cols-2 gap-4">
<RhfTextField name="from_time" label="From Time" placeholder="HH:MM" type="time" />
<RhfTextField name="to_time" label="To Time" placeholder="HH:MM" type="time" />
<RhfTimeField name="from_time" label="From Time" placeholder="HH:MM" />
<RhfTimeField name="to_time" label="To Time" placeholder="HH:MM" />
</div>
</FieldGroup>
apps/dashboard/modules/customers/customer-form.tsx
+21 -13
View File
@@ -21,7 +21,8 @@ import {
customerFormSchema,
type CustomerFormValues,
} from "./customer.schema"
import { CUSTOMER_ROUTES } from "@garage/api"
import { CUSTOMER_ROUTES, PAYMENT_TERM_ROUTES } from "@garage/api"
import { PaymentTermCrudDialog } from "./payment-term-crud-dialog"
// ── Constants ──
@@ -69,7 +70,7 @@ function mapCustomerToFormValues(data: unknown): CustomerFormValues {
const c = (data as any)?.data ?? data ?? {}
return {
customer_type: toRelation(c.customer_type_id, c.customer_type_name),
customer_type: toRelation(c.customer_type_id, c.customer_type?.name ?? c.customer_type_name),
referral_source: toRelation(c.referral_source_id, c.referral_source_name),
payment_terms: toRelation(c.payment_terms_id, c.payment_terms_name),
country: toRelation(c.country_id, c.country_name),
@@ -113,10 +114,10 @@ function mapFormToPayload(values: CustomerFormValues) {
const mapLookupOption = (item: any) => ({
value: String(item.id),
label: item.name,
label: item.title||item.name || `#${item.id}`,
})
const STORE_OBJECT = { getOptionValue: (o: any) => o, getOptionLabel: (o: any) => o.label }
const STORE_OBJECT = { getOptionValue: (o: any) => o, getOptionLabel: (o: any) => o.label || o.name || `#${o.id}` }
// ── Component ──
@@ -173,6 +174,7 @@ export function CustomerForm({ resourceId, initialData, onSuccess }: CustomerFor
options={SALUTATION_OPTIONS}
/>
<RhfAsyncSelectField
required
name="customer_type"
label="Customer Type"
placeholder="Select customer type"
@@ -211,15 +213,21 @@ export function CustomerForm({ resourceId, initialData, onSuccess }: CustomerFor
mapOption={mapLookupOption}
{...STORE_OBJECT}
/>
<RhfAsyncSelectField
name="payment_terms"
label="Payment Terms"
placeholder="Select payment terms"
queryKey={["payment-terms"]}
listFn={() => api.paymentTerms.list()}
mapOption={mapLookupOption}
{...STORE_OBJECT}
/>
<div>
<div className="flex items-center justify-between mb-1">
<span className="text-sm font-medium">Payment Terms</span>
<PaymentTermCrudDialog />
</div>
<RhfAsyncSelectField
name="payment_terms"
label=""
placeholder="Select payment terms"
queryKey={[PAYMENT_TERM_ROUTES.INDEX]}
listFn={() => api.paymentTerms.list()}
mapOption={mapLookupOption}
{...STORE_OBJECT}
/>
</div>
</div>
{/* Address */}
apps/dashboard/modules/customers/customer.schema.ts
+1 -1
View File
@@ -12,7 +12,7 @@ type RelationField = z.infer<typeof relationFieldSchema>
const customerFormSchema = z.object({
// ── Relations (stored as objects, mapped to IDs on submit) ──
customer_type: relationFieldSchema,
customer_type: relationFieldSchema.refine((val) => !!val?.value, "Customer type is required"),
referral_source: relationFieldSchema,
payment_terms: relationFieldSchema,
country: relationFieldSchema,
apps/dashboard/modules/customers/payment-term-crud-dialog.tsx
+33
View File
@@ -0,0 +1,33 @@
"use client"
import { CrudDialog } from "@/shared/components/crud-dialog"
import { ColumnHeader } from "@/shared/data-view/table-view"
import { useAuthApi } from "@/shared/useApi"
import { PAYMENT_TERM_ROUTES } from "@garage/api"
import { PaymentTermForm } from "./payment-term-form"
export function PaymentTermCrudDialog() {
const api = useAuthApi()
return (
<CrudDialog
title="Payment Terms"
queryKey={[PAYMENT_TERM_ROUTES.INDEX]}
getClient={() => api.paymentTerms}
resourceLabel="payment term"
columns={() => [
{
accessorKey: "title",
header: ({ column }) => <ColumnHeader column={column} title="Name" />,
},
]}
renderForm={({ resourceId, initialData, onSuccess }) => (
<PaymentTermForm
resourceId={resourceId}
initialData={initialData}
onSuccess={onSuccess}
/>
)}
/>
)
}
apps/dashboard/modules/customers/payment-term-form.tsx
+86
View File
@@ -0,0 +1,86 @@
"use client"
import { z } from "zod"
import { useForm } from "react-hook-form"
import { zodResolver } from "@hookform/resolvers/zod"
import { Plus, Save } from "lucide-react"
import { Button } from "@/shared/components/ui/button"
import { FieldGroup } from "@/shared/components/ui/field"
import { Rhform, RhfTextField } from "@/shared/components/form"
import { toast } from "sonner"
import { useAuthApi } from "@/shared/useApi"
import { useEffect } from "react"
// ── Schema ──
const paymentTermSchema = z.object({
name: z.string().min(1, "Name is required"),
})
type PaymentTermFormValues = z.infer<typeof paymentTermSchema>
// ── Props ──
type PaymentTermFormProps = {
resourceId?: string | null
initialData?: any
onSuccess?: () => void
}
// ── Component ──
export function PaymentTermForm({ resourceId, initialData, onSuccess }: PaymentTermFormProps) {
const api = useAuthApi()
const isEditing = !!resourceId
const form = useForm<PaymentTermFormValues>({
resolver: zodResolver(paymentTermSchema),
defaultValues: { name: "" },
})
useEffect(() => {
if (initialData) {
const d = initialData?.data ?? initialData
form.reset({ name: d.title ?? "" })
}
}, [initialData, form])
const handleSubmit = async (values: PaymentTermFormValues) => {
try {
const promise = isEditing
? api.paymentTerms.update(resourceId!, { title: values.name } as any)
: api.paymentTerms.create({ title: values.name } as any)
toast.promise(promise, {
loading: isEditing ? "Updating..." : "Creating...",
success: isEditing ? "Updated successfully" : "Created successfully",
error: isEditing ? "Failed to update" : "Failed to create",
})
await promise
form.reset()
onSuccess?.()
} catch {
// toast already shown
}
}
return (
<Rhform form={form} onSubmit={handleSubmit}>
<FieldGroup>
<RhfTextField
name="name"
label="Name"
placeholder="e.g. Net 30"
required
/>
<Button type="submit" disabled={form.formState.isSubmitting}>
{isEditing ? <Save className="h-4 w-4" /> : <Plus className="h-4 w-4" />}
{form.formState.isSubmitting
? (isEditing ? "Updating..." : "Creating...")
: (isEditing ? "Update" : "Create")}
</Button>
</FieldGroup>
</Rhform>
)
}
apps/dashboard/modules/invoices/invoice-payments-section.tsx
+9 -1
View File
@@ -31,7 +31,15 @@ export default function InvoicePaymentsSection() {
<PaymentReceivedForm
invoiceId={invoice?.id as string}
invoiceCustomer={invoice?.customer as any}
invoiceCustomer={
(invoice?.customer as any) ??
((invoice as any)?.customer_id
? {
id: (invoice as any).customer_id,
first_name: (invoice as any).customer_name,
}
: null)
}
invoiceAmount={invoice?.balance_due as any}
resourceId={resourceId}
onSuccess={()=>{router.refresh(); invalidateQuery()}}
apps/dashboard/modules/job-cards/insurance-type-crud-dialog.tsx
+5 -1
View File
@@ -17,9 +17,13 @@ export function InsuranceTypeCrudDialog() {
resourceLabel="insurance type"
columns={() => [
{
accessorKey: "name",
accessorKey: "title",
header: ({ column }) => <ColumnHeader column={column} title="Name" />,
},
{
accessorKey: "description",
header: ({ column }) => <ColumnHeader column={column} title="Description" />,
},
]}
renderForm={({ resourceId, initialData, onSuccess }) => (
<InsuranceTypeForm
apps/dashboard/modules/job-cards/insurance-type-form.tsx
+13 -5
View File
@@ -6,7 +6,7 @@ import { zodResolver } from "@hookform/resolvers/zod"
import { Plus, Save } from "lucide-react"
import { Button } from "@/shared/components/ui/button"
import { FieldGroup } from "@/shared/components/ui/field"
import { Rhform, RhfTextField } from "@/shared/components/form"
import { Rhform, RhfTextField, RhfTextareaField } from "@/shared/components/form"
import { toast } from "sonner"
import { useAuthApi } from "@/shared/useApi"
import { useEffect } from "react"
@@ -15,6 +15,7 @@ import { useEffect } from "react"
const insuranceTypeSchema = z.object({
name: z.string().min(1, "Name is required"),
description: z.string().min(1, "Description is required"),
})
type InsuranceTypeFormValues = z.infer<typeof insuranceTypeSchema>
@@ -35,22 +36,22 @@ export function InsuranceTypeForm({ resourceId, initialData, onSuccess }: Insura
const form = useForm<InsuranceTypeFormValues>({
resolver: zodResolver(insuranceTypeSchema),
defaultValues: { name: "" },
defaultValues: { name: "", description: "" },
})
// Pre-fill when editing
useEffect(() => {
if (initialData) {
const d = initialData?.data ?? initialData
form.reset({ name: d.name ?? "" })
form.reset({ name: d.title ?? "", description: d.description ?? "" })
}
}, [initialData, form])
const handleSubmit = async (values: InsuranceTypeFormValues) => {
try {
const promise = isEditing
? api.insuranceTypes.update(resourceId!, { title: values.name } as any)
: api.insuranceTypes.create({ title: values.name } as any)
? api.insuranceTypes.update(resourceId!, { title: values.name, description: values.description } as any)
: api.insuranceTypes.create({ title: values.name, description: values.description } as any)
toast.promise(promise, {
loading: isEditing ? "Updating..." : "Creating...",
@@ -75,6 +76,13 @@ export function InsuranceTypeForm({ resourceId, initialData, onSuccess }: Insura
placeholder="e.g. Comprehensive"
required
/>
<RhfTextareaField
name="description"
label="Description"
placeholder="e.g. Comprehensive insurance coverage for vehicles"
rows={3}
required
/>
<Button type="submit" disabled={form.formState.isSubmitting}>
{isEditing ? <Save className="h-4 w-4" /> : <Plus className="h-4 w-4" />}
{form.formState.isSubmitting
apps/dashboard/modules/job-cards/job-card-actions.tsx
+48 -20
View File
@@ -20,7 +20,7 @@ import { Calendar } from "@/shared/components/ui/calendar"
import { toast } from "sonner"
import { Pencil, CalendarIcon, UserCog, UserCheck, Loader2 } from "lucide-react"
import { format } from "date-fns"
import { EmployeeCombobox } from "@/modules/employees/employee-combobox"
import { EmployeeCombobox, type EmployeeOption } from "@/modules/employees/employee-combobox"
type JobCardActionsProps = {
jobCardId: string
@@ -82,6 +82,16 @@ function EmployeePickerDialog({
isPending,
onSelect,
}: EmployeePickerDialogProps) {
const handleSelect = (emp: EmployeeOption | null) => {
console.log('Selected employee object:', emp, 'Value:', emp?.value, 'Type of value:', typeof emp?.value)
if (emp && emp.value) {
const employeeId = Number(emp.value)
console.log('Parsed employee ID:', employeeId, 'Type:', typeof employeeId)
onSelect(employeeId)
onOpenChange(false)
}
}
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="sm:max-w-md">
@@ -91,9 +101,7 @@ function EmployeePickerDialog({
</DialogHeader>
<EmployeeCombobox
value={null}
onValueChange={(emp) => {
if (emp) onSelect(Number(emp.value))
}}
onValueChange={handleSelect}
disabled={isPending}
placeholder="Search employees..."
showClear={false}
@@ -131,7 +139,8 @@ export function JobCardActions({ jobCardId, orderDate, serviceWriterName, salesP
})
const changeServiceWriterMutation = useMutation({
mutationFn: (employeeId: number) => {
mutationFn: async (employeeId: number) => {
console.log('Sending service writer ID:', employeeId, 'Type:', typeof employeeId)
const promise = api.jobCards.changeServiceWriter(jobCardId, { service_writer_id: employeeId })
toast.promise(promise, {
loading: "Updating service writer...",
@@ -147,7 +156,8 @@ export function JobCardActions({ jobCardId, orderDate, serviceWriterName, salesP
})
const changeSalesPersonMutation = useMutation({
mutationFn: (employeeId: number) => {
mutationFn: async (employeeId: number) => {
console.log('Sending sales person ID:', employeeId, 'Type:', typeof employeeId)
const promise = api.jobCards.changeSalesPerson(jobCardId, { sales_person_id: employeeId })
toast.promise(promise, {
loading: "Updating sales person...",
@@ -162,6 +172,23 @@ export function JobCardActions({ jobCardId, orderDate, serviceWriterName, salesP
},
})
const changePrimaryTechnicianMutation = useMutation({
mutationFn: async (employeeId: number) => {
console.log('Sending primary technician ID:', employeeId, 'Type:', typeof employeeId)
const promise = api.jobCards.changeTechnician(jobCardId, { technician_id: employeeId })
toast.promise(promise, {
loading: "Updating primary technician...",
success: "Primary technician updated successfully",
error: "Failed to update primary technician",
})
return promise
},
onSuccess: () => {
setPrimaryTechnicianDialogOpen(false)
router.refresh()
},
})
return (
@@ -226,7 +253,7 @@ export function JobCardActions({ jobCardId, orderDate, serviceWriterName, salesP
icon={UserCheck}
label="Primary Technician"
value={primaryTechnicianName ?? null}
isPending={false}
isPending={changePrimaryTechnicianMutation.isPending}
/>
</button>
@@ -239,7 +266,10 @@ export function JobCardActions({ jobCardId, orderDate, serviceWriterName, salesP
title="Change Service Writer"
description="Search and select an employee to assign as service writer."
isPending={changeServiceWriterMutation.isPending}
onSelect={(id) => changeServiceWriterMutation.mutate(id)}
onSelect={(id) => {
console.log('Service Writer dialog onSelect called with:', id, 'Type:', typeof id)
changeServiceWriterMutation.mutate(id)
}}
/>
<EmployeePickerDialog
@@ -248,24 +278,22 @@ export function JobCardActions({ jobCardId, orderDate, serviceWriterName, salesP
title="Change Sales Person"
description="Search and select an employee to assign as sales person."
isPending={changeSalesPersonMutation.isPending}
onSelect={(id) => changeSalesPersonMutation.mutate(id)}
/>
<EmployeePickerDialog
open={salesPersonDialogOpen}
onOpenChange={setSalesPersonDialogOpen}
title="Change Sales Person"
description="Search and select an employee to assign as sales person."
isPending={changeSalesPersonMutation.isPending}
onSelect={(id) => changeSalesPersonMutation.mutate(id)}
onSelect={(id) => {
console.log('Dialog onSelect called with:', id, 'Type:', typeof id)
changeSalesPersonMutation.mutate(id)
}}
/>
<EmployeePickerDialog
open={primaryTechnicianDialogOpen}
onOpenChange={setPrimaryTechnicianDialogOpen}
title="Change Primary Technician"
description="Search and select an employee to assign as primary technician."
isPending={false}
onSelect={()=>{}}
// onSelect={(id) => changePrimaryTechnicianMutation.mutate(id)}
isPending={changePrimaryTechnicianMutation.isPending}
onSelect={(id) => {
console.log('Primary Technician dialog onSelect called with:', id, 'Type:', typeof id)
changePrimaryTechnicianMutation.mutate(id)
}}
/>
</div>
apps/dashboard/modules/job-cards/job-card-form.tsx
+3 -2
View File
@@ -69,9 +69,10 @@ const DEFAULT_VALUES: JobCardFormValues = {
check_in_date: "",
check_in_time: "",
start_date: "",
start_time: "",
// Must be initialized with 00:00:00
start_time: "00:00:00",
delivery_date: "",
delivery_time: "",
delivery_time: "00:00:00",
km_in: "",
fuel_level: "",
has_insurance: false,
apps/dashboard/modules/job-cards/job-card-general-info.tsx
+1 -1
View File
@@ -79,7 +79,7 @@ export function JobCardGeneralInfo({ jobCard }: { jobCard: JobCard }) {
return (
<div className="flex flex-col gap-6">
<JobCardActions
jobCardId={String(jobCard)}
jobCardId={String(jobCard.id )}
orderDate={jobCard.order_date ?? null}
serviceWriterName={jobCard.service_writer?.first_name}
salesPersonName={jobCard.sales_person?.first_name}
apps/dashboard/modules/job-cards/job-card-payments-received.tsx
+3 -2
View File
@@ -47,6 +47,7 @@ export default function JobCardPaymentsReceived() {
<PaymentReceivedForm
resourceId={resourceId}
defaultJobCard={{ id: jobCard?.id, title: jobCard?.title }}
invoiceCustomer={jobCard?.customer as any}
onSuccess={invalidateQuery}
/>
)}
@@ -83,14 +84,14 @@ export default function JobCardPaymentsReceived() {
},
},
{
accessorKey: "payment_mode_name",
accessorKey: "payment_mode",
header: ({ column }) => <ColumnHeader column={column} title="Payment Mode" />,
cell: ({ row }) => {
const item = row.original as any
return (
<div className="flex items-center gap-2">
<CreditCardIcon className="h-4 w-4 text-muted-foreground" />
<span className="capitalize">{item.payment_mode_name || "—"}</span>
<span className="capitalize">{(item.payment_mode?.title) || "—"}</span>
</div>
)
},
apps/dashboard/modules/payment-received/payment-received-form.tsx
+4 -6
View File
@@ -100,12 +100,10 @@ export function PaymentReceivedForm({ resourceId, initialData, onSuccess, defaul
base.job_card = toRelation(defaultJobCard.id, defaultJobCard.title ?? undefined)
}
if (invoiceCustomer?.id != null) {
base.customer = toRelation(
invoiceCustomer.id,
invoiceCustomer.first_name
? `${invoiceCustomer.first_name} ${invoiceCustomer.last_name || ""}`.trim()
: undefined
)
const customerLabel = invoiceCustomer.first_name
? `${invoiceCustomer.first_name} ${invoiceCustomer.last_name || ""}`.trim()
: (invoiceCustomer as any).company_name || (invoiceCustomer as any).name || undefined
base.customer = toRelation(invoiceCustomer.id, customerLabel)
}
if (invoiceAmount != null && invoiceAmount !== "") {
base.amount_received = String(invoiceAmount)
apps/dashboard/modules/vehicles/rhf-vehicle-select-field.tsx
+2 -2
View File
@@ -131,7 +131,7 @@ export function RhfVehicleSelectField<
const combobox = (
<div ref={anchorRef}>
<Combobox
<Combobox
value={field.value}
onValueChange={(val: VehicleOption | VehicleOption[] | null) => {
const single = Array.isArray(val) ? val[0] ?? null : val
@@ -246,7 +246,7 @@ export function RhfVehicleSelectField<
<DialogTitle className="text-2xl font-bold">
Add {label}
</DialogTitle>
</DialogHeader>
</DialogHeader>
<ScrollArea className="max-h-[80vh] px-4">
<VehicleForm onSuccess={handleCreateSuccess} />
</ScrollArea>
apps/dashboard/modules/vehicles/vehicle-form.tsx
+7 -1
View File
@@ -23,6 +23,7 @@ import { useAuthApi } from "@/shared/useApi"
import { useResourceForm } from "@/shared/hooks/use-resource-form"
import { useFormMutation } from "@/shared/hooks/use-form-mutation"
import { toRelation, toId } from "@/shared/lib/utils"
import { formatUppercase } from "@/shared/utils/formatters"
import { vehicleFormSchema, type VehicleFormValues } from "./vehicle.schema"
import { VEHICLE_ROUTES } from "@garage/api"
@@ -225,7 +226,12 @@ export function VehicleForm({ resourceId, initialData, onSuccess }: VehicleFormP
{/* License & identifiers */}
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
<RhfTextField name="license_plate" label="License Plate" placeholder="e.g. ABC-123" />
<RhfTextField
name="license_plate"
label="License Plate"
placeholder="e.g. ABC-123"
formatter={formatUppercase}
/>
<RhfTextField name="mileage" label="Mileage" placeholder="e.g. 10000" />
</div>