Fix/skv connection flow (#1015)
* 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>
This commit is contained in:
Mattsson
co-authored by
Claude Fable 5
Claude Fable 5
parent
e7e3c35f9e
commit
b6332e9ff4
@@ -7,7 +7,7 @@ import CompanyTabSync from '@/components/dashboard/CompanyTabSync'
|
||||
import { RecaptIdentify } from '@/components/RecaptIdentify'
|
||||
import { AgentSheetProvider } from '@/components/agent/AgentSheetProvider'
|
||||
import AgentTrigger from '@/components/agent/AgentTrigger'
|
||||
import CommandPalette from '@/components/common/CommandPalette'
|
||||
import LazyCommandPalette from '@/components/common/LazyCommandPalette'
|
||||
import { SettingsHotkey } from '@/components/settings/SettingsHotkey'
|
||||
import { SandboxBanner } from '@/components/dashboard/SandboxBanner'
|
||||
import { getExtensionNavItems } from '@/lib/extensions/sectors'
|
||||
@@ -16,7 +16,6 @@ import { getActiveCompanyId } from '@/lib/company/context'
|
||||
import { getCompanyEntitlements } from '@/lib/entitlements/has-capability'
|
||||
import { getBranding } from '@/lib/branding/service'
|
||||
import { ensureSandboxAgentProfile } from '@/lib/sandbox/ensure-agent'
|
||||
import { countPendingOperations, countUnbookedTransactions } from '@/lib/worklist'
|
||||
import type { EntityType, CompanyRole, Team } from '@/types'
|
||||
|
||||
/**
|
||||
@@ -99,8 +98,6 @@ export default async function DashboardLayout({
|
||||
<DashboardNav
|
||||
companyName={getBranding().appName.toLowerCase()}
|
||||
entityType="enskild_firma"
|
||||
uncategorizedTransactionCount={0}
|
||||
pendingOperationsCount={0}
|
||||
isSandbox={false}
|
||||
extensionNavItems={getExtensionNavItems()}
|
||||
/>
|
||||
@@ -131,8 +128,6 @@ export default async function DashboardLayout({
|
||||
{ data: memberRow },
|
||||
{ data: allMemberships },
|
||||
{ data: settings },
|
||||
uncategorizedCount,
|
||||
pendingOpsCount,
|
||||
{ data: agentProfileIdentity },
|
||||
{ data: userProfile },
|
||||
entitlements,
|
||||
@@ -146,11 +141,10 @@ export default async function DashboardLayout({
|
||||
.select('company_name, onboarding_complete, entity_type, pays_salaries, is_sandbox, dimensions_enabled')
|
||||
.eq('company_id', companyId)
|
||||
.single(),
|
||||
// Shared worklist predicates (lib/worklist), the badge must show the
|
||||
// same number as every other "att göra" surface. Notably this excludes
|
||||
// is_ignored rows, which the old inline query here did not.
|
||||
countUnbookedTransactions(supabase, companyId),
|
||||
countPendingOperations(supabase, companyId),
|
||||
// Nav badge counts (unbooked transactions, pending operations) are NOT
|
||||
// fetched here anymore: DashboardNav loads them client-side after mount
|
||||
// (lib/hooks/use-worklist-badges) so two head-count queries stop blocking
|
||||
// first paint on every dashboard navigation.
|
||||
// Agent identity, name + avatar, surfaced on the FAB and chat
|
||||
// surfaces. Null when no agent_profile exists yet (banner CTA path).
|
||||
supabase
|
||||
@@ -203,8 +197,6 @@ export default async function DashboardLayout({
|
||||
<DashboardNav
|
||||
companyName={getBranding().appName.toLowerCase()}
|
||||
entityType="enskild_firma"
|
||||
uncategorizedTransactionCount={0}
|
||||
pendingOperationsCount={0}
|
||||
isSandbox={false}
|
||||
extensionNavItems={getExtensionNavItems()}
|
||||
/>
|
||||
@@ -311,8 +303,6 @@ export default async function DashboardLayout({
|
||||
entityType={entityType}
|
||||
paysSalaries={paysSalaries}
|
||||
dimensionsEnabled={dimensionsEnabled}
|
||||
uncategorizedTransactionCount={uncategorizedCount}
|
||||
pendingOperationsCount={pendingOpsCount}
|
||||
isSandbox={isSandbox}
|
||||
extensionNavItems={getExtensionNavItems()}
|
||||
userName={userProfile?.full_name ?? null}
|
||||
@@ -322,7 +312,7 @@ export default async function DashboardLayout({
|
||||
<MainContainer companyId={companyId}>{children}</MainContainer>
|
||||
</main>
|
||||
<AgentTrigger />
|
||||
<CommandPalette />
|
||||
<LazyCommandPalette />
|
||||
<SettingsHotkey />
|
||||
{settingsModal}
|
||||
</div>
|
||||
|
||||
@@ -714,20 +714,28 @@ export default function PendingOperationsPage() {
|
||||
// in-place) so server-side filtering, sorting, and computed fields stay in
|
||||
// sync with whatever the API route returned. The counts endpoint isn't
|
||||
// pushed by the same trigger, so we also refresh counts on every change.
|
||||
// Trailing debounce: bulk actions emit one event per row, which previously
|
||||
// stampeded 4 requests per event (list + 3 counts); the burst now collapses
|
||||
// into a single refetch after the last event.
|
||||
useEffect(() => {
|
||||
const supabase = createClient()
|
||||
let debounce: ReturnType<typeof setTimeout> | null = null
|
||||
const channel = supabase
|
||||
.channel('pending_operations:list')
|
||||
.on(
|
||||
'postgres_changes',
|
||||
{ event: '*', schema: 'public', table: 'pending_operations' },
|
||||
() => {
|
||||
fetchOperations()
|
||||
fetchAllCounts()
|
||||
if (debounce) clearTimeout(debounce)
|
||||
debounce = setTimeout(() => {
|
||||
fetchOperations()
|
||||
fetchAllCounts()
|
||||
}, 400)
|
||||
}
|
||||
)
|
||||
.subscribe()
|
||||
return () => {
|
||||
if (debounce) clearTimeout(debounce)
|
||||
void supabase.removeChannel(channel)
|
||||
}
|
||||
}, [fetchOperations, fetchAllCounts])
|
||||
|
||||
@@ -24,6 +24,7 @@ import {
|
||||
} from '@/lib/salary/payment/bank-account'
|
||||
import type { Employee } from '@/types'
|
||||
import { EmployeeBenefitsPanel } from '@/components/salary/EmployeeBenefitsPanel'
|
||||
import { OpeningBalancesPanel } from '@/components/salary/OpeningBalancesPanel'
|
||||
import EmployeeTaxCard, { type EmployeeTaxValue } from '@/components/salary/EmployeeTaxCard'
|
||||
import LineDimensionFields from '@/components/dimensions/LineDimensionFields'
|
||||
|
||||
@@ -124,12 +125,18 @@ export default function EmployeeDetailPage({ params }: { params: Promise<{ id: s
|
||||
employment_type: employmentType,
|
||||
employment_start: form.get('employment_start') as string || undefined,
|
||||
employment_end: form.get('employment_end') as string || undefined,
|
||||
employment_degree: parseFloat(form.get('employment_degree') as string) || 100,
|
||||
// Sparse patch: an empty/cleared field is OMITTED (undefined keys are
|
||||
// dropped by JSON.stringify) so the server's patch schema leaves the
|
||||
// column unchanged. Hardcoded fallbacks here would silently reset real
|
||||
// DB values on submit.
|
||||
employment_degree: parseFloat(form.get('employment_degree') as string) || undefined,
|
||||
hours_per_week: parseFloat(form.get('hours_per_week') as string) || undefined,
|
||||
workdays_per_week: parseFloat(form.get('workdays_per_week') as string) || undefined,
|
||||
salary_type: salaryType,
|
||||
f_skatt_status: tax?.f_skatt_status,
|
||||
is_sidoinkomst: tax?.is_sidoinkomst,
|
||||
tax_table_number: tax?.tax_table_number ?? undefined,
|
||||
tax_column: tax?.tax_column ?? 1,
|
||||
tax_column: tax?.tax_column ?? undefined,
|
||||
tax_municipality: tax?.tax_municipality || undefined,
|
||||
email: form.get('email') as string || undefined,
|
||||
phone: form.get('phone') as string || undefined,
|
||||
@@ -139,7 +146,7 @@ export default function EmployeeDetailPage({ params }: { params: Promise<{ id: s
|
||||
clearing_number: normalizeBankNumber(clearing) || undefined,
|
||||
bank_account_number: normalizeBankNumber(account) || undefined,
|
||||
vacation_rule: vacationRule,
|
||||
vacation_days_per_year: parseInt(form.get('vacation_days_per_year') as string) || 25,
|
||||
vacation_days_per_year: parseInt(form.get('vacation_days_per_year') as string) || undefined,
|
||||
// Always sent: {} clears the employee's default dimensions.
|
||||
default_dimensions: dimensions,
|
||||
}
|
||||
@@ -291,6 +298,15 @@ export default function EmployeeDetailPage({ params }: { params: Promise<{ id: s
|
||||
<Label htmlFor="employment_degree">{t('form_employment_degree')}</Label>
|
||||
<Input id="employment_degree" name="employment_degree" type="number" defaultValue={employee.employment_degree} min="1" max="100" disabled={!canWrite} />
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="hours_per_week">{t('form_hours_per_week')}</Label>
|
||||
<Input id="hours_per_week" name="hours_per_week" type="number" defaultValue={employee.hours_per_week ?? 40} min="1" max="80" step="0.5" disabled={!canWrite} />
|
||||
<p className="text-xs text-muted-foreground">{t('form_work_schedule_hint')}</p>
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="workdays_per_week">{t('form_workdays_per_week')}</Label>
|
||||
<Input id="workdays_per_week" name="workdays_per_week" type="number" defaultValue={employee.workdays_per_week ?? 5} min="1" max="7" step="1" disabled={!canWrite} />
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="salary_type">{t('form_salary_type')}<RequiredMark /></Label>
|
||||
<Select value={salaryType} onValueChange={setSalaryType} disabled={!canWrite}>
|
||||
@@ -453,6 +469,9 @@ export default function EmployeeDetailPage({ params }: { params: Promise<{ id: s
|
||||
{/* Benefits */}
|
||||
<EmployeeBenefitsPanel employeeId={id} canWrite={canWrite} />
|
||||
|
||||
{/* Ingående saldon (payroll cutover) */}
|
||||
<OpeningBalancesPanel employeeId={id} canWrite={canWrite} />
|
||||
|
||||
{canWrite && (
|
||||
<div className="flex justify-end gap-3">
|
||||
<Button variant="outline" asChild>
|
||||
|
||||
@@ -15,6 +15,9 @@ import { ArrowRight, CalendarClock, CheckCircle2, HandCoins, Loader2, Plus, User
|
||||
import { PageHeader } from '@/components/ui/page-header'
|
||||
import { useToast } from '@/components/ui/use-toast'
|
||||
import { useCanWrite } from '@/lib/hooks/use-can-write'
|
||||
import { VacationBalanceCard } from '@/components/salary/VacationBalanceCard'
|
||||
import { useAgiSubmission } from '@/lib/hooks/use-agi-submission'
|
||||
import { deriveAgiFilingState } from '@/lib/salary/agi-submission-state'
|
||||
import { useCompany } from '@/contexts/CompanyContext'
|
||||
import { getErrorMessage } from '@/lib/errors/get-error-message'
|
||||
import { formatCurrency, formatDate } from '@/lib/utils'
|
||||
@@ -65,50 +68,52 @@ export default function SalaryPage() {
|
||||
const tp = useTranslations('salary_payments')
|
||||
|
||||
const load = useCallback(async () => {
|
||||
const [runsRes, empRes, settingsRes] = await Promise.all([
|
||||
fetch('/api/salary/runs'),
|
||||
fetch('/api/salary/employees'),
|
||||
fetch('/api/settings'),
|
||||
// Everything loads in parallel; the tax-payment fetch is the only
|
||||
// dependent request and chains directly off the runs response instead of
|
||||
// waiting for the whole batch. Was three sequential legs (batch → tax
|
||||
// payment → SKV status), now the longest chain is runs → tax payment.
|
||||
const runsPromise: Promise<SalaryRun[]> = fetch('/api/salary/runs')
|
||||
.then(async res => (res.ok ? (await res.json()).data || [] : []))
|
||||
.catch(() => [])
|
||||
|
||||
// Latest booked run drives the "skatt att betala" card. Resolves to
|
||||
// undefined ("leave state unchanged") when there is no booked run or the
|
||||
// fetch fails, mirroring the old sequential behavior on reloads.
|
||||
const taxPaymentPromise: Promise<TaxPaymentState | null | undefined> = runsPromise
|
||||
.then(async loadedRuns => {
|
||||
const latestBooked = loadedRuns.find(r => r.status === 'booked')
|
||||
if (!latestBooked) return undefined
|
||||
const period = `${latestBooked.period_year}-${String(latestBooked.period_month).padStart(2, '0')}`
|
||||
const txRes = await fetch(`/api/skatteverket/tax-payments/${period}`)
|
||||
if (!txRes.ok) return undefined
|
||||
return (await txRes.json()).data ?? null
|
||||
})
|
||||
.catch(() => undefined)
|
||||
|
||||
const [loadedRuns, taxPaymentData, empRes, settingsRes, skvStatus] = await Promise.all([
|
||||
runsPromise,
|
||||
taxPaymentPromise,
|
||||
fetch('/api/salary/employees').catch(() => null),
|
||||
fetch('/api/settings').catch(() => null),
|
||||
// Connection health for the tax card hint. Only needs_reconsent counts:
|
||||
// the routine short-lived token expiry is normal and must not nag. Any
|
||||
// failure (extension disabled → 503, network) silently means no hint.
|
||||
fetch('/api/extensions/ext/skatteverket/status')
|
||||
.then(res => (res.ok ? res.json() : null))
|
||||
.catch(() => null),
|
||||
])
|
||||
|
||||
let loadedRuns: SalaryRun[] = []
|
||||
if (runsRes.ok) {
|
||||
const { data } = await runsRes.json()
|
||||
loadedRuns = data || []
|
||||
setRuns(loadedRuns)
|
||||
}
|
||||
if (empRes.ok) {
|
||||
setRuns(loadedRuns)
|
||||
if (taxPaymentData !== undefined) setTaxPayment(taxPaymentData)
|
||||
if (empRes?.ok) {
|
||||
const { data } = await empRes.json()
|
||||
setEmployees(data || [])
|
||||
}
|
||||
if (settingsRes.ok) {
|
||||
if (settingsRes?.ok) {
|
||||
const { data } = await settingsRes.json()
|
||||
if (typeof data?.salary_pay_day === 'number') setPayDay(data.salary_pay_day)
|
||||
}
|
||||
|
||||
// Latest booked run drives the "skatt att betala" card.
|
||||
const latestBooked = loadedRuns.find(r => r.status === 'booked')
|
||||
if (latestBooked) {
|
||||
const period = `${latestBooked.period_year}-${String(latestBooked.period_month).padStart(2, '0')}`
|
||||
const txRes = await fetch(`/api/skatteverket/tax-payments/${period}`)
|
||||
if (txRes.ok) {
|
||||
const tx = await txRes.json()
|
||||
setTaxPayment(tx.data)
|
||||
}
|
||||
}
|
||||
|
||||
// Connection health for the tax card hint. Only needs_reconsent counts:
|
||||
// the routine short-lived token expiry is normal and must not nag. Any
|
||||
// failure (extension disabled → 503, network) silently means no hint.
|
||||
try {
|
||||
const statusRes = await fetch('/api/extensions/ext/skatteverket/status')
|
||||
if (statusRes.ok) {
|
||||
const status = await statusRes.json()
|
||||
setSkvNeedsReconsent(status?.needsReconsent === true)
|
||||
}
|
||||
} catch {
|
||||
// Extension unavailable: no hint.
|
||||
}
|
||||
if (skvStatus) setSkvNeedsReconsent(skvStatus.needsReconsent === true)
|
||||
|
||||
setLoading(false)
|
||||
}, [])
|
||||
@@ -151,6 +156,16 @@ export default function SalaryPage() {
|
||||
.then(({ data }) => setAgiDeadline(data ?? null))
|
||||
}, [company])
|
||||
|
||||
// The active run's AGI submission record: lets the hero distinguish
|
||||
// "lämna in till Skatteverket" from "väntar på din BankID-signatur".
|
||||
// Only fetched while a booked run is still unfiled; null otherwise.
|
||||
const activeRun = runs.find(r => r.status !== 'corrected')
|
||||
const { submission: agiSubmission } = useAgiSubmission(
|
||||
activeRun && activeRun.status === 'booked' && !activeRun.agi_submitted_at
|
||||
? `${activeRun.period_year}${String(activeRun.period_month).padStart(2, '0')}`
|
||||
: null,
|
||||
)
|
||||
|
||||
// One-click run creation: the API seeds all active employees, calculates,
|
||||
// and resolves period/pay-date/series defaults from settings.
|
||||
async function startRun() {
|
||||
@@ -244,7 +259,8 @@ export default function SalaryPage() {
|
||||
}
|
||||
|
||||
// ── Hero state machine (first match wins) ────────────────────────────────
|
||||
const activeRun = runs.find(r => r.status !== 'corrected')
|
||||
// activeRun is derived above the loading return (the AGI submission hook
|
||||
// needs it before any early return).
|
||||
const latestBooked = runs.find(r => r.status === 'booked')
|
||||
const periodOf = (r: SalaryRun) => `${r.period_year}-${String(r.period_month).padStart(2, '0')}`
|
||||
|
||||
@@ -315,6 +331,19 @@ export default function SalaryPage() {
|
||||
}
|
||||
}
|
||||
if (activeRun && activeRun.status === 'booked' && !activeRun.agi_submitted_at) {
|
||||
// The underlag may already be at Skatteverket waiting for a BankID
|
||||
// signature: telling the user to "lämna in" something they already
|
||||
// submitted reads as a broken flow. Follow the real filing state.
|
||||
const agiState = deriveAgiFilingState(activeRun, agiSubmission)
|
||||
if (agiState === 'awaiting_signing' || agiState === 'underlag_submitted') {
|
||||
return {
|
||||
kind: 'cta',
|
||||
title: t('hero_agi_signing_title', { period: periodOf(activeRun) }),
|
||||
description: t('hero_agi_signing_description'),
|
||||
label: t('hero_agi_signing_action'),
|
||||
runId: activeRun.id,
|
||||
}
|
||||
}
|
||||
return {
|
||||
kind: 'cta',
|
||||
title: t('hero_agi_title', { period: periodOf(activeRun) }),
|
||||
@@ -409,7 +438,7 @@ export default function SalaryPage() {
|
||||
)}
|
||||
|
||||
{/* Attention cards */}
|
||||
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
|
||||
<Card>
|
||||
<CardContent className="p-4">
|
||||
<div className="flex items-center gap-2 mb-2">
|
||||
@@ -504,6 +533,9 @@ export default function SalaryPage() {
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
{/* Semester (vacation ledger + year close): payroll gap-closure 3.5 */}
|
||||
<VacationBalanceCard canWrite={canWrite} />
|
||||
</div>
|
||||
|
||||
{/* History */}
|
||||
|
||||
@@ -17,6 +17,8 @@ import {
|
||||
import { AlertTriangle, Download, Loader2 } from 'lucide-react'
|
||||
import { useToast } from '@/components/ui/use-toast'
|
||||
import { useCanWrite } from '@/lib/hooks/use-can-write'
|
||||
import { useAgiSubmission } from '@/lib/hooks/use-agi-submission'
|
||||
import { deriveAgiFilingState } from '@/lib/salary/agi-submission-state'
|
||||
import { getErrorMessage } from '@/lib/errors/get-error-message'
|
||||
import { AGIPanel } from '@/components/salary/AGIPanel'
|
||||
import { PaymentFilePanel } from '@/components/salary/PaymentFilePanel'
|
||||
@@ -55,6 +57,16 @@ export default function SalaryRunPage({ params }: { params: Promise<{ id: string
|
||||
tax_paid_at: string | null
|
||||
} | null>(null)
|
||||
|
||||
// Skatteverket's per-period AGI submission record: drives the AGI step on
|
||||
// the progress rail and the panel's state machine (underlag submitted /
|
||||
// awaiting BankID signature / signed). Only booked runs can file AGI, so
|
||||
// the fetch is skipped (null period) for everything else.
|
||||
const { submission: agiSubmission, refresh: refreshAgiSubmission } = useAgiSubmission(
|
||||
run && run.status === 'booked'
|
||||
? `${run.period_year}${String(run.period_month).padStart(2, '0')}`
|
||||
: null,
|
||||
)
|
||||
|
||||
async function loadRun() {
|
||||
const res = await fetch(`/api/salary/runs/${id}`)
|
||||
if (res.ok) {
|
||||
@@ -494,6 +506,10 @@ export default function SalaryRunPage({ params }: { params: Promise<{ id: string
|
||||
// hidden - mirrors the pain.001 / BG-LB generators, which emit no rows here.
|
||||
const noPayout = isCalculated && Math.round((run.total_net ?? 0) * 100) === 0
|
||||
|
||||
// Real AGI filing state: run-row timestamps + the extension's submission
|
||||
// record. Falls back gracefully when the extension is unavailable.
|
||||
const agiState = deriveAgiFilingState(run, agiSubmission)
|
||||
|
||||
// Advancing a draft to review. For a nollkörning confirm first: an empty
|
||||
// declaration is filed to Skatteverket, which should be deliberate.
|
||||
function handleToReview() {
|
||||
@@ -536,6 +552,8 @@ export default function SalaryRunPage({ params }: { params: Promise<{ id: string
|
||||
run={run}
|
||||
isCalculated={isCalculated}
|
||||
noPayout={noPayout}
|
||||
agiState={agiState}
|
||||
agiKvittensnummer={agiSubmission?.kvittensnummer ?? null}
|
||||
canWrite={canWrite}
|
||||
actionLoading={actionLoading}
|
||||
primaryAction={primaryAction}
|
||||
@@ -623,6 +641,8 @@ export default function SalaryRunPage({ params }: { params: Promise<{ id: string
|
||||
period={`${run.period_year}${String(run.period_month).padStart(2, '0')}`}
|
||||
agiGeneratedAt={run.agi_generated_at}
|
||||
agiSubmittedAt={run.agi_submitted_at}
|
||||
submission={agiSubmission}
|
||||
onRefreshSubmission={refreshAgiSubmission}
|
||||
readOnly={!canWrite}
|
||||
onChange={loadRun}
|
||||
/>
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
import { Suspense } from 'react'
|
||||
import { BankingSettingsContent } from '@/components/settings/sections/BankingSettingsContent'
|
||||
|
||||
// BankingSettingsContent (and the extension panel it hosts) reads
|
||||
// useSearchParams for the OAuth-callback ?select_accounts param; without a
|
||||
// Suspense boundary that de-opts the whole route to client rendering.
|
||||
export default function BankingSettingsPage() {
|
||||
return <BankingSettingsContent />
|
||||
return (
|
||||
<Suspense>
|
||||
<BankingSettingsContent />
|
||||
</Suspense>
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user