* feat(salary): one-click AGI submission with filing state machine and success feedback The AGI panel required users to know that "Ladda ner AGI-fil" was the generate step, then click submit, signing link, and kvittens manually. A nollkorning filing stalled on "AGI-XML saknas" pointing at a UI path that does not exist. - New primary button "Lamna in till Skatteverket" chains the existing endpoints client-side: generate XML if missing, POST underlag, poll kontrollresultat, create signing link, open Mina Sidor in a tab opened synchronously at click (popup-blocker safe). Inline stepper shows each step; the four old buttons become collapsed advanced/recovery actions, auto-expanded in stale-draft and rejected states. XML download stays visible and free for manual filing. - deriveAgiFilingState() + useAgiSubmission() lift the per-period submission record to the run page: the progress rail and salary hero now render the real state machine (generated, underlag inskickat, vantar pa BankID-signatur, inlamnad med kvittensnummer) instead of telling users to "lamna in" an already-submitted declaration. - Success card with kvittensnummer and signature metadata once signed, plus a toast when a poll flips the state while the page is open. - AGI kvittens cron every 15 min instead of every 2 h so filings signed on another device get stamped and emailed promptly. - Advanced submit also auto-generates, and the stale "Lon -> AGI -> Generera" error text now points at the real buttons. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(enable-banking): instant OAuth callback feedback and dead-attempt cleanup The bank redirect landed on a blank page for the several seconds the callback spent exchanging the PSD2 session and mirroring accounts, and every failed connect attempt left a status='error' row that rendered forever as an "Atgard kravs" card next to a successful retry, showing duplicate connections to the same bank. - Stream a branded "Slutfor bankanslutningen" progress page from the callback: the shell flushes before the session exchange starts and a script/meta redirect follows when the work completes, with a 30s slow-work escape hatch. Fast outcomes (denial, bad params, unknown state) keep their plain redirects. - Delete never-activated connection rows (no session_id, no accounts_data) on denial or exchange failure, and sweep leftovers for the same bank on the next connect. Established connections keep their "Atgard krävs" card via the accounts_data guard; FKs are ON DELETE SET NULL so deletion has no dependents. - Show "Banken ar ansluten: hamtar dina konton" while the settings panel loads after the callback instead of an anonymous spinner. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): reject re-send of issued invoices and gate bookkeeping on the sent flip A direct POST to /api/invoices/[id]/send against an already-issued invoice re-emailed the customer and posted a second revenue verifikat (createInvoiceJournalEntry has no dedup), overwriting journal_entry_id and orphaning the first entry. Only the UI hid the button; the v1 route and the MCP commit executor already rejected non-drafts. - Non-draft invoices now return 409 INVOICE_ALREADY_SENT. - The draft to sent status flip is an optimistic lock (status guard plus row-count check); journal entry, accrual schedules, PDF archival and the invoice.sent event only run for the request that won the flip. - On a flip failure the journal entry is deferred: the row stays draft and a retry re-runs the pipeline, ending with exactly one verifikat. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): payment links, failure visibility and sandbox guard for recurring auto-send - sendInvoiceFromSchedule now auto-creates an online payment link via applyPaymentLinkToInvoice before rendering and passes the payment link QR to the PDF: parity with the dashboard and v1 send routes, which recurring invoices silently lacked. - The recurring cron persists last_run_warning both when a claimed run throws (hourly retries stay visible on the schedule) and when a stale schedule is rolled forward, so a deterministic failure can no longer skip a month silently. - Auto-send is blocked for sandbox companies at the email chokepoint (freeze-and-retain: the invoice is still generated as a draft), covering both the cron and the run-now route with one guard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(salary): close the Fortnox payroll API gaps (phases 1-4) Payroll now runs end-to-end through the open API, including onboarding a client from another payroll system, with every write staged for approval. - v1: per-employee payslips (list/detail/PDF), payslip line writes, run roster attach/remove, absence ranges (per-day storage), jamkning fields, cutover opening balances (single + atomic bulk PUT), vacation balance + vacation-year-close. PUT added to the wrapper's idempotency/ test-key set (test keys could otherwise write through PUT). - MCP: 10 new tools (get_employee/get_payslip/list_absence/ get_vacation_balance reads + staged update_payslip_line, register_absence, create_employee, update_employee, set_employee_opening_balances, close_vacation_year), executors, risk tiers, op-type CHECK expansions. create_employee encrypts personnummer at staging: pending_operations never holds plaintext. - Scope-map audit retrofit: 11 formerly unmapped tools now scoped; BREAKING for keys that relied on the 4 default-allow writes. - Cutover: employee_opening_balances (derived lock trigger, self-unlocks on run correction), engine YTD/karens/liability integration, Ingaende saldon section in the employee editor. - Arbetsschema-lite: employees.hours_per_week/workdays_per_week drive the hourly/daily divisors; legacy 173/21 preserved exactly at defaults so existing pay math is byte-identical. - Vacation ledger + semesterberedning/arsavslut: recomputed per-year day balances (synced on book/correct, non-fatal), year-close with the min-20 floor, 5-year sparade-dagar expiry to forced payout, and a 2920/2940 drift adjustment via the bookkeeping engine; Semester dashboard card with preview-then-confirm dialog. - Fix: Zod 4 defaults leak through .partial(), which made every sparse employee PATCH fail validation and reset defaulted columns. Migrations 20260713100000/101000/110000/121000/122000 (applied to staging with version rows; prod via merge). vacation_ledger renamed from 20260713120000 to avoid colliding with vat_declaration_totals_rpc. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * perf: cut dashboard page-load latency (region, round trips, caching, VAT RPC) The dominant cost was infrastructure: Vercel functions ran in iad1 (Washington D.C.) while Supabase (DB + auth) lives in eu-north-1 (Stockholm), so every request paid 4-5 transatlantic round trips of auth + company resolution before doing any real work (measured 530-1900ms for single-query GETs in prod logs). Pin functions to arn1 and cut the redundant work on top: - vercel.json: functions to arn1, same city as the database - getActiveCompanyId: preference + first-membership queries run in parallel; the fallback result doubles as validation in the common single-company case (one round trip instead of two sequential) - withRouteContext: Server-Timing header and authMs/companyMs/handlerMs in the op-completed log, so latency is attributable per phase - dashboard layout: nav badge counts off the critical path; DashboardNav loads them client-side via the new use-worklist-badges SWR hook with debounced realtime revalidation - swr (new dependency, approved): global provider; useCompanySettings shares one cache entry across consumers and renders from cache on back-navigation instead of re-showing skeletons - /pending: realtime refetch debounced; bulk operations previously fired 4 requests per row-change event - VAT declaration: new get_vat_declaration_totals RPC returns per-account totals, settlement-shape detection (#984) and source_type counts in ONE round trip instead of paging every entry+line through PostgREST. Account lists stay TS-side parameters so ACCOUNT_RUTA remains the single source of truth. Shape-exclusion coverage moved to tests/pg/vat-declaration-totals-rpc.pg.test.ts; DDL already applied to staging. - bundle: CommandPalette lazy-mounts on first Ctrl/Cmd+K, AgentChat dynamic-imports the markdown parser, @vercel/speed-insights (new dependency, approved) added for real-user timings The /salary fetch-waterfall fix from the same effort already landed inside 2084a756. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): settle öre-rounded payments from the mark-paid flow An invoice with öresavrundning shows a rounded "Att betala" on the PDF; the customer pays that amount (up to 50 öre off the stored öre total) and the invoice-page mark-paid flow rejected it with MATCH_AMOUNT_EXCEEDS_REMAINING: a dead end, while the bank-transaction match flow already absorbed the residual to 3740. - PaymentBookingDialog now proposes the rounded bank leg plus the 3740 residual line (credit when rounded up, debit when rounded down), resolved via getDisplayTotal from the per-invoice override and company_settings.ore_rounding. - settleInvoicePayment and the v1 mark-paid route absorb the sub-krona residual, gated by planInvoicePaymentForLines: absorption applies ONLY when the caller lines carry the exact residual on 3740; otherwise the strict plan applies (sub-krona partials stay partial, no-3740 overshoots keep the 400), so the GL can never diverge from the AR sub-ledger. - planInvoicePayment absorb-band boundary tightened to >= 1 kr: an exactly-1-kr overshoot used to slip past both the guard and the absorb branch and silently over-record paid_amount (pre-existing on the bank-match path). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(security): resolve all 7 PR compliance findings - ASVS V3.3: per-request CSP nonce on the enable-banking finalize page (mirrors the mcp-oauth consent page); inline scripts are nonce-bound - ASVS V16: decouple callback finalize work from the response stream (eager promise + next/server after()) so a client disconnect cannot drop session persistence or the consent_granted audit emit - ISO 27001 A.8.15: failed audit-event emits log through the structured logger with a stable message for log-based alerting - ASVS V2.3: recurring-invoice cron and run-now routes resolve isSandboxCompany themselves and pass an explicit suppressAutoSend flag (defence in depth around the email chokepoint, freeze-and-retain kept) - ISO 27001 A.8.11: stagePendingOperation rejects plaintext personnummer-bearing keys in params/preview_data (key-based guard; EF org numbers make value-matching unsafe) - ASVS V4.5: employee PATCH body is truly sparse; cleared number fields are omitted instead of resetting DB values to hardcoded fallbacks - ASVS V8.2.1: route-level tests pin the v1 cross-company deny (404 by convention, not 403) on the payslip PDF endpoint Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat: implement vacation-year basis change validation and error handling - Added tests to block vacation-year basis changes when open balances exist. - Implemented error handling for open-balances guard query failures in the settings route. - Enhanced absence route to reject reversed date ranges with a validation error. - Updated absence handling to use atomic upserts instead of delete+insert for better performance and reliability. - Refactored salary calculation logic to correctly handle age-based avgifter rates according to Skatteverket's rules. - Improved error messaging for vacation year closure adjustments. - Adjusted employee opening balances handling to preserve audit information during upserts. * feat(settings): add validation to block vacation-year basis change with open balances feat(absence): reject reversed date ranges in absence queries fix(absence): update absence handling to use atomic upserts instead of delete+insert fix(employee): improve validation for jamkning dates in employee updates fix(opening-balances): ensure created_by field is preserved during upserts test(absence): enhance tests for absence range and date validations test(calculation): add tests for age-based avgifter rates and edge cases test(semesterberedning): validate vacation year closure adjustments and error handling test(employee-opening-balances): update tests to reflect changes in salary_run_employees schema * fix(migrations): implement NOT VALID constraints for pending_operations and add validation migration --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
163 lines
6.6 KiB
TypeScript
163 lines
6.6 KiB
TypeScript
/**
|
||
* Single source of truth for applying a payment amount to a customer invoice.
|
||
*
|
||
* Computes the new paid/remaining/status and: critically: REJECTS overpayment
|
||
* before the caller creates any journal entry, so a doomed match never burns a
|
||
* voucher number.
|
||
*
|
||
* Background: this math was copy-pasted across three sites: the dashboard
|
||
* match-invoice route (which had the overpayment guard), the v1 public API
|
||
* route, and `commitMatchTransactionInvoice` (the agent/MCP path). The latter
|
||
* two had drifted WITHOUT the guard, so they silently swallowed overpayment via
|
||
* `Math.max(0, …)`: recording e.g. 1500 paid on a 1000 invoice and
|
||
* over-crediting accounts receivable. Centralizing the math + guard here closes
|
||
* that drift; all three sites delegate to `planInvoicePayment`.
|
||
*
|
||
* FX: `paymentAmountInInvoiceCurrency` MUST already be in the invoice's
|
||
* currency. The caller owns any conversion (cross-currency settlement lives in
|
||
* the dashboard route), keeping this helper FX-agnostic.
|
||
*
|
||
* Extracted from the proven dashboard route with the same half-öre overshoot
|
||
* tolerance. Rounding goes through the canonical `roundOre` (@/lib/money) per
|
||
* guard rail #9: identical to the route's previous `Math.round(x*100)/100`
|
||
* except on exact-half-öre amounts, where `roundOre` rounds correctly.
|
||
*/
|
||
import { roundOre, ORE_TOLERANCE, ORE_ROUNDING_SETTLEMENT_MAX } from '@/lib/money'
|
||
|
||
/** Half an öre: anything over the remaining by more than this is a real overpayment. */
|
||
export const PAYMENT_OVERSHOOT_TOLERANCE = ORE_TOLERANCE
|
||
|
||
export interface InvoicePaymentTotals {
|
||
total: number
|
||
paid_amount?: number | null
|
||
remaining_amount?: number | null
|
||
}
|
||
|
||
export interface InvoicePaymentPlan {
|
||
newPaidAmount: number
|
||
newRemaining: number
|
||
isFullyPaid: boolean
|
||
newStatus: 'paid' | 'partially_paid'
|
||
/** True when a sub-krona öre residual was absorbed (full settlement of an
|
||
* inexact amount): the 3740 line carries it. Always false unless the caller
|
||
* opts in via `absorbOreRounding`. */
|
||
oreSettled: boolean
|
||
}
|
||
|
||
export type PlanInvoicePaymentResult =
|
||
| { ok: true; plan: InvoicePaymentPlan }
|
||
| {
|
||
ok: false
|
||
code: 'MATCH_AMOUNT_EXCEEDS_REMAINING'
|
||
details: { transaction_amount: number; remaining_amount: number; excess: number }
|
||
}
|
||
|
||
export function planInvoicePayment(
|
||
invoice: InvoicePaymentTotals,
|
||
paymentAmountInInvoiceCurrency: number,
|
||
opts?: { absorbOreRounding?: boolean },
|
||
): PlanInvoicePaymentResult {
|
||
const absorbOre = opts?.absorbOreRounding === true
|
||
const currentRemaining =
|
||
invoice.remaining_amount ?? invoice.total - (invoice.paid_amount || 0)
|
||
|
||
// A rounded-up whole-krona payment is not an overpayment: when absorbing öre,
|
||
// accept only an overshoot strictly inside the settlement band. The boundary
|
||
// must be >= : with a strict > guard an exact 1 kr overshoot passed the guard
|
||
// AND missed the |diff| < 1 absorb branch, falling through to record
|
||
// paid_amount = total + 1 kr with remaining clamped to 0 (silent over-credit).
|
||
// Without absorb, keep the strict half-öre float tolerance the legacy callers
|
||
// rely on.
|
||
const overshoot = roundOre(paymentAmountInInvoiceCurrency - currentRemaining)
|
||
const isOverpayment = absorbOre
|
||
? overshoot >= ORE_ROUNDING_SETTLEMENT_MAX
|
||
: paymentAmountInInvoiceCurrency > currentRemaining + PAYMENT_OVERSHOOT_TOLERANCE
|
||
if (isOverpayment) {
|
||
return {
|
||
ok: false,
|
||
code: 'MATCH_AMOUNT_EXCEEDS_REMAINING',
|
||
details: {
|
||
transaction_amount: paymentAmountInInvoiceCurrency,
|
||
remaining_amount: roundOre(currentRemaining),
|
||
excess: roundOre(paymentAmountInInvoiceCurrency - currentRemaining),
|
||
},
|
||
}
|
||
}
|
||
|
||
const diff = roundOre(currentRemaining - paymentAmountInInvoiceCurrency)
|
||
|
||
// Within the öre band (and absorbing) → settle in full; the 3740 line carries
|
||
// the residual. Covers both a short whole-krona payment and a rounded-up one.
|
||
if (absorbOre && Math.abs(diff) < ORE_ROUNDING_SETTLEMENT_MAX) {
|
||
return {
|
||
ok: true,
|
||
plan: {
|
||
newPaidAmount: roundOre((invoice.paid_amount || 0) + currentRemaining),
|
||
newRemaining: 0,
|
||
isFullyPaid: true,
|
||
newStatus: 'paid',
|
||
oreSettled: Math.abs(diff) >= ORE_TOLERANCE,
|
||
},
|
||
}
|
||
}
|
||
|
||
const newPaidAmount = roundOre((invoice.paid_amount || 0) + paymentAmountInInvoiceCurrency)
|
||
const newRemaining = Math.max(0, roundOre(currentRemaining - paymentAmountInInvoiceCurrency))
|
||
const isFullyPaid = newRemaining <= 0
|
||
|
||
return {
|
||
ok: true,
|
||
plan: {
|
||
newPaidAmount,
|
||
newRemaining,
|
||
isFullyPaid,
|
||
newStatus: isFullyPaid ? 'paid' : 'partially_paid',
|
||
oreSettled: false,
|
||
},
|
||
}
|
||
}
|
||
|
||
/** BAS öres- och kronutjämning: the only account that may carry an absorbed residual. */
|
||
const ORE_ROUNDING_ACCOUNT = '3740'
|
||
|
||
/**
|
||
* `planInvoicePayment` for caller-supplied booking lines (the mark-paid
|
||
* dialog and the v1 API), where the server does NOT build the verifikat.
|
||
*
|
||
* Absorbing an öre residual is only safe when the lines actually book it:
|
||
* in the server-built bank-match flow `buildInvoicePaymentClearingLines`
|
||
* guarantees 1510 is credited the full remaining and 3740 carries the exact
|
||
* residual, so plan and GL absorb together. Here the lines are caller-owned,
|
||
* so absorption is granted only when the net 3740 amount (debit − credit)
|
||
* equals the signed residual (remaining − payment). Otherwise fall back to
|
||
* the strict plan: a sub-krona short payment stays a real partial and a
|
||
* sub-krona overshoot is rejected, exactly as before absorption existed.
|
||
* Without this gate an invoice could flip to paid while the posted lines
|
||
* under-clear 1510, diverging the GL from the AR sub-ledger.
|
||
*/
|
||
export function planInvoicePaymentForLines(
|
||
invoice: InvoicePaymentTotals,
|
||
paymentAmountInInvoiceCurrency: number,
|
||
lines:
|
||
| Array<{ account_number: string; debit_amount: number; credit_amount: number }>
|
||
| undefined,
|
||
invoiceCurrency: string,
|
||
): PlanInvoicePaymentResult {
|
||
const absorbEligible = !!lines && invoiceCurrency === 'SEK'
|
||
const payment = planInvoicePayment(invoice, paymentAmountInInvoiceCurrency, {
|
||
absorbOreRounding: absorbEligible,
|
||
})
|
||
if (!absorbEligible || !payment.ok || !payment.plan.oreSettled) return payment
|
||
|
||
const currentRemaining =
|
||
invoice.remaining_amount ?? invoice.total - (invoice.paid_amount || 0)
|
||
const residual = roundOre(currentRemaining - paymentAmountInInvoiceCurrency)
|
||
const net3740 = roundOre(
|
||
lines!
|
||
.filter((l) => l.account_number === ORE_ROUNDING_ACCOUNT)
|
||
.reduce((s, l) => s + l.debit_amount - l.credit_amount, 0),
|
||
)
|
||
if (net3740 === residual) return payment
|
||
return planInvoicePayment(invoice, paymentAmountInInvoiceCurrency)
|
||
}
|