* 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>
124 lines
4.7 KiB
TypeScript
124 lines
4.7 KiB
TypeScript
import { createClient } from '@/lib/supabase/server'
|
|
import { NextResponse } from 'next/server'
|
|
import { eventBus } from '@/lib/events'
|
|
import { ensureInitialized } from '@/lib/init'
|
|
import { requireCompanyId } from '@/lib/company/context'
|
|
import { requireWritePermission } from '@/lib/auth/require-write'
|
|
import { errorResponseFromCode } from '@/lib/errors/get-structured-error'
|
|
import { createLogger } from '@/lib/logger'
|
|
|
|
ensureInitialized() // Module-level — wires the audit-log handler for invoice.draft_deleted.
|
|
|
|
const log = createLogger('api.invoices.cancel')
|
|
|
|
/**
|
|
* DELETE /api/invoices/[id]
|
|
*
|
|
* Removes a draft invoice. Behaviour depends on whether a number was issued:
|
|
*
|
|
* - Unnumbered draft (saved via "Spara som utkast", never finalized): hard
|
|
* deleted. No F-series number was consumed, so there is no gap to document
|
|
* (ML 17 kap 24§). invoice_items cascade via the FK.
|
|
* - Numbered draft (created directly, or finalized via "Granska och skapa"):
|
|
* makulerad — the row and its number are retained and status flips to
|
|
* 'cancelled', keeping the F-series gap-free per ML 17 kap 24§ / BFNAR 2013:2.
|
|
*
|
|
* Only drafts may be removed either way. Sent / paid invoices are immutable per
|
|
* BFL and must be reversed via a credit note instead.
|
|
*/
|
|
export async function DELETE(
|
|
request: Request,
|
|
{ params }: { params: Promise<{ id: string }> }
|
|
) {
|
|
const { id } = await params
|
|
const supabase = await createClient()
|
|
|
|
const { data: { user } } = await supabase.auth.getUser()
|
|
|
|
if (!user) {
|
|
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
|
}
|
|
|
|
const writeCheck = await requireWritePermission(supabase, user.id)
|
|
if (!writeCheck.ok) return writeCheck.response
|
|
|
|
const companyId = await requireCompanyId(supabase, user.id)
|
|
|
|
const { data: invoice, error: fetchError } = await supabase
|
|
.from('invoices')
|
|
.select('id, status, invoice_number, user_id')
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.single()
|
|
|
|
if (fetchError || !invoice) {
|
|
return NextResponse.json({ error: 'Invoice not found' }, { status: 404 })
|
|
}
|
|
|
|
if (invoice.status !== 'draft') {
|
|
return errorResponseFromCode('INVOICE_DELETE_NOT_DRAFT', log)
|
|
}
|
|
|
|
// Unnumbered drafts (saved via "Spara som utkast", never finalized) are not
|
|
// yet issued invoices — no F-series number was consumed — so they can be hard
|
|
// deleted with no gap in the sequence (ML 17 kap 24§). invoice_items cascade
|
|
// via the FK (ON DELETE CASCADE); an un-finalized draft has no journal entry
|
|
// or linked document. The status='draft' + invoice_number IS NULL guard makes
|
|
// the delete a no-op if the row was finalized (numbered) concurrently.
|
|
if (!invoice.invoice_number) {
|
|
const { data: removed, error: removeError } = await supabase
|
|
.from('invoices')
|
|
.delete()
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.eq('status', 'draft')
|
|
.is('invoice_number', null)
|
|
.select('id')
|
|
|
|
if (removeError) {
|
|
return NextResponse.json({ error: removeError.message }, { status: 500 })
|
|
}
|
|
|
|
if (!removed || removed.length === 0) {
|
|
// Finalized between fetch and delete — refuse rather than fall through to
|
|
// makulering of a now-issued invoice.
|
|
return errorResponseFromCode('INVOICE_CANCEL_RACE', log)
|
|
}
|
|
|
|
// The row is gone, so there's no journal trace of the removal. Emit an
|
|
// audit event carrying the identifiers so the event log records who deleted
|
|
// which draft and when — the makulering path leaves a journal/status trail,
|
|
// a hard delete otherwise leaves none.
|
|
await eventBus.emit({
|
|
type: 'invoice.draft_deleted',
|
|
payload: { invoiceId: id, companyId, userId: user.id },
|
|
})
|
|
|
|
return NextResponse.json({ data: { deleted: true } })
|
|
}
|
|
|
|
// Numbered draft: retain the row and its number, flip to 'cancelled'
|
|
// (makulering) so the F-series stays gap-free.
|
|
// .select() returns the affected rows so we can detect a TOCTOU race where
|
|
// the status flipped between the fetch above and this update. With only the
|
|
// .eq('status','draft') guard, a 0-row update returns success and the user
|
|
// would see "Makulerad" while the invoice is still in its previous state.
|
|
const { data: updated, error: cancelError } = await supabase
|
|
.from('invoices')
|
|
.update({ status: 'cancelled', updated_at: new Date().toISOString() })
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.eq('status', 'draft')
|
|
.select('id')
|
|
|
|
if (cancelError) {
|
|
return NextResponse.json({ error: cancelError.message }, { status: 500 })
|
|
}
|
|
|
|
if (!updated || updated.length === 0) {
|
|
return errorResponseFromCode('INVOICE_CANCEL_RACE', log)
|
|
}
|
|
|
|
return NextResponse.json({ data: { cancelled: true, invoice_number: invoice.invoice_number } })
|
|
}
|