241959513b
* feat(api): test-mode API keys force dry-run on the v1 REST API A key created with mode='test' (prefix gnubok_sk_test_) binds to the real company, but the v1 wrapper forces dry_run on every write so nothing is persisted or sent. Mutations on endpoints that can't be simulated (dryRunSupported=false or unregistered) are refused with 403 TEST_KEY_WRITE_BLOCKED — fail-closed. Reads pass through unchanged and every test-key response carries X-Gnubok-Mode: test. Live keys are unaffected (mode defaults to 'live'). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(invoices): company default "Vår referens" + per-line sales-account override Add company_settings.default_our_reference (settings form, schema, type); the invoice editor pre-fills our_reference from it on new invoices only, never overwriting an edited draft. Separately, add an optional per-line försäljningskonto (class-3) override in the editor — left blank, the engine still derives the revenue account from the VAT rate, and reverse-charge/export lines ignore the override. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(invoices): render a Swish payment QR on invoice PDFs Build the Swish "Type C" QR payload offline (no Swish API call) and embed it as a PNG in the invoice PDF payment box when Swish display is enabled, the invoice is in SEK, and the amount is positive. Also surface the invoice number in the payment box. Wired through every PDF render path: send, mark-sent and pdf routes (both legacy and v1), the recurring-schedule sender, and the staged-send commit. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(bookkeeping): draft exclusion + correction-chain collapse on verifikationslista Extend list_fiscal_period_entries_with_related with two opt-in params: p_exclude_draft (keep drafts off the committed list — they get their own surface) and p_collapse_corrections (render a correction group as the single live correction, hiding the mechanical storno and the reversed original). Both default false; nothing is deleted, every voucher keeps its number, and a "show all" toggle exposes the full chain. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(reports): link multi-year SIE periods so resultatrapport shows the prior year SIE import now sets fiscal_periods.previous_period_id in both directions when creating a period, so multi-year files chain correctly regardless of #RAR order. A backfill migration repairs periods imported before this (idempotent; only touches NULL links on first-of-month periods). generateResultatrapport falls back to the date-adjacent prior period when the chain is still null, so the comparison column works for legacy data too. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(articles): hide the VAT field for non-momsregistrerade companies The article form reads company_settings.vat_registered and, when false, hides the moms field and forces vat_rate to 0 on submit — mirroring the invoice editor so a non-VAT-registered company never sets a rate it can't charge. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(import): allow file-based imports in the sandbox Bank-file, CSV/Excel and SIE imports run entirely on uploaded data with no external service, so they're now reachable in the sandbox. Only the API-backed options that need live third-party credentials (PSD2 bank connection, provider migration) stay disabled. Updates the sandbox notice copy to match. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(bookkeeping): add edit draft functionality for journal entries * feat(database): add default "Vår referens" column to company_settings for invoicing * fix(tests): set SHOW_SWISH_ON_INVOICE to false in PDF template mocks * @ fix(payments): use roundOre for Swish amount formatting Replace naive Math.round(x*100)/100 with roundOre from @/lib/money to satisfy the antipattern guard. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> @ --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
421 lines
14 KiB
TypeScript
421 lines
14 KiB
TypeScript
'use client'
|
|
|
|
import { useEffect, useMemo, useState } from 'react'
|
|
import { useForm, Controller } from 'react-hook-form'
|
|
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import { z } from 'zod'
|
|
import { 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 { ChevronDown, Loader2, Lock } from 'lucide-react'
|
|
import { cn } from '@/lib/utils'
|
|
import { useCanWrite } from '@/lib/hooks/use-can-write'
|
|
import { useCompany } from '@/contexts/CompanyContext'
|
|
import { createClient } from '@/lib/supabase/client'
|
|
import AccountCombobox from '@/components/bookkeeping/AccountCombobox'
|
|
import { AddAccountDialog } from '@/components/bookkeeping/AddAccountDialog'
|
|
import type { BASAccount, CreateArticleInput } from '@/types'
|
|
|
|
// Unit list mirrors the invoice line editor (app/(dashboard)/invoices/new/page.tsx).
|
|
const UNITS = ['st', 'tim', 'dag', 'månad', 'km', 'kg'] as const
|
|
|
|
// Legal Swedish VAT rates as integer percent. Matches vatRatePercent in
|
|
// lib/api/schemas.ts (25 | 12 | 6 | 0).
|
|
const VAT_RATES = [25, 12, 6, 0] as const
|
|
|
|
interface ArticleFormProps {
|
|
onSubmit: (data: CreateArticleInput) => Promise<void>
|
|
isLoading: boolean
|
|
initialData?: Partial<CreateArticleInput>
|
|
}
|
|
|
|
export default function ArticleForm({
|
|
onSubmit,
|
|
isLoading,
|
|
initialData,
|
|
}: ArticleFormProps) {
|
|
const { canWrite } = useCanWrite()
|
|
const { company } = useCompany()
|
|
const supabase = createClient()
|
|
const t = useTranslations('form_article')
|
|
// Active class-3 (revenue) accounts for the combobox. The combobox accepts
|
|
// unknown 4-digit numbers optimistically — the API answers with
|
|
// ACCOUNTS_NOT_IN_CHART for activatable BAS accounts, and the host page's
|
|
// ActivateAccountsDialog flow takes over (same UX as the journal entry form).
|
|
const [revenueAccounts, setRevenueAccounts] = useState<BASAccount[]>([])
|
|
// Inline account creation: what the user typed in the combobox when they hit
|
|
// "Skapa konto" — non-null opens AddAccountDialog prefilled with it.
|
|
const [createAccountPrefill, setCreateAccountPrefill] = useState<string | null>(null)
|
|
// Momsregistrerad? A non-VAT-registered company never charges moms, so the
|
|
// VAT field is hidden and the rate forced to 0 — mirrors the invoice editor.
|
|
const [vatRegistered, setVatRegistered] = useState(true)
|
|
|
|
async function fetchRevenueAccounts() {
|
|
try {
|
|
const res = await fetch('/api/bookkeeping/accounts?class=3')
|
|
const body = await res.json()
|
|
setRevenueAccounts((body?.data as BASAccount[]) || [])
|
|
} catch {
|
|
// Non-fatal: the combobox degrades to free 4-digit entry.
|
|
}
|
|
}
|
|
|
|
useEffect(() => {
|
|
fetchRevenueAccounts()
|
|
}, [])
|
|
|
|
useEffect(() => {
|
|
if (!company?.id) return
|
|
let cancelled = false
|
|
supabase
|
|
.from('company_settings')
|
|
.select('vat_registered')
|
|
.eq('company_id', company.id)
|
|
.single()
|
|
.then(({ data }) => {
|
|
if (!cancelled && typeof data?.vat_registered === 'boolean') {
|
|
setVatRegistered(data.vat_registered)
|
|
}
|
|
})
|
|
return () => {
|
|
cancelled = true
|
|
}
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [company?.id])
|
|
// Open the advanced section by default when it already holds data, so an
|
|
// edit never hides a value the user previously set.
|
|
const [advancedOpen, setAdvancedOpen] = useState(
|
|
Boolean(
|
|
initialData?.revenue_account ||
|
|
initialData?.cost_price != null ||
|
|
initialData?.ean ||
|
|
initialData?.housework_type ||
|
|
initialData?.notes,
|
|
),
|
|
)
|
|
|
|
// UI-local schema mirroring CreateArticleSchema (lib/api/schemas.ts).
|
|
const schema = useMemo(
|
|
() =>
|
|
z.object({
|
|
name: z.string().min(1, t('name_required')),
|
|
name_en: z.string().optional(),
|
|
type: z.enum(['vara', 'tjanst']),
|
|
unit: z.string().min(1),
|
|
price_excl_vat: z.number({ message: t('price_required') }).nonnegative(t('price_required')),
|
|
vat_rate: z.union([z.literal(25), z.literal(12), z.literal(6), z.literal(0)]),
|
|
revenue_account: z.string().optional(),
|
|
cost_price: z.number().nonnegative().optional(),
|
|
ean: z.string().optional(),
|
|
housework_type: z.string().optional(),
|
|
notes: z.string().optional(),
|
|
}),
|
|
[t],
|
|
)
|
|
|
|
type FormData = z.infer<typeof schema>
|
|
|
|
const {
|
|
register,
|
|
handleSubmit,
|
|
watch,
|
|
control,
|
|
setValue,
|
|
formState: { errors },
|
|
} = useForm<FormData>({
|
|
resolver: zodResolver(schema),
|
|
defaultValues: {
|
|
name: initialData?.name || '',
|
|
name_en: initialData?.name_en || '',
|
|
type: initialData?.type || 'tjanst',
|
|
unit: initialData?.unit || 'st',
|
|
price_excl_vat: initialData?.price_excl_vat ?? 0,
|
|
vat_rate: (initialData?.vat_rate as FormData['vat_rate']) ?? 25,
|
|
revenue_account: initialData?.revenue_account || '',
|
|
cost_price: initialData?.cost_price ?? undefined,
|
|
ean: initialData?.ean || '',
|
|
housework_type: initialData?.housework_type || '',
|
|
notes: initialData?.notes || '',
|
|
},
|
|
})
|
|
|
|
const type = watch('type')
|
|
|
|
const onFormSubmit = (data: FormData) => {
|
|
onSubmit({
|
|
name: data.name,
|
|
name_en: data.name_en || null,
|
|
type: data.type,
|
|
unit: data.unit,
|
|
price_excl_vat: data.price_excl_vat,
|
|
vat_rate: vatRegistered ? data.vat_rate : 0,
|
|
revenue_account: data.revenue_account || null,
|
|
cost_price: data.cost_price ?? null,
|
|
ean: data.ean || null,
|
|
housework_type: type === 'tjanst' ? data.housework_type || null : null,
|
|
notes: data.notes || null,
|
|
})
|
|
}
|
|
|
|
return (
|
|
<form onSubmit={handleSubmit(onFormSubmit)} className="space-y-6">
|
|
{/* Type */}
|
|
<div className="space-y-2">
|
|
<Label>{t('type_label')}</Label>
|
|
<Controller
|
|
name="type"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Select value={field.value} onValueChange={(v) => { if (v) field.onChange(v) }}>
|
|
<SelectTrigger>
|
|
<SelectValue placeholder={t('type_placeholder')} />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectItem value="vara">{t('type_vara')}</SelectItem>
|
|
<SelectItem value="tjanst">{t('type_tjanst')}</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>
|
|
|
|
{/* English name */}
|
|
<div className="space-y-2">
|
|
<Label htmlFor="name_en">{t('name_en_label')}</Label>
|
|
<Input
|
|
id="name_en"
|
|
placeholder={t('name_en_placeholder')}
|
|
{...register('name_en')}
|
|
/>
|
|
<p className="text-xs text-muted-foreground">{t('name_en_hint')}</p>
|
|
</div>
|
|
|
|
{/* Unit + price + VAT (moms hidden for non-momsregistrerade) */}
|
|
<div className={`grid grid-cols-1 gap-4 ${vatRegistered ? 'sm:grid-cols-3' : 'sm:grid-cols-2'}`}>
|
|
<div className="space-y-2">
|
|
<Label>{t('unit_label')}</Label>
|
|
<Controller
|
|
name="unit"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Select value={field.value} onValueChange={(v) => { if (v) field.onChange(v) }}>
|
|
<SelectTrigger>
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{UNITS.map((u) => (
|
|
<SelectItem key={u} value={u}>{u}</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
)}
|
|
/>
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="price_excl_vat">{t('price_label')}</Label>
|
|
<Input
|
|
id="price_excl_vat"
|
|
type="number"
|
|
step="0.01"
|
|
min="0"
|
|
className="tabular-nums"
|
|
{...register('price_excl_vat', { valueAsNumber: true })}
|
|
/>
|
|
{errors.price_excl_vat && (
|
|
<p className="text-sm text-destructive">{errors.price_excl_vat.message}</p>
|
|
)}
|
|
</div>
|
|
{vatRegistered && (
|
|
<div className="space-y-2">
|
|
<Label>{t('vat_rate_label')}</Label>
|
|
<Controller
|
|
name="vat_rate"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Select
|
|
value={String(field.value)}
|
|
onValueChange={(v) => { if (v) field.onChange(Number(v)) }}
|
|
>
|
|
<SelectTrigger>
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{VAT_RATES.map((rate) => (
|
|
<SelectItem key={rate} value={String(rate)}>{rate} %</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
)}
|
|
/>
|
|
</div>
|
|
)}
|
|
</div>
|
|
|
|
{/* Advanced (collapsible) */}
|
|
<div className="pt-4 border-t">
|
|
<button
|
|
type="button"
|
|
onClick={() => setAdvancedOpen((o) => !o)}
|
|
className="flex items-center gap-1.5 text-sm font-medium text-muted-foreground hover:text-foreground transition-colors"
|
|
aria-expanded={advancedOpen}
|
|
>
|
|
<ChevronDown
|
|
className={cn('h-4 w-4 transition-transform duration-200', advancedOpen && 'rotate-180')}
|
|
/>
|
|
{t('advanced_section')}
|
|
</button>
|
|
|
|
{advancedOpen && (
|
|
<div className="space-y-4 pt-4">
|
|
{/* Revenue account */}
|
|
<div className="space-y-2">
|
|
<Label>{t('revenue_account_label')}</Label>
|
|
<Controller
|
|
name="revenue_account"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<AccountCombobox
|
|
value={field.value || ''}
|
|
accounts={revenueAccounts}
|
|
onChange={field.onChange}
|
|
onCreateAccount={(prefill) => setCreateAccountPrefill(prefill)}
|
|
/>
|
|
)}
|
|
/>
|
|
<p className="text-xs text-muted-foreground">{t('revenue_account_hint')}</p>
|
|
</div>
|
|
|
|
{/* Cost price */}
|
|
<div className="space-y-2">
|
|
<Label htmlFor="cost_price">{t('cost_price_label')}</Label>
|
|
<Input
|
|
id="cost_price"
|
|
type="number"
|
|
step="0.01"
|
|
min="0"
|
|
className="tabular-nums"
|
|
{...register('cost_price', {
|
|
setValueAs: (v) => (v === '' || v == null ? undefined : Number(v)),
|
|
})}
|
|
/>
|
|
<p className="text-xs text-muted-foreground">{t('cost_price_hint')}</p>
|
|
</div>
|
|
|
|
{/* EAN */}
|
|
<div className="space-y-2">
|
|
<Label htmlFor="ean">{t('ean_label')}</Label>
|
|
<Input
|
|
id="ean"
|
|
placeholder={t('ean_placeholder')}
|
|
className="tabular-nums"
|
|
{...register('ean')}
|
|
/>
|
|
</div>
|
|
|
|
{/* Housework type (tjänst only) */}
|
|
{type === 'tjanst' && (
|
|
<div className="space-y-2">
|
|
<Label>{t('housework_label')}</Label>
|
|
<Controller
|
|
name="housework_type"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Select
|
|
value={field.value || 'none'}
|
|
onValueChange={(v) => field.onChange(v === 'none' ? '' : v)}
|
|
>
|
|
<SelectTrigger>
|
|
<SelectValue placeholder={t('housework_placeholder')} />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectItem value="none">{t('housework_none')}</SelectItem>
|
|
<SelectItem value="ROT">{t('housework_rot')}</SelectItem>
|
|
<SelectItem value="RUT">{t('housework_rut')}</SelectItem>
|
|
</SelectContent>
|
|
</Select>
|
|
)}
|
|
/>
|
|
<p className="text-xs text-muted-foreground">{t('housework_hint')}</p>
|
|
</div>
|
|
)}
|
|
|
|
{/* Notes */}
|
|
<div className="space-y-2">
|
|
<Label htmlFor="notes">{t('notes_label')}</Label>
|
|
<Textarea
|
|
id="notes"
|
|
placeholder={t('notes_placeholder')}
|
|
{...register('notes')}
|
|
/>
|
|
</div>
|
|
</div>
|
|
)}
|
|
</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>
|
|
|
|
{/* Inline custom-account creation (renders in a portal, outside the form).
|
|
After create: refresh the chart and select the new number as the
|
|
article's revenue account — mirrors the journal entry form. */}
|
|
<AddAccountDialog
|
|
open={createAccountPrefill != null}
|
|
onOpenChange={(next) => {
|
|
if (!next) setCreateAccountPrefill(null)
|
|
}}
|
|
initialAccountNumber={
|
|
createAccountPrefill && /^\d{1,4}$/.test(createAccountPrefill)
|
|
? createAccountPrefill
|
|
: undefined
|
|
}
|
|
initialAccountName={
|
|
createAccountPrefill && !/^\d{1,4}$/.test(createAccountPrefill)
|
|
? createAccountPrefill
|
|
: undefined
|
|
}
|
|
onCreated={async (account) => {
|
|
await fetchRevenueAccounts()
|
|
setValue('revenue_account', account.account_number, { shouldDirty: true })
|
|
setCreateAccountPrefill(null)
|
|
}}
|
|
/>
|
|
</form>
|
|
)
|
|
}
|