Improve repair batches: account search, add repair button, batch PDF
Batch create form now uses searchable account picker (same as ticket intake) instead of a dropdown. Batch detail shows + Add Repair button that creates a ticket pre-linked to the batch. Repair count and total estimate auto-calculated from linked tickets. Batch PDF generates a summary with all repairs, statuses, estimates, and grand total. Added Mark Delivered button for completed batches. New repair form shows batch badge when linked from a batch.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import { createFileRoute, useNavigate } from '@tanstack/react-router'
|
||||
import { useState } from 'react'
|
||||
import { createFileRoute, useNavigate, Link } from '@tanstack/react-router'
|
||||
import { useQuery, useMutation } from '@tanstack/react-query'
|
||||
import { useForm } from 'react-hook-form'
|
||||
import { zodResolver } from '@hookform/resolvers/zod'
|
||||
@@ -9,10 +10,10 @@ import { Button } from '@/components/ui/button'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
|
||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
||||
import { ArrowLeft } from 'lucide-react'
|
||||
import { ArrowLeft, Search, Plus, X } from 'lucide-react'
|
||||
import { toast } from 'sonner'
|
||||
import type { Account } from '@/types/account'
|
||||
|
||||
export const Route = createFileRoute('/_authenticated/repair-batches/new')({
|
||||
component: NewRepairBatchPage,
|
||||
@@ -21,7 +22,13 @@ export const Route = createFileRoute('/_authenticated/repair-batches/new')({
|
||||
function NewRepairBatchPage() {
|
||||
const navigate = useNavigate()
|
||||
|
||||
const { data: accountsData } = useQuery(accountListOptions({ page: 1, limit: 100, order: 'asc', sort: 'name' }))
|
||||
const [accountSearch, setAccountSearch] = useState('')
|
||||
const [selectedAccount, setSelectedAccount] = useState<Account | null>(null)
|
||||
const [showAccountDropdown, setShowAccountDropdown] = useState(false)
|
||||
|
||||
const { data: accountsData } = useQuery(
|
||||
accountListOptions({ page: 1, limit: 20, q: accountSearch || undefined, order: 'asc', sort: 'name' }),
|
||||
)
|
||||
|
||||
const {
|
||||
register,
|
||||
@@ -35,7 +42,6 @@ function NewRepairBatchPage() {
|
||||
contactName: '',
|
||||
contactPhone: '',
|
||||
contactEmail: '',
|
||||
instrumentCount: 0,
|
||||
notes: '',
|
||||
},
|
||||
})
|
||||
@@ -49,10 +55,28 @@ function NewRepairBatchPage() {
|
||||
onError: (err) => toast.error(err.message),
|
||||
})
|
||||
|
||||
function selectAccount(account: Account) {
|
||||
setSelectedAccount(account)
|
||||
setShowAccountDropdown(false)
|
||||
setAccountSearch('')
|
||||
setValue('accountId', account.id)
|
||||
if (account.phone) setValue('contactPhone', account.phone)
|
||||
if (account.email) setValue('contactEmail', account.email)
|
||||
setValue('contactName', account.name)
|
||||
}
|
||||
|
||||
function clearAccount() {
|
||||
setSelectedAccount(null)
|
||||
setValue('accountId', '')
|
||||
setValue('contactName', '')
|
||||
setValue('contactPhone', '')
|
||||
setValue('contactEmail', '')
|
||||
}
|
||||
|
||||
const accounts = accountsData?.data ?? []
|
||||
|
||||
return (
|
||||
<div className="space-y-6 max-w-2xl">
|
||||
<div className="space-y-6 max-w-3xl">
|
||||
<div className="flex items-center gap-3">
|
||||
<Button variant="ghost" size="sm" onClick={() => navigate({ to: '/repair-batches', search: {} as any })}>
|
||||
<ArrowLeft className="h-4 w-4" />
|
||||
@@ -60,28 +84,72 @@ function NewRepairBatchPage() {
|
||||
<h1 className="text-2xl font-bold">New Repair Batch</h1>
|
||||
</div>
|
||||
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle className="text-lg">Batch Details</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<form onSubmit={handleSubmit((data) => mutation.mutate(data))} className="space-y-4">
|
||||
<div className="space-y-2">
|
||||
<Label>Account (School) *</Label>
|
||||
<Select onValueChange={(v) => setValue('accountId', v)}>
|
||||
<SelectTrigger>
|
||||
<SelectValue placeholder="Select account" />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{accounts.map((a: { id: string; name: string }) => (
|
||||
<SelectItem key={a.id} value={a.id}>{a.name}</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
{errors.accountId && <p className="text-sm text-destructive">{errors.accountId.message}</p>}
|
||||
<form onSubmit={handleSubmit((data) => mutation.mutate(data))} className="space-y-6">
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<div className="flex items-center justify-between">
|
||||
<CardTitle className="text-lg">Account</CardTitle>
|
||||
<Link to="/accounts/new" className="text-sm text-primary hover:underline flex items-center gap-1">
|
||||
<Plus className="h-3 w-3" />New Account
|
||||
</Link>
|
||||
</div>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
{!selectedAccount ? (
|
||||
<div className="relative">
|
||||
<Label>Search Account</Label>
|
||||
<div className="relative mt-1">
|
||||
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
|
||||
<Input
|
||||
placeholder="Type to search by name, email, or phone..."
|
||||
value={accountSearch}
|
||||
onChange={(e) => { setAccountSearch(e.target.value); setShowAccountDropdown(true) }}
|
||||
onFocus={() => setShowAccountDropdown(true)}
|
||||
className="pl-9"
|
||||
/>
|
||||
</div>
|
||||
{showAccountDropdown && accountSearch.length > 0 && (
|
||||
<div className="absolute z-50 mt-1 w-full rounded-md border bg-popover shadow-lg max-h-60 overflow-auto">
|
||||
{accounts.length === 0 ? (
|
||||
<div className="p-3 text-sm text-muted-foreground">No accounts found</div>
|
||||
) : (
|
||||
accounts.map((a) => (
|
||||
<button key={a.id} type="button" className="w-full text-left px-3 py-2 text-sm hover:bg-accent flex items-center justify-between" onClick={() => selectAccount(a)}>
|
||||
<div>
|
||||
<span className="font-medium">{a.name}</span>
|
||||
{a.email && <span className="text-muted-foreground ml-2">{a.email}</span>}
|
||||
{a.phone && <span className="text-muted-foreground ml-2">{a.phone}</span>}
|
||||
</div>
|
||||
{a.accountNumber && <span className="text-xs text-muted-foreground font-mono">#{a.accountNumber}</span>}
|
||||
</button>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{errors.accountId && <p className="text-sm text-destructive mt-1">{errors.accountId.message}</p>}
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex items-center justify-between p-3 rounded-md border bg-muted/30">
|
||||
<div>
|
||||
<p className="font-medium">{selectedAccount.name}</p>
|
||||
<div className="flex gap-4 text-sm text-muted-foreground">
|
||||
{selectedAccount.phone && <span>{selectedAccount.phone}</span>}
|
||||
{selectedAccount.email && <span>{selectedAccount.email}</span>}
|
||||
{selectedAccount.accountNumber && <span className="font-mono">#{selectedAccount.accountNumber}</span>}
|
||||
</div>
|
||||
</div>
|
||||
<Button type="button" variant="ghost" size="sm" onClick={clearAccount}><X className="h-4 w-4" /></Button>
|
||||
</div>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle className="text-lg">Contact & Details</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
<div className="space-y-2">
|
||||
<Label>Contact Name</Label>
|
||||
<Input {...register('contactName')} />
|
||||
@@ -92,33 +160,27 @@ function NewRepairBatchPage() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<div className="space-y-2">
|
||||
<Label>Contact Email</Label>
|
||||
<Input type="email" {...register('contactEmail')} />
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label>Instrument Count</Label>
|
||||
<Input type="number" {...register('instrumentCount', { valueAsNumber: true })} />
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label>Contact Email</Label>
|
||||
<Input type="email" {...register('contactEmail')} />
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label>Notes</Label>
|
||||
<Textarea {...register('notes')} rows={3} placeholder="e.g. Annual instrument checkup for band program" />
|
||||
<Textarea {...register('notes')} rows={3} placeholder="e.g. Annual instrument checkup, multiple guitars needing setups" />
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
<div className="flex gap-2">
|
||||
<Button type="submit" disabled={mutation.isPending}>
|
||||
{mutation.isPending ? 'Creating...' : 'Create Batch'}
|
||||
</Button>
|
||||
<Button variant="secondary" type="button" onClick={() => navigate({ to: '/repair-batches', search: {} as any })}>
|
||||
Cancel
|
||||
</Button>
|
||||
</div>
|
||||
</form>
|
||||
</CardContent>
|
||||
</Card>
|
||||
<div className="flex gap-2">
|
||||
<Button type="submit" disabled={mutation.isPending} size="lg">
|
||||
{mutation.isPending ? 'Creating...' : 'Create Batch'}
|
||||
</Button>
|
||||
<Button variant="secondary" type="button" size="lg" onClick={() => navigate({ to: '/repair-batches', search: {} as any })}>
|
||||
Cancel
|
||||
</Button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user