* refactor(ui): app-wide UI/UX consistency pass
Net: +1,159 / −1,373 LOC across 77 files. No new features, no behavior
changes. Locks in a uniform design system across every dashboard surface.
What changed:
- **Foundation**: sidebar width 232→256px (md:w-64), spacing scale locked
(Tailwind 1/2/3/4/6/8/10/12; 2.5/5 forbidden), card padding p-6 default
(p-4 for compact metric cards), space-y-8 between page sections.
- **Tables unified**: all 33 thead blocks now share the Resultatrapport
pattern via shadcn Table primitive (text-[11px] font-medium uppercase
tracking-wider text-muted-foreground). Hand-rolled <table> instances
converted where they were data tables; form/edit grids kept distinct.
- **Status badges unified**: every status indicator routes through
shadcn <Badge variant>. Eliminated raw Tailwind colors
(bg-amber-100, bg-emerald-500/10, bg-blue-100, bg-purple-100, etc.)
in favor of the gnubok semantic palette (success=sage, warning=ochre,
destructive=terracotta).
- **Empty states unified**: list pages migrated from hand-rolled
"flex flex-col items-center py-12" divs to the EmptyState primitive.
- **Loading skeletons unified**: hand-rolled bg-muted rounded animate-pulse
divs replaced with shadcn <Skeleton> across 15 files.
- **Touch targets**: 6 back-buttons + edit-pencil + inbox delete bumped
from 24/32/36px to shadcn's 40px icon default. Added aria-labels on
9 icon-only navigation buttons.
- **Date formatting**: formatDate() for accounting data (ISO yyyy-MM-dd,
table-friendly) vs formatDateLong() for metadata (Swedish long form).
Raw {x.invoice_date} renderings routed through formatDate() in 18 sites.
- **Toast titles**: eliminated 33 generic "Fel" titles. Each toast title
now carries the action ("Kunde inte skapa lönekörning" etc.) with
description carrying the error detail.
- **Page-level cleanups**:
- Dashboard: dropped greeting hero + Snabbåtgärder/Att hantera nav
duplicates + Visa detaljer collapsible.
- Reports: 5-col mega-menu replaced with left-rail layout
(new ReportsNav component).
- Bookkeeping: fixed layout jump between Verifikationer/Ny verifikation
tabs (moved FiscalYearSelector inside journal tab).
- Bookkeeping: added voucher sort (A1 first / latest first) alongside
existing date sort. Required matching API param sort_by.
- KPI page: FiscalYearSelector instead of raw <select>; InfoTooltip
instead of inline info-button toggle; bigger numbers.
- Salary section: enum values translated to Swedish labels, mobile
table collapses to Anställd+Netto on <md, KPI typography aligned
with dashboard.
- Invoice forms: styled RequiredMark + aria-required, tabular-nums
on amount inputs.
- **CLAUDE.md**: new "Design System Tokens" subsection documents the
locked spacing scale, primitives table, typography rules, date helpers,
and forbidden patterns so future contributors don't drift.
Tests: 2,906 passing (unchanged). Lint: unchanged from main baseline.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix: address PR review feedback (Greptile + compliance bot)
- **formatDate / formatDateLong timezone fix**: switch from new Date() to
parseISO. Bare yyyy-MM-dd strings are now parsed as local midnight rather
than UTC midnight, eliminating the off-by-one display in west-of-UTC
timezones flagged by Greptile.
- **DashboardContentProps cleanup**: removed unused firstName and settings
fields from the interface, and the corresponding fetch (profiles table)
+ computation in app/(dashboard)/page.tsx. The greeting was dropped in
the dashboard cleanup; these props were dead weight.
- **Voucher sort behavior documented**: extended the comment in the journal
entries API route to explain why voucher sort intentionally uses strict
fiscal_period_id filtering (BFL 5 kap 6–7 §§ — voucher numbers are
series-scoped within a fiscal year). The row-count delta between date
sort and voucher sort is now a documented design choice.
- **delete_last_voucher migration + draft-delete test included**: the UI
already shipped the "Radera utkast" path in the previous commit; this
pulls in the backing RPC migration that allows draft deletes (with the
full safety logic — drafts skip series/period checks since they have
voucher_number=0, posted entries go through the existing unchanged
path). This was originally meant for a separate PR but the UI shipped
half the feature without it.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(migration): rename to match applied version
The function delete_last_voucher is already applied to the production DB
under version 20260509103736 (verified via pg_get_functiondef — exact
byte-for-byte match to file content). The previous file timestamp
20260509120000 would cause a fresh `supabase db push` to attempt re-applying
under a different version row. Renaming the file aligns local tracking
with what the database actually has.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix: address compliance bot findings (payroll label + VAT visibility)
- sick_karens label: drop "(första sjukdagen)" qualifier. Per sjuklönelagen
6 §, karensavdrag is a single calculated amount (20% of one week's
sjuklön) deducted from the first sick day's pay — not bounded to the
first day. The qualifier could mislead users when the first sick day
and return-to-work span a weekend. Swedish-payroll bot recommendation.
- Omvänd skattskyldighet badge: variant outline → warning. The reverse-
charge indicator is compliance-critical (ML 16 kap) — missing it leads
to incorrect input VAT deduction. Outline was too subtle; warning's
ochre fill matches its semantic weight.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
214 lines
7.7 KiB
TypeScript
214 lines
7.7 KiB
TypeScript
'use client'
|
||
|
||
import { Badge } from '@/components/ui/badge'
|
||
import { Separator } from '@/components/ui/separator'
|
||
import { formatCurrency } from '@/lib/utils'
|
||
import { getDisplayTotal } from '@/lib/invoices/rounding'
|
||
import type { Customer, Currency } from '@/types'
|
||
|
||
interface ReviewItem {
|
||
description: string
|
||
quantity: number
|
||
unit: string
|
||
unit_price: number
|
||
vat_rate?: number
|
||
}
|
||
|
||
interface InvoiceReviewContentProps {
|
||
customer: Customer
|
||
invoiceDate: string
|
||
dueDate: string
|
||
currency: Currency
|
||
items: ReviewItem[]
|
||
subtotal: number
|
||
vatAmount: number
|
||
total: number
|
||
yourReference?: string
|
||
ourReference?: string
|
||
notes?: string
|
||
/** The invoice number that will be assigned on confirm. Null when unknown
|
||
* (e.g. delivery notes use a different sequence) or unfetched. */
|
||
numberPreview?: string | null
|
||
/** Mirrors `company_settings.ore_rounding`. Defaults to true to match `getDisplayTotal`. */
|
||
oreRounding?: boolean
|
||
}
|
||
|
||
export function InvoiceReviewContent({
|
||
customer,
|
||
invoiceDate,
|
||
dueDate,
|
||
currency,
|
||
items,
|
||
subtotal,
|
||
vatAmount,
|
||
total,
|
||
yourReference,
|
||
ourReference,
|
||
notes,
|
||
numberPreview,
|
||
oreRounding,
|
||
}: InvoiceReviewContentProps) {
|
||
const rounding = getDisplayTotal({ total, currency }, { ore_rounding: oreRounding ?? true })
|
||
const customerTypeLabel: Record<string, string> = {
|
||
individual: 'Privatperson',
|
||
swedish_business: 'Svenskt företag eller organisation',
|
||
eu_business: 'EU-företag',
|
||
non_eu_business: 'Utanför EU',
|
||
}
|
||
|
||
// Calculate per-rate VAT breakdown
|
||
const vatByRate = new Map<number, number>()
|
||
for (const item of items) {
|
||
const rate = item.vat_rate ?? 0
|
||
const lineTotal = item.quantity * item.unit_price
|
||
const lineVat = Math.round(lineTotal * rate / 100 * 100) / 100
|
||
vatByRate.set(rate, (vatByRate.get(rate) || 0) + lineVat)
|
||
}
|
||
|
||
const showVatColumn = vatByRate.size > 1
|
||
|
||
return (
|
||
<div className="space-y-4">
|
||
{numberPreview && (
|
||
<div className="text-sm text-muted-foreground">
|
||
Tilldelas fakturanummer{' '}
|
||
<span className="font-medium tabular-nums text-foreground">{numberPreview}</span>
|
||
</div>
|
||
)}
|
||
{/* Customer info */}
|
||
<div className="bg-muted rounded-lg p-3 sm:p-4 flex flex-col sm:flex-row sm:items-center gap-2 sm:justify-between">
|
||
<div className="min-w-0">
|
||
<p className="font-medium text-base truncate">{customer.name}</p>
|
||
<p className="text-sm text-muted-foreground truncate">{customer.email}</p>
|
||
</div>
|
||
<Badge variant="outline" className="self-start sm:self-auto shrink-0">
|
||
{customerTypeLabel[customer.customer_type] || customer.customer_type}
|
||
</Badge>
|
||
</div>
|
||
|
||
{/* Dates */}
|
||
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4 text-sm">
|
||
<div>
|
||
<span className="text-muted-foreground">Fakturadatum</span>
|
||
<p className="font-medium">{invoiceDate}</p>
|
||
</div>
|
||
<div>
|
||
<span className="text-muted-foreground">Förfallodatum</span>
|
||
<p className="font-medium">{dueDate}</p>
|
||
</div>
|
||
</div>
|
||
|
||
{/* Line items — table on desktop, cards on mobile */}
|
||
<div className="hidden sm:block">
|
||
<table className="w-full text-sm">
|
||
<thead className="[&_th]:font-medium [&_th]:text-[11px] [&_th]:uppercase [&_th]:tracking-wider [&_th]:text-muted-foreground">
|
||
<tr className="border-b text-left">
|
||
<th className="py-2">Beskrivning</th>
|
||
<th className="py-2 w-16 text-right">Antal</th>
|
||
<th className="py-2 w-16 text-center">Enhet</th>
|
||
<th className="py-2 w-24 text-right">À-pris</th>
|
||
{showVatColumn && <th className="py-2 w-16 text-right">Moms</th>}
|
||
<th className="py-2 w-28 text-right">Belopp</th>
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
{items.map((item, index) => (
|
||
<tr key={index} className="border-b last:border-0">
|
||
<td className="py-2">{item.description}</td>
|
||
<td className="py-2 text-right">{item.quantity}</td>
|
||
<td className="py-2 text-center">{item.unit}</td>
|
||
<td className="py-2 text-right">{formatCurrency(item.unit_price, currency)}</td>
|
||
{showVatColumn && (
|
||
<td className="py-2 text-right">{item.vat_rate ?? 0}%</td>
|
||
)}
|
||
<td className="py-2 text-right">
|
||
{formatCurrency(item.quantity * item.unit_price, currency)}
|
||
</td>
|
||
</tr>
|
||
))}
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
<div className="sm:hidden space-y-2">
|
||
{items.map((item, index) => (
|
||
<div key={index} className="border rounded-lg p-3 text-sm space-y-1.5">
|
||
<p className="font-medium">{item.description}</p>
|
||
<div className="flex items-center justify-between text-muted-foreground">
|
||
<span>{item.quantity} {item.unit} × {formatCurrency(item.unit_price, currency)}</span>
|
||
{showVatColumn && <span className="text-xs">({item.vat_rate ?? 0}% moms)</span>}
|
||
</div>
|
||
<p className="text-right font-medium">
|
||
{formatCurrency(item.quantity * item.unit_price, currency)}
|
||
</p>
|
||
</div>
|
||
))}
|
||
</div>
|
||
|
||
{/* Totals */}
|
||
<div className="space-y-2 text-sm">
|
||
<div className="flex justify-between">
|
||
<span className="text-muted-foreground">Delsumma</span>
|
||
<span>{formatCurrency(subtotal, currency)}</span>
|
||
</div>
|
||
{Array.from(vatByRate.entries())
|
||
.filter(([, vat]) => vat > 0)
|
||
.sort(([a], [b]) => b - a)
|
||
.map(([rate, vat]) => (
|
||
<div key={rate} className="flex justify-between">
|
||
<span className="text-muted-foreground">Moms {rate}%</span>
|
||
<span>{formatCurrency(vat, currency)}</span>
|
||
</div>
|
||
))}
|
||
{Array.from(vatByRate.values()).every((vat) => vat === 0) && (
|
||
<div className="flex justify-between">
|
||
<span className="text-muted-foreground">Moms</span>
|
||
<span>{formatCurrency(0, currency)}</span>
|
||
</div>
|
||
)}
|
||
{rounding.applies && (
|
||
<div className="flex justify-between">
|
||
<span className="text-muted-foreground">Öresavrundning</span>
|
||
<span>{formatCurrency(rounding.roundingDelta, currency)}</span>
|
||
</div>
|
||
)}
|
||
<Separator />
|
||
<div className="flex justify-between font-bold text-xl sm:text-2xl">
|
||
<span>Totalt</span>
|
||
<span>{formatCurrency(rounding.displayed, currency)}</span>
|
||
</div>
|
||
</div>
|
||
|
||
{/* References/notes */}
|
||
{(yourReference || ourReference || notes) && (
|
||
<div className="border-t pt-3 space-y-2 text-sm text-muted-foreground">
|
||
{yourReference && (
|
||
<div>
|
||
<span>Er referens:</span>
|
||
<div className="flex flex-wrap gap-1 mt-1">
|
||
{yourReference.split(',').map((ref, i) => (
|
||
<Badge key={i} variant="secondary" className="text-xs font-normal">
|
||
{ref.trim()}
|
||
</Badge>
|
||
))}
|
||
</div>
|
||
</div>
|
||
)}
|
||
{ourReference && (
|
||
<div>
|
||
<span>Vår referens:</span>
|
||
<div className="flex flex-wrap gap-1 mt-1">
|
||
{ourReference.split(',').map((ref, i) => (
|
||
<Badge key={i} variant="secondary" className="text-xs font-normal">
|
||
{ref.trim()}
|
||
</Badge>
|
||
))}
|
||
</div>
|
||
</div>
|
||
)}
|
||
{notes && <p>Anteckning: {notes}</p>}
|
||
</div>
|
||
)}
|
||
</div>
|
||
)
|
||
}
|