Typing "0" into Betalningsvillkor on a customer made the form silently unsavable: the form schema had min(1) and no error was rendered for the field, so the user saw nothing happen. 0 days is a real value (betalning direkt / vid mottagande), and the invoice schema already accepted it. Customer and supplier forms now validate whole days 0-365 and show the rule under the field; the API schemas (customer create/update, supplier) accept 0 the same way; and every `|| 30` fallback that would have turned a stored 0 back into 30 on edit or create is `?? 30`. Closes #2070 Claude-Session: https://claude.ai/code/session_01VnConrmMCxJRQ5kfiPPWyy Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
411 lines
16 KiB
TypeScript
411 lines
16 KiB
TypeScript
'use client'
|
|
|
|
import { useMemo } from 'react'
|
|
import { useAccounts } from '@/lib/reference-data/hooks'
|
|
import { useForm, Controller } from 'react-hook-form'
|
|
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import { z } from 'zod'
|
|
import { useLocale, useTranslations } from 'next-intl'
|
|
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 { Loader2, Lock, X } from 'lucide-react'
|
|
import AccountCombobox from '@/components/bookkeeping/AccountCombobox'
|
|
import { useCanWrite } from '@/lib/hooks/use-can-write'
|
|
import { getCountryOptions, normalizeCountryCode } from '@/lib/vat/country-codes'
|
|
import type { CreateSupplierInput } from '@/types'
|
|
|
|
interface SupplierFormProps {
|
|
onSubmit: (data: CreateSupplierInput) => Promise<void>
|
|
isLoading: boolean
|
|
initialData?: Partial<CreateSupplierInput>
|
|
}
|
|
|
|
export default function SupplierForm({
|
|
onSubmit,
|
|
isLoading,
|
|
initialData,
|
|
}: SupplierFormProps) {
|
|
const { canWrite } = useCanWrite()
|
|
const t = useTranslations('form_supplier')
|
|
const locale = useLocale() === 'en' ? 'en' : 'sv'
|
|
const countryOptions = useMemo(() => getCountryOptions(locale), [locale])
|
|
// Chart of accounts from the session cache (lib/reference-data): the
|
|
// konto combobox is populated on the first paint; without the chart it
|
|
// still accepts a typed 4-digit number.
|
|
const { accounts } = useAccounts()
|
|
|
|
// The default account seeds expense lines on supplier invoices, so the
|
|
// browsable list is cost classes 4-7. Any other 4-digit number can still be
|
|
// typed in; the API only enforces the format.
|
|
const expenseAccounts = useMemo(
|
|
() => accounts.filter((a) => a.account_class >= 4 && a.account_class <= 7),
|
|
[accounts]
|
|
)
|
|
const accountNameByNumber = useMemo(
|
|
() => new Map(accounts.map((a) => [a.account_number, a.account_name])),
|
|
[accounts]
|
|
)
|
|
|
|
const schema = useMemo(() => z.object({
|
|
name: z.string().min(1, t('name_required')),
|
|
supplier_type: z.enum(['swedish_business', 'eu_business', 'non_eu_business']),
|
|
email: z.string().email(t('email_invalid')).optional().or(z.literal('')),
|
|
phone: z.string().optional(),
|
|
address_line1: z.string().optional(),
|
|
address_line2: z.string().optional(),
|
|
postal_code: z.string().optional(),
|
|
city: z.string().optional(),
|
|
// ISO 3166-1 alpha-2; an unmapped legacy name is shown as-is and has to
|
|
// be replaced before the form saves.
|
|
country: z.string().refine((v) => normalizeCountryCode(v) !== null, t('country_invalid')),
|
|
org_number: z.string().optional(),
|
|
vat_number: z.string().optional(),
|
|
bankgiro: z.string().optional(),
|
|
plusgiro: z.string().optional(),
|
|
iban: z.string().optional(),
|
|
bic: z.string().optional(),
|
|
clearing_number: z.string().optional(),
|
|
account_number: z.string().optional(),
|
|
default_expense_account: z.string().optional(),
|
|
// Whole days 0-365; 0 = betalning direkt (issue #2070, same as CustomerForm).
|
|
default_payment_terms: z
|
|
.number({ message: t('default_payment_terms_invalid') })
|
|
.int(t('default_payment_terms_invalid'))
|
|
.min(0, t('default_payment_terms_invalid'))
|
|
.max(365, t('default_payment_terms_invalid')),
|
|
default_currency: z.string().optional(),
|
|
notes: z.string().optional(),
|
|
}), [t])
|
|
|
|
type FormData = z.infer<typeof schema>
|
|
|
|
const {
|
|
register,
|
|
handleSubmit,
|
|
control,
|
|
watch,
|
|
formState: { errors },
|
|
} = useForm<FormData>({
|
|
resolver: zodResolver(schema),
|
|
defaultValues: {
|
|
name: initialData?.name || '',
|
|
supplier_type: initialData?.supplier_type || 'swedish_business',
|
|
email: initialData?.email || '',
|
|
phone: initialData?.phone || '',
|
|
address_line1: initialData?.address_line1 || '',
|
|
postal_code: initialData?.postal_code || '',
|
|
city: initialData?.city || '',
|
|
country: normalizeCountryCode(initialData?.country) ?? initialData?.country ?? 'SE',
|
|
org_number: initialData?.org_number || '',
|
|
vat_number: initialData?.vat_number || '',
|
|
bankgiro: initialData?.bankgiro || '',
|
|
plusgiro: initialData?.plusgiro || '',
|
|
iban: initialData?.iban || '',
|
|
bic: initialData?.bic || '',
|
|
clearing_number: initialData?.clearing_number || '',
|
|
account_number: initialData?.account_number || '',
|
|
default_expense_account: initialData?.default_expense_account || '',
|
|
// ?? not ||: a stored 0 (betalning direkt) must not reopen as 30.
|
|
default_payment_terms: initialData?.default_payment_terms ?? 30,
|
|
default_currency: initialData?.default_currency || 'SEK',
|
|
notes: initialData?.notes || '',
|
|
},
|
|
})
|
|
|
|
const countryValue = watch('country')
|
|
// A stored value the picker does not list (an unmapped legacy name, or a
|
|
// code outside the curated list) still has to be visible, or the field
|
|
// would look empty while holding something.
|
|
const countryValueUnlisted =
|
|
countryValue && !countryOptions.some((option) => option.code === countryValue)
|
|
|
|
// Empty strings go through as-is: the API schemas normalize them (dropped on
|
|
// create, null on update so a cleared field actually clears the column).
|
|
const onFormSubmit = (data: FormData) => {
|
|
onSubmit(data)
|
|
}
|
|
|
|
return (
|
|
<form onSubmit={handleSubmit(onFormSubmit)} className="space-y-6">
|
|
{/* Supplier Type */}
|
|
<div className="space-y-2">
|
|
<Label>{t('type_label')}</Label>
|
|
<Controller
|
|
name="supplier_type"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Select value={field.value} onValueChange={(v) => { if (v) field.onChange(v) }}>
|
|
<SelectTrigger>
|
|
<SelectValue placeholder={t('type_label')} />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectItem value="swedish_business">{t('type_swedish_business')}</SelectItem>
|
|
<SelectItem value="eu_business">{t('type_eu_business')}</SelectItem>
|
|
<SelectItem value="non_eu_business">{t('type_non_eu_business')}</SelectItem>
|
|
</SelectContent>
|
|
</Select>
|
|
)}
|
|
/>
|
|
</div>
|
|
|
|
{/* Name */}
|
|
<div className="space-y-2">
|
|
<Label htmlFor="name">{t('name_label')}</Label>
|
|
<Input
|
|
id="name"
|
|
placeholder={t('name_placeholder')}
|
|
{...register('name')}
|
|
/>
|
|
{errors.name && (
|
|
<p className="text-sm text-destructive">{errors.name.message}</p>
|
|
)}
|
|
</div>
|
|
|
|
{/* Contact */}
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="email">{t('email_label')}</Label>
|
|
<Input
|
|
id="email"
|
|
type="email"
|
|
placeholder={t('email_placeholder')}
|
|
{...register('email')}
|
|
/>
|
|
{errors.email && (
|
|
<p className="text-sm text-destructive">{errors.email.message}</p>
|
|
)}
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="phone">{t('phone_label')}</Label>
|
|
<Input
|
|
id="phone"
|
|
placeholder="+46 8 123 45 67"
|
|
{...register('phone')}
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Business info */}
|
|
<div className="space-y-4 pt-4 border-t">
|
|
<h3>{t('business_section')}</h3>
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="org_number">{t('org_number_label')}</Label>
|
|
<Input
|
|
id="org_number"
|
|
placeholder={t('org_number_placeholder')}
|
|
{...register('org_number')}
|
|
/>
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="vat_number">{t('vat_label')}</Label>
|
|
<Input
|
|
id="vat_number"
|
|
placeholder={t('vat_placeholder_se')}
|
|
{...register('vat_number')}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Address */}
|
|
<div className="space-y-4 pt-4 border-t">
|
|
<h3>{t('address_section')}</h3>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="address_line1">{t('street_label')}</Label>
|
|
<Input
|
|
id="address_line1"
|
|
placeholder="Storgatan 1"
|
|
{...register('address_line1')}
|
|
/>
|
|
</div>
|
|
<div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="postal_code">{t('postal_label')}</Label>
|
|
<Input id="postal_code" placeholder="123 45" {...register('postal_code')} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="city">{t('city_label')}</Label>
|
|
<Input id="city" placeholder="Stockholm" {...register('city')} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="country">{t('country_label')}</Label>
|
|
<Controller
|
|
name="country"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Select value={field.value} onValueChange={(v) => { if (v) field.onChange(v) }}>
|
|
<SelectTrigger id="country">
|
|
<SelectValue placeholder={t('country_placeholder')} />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{countryValueUnlisted && (
|
|
<SelectItem value={countryValue}>
|
|
{normalizeCountryCode(countryValue)
|
|
? countryValue
|
|
: t('country_unknown_option', { value: countryValue })}
|
|
</SelectItem>
|
|
)}
|
|
{countryOptions.map((option) => (
|
|
<SelectItem key={option.code} value={option.code}>
|
|
{locale === 'en' ? option.nameEn : option.name}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
)}
|
|
/>
|
|
{errors.country && (
|
|
<p className="text-sm text-destructive">{errors.country.message}</p>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Payment details */}
|
|
<div className="space-y-4 pt-4 border-t">
|
|
<h3>{t('payment_section')}</h3>
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="bankgiro">{t('bankgiro_label')}</Label>
|
|
<Input id="bankgiro" placeholder={t('bankgiro_placeholder')} {...register('bankgiro')} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="plusgiro">{t('plusgiro_label')}</Label>
|
|
<Input id="plusgiro" placeholder="XXXXXXX-X" {...register('plusgiro')} />
|
|
</div>
|
|
</div>
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="clearing_number">{t('clearing_label')}</Label>
|
|
<Input id="clearing_number" placeholder="XXXX" {...register('clearing_number')} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="account_number">{t('account_number_label')}</Label>
|
|
<Input id="account_number" placeholder="XXXXXXXXX" {...register('account_number')} />
|
|
</div>
|
|
</div>
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="iban">{t('iban_label')}</Label>
|
|
<Input id="iban" placeholder={t('iban_placeholder')} {...register('iban')} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="bic">{t('swift_label')}</Label>
|
|
<Input id="bic" placeholder="SWEDSESS" {...register('bic')} />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Defaults */}
|
|
<div className="space-y-4 pt-4 border-t">
|
|
<div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
|
|
<div className="space-y-2">
|
|
<Label>{t('default_account_label')}</Label>
|
|
<Controller
|
|
name="default_expense_account"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<div className="flex items-start gap-1">
|
|
<div className="min-w-0 flex-1">
|
|
<AccountCombobox
|
|
value={field.value || ''}
|
|
accounts={expenseAccounts}
|
|
onChange={field.onChange}
|
|
selectedName={accountNameByNumber.get(field.value || '')}
|
|
/>
|
|
</div>
|
|
{field.value ? (
|
|
<Button
|
|
type="button"
|
|
variant="ghost"
|
|
size="icon"
|
|
aria-label={t('default_account_clear')}
|
|
onClick={() => field.onChange('')}
|
|
>
|
|
<X className="h-4 w-4" />
|
|
</Button>
|
|
) : null}
|
|
</div>
|
|
)}
|
|
/>
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="payment_terms">{t('default_payment_terms_label')}</Label>
|
|
<Input
|
|
id="payment_terms"
|
|
type="number"
|
|
min={0}
|
|
max={365}
|
|
step={1}
|
|
{...register('default_payment_terms', { valueAsNumber: true })}
|
|
/>
|
|
<p className="text-xs text-muted-foreground">{t('default_payment_terms_help')}</p>
|
|
{errors.default_payment_terms && (
|
|
<p className="text-sm text-destructive">{errors.default_payment_terms.message}</p>
|
|
)}
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="default_currency">{t('default_currency_label')}</Label>
|
|
<Controller
|
|
name="default_currency"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Select value={field.value} onValueChange={(v) => { if (v) field.onChange(v) }}>
|
|
<SelectTrigger>
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectItem value="SEK">SEK</SelectItem>
|
|
<SelectItem value="EUR">EUR</SelectItem>
|
|
<SelectItem value="USD">USD</SelectItem>
|
|
<SelectItem value="GBP">GBP</SelectItem>
|
|
<SelectItem value="NOK">NOK</SelectItem>
|
|
<SelectItem value="DKK">DKK</SelectItem>
|
|
</SelectContent>
|
|
</Select>
|
|
)}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Notes */}
|
|
<div className="space-y-2">
|
|
<Label htmlFor="notes">{t('notes_label')}</Label>
|
|
<Textarea
|
|
id="notes"
|
|
placeholder={t('notes_placeholder')}
|
|
{...register('notes')}
|
|
/>
|
|
</div>
|
|
|
|
{/* Submit */}
|
|
<div className="flex justify-end gap-2">
|
|
<Button
|
|
type="submit"
|
|
disabled={isLoading || !canWrite}
|
|
title={!canWrite ? t('viewer_disabled_tooltip') : undefined}
|
|
>
|
|
{isLoading ? (
|
|
<>
|
|
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
|
{t('submit_saving')}
|
|
</>
|
|
) : !canWrite ? (
|
|
<>
|
|
<Lock className="mr-2 h-4 w-4" />
|
|
{t('submit_save')}
|
|
</>
|
|
) : (
|
|
t('submit_save')
|
|
)}
|
|
</Button>
|
|
</div>
|
|
</form>
|
|
)
|
|
}
|