* feat: import system improvements, INK2 fix, and Swedish text corrections - SIE parser: Windows-1252 and CP437 encoding detection and decoding - Bank file parser: add Nordea Business (Företag) CSV format - Bank file parser: improve format detection for SEB, Länsförsäkringar, generic CSV - INK2 engine: calculate årets resultat (7222) from income statement for open fiscal years - Dashboard: parallel Supabase queries, simplified dashboard page - Fix Swedish characters (å, ä, ö) in BAS data descriptions, validation messages, AI consent disclosures - Import wizard UI improvements across all steps - Migration: add 'bas_range' match type to sie_account_mappings constraint - Extensive new tests for SIE parser encoding and bank file parser Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: arcim migration wizard UX fixes, Sentry setup, and extension scaffolding Arcim migration wizard improvements: - Progress bar now excludes non-interactive steps (migrating/result) - Fix OAuth text to match target="_blank" behavior (new tab, not redirect) - Display month names instead of "Månad X" in preview - Fix Swedish typo "förifylla" in no-company-info message - Replace native checkboxes with shadcn Switch in options step - Add ConfirmationDialog before starting migration - Show progress percentage during migration - Add "Nästa steg" guidance and navigation links in result step - Add "Försök igen" button in error state (returns to options) - Add Bokio company ID help text (GUID from URL) - Add Fortnox integration add-on hint on connection failure Also includes: SIE import system improvements, INK2 fixes, Swedish text corrections, Sentry error tracking setup, and arcim-migration extension scaffolding. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: address PR review feedback - Fix OAuth error recovery blank page (restore provider from URL params) - Pass real userId to MigrationWizard instead of empty string - Remove ~50 debug console.log statements from sie-import.ts - Fix comment referencing account 3740 → 3741 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: comprehensive UI design audit and normalization Dashboard audit: - Fix muted-foreground contrast (4.31:1 → 5.08:1) for WCAG AA - Add prefers-reduced-motion media query for all animations - Replace border-l-2 accent anti-pattern with subtle full-border colors - Add aria-expanded to toggle buttons, role="status" to live counters - Fix touch targets on deadline buttons (28px → 36px) - Vary section spacing for rhythm (mb-12/mb-10/mb-8) - Remove unused imports and dead code Transactions audit + hardening: - Add pagination (200 per page) with "Ladda fler" button - Replace height animation with transform-only exit animation - Show batch progress in floating action bar during processing - Fix batch bar mobile overlap (bottom-20 on mobile) - Replace clickable badges with proper button elements - Add safe area padding to fullscreen swipe view - Add response.ok check to suggestion fetch - Add truncation to invoice number buttons Invoicing audit: - Remove border-l-4 accent pattern from invoice cards - Replace string concatenation with cn() utility Systemic sweep (34 files): - All page headings: font-bold → font-display font-medium (Fraunces) - All stat numbers: font-bold → font-display font-medium tabular-nums - All hard-coded blue/amber/emerald colors → design tokens - Remove all dark mode overrides (tokens handle automatically) - Tint pure white card background to 99% Design context added to CLAUDE.md with brand personality, aesthetic direction, and 5 design principles. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: bookkeeping flow audit — design system, accessibility, UX - Replace raw <select> with shadcn Select component (JournalEntryForm) - Add confirmation dialog for account deletion (ChartOfAccountsManager) - Remove console.error from production code (JournalEntryList, JournalEntryForm) - Fix contradictory h-7/min-h-[44px] button sizing → h-10 (ChartOfAccountsManager) - Increase BAS catalog "Lägg till" touch target h-7 → h-9 - Improve loading state with spinner (JournalEntryList) - Improve empty state with icon, description, and guidance (JournalEntryList) - Add response.ok check on journal entry fetch - Add aria-expanded to entry expand buttons - Add tabular-nums to desktop debit/credit columns Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: onboarding and empty state improvements Onboarding: - Replace font-serif with font-display (Fraunces) for brand consistency - Remove console.error calls from production code Empty states: - Fix broken /transactions/new link in EmptyTransactions (route doesn't exist) - Add actionHref fallback to EmptyCustomers when no onAction prop provided - Improve EmptyTransactions description copy Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: clarify Swedish UX copy — terminology, errors, descriptions Terminology consistency: - "Försenad" → "Förfallen" for overdue invoices (customers/[id]) - "bokföringsorder" → actionable description in bookkeeping page - "verifikation har bifogats" → "underlag har bifogats" in doc warning - "Fortsätt ändå" → "Bokför utan underlag" (specific action) Error messages — replace generic "Fel" + "Något gick fel" with specific: - "Något gick fel vid bokföring" → "Transaktionen kunde inte bokföras" - "Något gick fel vid matchning" → "Transaktionen kunde inte matchas" - "Kunde inte hämta X" → "Kunde inte ladda X" + recovery hint - Add "Försök igen" guidance to all error toasts Page descriptions — replace redundant with actionable: - Invoices: "Skapa och hantera" → "Skicka, följ betalningar, skapa kreditnotor" - Bookkeeping: list of features → actionable description Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: design critique — dashboard affordance, reports description Dashboard: - Add ChevronRight indicator to clickable summary cards (Att få betalt, Koppla bank) to distinguish from static cards - Add cursor-pointer to linked cards Reports: - Replace feature list description with actionable guidance "Huvudbok, grundbok..." → "Generera skattedeklarationer..." Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: replace generic "Fel" error toasts with specific messages Deadlines: 5 generic "Fel" → specific per-action titles (create, toggle, edit, delete, load) Expenses detail: 5 generic "Fel" → specific per-action titles (load, approve, pay, credit, delete) Expenses new: 3 generic "Fel" → instructional validation messages (supplier name, supplier selection, invoice number) Customers: 1 generic "Fel" → specific load error with recovery hint All error toasts now follow pattern: title = what failed, description = how to recover Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: replace all remaining generic "Fel" error toasts (37 instances) Systematic sweep across 12 dashboard pages replacing generic title: 'Fel' with context-specific error titles: - Load errors: "Kunde inte ladda [resurs]" - Action errors: "[Åtgärd] misslyckades" - Validation: "[Fält] saknas" Every error toast now tells the user what failed without needing to read the description. Recovery hints added where missing. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: import flow — normalize stat typography, remove console.warn - Replace font-bold with font-display font-medium on 13 stat numbers across SIEPreviewStep, BankFilePreviewStep, BankFileConfirmStep, ImportResultStep (missed by systemic sweep since these are in components/import/, not app/(dashboard)/) - Add tabular-nums to stat numbers displaying counts/currency - Remove console.warn in ArcimMigrationWorkspace Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: final cleanup — console statements, remaining font-bold stats Remove production console statements: - Step1EntityType: remove debug console.warn (dead code after onNext) - TransactionBookingDialog: remove console.error on doc link failure - JournalEntryAttachments: remove 3 console.error calls Normalize remaining font-bold stat displays: - SwipeCategorizationView: 3 instances (completion, amount displays) - NEDeclarationView: yearly result heading + value Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address Greptile review feedback loadMoreTransactions: add inbox item enrichment matching fetchTransactions - Paginated transactions now fetch invoice_inbox_items in parallel - Fixes missing document indicator, template suggestions, and inbox match card for transactions loaded via "Ladda fler" fetchAllPages: add maxPages guard (default 500) to prevent infinite loop - If Arcim gateway returns hasMore:true indefinitely, the loop now exits after 500 pages instead of running forever Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
289 lines
12 KiB
TypeScript
289 lines
12 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useEffect } from 'react'
|
|
import Link from 'next/link'
|
|
import { createClient } from '@/lib/supabase/client'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Card, CardContent } from '@/components/ui/card'
|
|
import { Badge } from '@/components/ui/badge'
|
|
import { Input } from '@/components/ui/input'
|
|
import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
|
|
import { PageHeader } from '@/components/ui/page-header'
|
|
import { EmptyState } from '@/components/ui/empty-state'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import { formatCurrency } from '@/lib/utils'
|
|
import { Plus, Search, Wallet, Clock, AlertCircle } from 'lucide-react'
|
|
import type { SupplierInvoice } from '@/types'
|
|
|
|
type ExpenseInvoice = SupplierInvoice & { supplier?: { id: string; name: string } }
|
|
|
|
const UNPAID_STATUSES = ['registered', 'approved', 'overdue', 'partially_paid']
|
|
const PAID_STATUSES = ['paid', 'credited']
|
|
|
|
function getSimplifiedStatus(status: string): { label: string; variant: 'default' | 'secondary' | 'destructive'; borderColor: string } {
|
|
switch (status) {
|
|
case 'registered':
|
|
case 'approved':
|
|
return { label: 'Obetald', variant: 'default', borderColor: 'border-l-warning' }
|
|
case 'overdue':
|
|
return { label: 'Förfallen', variant: 'destructive', borderColor: 'border-l-destructive' }
|
|
case 'partially_paid':
|
|
return { label: 'Delbetald', variant: 'default', borderColor: 'border-l-orange-400' }
|
|
case 'paid':
|
|
return { label: 'Betald', variant: 'secondary', borderColor: 'border-l-success' }
|
|
case 'credited':
|
|
return { label: 'Krediterad', variant: 'secondary', borderColor: 'border-l-muted-foreground/30' }
|
|
default:
|
|
return { label: status, variant: 'secondary', borderColor: 'border-l-muted-foreground/30' }
|
|
}
|
|
}
|
|
|
|
function getRelativeTimeLabel(dueDateStr: string, status: string): { text: string; color: string } | null {
|
|
if (PAID_STATUSES.includes(status)) return null
|
|
|
|
const today = new Date()
|
|
today.setHours(0, 0, 0, 0)
|
|
const dueDate = new Date(dueDateStr)
|
|
dueDate.setHours(0, 0, 0, 0)
|
|
const diffDays = Math.round((dueDate.getTime() - today.getTime()) / (1000 * 60 * 60 * 24))
|
|
|
|
if (diffDays < 0) {
|
|
return { text: `${Math.abs(diffDays)} dagar försenad`, color: 'text-destructive' }
|
|
} else if (diffDays === 0) {
|
|
return { text: 'Förfaller idag', color: 'text-warning-foreground' }
|
|
} else if (diffDays <= 3) {
|
|
return { text: `${diffDays} dagar kvar`, color: 'text-warning-foreground' }
|
|
} else if (diffDays <= 7) {
|
|
return { text: `${diffDays} dagar kvar`, color: 'text-muted-foreground' }
|
|
}
|
|
return null
|
|
}
|
|
|
|
export default function ExpensesPage() {
|
|
const [invoices, setInvoices] = useState<ExpenseInvoice[]>([])
|
|
const [isLoading, setIsLoading] = useState(true)
|
|
const [searchTerm, setSearchTerm] = useState('')
|
|
const [activeTab, setActiveTab] = useState('unpaid')
|
|
const { toast } = useToast()
|
|
const supabase = createClient()
|
|
|
|
async function fetchExpenses() {
|
|
setIsLoading(true)
|
|
const { data, error } = await supabase
|
|
.from('supplier_invoices')
|
|
.select('*, supplier:suppliers(id, name)')
|
|
.order('due_date', { ascending: true })
|
|
|
|
if (error) {
|
|
toast({ title: 'Kunde inte ladda utgifter', description: 'Kontrollera din anslutning och försök igen.', variant: 'destructive' })
|
|
} else {
|
|
setInvoices(data || [])
|
|
}
|
|
setIsLoading(false)
|
|
}
|
|
|
|
useEffect(() => {
|
|
fetchExpenses()
|
|
}, [])
|
|
|
|
const filteredInvoices = invoices.filter((inv) => {
|
|
const matchesSearch =
|
|
(inv.supplier?.name || '').toLowerCase().includes(searchTerm.toLowerCase()) ||
|
|
inv.supplier_invoice_number.toLowerCase().includes(searchTerm.toLowerCase())
|
|
|
|
const matchesTab =
|
|
activeTab === 'unpaid'
|
|
? UNPAID_STATUSES.includes(inv.status)
|
|
: PAID_STATUSES.includes(inv.status)
|
|
|
|
return matchesSearch && matchesTab
|
|
})
|
|
|
|
const unpaidInvoices = invoices.filter((i) => UNPAID_STATUSES.includes(i.status))
|
|
const overdueInvoices = invoices.filter((i) => i.status === 'overdue')
|
|
|
|
const stats = {
|
|
unpaidAmount: unpaidInvoices.reduce((sum, i) => sum + i.remaining_amount, 0),
|
|
unpaidCount: unpaidInvoices.length,
|
|
overdueAmount: overdueInvoices.reduce((sum, i) => sum + i.remaining_amount, 0),
|
|
overdueCount: overdueInvoices.length,
|
|
}
|
|
|
|
return (
|
|
<div className="space-y-6">
|
|
<PageHeader
|
|
title="Utgifter"
|
|
description="Registrera och hantera dina utgifter"
|
|
action={
|
|
<Link href="/expenses/new">
|
|
<Button>
|
|
<Plus className="mr-2 h-4 w-4" />
|
|
Ny utgift
|
|
</Button>
|
|
</Link>
|
|
}
|
|
/>
|
|
|
|
{/* Stats */}
|
|
<div className="grid gap-4 md:grid-cols-2">
|
|
<Card>
|
|
<CardContent className="pt-6">
|
|
<div className="flex items-center gap-4">
|
|
<div className="h-12 w-12 rounded-lg bg-muted flex items-center justify-center">
|
|
<Clock className="h-6 w-6 text-muted-foreground" />
|
|
</div>
|
|
<div>
|
|
<p className="text-sm text-muted-foreground">Att betala</p>
|
|
<p className="font-display text-2xl font-medium tabular-nums">{formatCurrency(stats.unpaidAmount)}</p>
|
|
<p className="text-xs text-muted-foreground">{stats.unpaidCount} utgifter</p>
|
|
</div>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
<Card>
|
|
<CardContent className="pt-6">
|
|
<div className="flex items-center gap-4">
|
|
<div className="h-12 w-12 rounded-lg bg-muted flex items-center justify-center">
|
|
<AlertCircle className={`h-6 w-6 ${stats.overdueCount > 0 ? 'text-destructive' : 'text-muted-foreground'}`} />
|
|
</div>
|
|
<div>
|
|
{stats.overdueCount > 0 ? (
|
|
<>
|
|
<p className="text-sm text-muted-foreground">Förfallet</p>
|
|
<p className="font-display text-2xl font-medium tabular-nums text-destructive">{formatCurrency(stats.overdueAmount)}</p>
|
|
<p className="text-xs text-muted-foreground">{stats.overdueCount} utgifter</p>
|
|
</>
|
|
) : (
|
|
<>
|
|
<p className="text-sm text-muted-foreground">Totalt antal</p>
|
|
<p className="font-display text-2xl font-medium tabular-nums">{invoices.length}</p>
|
|
</>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
|
|
{/* Search and tabs */}
|
|
<div className="flex flex-col sm:flex-row gap-4">
|
|
<div className="relative flex-1">
|
|
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
|
|
<Input
|
|
placeholder="Sök på leverantör eller fakturanummer..."
|
|
value={searchTerm}
|
|
onChange={(e) => setSearchTerm(e.target.value)}
|
|
className="pl-10"
|
|
/>
|
|
</div>
|
|
<Tabs value={activeTab} onValueChange={setActiveTab}>
|
|
<TabsList>
|
|
<TabsTrigger value="unpaid">Att betala</TabsTrigger>
|
|
<TabsTrigger value="paid">Betalda</TabsTrigger>
|
|
</TabsList>
|
|
</Tabs>
|
|
</div>
|
|
|
|
{/* Expense list */}
|
|
{isLoading ? (
|
|
<div className="space-y-2">
|
|
{[1, 2, 3].map((i) => (
|
|
<Card key={i} className="animate-pulse">
|
|
<CardContent className="py-4">
|
|
<div className="flex items-center justify-between">
|
|
<div className="space-y-2">
|
|
<div className="h-5 bg-muted rounded w-32" />
|
|
<div className="h-4 bg-muted rounded w-48" />
|
|
</div>
|
|
<div className="h-8 bg-muted rounded w-24" />
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
))}
|
|
</div>
|
|
) : filteredInvoices.length === 0 ? (
|
|
<Card>
|
|
<CardContent>
|
|
{searchTerm ? (
|
|
<div className="flex flex-col items-center justify-center py-12">
|
|
<Wallet className="h-12 w-12 text-muted-foreground mb-4" />
|
|
<h3 className="text-lg font-medium">Inga träffar</h3>
|
|
<p className="text-muted-foreground text-center mt-1">
|
|
Inga utgifter matchar "{searchTerm}"
|
|
</p>
|
|
</div>
|
|
) : invoices.length === 0 ? (
|
|
<EmptyState
|
|
icon={Wallet}
|
|
title="Inga utgifter ännu"
|
|
description="Registrera din första utgift. Vi bokför automatiskt och håller koll på betalningar."
|
|
actionLabel="Ny utgift"
|
|
actionHref="/expenses/new"
|
|
/>
|
|
) : (
|
|
<div className="flex flex-col items-center justify-center py-12">
|
|
<Wallet className="h-12 w-12 text-muted-foreground mb-4" />
|
|
<h3 className="text-lg font-medium">Inga utgifter i denna kategori</h3>
|
|
<p className="text-muted-foreground text-center mt-1">
|
|
Prova att byta flik för att se fler utgifter
|
|
</p>
|
|
</div>
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
) : (
|
|
<div className="space-y-2">
|
|
{filteredInvoices.map((inv) => {
|
|
const status = getSimplifiedStatus(inv.status)
|
|
const relativeTime = inv.due_date ? getRelativeTimeLabel(inv.due_date, inv.status) : null
|
|
|
|
return (
|
|
<Link key={inv.id} href={`/expenses/${inv.id}`}>
|
|
<Card className={`hover:border-primary/50 transition-colors cursor-pointer border-l-4 ${status.borderColor} ${inv.status === 'overdue' ? 'ring-1 ring-destructive/20' : ''}`}>
|
|
<CardContent className="py-4">
|
|
<div className="flex items-center justify-between">
|
|
<div className="flex items-center gap-4">
|
|
<div className="h-10 w-10 rounded-lg bg-muted flex items-center justify-center">
|
|
<Wallet className="h-5 w-5 text-muted-foreground" />
|
|
</div>
|
|
<div>
|
|
<div className="flex items-center gap-2">
|
|
<p className="font-medium">{inv.supplier?.name || 'Okänd leverantör'}</p>
|
|
<Badge variant={status.variant as 'default' | 'secondary' | 'destructive'}>
|
|
{status.label}
|
|
</Badge>
|
|
</div>
|
|
<div className="flex items-center gap-2">
|
|
<p className="text-sm text-muted-foreground">
|
|
{inv.supplier_invoice_number} · Förfaller {inv.due_date}
|
|
</p>
|
|
{relativeTime && (
|
|
<span className={`text-xs font-medium ${relativeTime.color}`}>
|
|
{relativeTime.text}
|
|
</span>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div className="text-right">
|
|
<p className="font-medium tabular-nums">
|
|
{formatCurrency(inv.total, inv.currency)}
|
|
</p>
|
|
{inv.remaining_amount !== inv.total && inv.remaining_amount > 0 && (
|
|
<p className="text-sm text-muted-foreground tabular-nums">
|
|
Kvar: {formatCurrency(inv.remaining_amount, inv.currency)}
|
|
</p>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</Link>
|
|
)
|
|
})}
|
|
</div>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|