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
@@ -1,6 +1,7 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import {
|
||||
planInvoicePayment,
|
||||
planInvoicePaymentForLines,
|
||||
PAYMENT_OVERSHOOT_TOLERANCE,
|
||||
} from '@/lib/invoices/apply-invoice-payment'
|
||||
|
||||
@@ -65,4 +66,184 @@ describe('planInvoicePayment', () => {
|
||||
it('overshoot tolerance is half an öre', () => {
|
||||
expect(PAYMENT_OVERSHOOT_TOLERANCE).toBe(0.005)
|
||||
})
|
||||
|
||||
describe('absorbOreRounding', () => {
|
||||
it('settles in full when the customer paid the rounded-up "Att betala"', () => {
|
||||
// Invoice total 1234.75, PDF shows 1235.00 (öresavrundning), customer pays that.
|
||||
const r = planInvoicePayment(
|
||||
{ total: 1234.75, paid_amount: 0, remaining_amount: 1234.75 },
|
||||
1235,
|
||||
{ absorbOreRounding: true },
|
||||
)
|
||||
expect(r.ok).toBe(true)
|
||||
if (r.ok) {
|
||||
expect(r.plan).toEqual({
|
||||
newPaidAmount: 1234.75,
|
||||
newRemaining: 0,
|
||||
isFullyPaid: true,
|
||||
newStatus: 'paid',
|
||||
oreSettled: true,
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
it('settles a sub-krona short payment in full (rounded-down total)', () => {
|
||||
const r = planInvoicePayment(
|
||||
{ total: 1000.4, paid_amount: 0, remaining_amount: 1000.4 },
|
||||
1000,
|
||||
{ absorbOreRounding: true },
|
||||
)
|
||||
expect(r.ok).toBe(true)
|
||||
if (r.ok) {
|
||||
expect(r.plan.newStatus).toBe('paid')
|
||||
expect(r.plan.newPaidAmount).toBe(1000.4)
|
||||
expect(r.plan.newRemaining).toBe(0)
|
||||
expect(r.plan.oreSettled).toBe(true)
|
||||
}
|
||||
})
|
||||
|
||||
it('still rejects an overshoot beyond the öre band', () => {
|
||||
const r = planInvoicePayment(
|
||||
{ total: 1000, paid_amount: 0, remaining_amount: 1000 },
|
||||
1001.25,
|
||||
{ absorbOreRounding: true },
|
||||
)
|
||||
expect(r.ok).toBe(false)
|
||||
})
|
||||
|
||||
it('rejects an overshoot of exactly 1 kr (band boundary must not over-record)', () => {
|
||||
const r = planInvoicePayment(
|
||||
{ total: 1000, paid_amount: 0, remaining_amount: 1000 },
|
||||
1001,
|
||||
{ absorbOreRounding: true },
|
||||
)
|
||||
expect(r.ok).toBe(false)
|
||||
})
|
||||
|
||||
it('a >=1 kr short payment stays a real partial', () => {
|
||||
const r = planInvoicePayment(
|
||||
{ total: 1000, paid_amount: 0, remaining_amount: 1000 },
|
||||
999,
|
||||
{ absorbOreRounding: true },
|
||||
)
|
||||
expect(r.ok).toBe(true)
|
||||
if (r.ok) {
|
||||
expect(r.plan.newStatus).toBe('partially_paid')
|
||||
expect(r.plan.newRemaining).toBe(1)
|
||||
expect(r.plan.oreSettled).toBe(false)
|
||||
}
|
||||
})
|
||||
|
||||
it('without the opt-in the sub-krona overshoot is still rejected', () => {
|
||||
const r = planInvoicePayment(
|
||||
{ total: 1234.75, paid_amount: 0, remaining_amount: 1234.75 },
|
||||
1235,
|
||||
)
|
||||
expect(r.ok).toBe(false)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('planInvoicePaymentForLines', () => {
|
||||
const INV = { total: 1234.75, paid_amount: 0, remaining_amount: 1234.75 }
|
||||
|
||||
it('absorbs when the lines carry the exact residual on 3740', () => {
|
||||
const r = planInvoicePaymentForLines(
|
||||
INV,
|
||||
1235,
|
||||
[
|
||||
{ account_number: '1930', debit_amount: 1235, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 1234.75 },
|
||||
{ account_number: '3740', debit_amount: 0, credit_amount: 0.25 },
|
||||
],
|
||||
'SEK',
|
||||
)
|
||||
expect(r.ok).toBe(true)
|
||||
if (r.ok) {
|
||||
expect(r.plan.newStatus).toBe('paid')
|
||||
expect(r.plan.newPaidAmount).toBe(1234.75)
|
||||
expect(r.plan.oreSettled).toBe(true)
|
||||
}
|
||||
})
|
||||
|
||||
it('short-payment lines with a 3740 debit residual settle in full', () => {
|
||||
const r = planInvoicePaymentForLines(
|
||||
{ total: 1000.4, paid_amount: 0, remaining_amount: 1000.4 },
|
||||
1000,
|
||||
[
|
||||
{ account_number: '1930', debit_amount: 1000, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 1000.4 },
|
||||
{ account_number: '3740', debit_amount: 0.4, credit_amount: 0 },
|
||||
],
|
||||
'SEK',
|
||||
)
|
||||
expect(r.ok).toBe(true)
|
||||
if (r.ok) expect(r.plan.newStatus).toBe('paid')
|
||||
})
|
||||
|
||||
it('a sub-krona short WITHOUT a 3740 line stays a real partial (no silent write-off)', () => {
|
||||
// Deliberate partial: user lowered both legs; 1510 is only cleared by the
|
||||
// paid amount, so flipping to paid would orphan the residual on 1510.
|
||||
const r = planInvoicePaymentForLines(
|
||||
INV,
|
||||
1234,
|
||||
[
|
||||
{ account_number: '1930', debit_amount: 1234, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 1234 },
|
||||
],
|
||||
'SEK',
|
||||
)
|
||||
expect(r.ok).toBe(true)
|
||||
if (r.ok) {
|
||||
expect(r.plan.newStatus).toBe('partially_paid')
|
||||
expect(r.plan.newRemaining).toBe(0.75)
|
||||
expect(r.plan.oreSettled).toBe(false)
|
||||
}
|
||||
})
|
||||
|
||||
it('a sub-krona overshoot WITHOUT a 3740 line is rejected (1510 would over-credit)', () => {
|
||||
const r = planInvoicePaymentForLines(
|
||||
INV,
|
||||
1235.25,
|
||||
[
|
||||
{ account_number: '1930', debit_amount: 1235.25, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 1235.25 },
|
||||
],
|
||||
'SEK',
|
||||
)
|
||||
expect(r.ok).toBe(false)
|
||||
})
|
||||
|
||||
it('a 3740 amount that does not match the residual falls back to the strict plan', () => {
|
||||
const r = planInvoicePaymentForLines(
|
||||
INV,
|
||||
1235.25, // 0.50 over, but the lines only book 0.25 on 3740
|
||||
[
|
||||
{ account_number: '1930', debit_amount: 1235.25, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 1235 },
|
||||
{ account_number: '3740', debit_amount: 0, credit_amount: 0.25 },
|
||||
],
|
||||
'SEK',
|
||||
)
|
||||
expect(r.ok).toBe(false)
|
||||
})
|
||||
|
||||
it('never absorbs for non-SEK invoices', () => {
|
||||
const r = planInvoicePaymentForLines(
|
||||
{ total: 100, paid_amount: 0, remaining_amount: 100 },
|
||||
100.25,
|
||||
[
|
||||
{ account_number: '1930', debit_amount: 100.25, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 100 },
|
||||
{ account_number: '3740', debit_amount: 0, credit_amount: 0.25 },
|
||||
],
|
||||
'EUR',
|
||||
)
|
||||
expect(r.ok).toBe(false)
|
||||
})
|
||||
|
||||
it('without lines it behaves exactly like the strict plan', () => {
|
||||
expect(planInvoicePaymentForLines(INV, 1234.75, undefined, 'SEK').ok).toBe(true)
|
||||
expect(planInvoicePaymentForLines(INV, 1235, undefined, 'SEK').ok).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,9 +1,80 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import type { SupabaseClient } from '@supabase/supabase-js'
|
||||
import {
|
||||
computeNextRunDate,
|
||||
computeInitialRunDate,
|
||||
getStockholmDateHour,
|
||||
executeRecurringSchedule,
|
||||
} from '@/lib/invoices/recurring-schedule-service'
|
||||
import { createQueuedMockSupabase, makeCustomer, makeCompanySettings } from '@/tests/helpers'
|
||||
import { eventBus } from '@/lib/events'
|
||||
|
||||
// ── Mocks for the executeRecurringSchedule auto-send path ─────────────
|
||||
// The pure date-helper tests below don't touch any of these modules.
|
||||
|
||||
const mockRenderToBuffer = vi.fn()
|
||||
vi.mock('@react-pdf/renderer', () => ({
|
||||
renderToBuffer: (...args: unknown[]) => mockRenderToBuffer(...args),
|
||||
}))
|
||||
|
||||
const mockInvoicePDF = vi.fn()
|
||||
vi.mock('@/lib/invoices/pdf-template', () => ({
|
||||
InvoicePDF: (...args: unknown[]) => mockInvoicePDF(...args),
|
||||
}))
|
||||
|
||||
const mockPrepareRender = vi.fn()
|
||||
const mockSwishQr = vi.fn()
|
||||
const mockPaymentLinkQr = vi.fn()
|
||||
vi.mock('@/lib/invoices/pdf-render-helpers', () => ({
|
||||
prepareInvoicePdfRender: (...args: unknown[]) => mockPrepareRender(...args),
|
||||
buildSwishQrDataUrl: (...args: unknown[]) => mockSwishQr(...args),
|
||||
buildPaymentLinkQrDataUrl: (...args: unknown[]) => mockPaymentLinkQr(...args),
|
||||
}))
|
||||
|
||||
const mockApplyPaymentLink = vi.fn()
|
||||
vi.mock('@/lib/extensions/payment-links', () => ({
|
||||
applyPaymentLinkToInvoice: (...args: unknown[]) => mockApplyPaymentLink(...args),
|
||||
}))
|
||||
|
||||
const mockSendEmail = vi.fn()
|
||||
const mockIsConfigured = vi.fn()
|
||||
vi.mock('@/lib/email/service', () => ({
|
||||
getEmailService: () => ({
|
||||
sendEmail: (...args: unknown[]) => mockSendEmail(...args),
|
||||
isConfigured: () => mockIsConfigured(),
|
||||
}),
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/email/invoice-templates', () => ({
|
||||
generateInvoiceEmailHtml: vi.fn().mockReturnValue('<html>Invoice</html>'),
|
||||
generateInvoiceEmailText: vi.fn().mockReturnValue('Invoice text'),
|
||||
generateInvoiceEmailSubject: vi.fn().mockReturnValue('Faktura F-1'),
|
||||
}))
|
||||
|
||||
const mockIsSandbox = vi.fn()
|
||||
vi.mock('@/lib/sandbox/guard', () => ({
|
||||
isSandboxCompany: (...args: unknown[]) => mockIsSandbox(...args),
|
||||
}))
|
||||
|
||||
const mockHasCapability = vi.fn()
|
||||
vi.mock('@/lib/entitlements/has-capability', () => ({
|
||||
hasCapability: (...args: unknown[]) => mockHasCapability(...args),
|
||||
}))
|
||||
|
||||
const mockEnsureNumber = vi.fn()
|
||||
vi.mock('@/lib/invoices/ensure-invoice-number', () => ({
|
||||
ensureInvoiceNumber: (...args: unknown[]) => mockEnsureNumber(...args),
|
||||
}))
|
||||
|
||||
const mockCreateJE = vi.fn()
|
||||
vi.mock('@/lib/bookkeeping/invoice-entries', () => ({
|
||||
createInvoiceJournalEntry: (...args: unknown[]) => mockCreateJE(...args),
|
||||
}))
|
||||
|
||||
const mockUploadDocument = vi.fn()
|
||||
vi.mock('@/lib/core/documents/document-service', () => ({
|
||||
uploadDocument: (...args: unknown[]) => mockUploadDocument(...args),
|
||||
}))
|
||||
|
||||
describe('computeNextRunDate', () => {
|
||||
it('advances day 15 from January to February', () => {
|
||||
@@ -98,3 +169,190 @@ describe('getStockholmDateHour', () => {
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('executeRecurringSchedule auto-send', () => {
|
||||
const { supabase, enqueue, reset } = createQueuedMockSupabase()
|
||||
const client = supabase as unknown as SupabaseClient
|
||||
const today = new Date('2026-07-06T06:30:00Z')
|
||||
|
||||
const customer = makeCustomer({ id: 'cust-1', email: 'kund@test.se' })
|
||||
const company = makeCompanySettings({ accounting_method: 'accrual' })
|
||||
|
||||
function makeSchedule() {
|
||||
return {
|
||||
id: 'sched-1',
|
||||
company_id: 'company-1',
|
||||
user_id: 'user-1',
|
||||
customer_id: 'cust-1',
|
||||
name: 'Monthly retainer',
|
||||
day_of_month: 6,
|
||||
send_hour: 8,
|
||||
payment_terms_days: 30,
|
||||
currency: 'SEK',
|
||||
your_reference: null,
|
||||
our_reference: null,
|
||||
notes: null,
|
||||
auto_send: true,
|
||||
status: 'active',
|
||||
next_run_date: '2026-07-06',
|
||||
last_run_at: null,
|
||||
last_invoice_id: null,
|
||||
last_run_warning: null,
|
||||
generated_count: 0,
|
||||
items: [
|
||||
{
|
||||
id: 'si-1',
|
||||
schedule_id: 'sched-1',
|
||||
sort_order: 0,
|
||||
description: 'Konsulttimmar',
|
||||
quantity: 10,
|
||||
unit: 'tim',
|
||||
unit_price: 1000,
|
||||
vat_rate: 25,
|
||||
},
|
||||
],
|
||||
} as unknown as Parameters<typeof executeRecurringSchedule>[1]
|
||||
}
|
||||
|
||||
// Fresh objects per test: ensureInvoiceNumber and applyPaymentLinkToInvoice
|
||||
// mutate the invoice they receive, so shared fixtures would leak state.
|
||||
function makeInsertedInvoice() {
|
||||
return { id: 'inv-1', invoice_number: null, document_type: 'invoice' }
|
||||
}
|
||||
function makeCompleteInvoice() {
|
||||
return {
|
||||
id: 'inv-1',
|
||||
invoice_number: 'F-1',
|
||||
status: 'draft',
|
||||
document_type: 'invoice',
|
||||
currency: 'SEK',
|
||||
total: 12500,
|
||||
credited_invoice_id: null,
|
||||
payment_link_url: null,
|
||||
customer,
|
||||
items: [{ id: 'item-1', sort_order: 0 }],
|
||||
}
|
||||
}
|
||||
|
||||
/** Queue for the full happy path (see call order in the service). */
|
||||
function enqueueHappyPath() {
|
||||
enqueue({ data: customer, error: null }) // customers select
|
||||
enqueue({ data: makeInsertedInvoice(), error: null }) // invoices insert
|
||||
enqueue({ data: null, error: null }) // invoice_items insert
|
||||
enqueue({ data: makeCompleteInvoice(), error: null }) // re-fetch with relations
|
||||
enqueue({ data: company, error: null }) // company_settings (auto-send)
|
||||
enqueue({ data: null, error: null }) // status flip to sent
|
||||
enqueue({ data: null, error: null }) // journal_entry_id write-back
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
reset()
|
||||
eventBus.clear()
|
||||
mockIsConfigured.mockReturnValue(true)
|
||||
mockIsSandbox.mockResolvedValue(false)
|
||||
mockHasCapability.mockResolvedValue(true)
|
||||
mockApplyPaymentLink.mockResolvedValue({ failure: null })
|
||||
mockEnsureNumber.mockImplementation(
|
||||
async (_supabase: unknown, _companyId: unknown, inv: { invoice_number: string | null }) => {
|
||||
inv.invoice_number = 'F-1'
|
||||
return 'F-1'
|
||||
},
|
||||
)
|
||||
mockPrepareRender.mockResolvedValue({ branding: {}, company })
|
||||
mockSwishQr.mockResolvedValue(null)
|
||||
mockPaymentLinkQr.mockResolvedValue(null)
|
||||
mockRenderToBuffer.mockResolvedValue(Buffer.from('fake-pdf'))
|
||||
mockInvoicePDF.mockReturnValue('pdf-element')
|
||||
mockSendEmail.mockResolvedValue({ success: true, messageId: 'm-1' })
|
||||
mockCreateJE.mockResolvedValue({ id: 'je-1' })
|
||||
mockUploadDocument.mockResolvedValue({})
|
||||
})
|
||||
|
||||
it('creates a payment link before rendering and passes its QR to the PDF', async () => {
|
||||
enqueueHappyPath()
|
||||
mockApplyPaymentLink.mockImplementation(
|
||||
async (_s: unknown, _c: unknown, _u: unknown, inv: { payment_link_url: string | null }) => {
|
||||
inv.payment_link_url = 'https://pay.example/x'
|
||||
return { failure: null }
|
||||
},
|
||||
)
|
||||
mockPaymentLinkQr.mockResolvedValue('data:image/png;base64,QR')
|
||||
|
||||
const result = await executeRecurringSchedule(client, makeSchedule(), today)
|
||||
|
||||
expect(result.autoSent).toBe(true)
|
||||
expect(result.warning).toBeNull()
|
||||
expect(mockApplyPaymentLink).toHaveBeenCalledTimes(1)
|
||||
expect(mockApplyPaymentLink).toHaveBeenCalledWith(
|
||||
expect.anything(),
|
||||
'company-1',
|
||||
'user-1',
|
||||
expect.objectContaining({ id: 'inv-1' }),
|
||||
expect.anything(),
|
||||
)
|
||||
// Link applied BEFORE the render so the email button and PDF QR carry it.
|
||||
expect(mockApplyPaymentLink.mock.invocationCallOrder[0]).toBeLessThan(
|
||||
mockRenderToBuffer.mock.invocationCallOrder[0],
|
||||
)
|
||||
// QR built from the renderable copy (status overridden to 'sent').
|
||||
expect(mockPaymentLinkQr).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ payment_link_url: 'https://pay.example/x', status: 'sent' }),
|
||||
)
|
||||
expect(mockInvoicePDF).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ paymentLinkQrDataUrl: 'data:image/png;base64,QR' }),
|
||||
)
|
||||
})
|
||||
|
||||
it('a payment link failure never blocks the send', async () => {
|
||||
enqueueHappyPath()
|
||||
mockApplyPaymentLink.mockResolvedValue({ failure: 'Stripe nere' })
|
||||
|
||||
const result = await executeRecurringSchedule(client, makeSchedule(), today)
|
||||
|
||||
expect(result.autoSent).toBe(true)
|
||||
expect(result.warning).toBeNull()
|
||||
expect(mockSendEmail).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('never auto-sends from a sandbox company; invoice stays a numbered draft', async () => {
|
||||
mockIsSandbox.mockResolvedValue(true)
|
||||
// Sandbox bails before company_settings/payment-link/render/email, so the
|
||||
// queue only covers invoice creation.
|
||||
enqueue({ data: customer, error: null })
|
||||
enqueue({ data: makeInsertedInvoice(), error: null })
|
||||
enqueue({ data: null, error: null })
|
||||
enqueue({ data: makeCompleteInvoice(), error: null })
|
||||
|
||||
const result = await executeRecurringSchedule(client, makeSchedule(), today)
|
||||
|
||||
expect(result.invoiceId).toBe('inv-1')
|
||||
expect(result.autoSent).toBe(false)
|
||||
expect(result.warning).toContain('Auto-utskick misslyckades')
|
||||
expect(mockSendEmail).not.toHaveBeenCalled()
|
||||
expect(mockApplyPaymentLink).not.toHaveBeenCalled()
|
||||
expect(mockCreateJE).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('route-level suppressAutoSend skips the send path without relying on the internal chokepoint', async () => {
|
||||
// Defence in depth (ASVS V2.3): the flag comes from the route's own
|
||||
// isSandboxCompany resolution, so sending is suppressed even before the
|
||||
// service-internal sandbox check runs. Invoice creation is unaffected.
|
||||
enqueue({ data: customer, error: null })
|
||||
enqueue({ data: makeInsertedInvoice(), error: null })
|
||||
enqueue({ data: null, error: null })
|
||||
enqueue({ data: makeCompleteInvoice(), error: null })
|
||||
|
||||
const result = await executeRecurringSchedule(client, makeSchedule(), today, {
|
||||
suppressAutoSend: true,
|
||||
})
|
||||
|
||||
expect(result.invoiceId).toBe('inv-1')
|
||||
expect(result.autoSent).toBe(false)
|
||||
expect(result.warning).toContain('Auto-utskick misslyckades')
|
||||
expect(mockSendEmail).not.toHaveBeenCalled()
|
||||
// The suppress branch bails before the email chokepoint entirely.
|
||||
expect(mockIsSandbox).not.toHaveBeenCalled()
|
||||
expect(mockCreateJE).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -19,6 +19,7 @@ import {
|
||||
createInvoicePaymentJournalEntry,
|
||||
createInvoiceCashEntry,
|
||||
} from '@/lib/bookkeeping/invoice-entries'
|
||||
import { createJournalEntry, findFiscalPeriod } from '@/lib/bookkeeping/engine'
|
||||
import { cancelOrphanedPaymentEntry } from '@/lib/bookkeeping/cancel-orphaned-entry'
|
||||
import { settleInvoicePayment } from '@/lib/invoices/settle-invoice-payment'
|
||||
import { eventBus } from '@/lib/events'
|
||||
@@ -100,6 +101,152 @@ describe('settleInvoicePayment', () => {
|
||||
expect(vi.mocked(createInvoicePaymentJournalEntry)).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('absorbs a sub-krona öresavrundning overshoot on SEK custom lines', async () => {
|
||||
vi.mocked(findFiscalPeriod).mockResolvedValue('fp-1')
|
||||
vi.mocked(createJournalEntry).mockResolvedValue({ id: 'je-ore' } as never)
|
||||
const { supabase, enqueue } = createQueuedMockSupabase()
|
||||
enqueue({ data: [{ id: 'inv-1' }] }) // CAS update matched
|
||||
|
||||
// Invoice total 1234.75, PDF "Att betala" 1235.00: the customer pays the
|
||||
// rounded amount and the 3740 line carries the residual.
|
||||
const invoice = payableInvoice({
|
||||
total: 1234.75,
|
||||
remaining_amount: 1234.75,
|
||||
journal_entry_id: 'je-orig',
|
||||
} as Partial<Invoice>)
|
||||
const result = await settleInvoicePayment(
|
||||
supabase as unknown as SupabaseClient,
|
||||
'company-1',
|
||||
'user-1',
|
||||
{
|
||||
...BASE_PARAMS,
|
||||
invoice,
|
||||
paymentAmountInInvoiceCurrency: 1235,
|
||||
customLines: [
|
||||
{ account_number: '1930', debit_amount: 1235, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 1234.75 },
|
||||
{ account_number: '3740', debit_amount: 0, credit_amount: 0.25 },
|
||||
],
|
||||
},
|
||||
)
|
||||
|
||||
expect(result).toMatchObject({
|
||||
ok: true,
|
||||
newStatus: 'paid',
|
||||
newPaidAmount: 1234.75,
|
||||
newRemaining: 0,
|
||||
journalEntryId: 'je-ore',
|
||||
})
|
||||
})
|
||||
|
||||
it('keeps a sub-krona short partial WITHOUT a 3740 line partially paid', async () => {
|
||||
vi.mocked(findFiscalPeriod).mockResolvedValue('fp-1')
|
||||
vi.mocked(createJournalEntry).mockResolvedValue({ id: 'je-partial' } as never)
|
||||
const { supabase, enqueue } = createQueuedMockSupabase()
|
||||
enqueue({ data: [{ id: 'inv-1' }] }) // CAS update matched
|
||||
|
||||
// Deliberate partial: both legs lowered, no 3740. Absorbing here would
|
||||
// flip the invoice to paid while 1510 keeps the 0.75 residual.
|
||||
const invoice = payableInvoice({
|
||||
total: 1234.75,
|
||||
remaining_amount: 1234.75,
|
||||
journal_entry_id: 'je-orig',
|
||||
} as Partial<Invoice>)
|
||||
const result = await settleInvoicePayment(
|
||||
supabase as unknown as SupabaseClient,
|
||||
'company-1',
|
||||
'user-1',
|
||||
{
|
||||
...BASE_PARAMS,
|
||||
invoice,
|
||||
paymentAmountInInvoiceCurrency: 1234,
|
||||
customLines: [
|
||||
{ account_number: '1930', debit_amount: 1234, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 1234 },
|
||||
],
|
||||
},
|
||||
)
|
||||
|
||||
expect(result).toMatchObject({
|
||||
ok: true,
|
||||
newStatus: 'partially_paid',
|
||||
newPaidAmount: 1234,
|
||||
newRemaining: 0.75,
|
||||
})
|
||||
})
|
||||
|
||||
it('rejects a sub-krona custom-line overshoot WITHOUT a 3740 line', async () => {
|
||||
const { supabase } = createQueuedMockSupabase()
|
||||
const invoice = payableInvoice({
|
||||
total: 1234.75,
|
||||
remaining_amount: 1234.75,
|
||||
} as Partial<Invoice>)
|
||||
const result = await settleInvoicePayment(
|
||||
supabase as unknown as SupabaseClient,
|
||||
'company-1',
|
||||
'user-1',
|
||||
{
|
||||
...BASE_PARAMS,
|
||||
invoice,
|
||||
paymentAmountInInvoiceCurrency: 1235.25,
|
||||
customLines: [
|
||||
{ account_number: '1930', debit_amount: 1235.25, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 1235.25 },
|
||||
],
|
||||
},
|
||||
)
|
||||
expect(result).toMatchObject({ ok: false, code: 'MATCH_AMOUNT_EXCEEDS_REMAINING' })
|
||||
expect(vi.mocked(createJournalEntry)).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('rejects a custom-line overshoot beyond the öre band', async () => {
|
||||
const { supabase } = createQueuedMockSupabase()
|
||||
const invoice = payableInvoice({
|
||||
total: 1234.75,
|
||||
remaining_amount: 1234.75,
|
||||
} as Partial<Invoice>)
|
||||
const result = await settleInvoicePayment(
|
||||
supabase as unknown as SupabaseClient,
|
||||
'company-1',
|
||||
'user-1',
|
||||
{
|
||||
...BASE_PARAMS,
|
||||
invoice,
|
||||
paymentAmountInInvoiceCurrency: 1236,
|
||||
customLines: [
|
||||
{ account_number: '1930', debit_amount: 1236, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 1236 },
|
||||
],
|
||||
},
|
||||
)
|
||||
expect(result).toMatchObject({ ok: false, code: 'MATCH_AMOUNT_EXCEEDS_REMAINING' })
|
||||
expect(vi.mocked(createJournalEntry)).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('does not absorb öre overshoot for non-SEK invoices', async () => {
|
||||
const { supabase } = createQueuedMockSupabase()
|
||||
const invoice = payableInvoice({
|
||||
total: 100,
|
||||
remaining_amount: 100,
|
||||
currency: 'EUR',
|
||||
} as Partial<Invoice>)
|
||||
const result = await settleInvoicePayment(
|
||||
supabase as unknown as SupabaseClient,
|
||||
'company-1',
|
||||
'user-1',
|
||||
{
|
||||
...BASE_PARAMS,
|
||||
invoice,
|
||||
paymentAmountInInvoiceCurrency: 100.25,
|
||||
customLines: [
|
||||
{ account_number: '1930', debit_amount: 100.25, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 100.25 },
|
||||
],
|
||||
},
|
||||
)
|
||||
expect(result).toMatchObject({ ok: false, code: 'MATCH_AMOUNT_EXCEEDS_REMAINING' })
|
||||
})
|
||||
|
||||
it('rejects overpayment before creating any journal entry', async () => {
|
||||
const { supabase } = createQueuedMockSupabase()
|
||||
const result = await settleInvoicePayment(
|
||||
|
||||
@@ -61,11 +61,18 @@ export function planInvoicePayment(
|
||||
const currentRemaining =
|
||||
invoice.remaining_amount ?? invoice.total - (invoice.paid_amount || 0)
|
||||
|
||||
// A rounded-up whole-krona payment is not an overpayment: widen the reject
|
||||
// band to one krona when absorbing öre; otherwise keep the strict half-öre
|
||||
// float tolerance the three legacy callers rely on.
|
||||
const overshootTolerance = absorbOre ? ORE_ROUNDING_SETTLEMENT_MAX : PAYMENT_OVERSHOOT_TOLERANCE
|
||||
if (paymentAmountInInvoiceCurrency > currentRemaining + overshootTolerance) {
|
||||
// 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',
|
||||
@@ -109,3 +116,47 @@ export function planInvoicePayment(
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/** 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)
|
||||
}
|
||||
|
||||
@@ -19,10 +19,16 @@ import { ensureInvoiceNumber } from '@/lib/invoices/ensure-invoice-number'
|
||||
import { createInvoiceJournalEntry } from '@/lib/bookkeeping/invoice-entries'
|
||||
import { renderToBuffer } from '@react-pdf/renderer'
|
||||
import { InvoicePDF } from '@/lib/invoices/pdf-template'
|
||||
import { prepareInvoicePdfRender, buildSwishQrDataUrl } from '@/lib/invoices/pdf-render-helpers'
|
||||
import {
|
||||
prepareInvoicePdfRender,
|
||||
buildSwishQrDataUrl,
|
||||
buildPaymentLinkQrDataUrl,
|
||||
} from '@/lib/invoices/pdf-render-helpers'
|
||||
import { applyPaymentLinkToInvoice } from '@/lib/extensions/payment-links'
|
||||
import { getEmailService } from '@/lib/email/service'
|
||||
import { hasCapability } from '@/lib/entitlements/has-capability'
|
||||
import { CAPABILITY } from '@/lib/entitlements/keys'
|
||||
import { isSandboxCompany } from '@/lib/sandbox/guard'
|
||||
import {
|
||||
generateInvoiceEmailHtml,
|
||||
generateInvoiceEmailText,
|
||||
@@ -138,6 +144,17 @@ export function getStockholmDateHour(instant: Date): { date: string; hour: numbe
|
||||
}
|
||||
}
|
||||
|
||||
export interface ExecuteScheduleOptions {
|
||||
/**
|
||||
* Defence-in-depth sandbox suppression (ASVS V2.3): callers that resolved
|
||||
* `isSandboxCompany` at the route level pass true to skip the auto-send
|
||||
* path outright, so the sandbox invariant does not hinge solely on the
|
||||
* chokepoint inside sendInvoiceFromSchedule. Freeze-and-retain semantics
|
||||
* are unchanged: the invoice is still created as a numbered draft.
|
||||
*/
|
||||
suppressAutoSend?: boolean
|
||||
}
|
||||
|
||||
/**
|
||||
* Spawn one invoice from a schedule. Always creates the invoice; auto_send
|
||||
* additionally renders + emails + flips status + creates JE + archives PDF.
|
||||
@@ -149,6 +166,7 @@ export async function executeRecurringSchedule(
|
||||
supabase: SupabaseClient,
|
||||
schedule: RecurringInvoiceSchedule & { items: RecurringInvoiceScheduleItem[] },
|
||||
today: Date = new Date(),
|
||||
options: ExecuteScheduleOptions = {},
|
||||
): Promise<ExecuteResult> {
|
||||
const opLog = log.child({ scheduleId: schedule.id, companyId: schedule.company_id })
|
||||
|
||||
@@ -329,7 +347,15 @@ export async function executeRecurringSchedule(
|
||||
// 9. Auto-send path. If anything below fails, we keep the invoice (now a
|
||||
// numbered draft) and surface a Swedish warning on the schedule: the
|
||||
// user can manually send from /invoices/[id].
|
||||
if (schedule.auto_send) {
|
||||
if (schedule.auto_send && options.suppressAutoSend) {
|
||||
// Route-level sandbox suppression: same outcome as the internal sandbox
|
||||
// chokepoint below (no email, invoice retained as draft, manual-send
|
||||
// warning), reached without entering the send path at all.
|
||||
opLog.warn('auto-send suppressed by route-level sandbox guard', {
|
||||
invoiceId: invoice.id,
|
||||
})
|
||||
warning = 'Auto-utskick misslyckades: fakturan finns som utkast och kan skickas manuellt.'
|
||||
} else if (schedule.auto_send) {
|
||||
try {
|
||||
autoSent = await sendInvoiceFromSchedule(
|
||||
supabase,
|
||||
@@ -386,6 +412,18 @@ async function sendInvoiceFromSchedule(
|
||||
})
|
||||
return false
|
||||
}
|
||||
// The sandbox must never deliver a real email to a real address. The
|
||||
// interactive send routes enforce this with guardSandbox, but cron and
|
||||
// run-now reach this function without any route-level guard, so the
|
||||
// invariant is enforced here at the email chokepoint. Freeze-and-retain
|
||||
// like the paywall path below: the invoice is still generated as a draft.
|
||||
if (await isSandboxCompany(supabase, companyId)) {
|
||||
log.warn('sandbox company; recurring schedule cannot auto-send', {
|
||||
invoiceId: invoice.id,
|
||||
companyId,
|
||||
})
|
||||
return false
|
||||
}
|
||||
// Paywall: email sending is a paid capability. The invoice itself is still
|
||||
// created (bookkeeping stays free); it just isn't emailed, and the schedule
|
||||
// surfaces the standard manual-send warning (freeze-and-retain).
|
||||
@@ -416,11 +454,32 @@ async function sendInvoiceFromSchedule(
|
||||
|
||||
const items = (invoice.items || []).slice().sort((a, b) => a.sort_order - b.sort_order)
|
||||
|
||||
// Auto-create an online payment link (extension-provided, e.g. Stripe) so
|
||||
// the email button and PDF QR carry it: parity with the manual and v1 send
|
||||
// routes. Best-effort: the faktura is legally valid without a link, so a
|
||||
// failure only logs and the send proceeds. On success the helper mirrors
|
||||
// payment_link_url onto this invoice object, which the email template and
|
||||
// QR builder below read.
|
||||
const { failure: paymentLinkFailure } = await applyPaymentLinkToInvoice(
|
||||
supabase,
|
||||
companyId,
|
||||
userId,
|
||||
invoice,
|
||||
log,
|
||||
)
|
||||
if (paymentLinkFailure) {
|
||||
log.warn('payment link creation failed for recurring invoice; sending without it', {
|
||||
invoiceId: invoice.id,
|
||||
reason: paymentLinkFailure,
|
||||
})
|
||||
}
|
||||
|
||||
// Render PDF with status overridden to 'sent' so the customer doesn't
|
||||
// receive a "UTKAST" stamp.
|
||||
const renderableInvoice = { ...invoice, status: 'sent' as const }
|
||||
const { branding, company: renderCompany } = await prepareInvoicePdfRender(company)
|
||||
const swishQrDataUrl = await buildSwishQrDataUrl(company, renderableInvoice)
|
||||
const paymentLinkQrDataUrl = await buildPaymentLinkQrDataUrl(renderableInvoice)
|
||||
const pdfBuffer = await renderToBuffer(
|
||||
InvoicePDF({
|
||||
invoice: renderableInvoice,
|
||||
@@ -429,6 +488,7 @@ async function sendInvoiceFromSchedule(
|
||||
company: renderCompany,
|
||||
branding,
|
||||
swishQrDataUrl,
|
||||
paymentLinkQrDataUrl,
|
||||
}),
|
||||
)
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import { createJournalEntry, findFiscalPeriod } from '@/lib/bookkeeping/engine'
|
||||
import { resolveInvoicePaymentSourceType } from '@/lib/bookkeeping/propose-payment-lines'
|
||||
import { isBookkeepingError } from '@/lib/bookkeeping/errors'
|
||||
import { cancelOrphanedPaymentEntry } from '@/lib/bookkeeping/cancel-orphaned-entry'
|
||||
import { planInvoicePayment } from '@/lib/invoices/apply-invoice-payment'
|
||||
import { planInvoicePaymentForLines } from '@/lib/invoices/apply-invoice-payment'
|
||||
import { eventBus } from '@/lib/events'
|
||||
import type { CreateJournalEntryInput, Customer, EntityType, Invoice } from '@/types'
|
||||
|
||||
@@ -116,7 +116,19 @@ export async function settleInvoicePayment(
|
||||
|
||||
// Ledger math + overpayment guard. Runs BEFORE any journal entry is
|
||||
// created so a doomed overpayment never burns a voucher number.
|
||||
const payment = planInvoicePayment(invoice, paymentAmountInInvoiceCurrency)
|
||||
// Custom-line SEK settlements absorb a sub-krona öresavrundning residual
|
||||
// (customer paid the rounded "Att betala" from the PDF, up to 1 kr off the
|
||||
// stored öre total) ONLY when the lines actually carry the residual on
|
||||
// 3740, mirroring the bank-transaction match flow; lines that don't (e.g.
|
||||
// a deliberate sub-krona partial) get the strict plan instead. The
|
||||
// generated-entry paths (Stripe sync, no-body mark-paid) always pay the
|
||||
// exact remaining, so absorption is a no-op there.
|
||||
const payment = planInvoicePaymentForLines(
|
||||
invoice,
|
||||
paymentAmountInInvoiceCurrency,
|
||||
customLines,
|
||||
invoice.currency,
|
||||
)
|
||||
if (!payment.ok) {
|
||||
return {
|
||||
ok: false,
|
||||
|
||||
Reference in New Issue
Block a user