0ca9c25aba
* feat(bookkeeping): make blocked fiscal-year creation actionable When creating a new räkenskapsår is blocked because a prior period is still open, the "Skapa räkenskapsår" dialog no longer dead-ends on an English toast. The API now returns the canonical bilingual error envelope with the blocking periods (id/name/dates) under details, and the dialog renders a Swedish panel that locks them inline (reversible locked_at) via the existing /lock endpoint and retries creation. The guard rule is unchanged and remains BFL-compliant: BFL 6 kap allows löpande bokföring of the new year in parallel with the prior year's bokslut, so a lock (not a full close) is sufficient and reversible. - Add PERIOD_CREATE_BLOCKED_BY_OPEN_PERIODS structured error code - Return envelope + details.blockingPeriods from the 409 (was English string) - CreatePeriodDialog: inline "lås och skapa" panel + lock-and-retry - Update route tests for the new envelope shape Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(ui): prevent mouse wheel from mutating number inputs A focused <input type="number"> would change its value on scroll, silently turning e.g. a 20000 salary into 19998. Blur number inputs on wheel so the page scrolls instead of editing the value. Applied at the Input primitive so all number fields are protected. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(salary): auto-derive skattetabell and kolumn for employees Replace the opaque manual "Skattetabell (29-42)" and "Kolumn (1-6)" inputs on the employee form with a self-deriving flow: the user picks their folkbokföringskommun from a searchable dropdown and the tax table fills itself in, while the column derives from the personnummer we already collect. - Add a searchable municipality picker (MunicipalityCombobox) backed by a new cached GET /api/salary/tax-tables/kommuner endpoint. - Wrap the whole "Skatt" card in a self-contained EmployeeTaxCard used by both the create and edit pages, with InfoTooltips and named column options. - deriveTaxColumn(): auto-select column 1 for under-66 employees; leave the ambiguous 66+ case (pension vs working senior) to a clearly-named manual choice. - Fix fetchKommunTaxRates() to page through all ~1300 församling rows instead of a single 500-row page (which silently dropped ~200 kommuner, incl. Göteborg) and normalize the uppercase names to title case. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(import): correct CSV amount-column guess and surface skipped rows Manual CSV column-mapping auto-guess walked each data row right-to-left and picked the first numeric cell as the amount, so on the common ...;Belopp;Saldo layout it grabbed the trailing running-balance column. Extract the guess into a pure, tested suggestColumnMapping(): match header labels first (belopp/amount -> amount, saldo/balance -> balance), auto-fill the balance field, and fall back to value heuristics that skip the balance column and prefer a column carrying negative values. Also surface stats.skipped_rows + parse warnings in BankFileConfirmStep - the manual-mapping path skips the preview step that was the only place they showed, so skipped rows were silently dropped from view. Add a unit test reproducing the Saldo-as-amount regression. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat: add "Save as draft" functionality for invoices - Implemented a new feature to allow users to save invoices as unnumbered drafts without generating an invoice number until finalized. - Added a `save_as_draft` flag to the CreateInvoiceInput schema to handle draft saving logic. - Updated the invoice creation API to skip number allocation when saving as a draft. - Introduced a new endpoint for finalizing drafts, which allocates an invoice number and emits an `invoice.created` event. - Enhanced the UI to include a "Save as draft" button, with loading states and tooltips. - Updated tests to cover the new draft saving and finalization logic, including race conditions for concurrent modifications. - Added relevant error handling for draft finalization and deletion scenarios. * feat(employee): add employment start and end date fields to employee forms * feat: enhance invoice and salary run handling with improved validation and event logging --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
243 lines
8.6 KiB
TypeScript
243 lines
8.6 KiB
TypeScript
'use client'
|
||
|
||
import { useState, useEffect } from 'react'
|
||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
|
||
import { Button } from '@/components/ui/button'
|
||
import { Badge } from '@/components/ui/badge'
|
||
import { Label } from '@/components/ui/label'
|
||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
|
||
import {
|
||
ArrowLeft,
|
||
Loader2,
|
||
Play,
|
||
FileText,
|
||
Link2,
|
||
Calendar,
|
||
Landmark,
|
||
AlertTriangle,
|
||
} from 'lucide-react'
|
||
import { formatCurrency } from '@/lib/utils'
|
||
import { createClient } from '@/lib/supabase/client'
|
||
import type { BankFileParseResult } from '@/lib/import/bank-file/types'
|
||
|
||
interface BankAccount {
|
||
account_number: string
|
||
account_name: string
|
||
}
|
||
|
||
interface BankFileConfirmStepProps {
|
||
parseResult: BankFileParseResult
|
||
onExecute: (options: { skip_duplicates: boolean; auto_categorize: boolean; settlement_account?: string }) => void
|
||
onBack: () => void
|
||
isLoading: boolean
|
||
}
|
||
|
||
export default function BankFileConfirmStep({
|
||
parseResult,
|
||
onExecute,
|
||
onBack,
|
||
isLoading,
|
||
}: BankFileConfirmStepProps) {
|
||
const { transactions, stats, date_from, date_to, issues } = parseResult
|
||
const refsCount = transactions.filter((t) => t.reference).length
|
||
const warnings = issues.filter((i) => i.severity === 'warning')
|
||
|
||
const [bankAccounts, setBankAccounts] = useState<BankAccount[]>([])
|
||
const [selectedAccount, setSelectedAccount] = useState('1930')
|
||
|
||
useEffect(() => {
|
||
async function fetchBankAccounts() {
|
||
const supabase = createClient()
|
||
const { data } = await supabase
|
||
.from('chart_of_accounts')
|
||
.select('account_number, account_name')
|
||
.eq('is_active', true)
|
||
.gte('account_number', '1900')
|
||
.lte('account_number', '1999')
|
||
.order('account_number')
|
||
|
||
if (data && data.length > 0) {
|
||
setBankAccounts(data)
|
||
// Default to 1930 if available, otherwise first account
|
||
const has1930 = data.some(a => a.account_number === '1930')
|
||
if (!has1930) setSelectedAccount(data[0].account_number)
|
||
}
|
||
}
|
||
fetchBankAccounts()
|
||
}, [])
|
||
|
||
if (isLoading) {
|
||
return (
|
||
<div className="flex flex-col items-center justify-center py-24 space-y-6">
|
||
<div className="relative">
|
||
<Loader2 className="h-12 w-12 animate-spin text-primary" />
|
||
</div>
|
||
<div className="text-center space-y-2">
|
||
<p className="text-lg font-medium">Importerar transaktioner...</p>
|
||
<p className="text-sm text-muted-foreground">
|
||
{stats.parsed_rows} transaktioner bearbetas
|
||
</p>
|
||
</div>
|
||
<div className="w-48 h-1 bg-muted rounded-full overflow-hidden">
|
||
<div className="h-full bg-primary rounded-full animate-pulse" style={{ width: '60%' }} />
|
||
</div>
|
||
</div>
|
||
)
|
||
}
|
||
|
||
return (
|
||
<div className="space-y-6">
|
||
{/* Summary */}
|
||
<Card>
|
||
<CardHeader>
|
||
<CardTitle>Bekräfta import</CardTitle>
|
||
<CardDescription>
|
||
Granska sammanfattningen och importera transaktionerna.
|
||
</CardDescription>
|
||
</CardHeader>
|
||
<CardContent className="space-y-6">
|
||
{/* Stats grid */}
|
||
<div className="grid grid-cols-2 md:grid-cols-4 gap-4">
|
||
<div className="p-4 bg-muted/50 rounded-lg">
|
||
<div className="flex items-center gap-2 text-muted-foreground mb-1">
|
||
<FileText className="h-4 w-4" />
|
||
<span className="text-xs">Transaktioner</span>
|
||
</div>
|
||
<p className="text-xl font-display font-medium tabular-nums">{stats.parsed_rows}</p>
|
||
{stats.skipped_rows > 0 && (
|
||
<p className="text-xs text-muted-foreground mt-1">
|
||
{stats.skipped_rows} rader hoppades över
|
||
</p>
|
||
)}
|
||
</div>
|
||
|
||
<div className="p-4 bg-muted/50 rounded-lg">
|
||
<div className="flex items-center gap-2 text-muted-foreground mb-1">
|
||
<Calendar className="h-4 w-4" />
|
||
<span className="text-xs">Period</span>
|
||
</div>
|
||
<p className="text-sm font-medium">
|
||
{date_from} – {date_to}
|
||
</p>
|
||
</div>
|
||
|
||
<div className="p-4 bg-muted/50 rounded-lg">
|
||
<div className="flex items-center gap-2 text-muted-foreground mb-1">
|
||
<span className="text-xs">Inkomster</span>
|
||
</div>
|
||
<p className="text-xl font-display font-medium tabular-nums">
|
||
{formatCurrency(stats.total_income)}
|
||
</p>
|
||
</div>
|
||
|
||
<div className="p-4 bg-muted/50 rounded-lg">
|
||
<div className="flex items-center gap-2 text-muted-foreground mb-1">
|
||
<span className="text-xs">Leverantörsfakturor</span>
|
||
</div>
|
||
<p className="text-xl font-display font-medium tabular-nums">
|
||
{formatCurrency(stats.total_expenses)}
|
||
</p>
|
||
</div>
|
||
</div>
|
||
|
||
{/* Bank account selector */}
|
||
{bankAccounts.length > 1 && (
|
||
<div className="space-y-2">
|
||
<Label className="flex items-center gap-2">
|
||
<Landmark className="h-4 w-4 text-muted-foreground" />
|
||
Bankkonto
|
||
</Label>
|
||
<Select value={selectedAccount} onValueChange={setSelectedAccount}>
|
||
<SelectTrigger className="w-full sm:w-72">
|
||
<SelectValue />
|
||
</SelectTrigger>
|
||
<SelectContent>
|
||
{bankAccounts.map((account) => (
|
||
<SelectItem key={account.account_number} value={account.account_number}>
|
||
<span className="font-mono">{account.account_number}</span>
|
||
{' '}
|
||
{account.account_name}
|
||
</SelectItem>
|
||
))}
|
||
</SelectContent>
|
||
</Select>
|
||
<p className="text-xs text-muted-foreground">
|
||
Välj vilket bankkonto transaktionerna ska bokföras mot.
|
||
</p>
|
||
</div>
|
||
)}
|
||
|
||
{/* Additional info */}
|
||
{refsCount > 0 && (
|
||
<div className="flex flex-wrap gap-2">
|
||
<Badge variant="outline" className="text-primary border-primary/30">
|
||
<Link2 className="mr-1 h-3 w-3" />
|
||
{refsCount} med OCR/referens
|
||
</Badge>
|
||
</div>
|
||
)}
|
||
</CardContent>
|
||
</Card>
|
||
|
||
{/* Skipped rows — surfaced here because the manual-mapping path skips the
|
||
preview step where these warnings would otherwise be shown. */}
|
||
{warnings.length > 0 && (
|
||
<Card>
|
||
<CardHeader className="py-3">
|
||
<CardTitle className="text-sm flex items-center gap-2">
|
||
<AlertTriangle className="h-4 w-4 text-warning" />
|
||
{warnings.length} {warnings.length === 1 ? 'rad' : 'rader'} hoppades över
|
||
</CardTitle>
|
||
<CardDescription>
|
||
Dessa rader kunde inte läsas och importeras inte. Kontrollera att inga transaktioner saknas.
|
||
</CardDescription>
|
||
</CardHeader>
|
||
<CardContent className="pt-0">
|
||
<div className="space-y-1 max-h-32 overflow-y-auto">
|
||
{warnings.slice(0, 10).map((issue, i) => (
|
||
<p key={i} className="text-xs text-muted-foreground">
|
||
Rad {issue.row}: {issue.message}
|
||
</p>
|
||
))}
|
||
{warnings.length > 10 && (
|
||
<p className="text-xs text-muted-foreground font-medium">
|
||
…och {warnings.length - 10} till
|
||
</p>
|
||
)}
|
||
</div>
|
||
</CardContent>
|
||
</Card>
|
||
)}
|
||
|
||
{/* Actions */}
|
||
<div className="flex flex-col-reverse gap-3 sm:flex-row sm:justify-between">
|
||
<Button variant="outline" className="min-h-11" onClick={onBack} disabled={isLoading}>
|
||
<ArrowLeft className="mr-2 h-4 w-4" />
|
||
Tillbaka
|
||
</Button>
|
||
<Button
|
||
className="min-h-11"
|
||
onClick={() => onExecute({
|
||
skip_duplicates: true,
|
||
auto_categorize: false,
|
||
settlement_account: selectedAccount !== '1930' ? selectedAccount : undefined,
|
||
})}
|
||
disabled={isLoading}
|
||
>
|
||
{isLoading ? (
|
||
<>
|
||
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
||
Importerar...
|
||
</>
|
||
) : (
|
||
<>
|
||
<Play className="mr-2 h-4 w-4" />
|
||
Importera {stats.parsed_rows} transaktioner
|
||
</>
|
||
)}
|
||
</Button>
|
||
</div>
|
||
</div>
|
||
)
|
||
}
|