* fix(invoices): apply configured voucher series to payments + preview next voucher The booking engine resolves the series from default_voucher_series_per_source_type, but the global "Standardserie" dropdown wrote a separate field the engine ignored, and cash-method invoice payments (invoice_cash_payment) weren't exposed in settings — so configured series were silently dropped to "A". - Expose cash/private payment source types in the per-source-type form - Write the global default through to the map on save, keeping overrides - Resolve voucher-sequences/next by source_type (+date) to match the engine - Show the upcoming voucher (V2) in the payment dialog title - Share resolveInvoicePaymentSourceType so preview and booking can't drift Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(salary): keep AGI panel in sync with Skatteverket signing state The AGI panel mixed run-scoped generation state (agi_generated_at, agi_declarations) with period-scoped submission state (extension_data agi_submission_{period}), so the two could drift and present contradictory UI. Reconcile them: - Auto-detect a Mina Sidor BankID signature: while awaiting_signing, poll /agi/kvittenser on mount and on tab refocus so the panel flips to "signed" (hiding the signing actions) without a manual "Hamta kvittens" click. - Warn instead of offering to sign when the locked granskningsunderlag predates the run's latest AGI generation (draftIsStale) — avoids filing superseded figures. - Self-heal a stale "AGI-XML saknas" error once the run's AGI is (re)generated out-of-band (MCP/API/other tab). - Refetch the salary run on tab focus so agi_generated_at reflects out-of-band generation without a hard reload. - /agi/lasUpp now clears the cached agi_submission_{period} record, so unlocking drops the panel back to the pre-submission state instead of stranding it on a released "redo att signeras" draft. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat: Implement VAT registration handling and invoice item line types - Added VAT registration check in commitCreateInvoice to set VAT rate to 0% for non-VAT registered companies. - Updated invoice creation logic to reflect 'exempt' VAT treatment and adjusted related fields accordingly. - Introduced support for free-text and blank spacer rows in invoice items by adding a new line_type field. - Enhanced invoice and credit note handling to accommodate new line types. - Added new localized messages for text rows in English and Swedish. - Created tests for salary run approval logic, ensuring bank details are validated correctly. - Implemented effective net payout calculation for salary runs, considering tax overrides. - Added SQL migrations to support new invoice item line types and accounting method awareness for linking invoices to vouchers. * feat(articles): artikelregister with revenue account + VAT rate per article Article register (non-inventory) with per-article VAT rate and optional BAS class-3 revenue-account override. Includes API routes, UI pages, MCP tools, pending-operation staging, and the activate-or-create account flow (ACCOUNTS_NOT_IN_CHART -> ActivateAccountsDialog, unknown numbers -> AddAccountDialog) reusing the journal entry UX. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(bookkeeping): no-doc-required batch + bulk-missing endpoints Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(payments): supplier payment lines + cash-method invoice matching Shared payment-line proposal for supplier invoices, improved match-invoice/match-supplier-invoice flows (kontantmetoden-aware), and voucher-link support without requiring a 151x clearing entry. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(bookkeeping): new journal entry dialog, SIE import tweaks, misc New journal entry dialog component, journal list/page updates, invoice editor updates, SIE import adjustments, transaction ingest and api-key tweaks, pr-agent workflow update. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(invoices): implement tax reduction features and localization updates * feat(tests): add VAT registration gate to pending operations commit tests --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
360 lines
12 KiB
TypeScript
360 lines
12 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useEffect, useCallback, useRef, use } from 'react'
|
|
import { useRouter } from 'next/navigation'
|
|
import Link from 'next/link'
|
|
import { useLocale, useTranslations } from 'next-intl'
|
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Badge } from '@/components/ui/badge'
|
|
import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import ArticleForm from '@/components/articles/ArticleForm'
|
|
import { ActivateAccountsDialog } from '@/components/bookkeeping/ActivateAccountsDialog'
|
|
import {
|
|
useSubmitWithAccountActivation,
|
|
throwOnStructuredError,
|
|
} from '@/lib/hooks/use-submit-with-account-activation'
|
|
import { getErrorMessage, type ErrorLocale } from '@/lib/errors/get-error-message'
|
|
import { DestructiveConfirmDialog, useDestructiveConfirm } from '@/components/ui/destructive-confirm-dialog'
|
|
import {
|
|
ArrowLeft,
|
|
Package,
|
|
Wrench,
|
|
Edit2,
|
|
Archive,
|
|
Loader2,
|
|
Lock,
|
|
} from 'lucide-react'
|
|
import { useCanWrite } from '@/lib/hooks/use-can-write'
|
|
import { formatCurrency } from '@/lib/utils'
|
|
import type { Article, ArticleType, CreateArticleInput } from '@/types'
|
|
|
|
const ARTICLE_TYPE_KEY: Record<ArticleType, string> = {
|
|
vara: 'type_vara',
|
|
tjanst: 'type_tjanst',
|
|
}
|
|
|
|
const articleTypeIcons: Record<ArticleType, React.ElementType> = {
|
|
vara: Package,
|
|
tjanst: Wrench,
|
|
}
|
|
|
|
export default function ArticleDetailPage({
|
|
params,
|
|
}: {
|
|
params: Promise<{ id: string }>
|
|
}) {
|
|
const { id } = use(params)
|
|
const router = useRouter()
|
|
const { toast } = useToast()
|
|
const { canWrite } = useCanWrite()
|
|
const t = useTranslations('article_detail')
|
|
const errorLocale = useLocale() as ErrorLocale
|
|
const [article, setArticle] = useState<Article | null>(null)
|
|
const [isLoading, setIsLoading] = useState(true)
|
|
const [isEditOpen, setIsEditOpen] = useState(false)
|
|
const [isUpdating, setIsUpdating] = useState(false)
|
|
const { dialogProps: confirmDialogProps, confirm: confirmAction } = useDestructiveConfirm()
|
|
|
|
useEffect(() => {
|
|
fetchArticle()
|
|
}, [id])
|
|
|
|
async function fetchArticle() {
|
|
setIsLoading(true)
|
|
try {
|
|
const response = await fetch(`/api/articles/${id}`)
|
|
if (!response.ok) {
|
|
throw new Error('Not found')
|
|
}
|
|
const { data } = await response.json()
|
|
setArticle(data)
|
|
} catch {
|
|
toast({
|
|
title: t('load_failed_title'),
|
|
description: t('load_failed_description'),
|
|
variant: 'destructive',
|
|
})
|
|
router.push('/articles')
|
|
} finally {
|
|
setIsLoading(false)
|
|
}
|
|
}
|
|
|
|
// Update runs through useSubmitWithAccountActivation so an
|
|
// ACCOUNTS_NOT_IN_CHART response (revenue account not yet activated) opens
|
|
// the standard activate-and-retry dialog — same UX as the journal entry form.
|
|
const pendingUpdateRef = useRef<CreateArticleInput | null>(null)
|
|
const submitUpdate = useCallback(async () => {
|
|
const response = await fetch(`/api/articles/${id}`, {
|
|
method: 'PATCH',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify(pendingUpdateRef.current),
|
|
})
|
|
return throwOnStructuredError(response)
|
|
}, [id])
|
|
const {
|
|
runSubmit: runUpdate,
|
|
dialog: activationDialog,
|
|
confirm: confirmActivation,
|
|
cancel: cancelActivation,
|
|
} = useSubmitWithAccountActivation(submitUpdate)
|
|
|
|
async function handleUpdate(data: CreateArticleInput) {
|
|
setIsUpdating(true)
|
|
pendingUpdateRef.current = data
|
|
try {
|
|
await runUpdate()
|
|
toast({
|
|
title: t('updated_title'),
|
|
description: data.name,
|
|
})
|
|
setIsEditOpen(false)
|
|
fetchArticle()
|
|
} catch (err) {
|
|
// The user closing the activation dialog is not an error worth toasting.
|
|
if (!(err instanceof Error && err.message === 'cancelled')) {
|
|
const body = (err as { body?: unknown }).body
|
|
toast({
|
|
title: t('update_failed_title'),
|
|
description: getErrorMessage(body ?? err, { context: 'article', locale: errorLocale }),
|
|
variant: 'destructive',
|
|
})
|
|
}
|
|
} finally {
|
|
setIsUpdating(false)
|
|
}
|
|
}
|
|
|
|
async function handleDeactivate() {
|
|
if (!article) return
|
|
const ok = await confirmAction({
|
|
title: t('deactivate_confirm_title', { name: article.name }),
|
|
description: t('deactivate_confirm_description'),
|
|
confirmLabel: t('deactivate_confirm_label'),
|
|
variant: 'destructive',
|
|
})
|
|
if (!ok) return
|
|
|
|
try {
|
|
const response = await fetch(`/api/articles/${id}`, {
|
|
method: 'DELETE',
|
|
})
|
|
|
|
if (!response.ok) {
|
|
throw new Error('Deactivate failed')
|
|
}
|
|
|
|
toast({
|
|
title: t('deactivated_title'),
|
|
description: article.name,
|
|
})
|
|
router.push('/articles')
|
|
} catch {
|
|
toast({
|
|
title: t('deactivate_failed_title'),
|
|
description: t('retry'),
|
|
variant: 'destructive',
|
|
})
|
|
}
|
|
}
|
|
|
|
if (isLoading) {
|
|
return (
|
|
<div className="flex items-center justify-center h-64">
|
|
<Loader2 className="h-8 w-8 animate-spin text-primary" />
|
|
</div>
|
|
)
|
|
}
|
|
|
|
if (!article) return null
|
|
|
|
const Icon = articleTypeIcons[article.type]
|
|
|
|
return (
|
|
<div className="space-y-8">
|
|
{/* Header */}
|
|
<div className="flex items-start justify-between gap-4">
|
|
<div>
|
|
<Link
|
|
href="/articles"
|
|
className="text-sm text-muted-foreground hover:text-foreground flex items-center gap-1 mb-2"
|
|
>
|
|
<ArrowLeft className="h-4 w-4" />
|
|
{t('back')}
|
|
</Link>
|
|
<div className="flex items-center gap-3">
|
|
<div className="h-12 w-12 rounded-full bg-primary/10 flex items-center justify-center">
|
|
<Icon className="h-6 w-6 text-primary" />
|
|
</div>
|
|
<div>
|
|
<h1 className="font-display text-2xl md:text-3xl font-medium tracking-tight">{article.name}</h1>
|
|
<div className="flex items-center gap-2 mt-1">
|
|
<Badge variant="secondary">{t(ARTICLE_TYPE_KEY[article.type])}</Badge>
|
|
{article.article_number && (
|
|
<span className="text-sm text-muted-foreground tabular-nums">
|
|
{article.article_number}
|
|
</span>
|
|
)}
|
|
<Badge variant={article.active ? 'success' : 'secondary'}>
|
|
{article.active ? t('status_active') : t('status_inactive')}
|
|
</Badge>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex items-center gap-2">
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() => setIsEditOpen(true)}
|
|
disabled={!canWrite}
|
|
title={!canWrite ? t('viewer_disabled_tooltip') : undefined}
|
|
>
|
|
{canWrite ? <Edit2 className="h-4 w-4 mr-1" /> : <Lock className="h-4 w-4 mr-1" />}
|
|
{t('edit')}
|
|
</Button>
|
|
{article.active && (
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={handleDeactivate}
|
|
className="text-destructive hover:text-destructive"
|
|
disabled={!canWrite}
|
|
title={!canWrite ? t('viewer_disabled_tooltip') : undefined}
|
|
>
|
|
{canWrite ? <Archive className="h-4 w-4 mr-1" /> : <Lock className="h-4 w-4 mr-1" />}
|
|
{t('deactivate')}
|
|
</Button>
|
|
)}
|
|
</div>
|
|
</div>
|
|
|
|
{/* Info cards */}
|
|
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
|
|
{/* Pricing */}
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle className="text-base">{t('section_pricing')}</CardTitle>
|
|
</CardHeader>
|
|
<CardContent className="space-y-3">
|
|
<div className="text-sm flex items-center justify-between">
|
|
<span className="text-muted-foreground">{t('label_price')}</span>
|
|
<span className="tabular-nums">{formatCurrency(article.price_excl_vat)}</span>
|
|
</div>
|
|
<div className="text-sm flex items-center justify-between">
|
|
<span className="text-muted-foreground">{t('label_vat')}</span>
|
|
<span className="tabular-nums">{article.vat_rate} %</span>
|
|
</div>
|
|
<div className="text-sm flex items-center justify-between">
|
|
<span className="text-muted-foreground">{t('label_unit')}</span>
|
|
<span>{article.unit}</span>
|
|
</div>
|
|
{article.cost_price != null && (
|
|
<div className="text-sm flex items-center justify-between">
|
|
<span className="text-muted-foreground">{t('label_cost_price')}</span>
|
|
<span className="tabular-nums">{formatCurrency(article.cost_price)}</span>
|
|
</div>
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
|
|
{/* Accounting */}
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle className="text-base">{t('section_accounting')}</CardTitle>
|
|
</CardHeader>
|
|
<CardContent className="space-y-3">
|
|
<div className="text-sm flex items-center justify-between">
|
|
<span className="text-muted-foreground">{t('label_revenue_account')}</span>
|
|
<span className="tabular-nums">
|
|
{article.revenue_account || t('revenue_account_auto')}
|
|
</span>
|
|
</div>
|
|
{article.type === 'tjanst' && article.housework_type && (
|
|
<div className="text-sm flex items-center justify-between">
|
|
<span className="text-muted-foreground">{t('label_housework')}</span>
|
|
<Badge variant="secondary">{article.housework_type}</Badge>
|
|
</div>
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
|
|
{/* Details */}
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle className="text-base">{t('section_details')}</CardTitle>
|
|
</CardHeader>
|
|
<CardContent className="space-y-3">
|
|
{article.name_en && (
|
|
<div className="text-sm flex items-center justify-between">
|
|
<span className="text-muted-foreground">{t('label_name_en')}</span>
|
|
<span className="truncate ml-2">{article.name_en}</span>
|
|
</div>
|
|
)}
|
|
{article.ean && (
|
|
<div className="text-sm flex items-center justify-between">
|
|
<span className="text-muted-foreground">{t('label_ean')}</span>
|
|
<span className="tabular-nums">{article.ean}</span>
|
|
</div>
|
|
)}
|
|
{!article.name_en && !article.ean && (
|
|
<p className="text-sm text-muted-foreground">{t('no_details')}</p>
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
|
|
{/* Notes */}
|
|
{article.notes && (
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle className="text-base">{t('section_notes')}</CardTitle>
|
|
</CardHeader>
|
|
<CardContent>
|
|
<p className="text-sm text-muted-foreground whitespace-pre-wrap">{article.notes}</p>
|
|
</CardContent>
|
|
</Card>
|
|
)}
|
|
|
|
<DestructiveConfirmDialog {...confirmDialogProps} />
|
|
|
|
<ActivateAccountsDialog
|
|
open={activationDialog.open}
|
|
accountNumbers={activationDialog.accountNumbers}
|
|
onConfirm={confirmActivation}
|
|
onCancel={cancelActivation}
|
|
confirmLabel={t('activate_and_save')}
|
|
/>
|
|
|
|
{/* Edit dialog */}
|
|
<Dialog open={isEditOpen} onOpenChange={setIsEditOpen}>
|
|
<DialogContent className="sm:max-w-2xl max-h-[95dvh] sm:max-h-[90vh] overflow-y-auto">
|
|
<DialogHeader>
|
|
<DialogTitle>{t('edit_dialog_title')}</DialogTitle>
|
|
</DialogHeader>
|
|
<ArticleForm
|
|
onSubmit={handleUpdate}
|
|
isLoading={isUpdating}
|
|
initialData={{
|
|
name: article.name,
|
|
name_en: article.name_en || undefined,
|
|
type: article.type,
|
|
unit: article.unit,
|
|
price_excl_vat: article.price_excl_vat,
|
|
vat_rate: article.vat_rate,
|
|
revenue_account: article.revenue_account || undefined,
|
|
cost_price: article.cost_price ?? undefined,
|
|
ean: article.ean || undefined,
|
|
housework_type: article.housework_type || undefined,
|
|
notes: article.notes || undefined,
|
|
}}
|
|
/>
|
|
</DialogContent>
|
|
</Dialog>
|
|
</div>
|
|
)
|
|
}
|