Jakob Wennberg
ec27228a8e
Em dashes (—) and en dashes (–) had spread across comments, docs, tests, and a few UI strings, reading as AI-generated boilerplate rather than house style. Replaced each with punctuation matching its context: colon for explanatory clauses, comma for asides, plain hyphen for numeric/legal ranges (e.g. "21-23§"), "to"/"till" for date ranges, parentheses for paired-dash asides. messages/en.json and messages/sv.json were fixed by hand together to keep sv/en in sync. Left untouched where the dash is the functional subject rather than decorative punctuation: date-range-parser.ts's separator regex, charset-repair.ts's CP1252 byte-mapping table (and its test), the SIE encoding mojibake docs, generic-csv.ts's minus-sign normalizer, the agent system-prompt files that already instruct against em dashes, and a golden iXBRL test fixture compared byte-for-byte. Also fixes two bugs surfaced along the way: an off-by-one in ApiKeysPanel's scope-label split (a leftover from an earlier partial pass), and a charset-repair test that had lost the literal en-dash it exists to verify. Regenerated the agent atom seed migration (skills:generate) since 27 SKILL.md files changed. Added a CLAUDE.md rule against em/en dashes, with an explicit carve-out for the functional-dash cases above. Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
85 lines
3.5 KiB
TypeScript
85 lines
3.5 KiB
TypeScript
'use client'
|
|
|
|
import { useTranslations } from 'next-intl'
|
|
import { BankDetailsForm, validateBankFields } from '@/components/settings/BankDetailsForm'
|
|
import { InvoiceSettingsForm } from '@/components/settings/InvoiceSettingsForm'
|
|
import { InvoiceEmailTextsSettings } from '@/components/settings/InvoiceEmailTextsSettings'
|
|
import { InvoicePreviewCard } from '@/components/settings/InvoicePreviewCard'
|
|
import { PdfPrintSettings } from '@/components/settings/PdfPrintSettings'
|
|
import { SettingsFormWrapper } from '@/components/settings/SettingsFormWrapper'
|
|
import { SettingsLoadError } from '@/components/settings/SettingsLoadError'
|
|
import { SettingsLoadingSkeleton } from '@/components/settings/SettingsLoadingSkeleton'
|
|
import { useSettings } from '@/components/settings/useSettings'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import { normaliseSwish } from '@/lib/payments/swish'
|
|
import { formatPlusgiroNumber } from '@/lib/bankgiro/luhn'
|
|
import type { CompanySettings } from '@/types'
|
|
|
|
export function InvoicingSettingsContent() {
|
|
const t = useTranslations('settings_invoicing')
|
|
const { settings, isLoading, updateSettings, refetch } = useSettings()
|
|
const { toast } = useToast()
|
|
|
|
if (isLoading) return <SettingsLoadingSkeleton />
|
|
if (!settings) return <SettingsLoadError onRetry={refetch} />
|
|
|
|
function handleSave(formData: FormData) {
|
|
const bankErrors = validateBankFields(formData)
|
|
if (bankErrors.length > 0) {
|
|
toast({
|
|
title: t('bank_validation_title'),
|
|
description: bankErrors.map(e => e.message).join(', '),
|
|
variant: 'destructive',
|
|
})
|
|
return {}
|
|
}
|
|
|
|
const updates: Record<string, unknown> = {
|
|
bank_name: formData.get('bank_name') as string,
|
|
clearing_number: formData.get('clearing_number') as string,
|
|
account_number: formData.get('account_number') as string,
|
|
bankgiro: (formData.get('bankgiro') as string) || null,
|
|
plusgiro: (formData.get('plusgiro') as string)?.trim()
|
|
? formatPlusgiroNumber((formData.get('plusgiro') as string).trim())
|
|
: null,
|
|
swish: normaliseSwish(formData.get('swish') as string) || null,
|
|
invoice_prefix: (formData.get('invoice_prefix') as string) || null,
|
|
next_invoice_number: parseInt(formData.get('next_invoice_number') as string) || 1,
|
|
invoice_default_days: parseInt(formData.get('invoice_default_days') as string) || 30,
|
|
invoice_default_notes: (formData.get('invoice_default_notes') as string) || null,
|
|
default_our_reference: (formData.get('default_our_reference') as string) || null,
|
|
}
|
|
return {
|
|
updates,
|
|
onSuccess: (data: Record<string, unknown>) => {
|
|
updateSettings(data as Partial<CompanySettings>)
|
|
},
|
|
}
|
|
}
|
|
|
|
return (
|
|
<div className="space-y-8">
|
|
<div className="flex justify-end">
|
|
<InvoicePreviewCard settings={settings} />
|
|
</div>
|
|
|
|
<SettingsFormWrapper onSave={handleSave} className="space-y-8">
|
|
<BankDetailsForm settings={settings} />
|
|
<div className="border-t border-border pt-8">
|
|
<InvoiceSettingsForm settings={settings} />
|
|
</div>
|
|
</SettingsFormWrapper>
|
|
|
|
{/* PDF settings: saves individually via toggle switches */}
|
|
<div className="border-t border-border pt-8">
|
|
<PdfPrintSettings settings={settings} onUpdate={updateSettings} />
|
|
</div>
|
|
|
|
{/* Invoice email texts: autosaves on blur */}
|
|
<div className="border-t border-border pt-8">
|
|
<InvoiceEmailTextsSettings settings={settings} onUpdate={updateSettings} />
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|