* feat(webshop-orders): schema, types and error codes for the orders surface webshop_orders (order/refund rows, financial-freeze trigger, member select/update RLS, no DELETE) + webshop_store_settings (per-store payment method -> account map), source_type 'webshop_order', multi-store index drop, customer_country, and a one-time woo cursor reset so the switch-over backfills and cross-marks existing feed rows. Tables classified in the full-archive export; pg-real coverage for RLS, freeze and CHECK. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(webshop-orders): core service (ingest, booking lines) upsertWebshopOrders: two-phase order/refund upsert with FX enrichment, legacy-feed cross-marking, frozen-row protection and field-wise jsonb comparisons (Postgres does not preserve object key order). Booking-line builder: per-rate VAT split with SIGNED buckets (discounts book as revenue reductions), refund mirroring, 3740 residual, per-store account prefill, and advisory export/EU + OSS warnings. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(webshop-orders): API routes for list, booking, invoicing and mapping Booking is draft -> atomic claim -> commit (conditional link-back closes the concurrent double-book race; a lost claim cancels the voucher-free draft). Legacy-feed guard honors transactions.is_ignored on both the book and create-invoice paths. Invoice conversion reuses buildInvoiceWriteData for an unnumbered draft with dominant-rate fallback and drift-safe unit prices. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(webshop-orders): Orders page, booking/invoice dialogs and gated nav /orders lists per-store orders with status tabs (server-side filters), exception chips and one action per row. Booking dialog prefills from the per-store payment-method mapping with an opt-in remember; invoice dialog converts to a draft kundfaktura. The Order nav item renders only for companies with an active WooCommerce connection or existing order rows (Shopify deliberately excluded until its sync writes webshop_orders). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(woocommerce): switch the order sync to webshop_orders, multi-store The sync maps rich wc/v3 payloads (billing, line/shipping/fee taxes, refund allocations with parent-prorated VAT fallback) and upserts order rows instead of transactions-inbox rows; already-imported feed rows stay bookable and get cross-marked. Multi-store: several active connections per company, per-store panel cards with the account-mapping editor. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(webshop-orders): decision log entries and ratchet baseline Baseline moves DOWN only: naive-ore-round 638 -> 637 via roundOre adoption; hand-rolled invariants stay at 115 (ACCOUNT_NUMBER_RE imported, not inlined). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(webshop-orders): resolve PR #1525 review findings and CI failures Review batch (Superagent, CodeRabbit, Swedish compliance review): - Mutual-exclusion claims: booking guards invoice_id, invoice link-back guards journal_entry_id AND treats zero matched rows as the conflict it is (409 + rollback), closing both TOCTOU races. - Freeze v2 migration (20260812124858): the link columns themselves are protected: invoice links immutable, journal links clearable only while the entry is still a draft (the booking rollback path). - Scraped orgnr no longer auto-written to customers.org_number; rate fallback applies only on single-VAT-bucket orders; refunds get their own WEBSHOP_ORDER_REFUND_NOT_CONVERTIBLE code; VAT advisories outrank the invoice-mode hint in the booking dialog. - Ingest compares every synced field (billing corrections no longer drop as unchanged); sync guards absent refunds arrays; /sync aggregates per-store results; panel disables all cards while a request runs; orders page separates load failure from empty; account field explains itself. CI: regenerated skills/accounted-api; pg tests restructured for transaction-abort/rollback semantics + freeze-link coverage; unresolvable- expression ceiling 375 -> 378 with documented reason (partial-update payloads in ingest, shapes covered by unit tests). Declined: CodeRabbit docstring-coverage advisory (house style: comments only where the code cannot say it). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
280 lines
9.1 KiB
TypeScript
280 lines
9.1 KiB
TypeScript
import { describe, it, expect } from 'vitest'
|
|
import {
|
|
buildOrderBookingLines,
|
|
fallbackVatBreakdown,
|
|
resolveBookingWarnings,
|
|
resolvePaymentAccount,
|
|
DEFAULT_PAYMENT_ACCOUNT,
|
|
} from '../booking-lines'
|
|
import type { CreateJournalEntryLineInput, WebshopStoreSettings } from '@/types'
|
|
|
|
import { roundOre as round } from '@/lib/money'
|
|
|
|
function sumDebits(lines: CreateJournalEntryLineInput[]): number {
|
|
return round(lines.reduce((sum, l) => sum + l.debit_amount, 0))
|
|
}
|
|
function sumCredits(lines: CreateJournalEntryLineInput[]): number {
|
|
return round(lines.reduce((sum, l) => sum + l.credit_amount, 0))
|
|
}
|
|
function lineFor(lines: CreateJournalEntryLineInput[], account: string) {
|
|
return lines.find((l) => l.account_number === account)
|
|
}
|
|
|
|
const settings: WebshopStoreSettings = {
|
|
id: 's1',
|
|
company_id: 'c1',
|
|
user_id: 'u1',
|
|
platform: 'woocommerce',
|
|
store_scope: 'butik.example.se',
|
|
payment_method_account_map: {
|
|
swish: { mode: 'book', account: '1930' },
|
|
klarna_payments: { mode: 'book', account: '1580' },
|
|
bacs: { mode: 'invoice' },
|
|
},
|
|
created_at: '',
|
|
updated_at: '',
|
|
}
|
|
|
|
function makeOrder(overrides: Record<string, unknown> = {}) {
|
|
return {
|
|
row_type: 'order' as const,
|
|
order_number: '1042',
|
|
payment_method: 'swish',
|
|
payment_method_title: 'Swish',
|
|
currency: 'SEK',
|
|
total: 500,
|
|
total_tax: 100,
|
|
total_sek: 500,
|
|
exchange_rate: 1,
|
|
vat_breakdown: [{ rate: 25, net: 400, tax: 100 }],
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
describe('resolvePaymentAccount', () => {
|
|
it('resolves a mapped book-mode account', () => {
|
|
expect(resolvePaymentAccount(makeOrder(), settings)).toEqual({
|
|
account: '1930',
|
|
invoiceMode: false,
|
|
mapped: true,
|
|
})
|
|
})
|
|
|
|
it('flags invoice-mode methods', () => {
|
|
const result = resolvePaymentAccount(makeOrder({ payment_method: 'bacs' }), settings)
|
|
expect(result.invoiceMode).toBe(true)
|
|
})
|
|
|
|
it('falls back to 1680 when unmapped or without settings', () => {
|
|
expect(resolvePaymentAccount(makeOrder({ payment_method: 'stripe' }), settings).account).toBe(
|
|
DEFAULT_PAYMENT_ACCOUNT,
|
|
)
|
|
expect(resolvePaymentAccount(makeOrder(), null).account).toBe(DEFAULT_PAYMENT_ACCOUNT)
|
|
expect(resolvePaymentAccount(makeOrder({ payment_method: null }), settings).mapped).toBe(false)
|
|
})
|
|
})
|
|
|
|
describe('fallbackVatBreakdown', () => {
|
|
it('infers 25/12/6 from the tax-to-net ratio', () => {
|
|
expect(fallbackVatBreakdown(500, 100)).toEqual([{ rate: 25, net: 400, tax: 100 }])
|
|
expect(fallbackVatBreakdown(112, 12)).toEqual([{ rate: 12, net: 100, tax: 12 }])
|
|
expect(fallbackVatBreakdown(106, 6)).toEqual([{ rate: 6, net: 100, tax: 6 }])
|
|
})
|
|
|
|
it('returns a 0% bucket for tax-free totals', () => {
|
|
expect(fallbackVatBreakdown(300, 0)).toEqual([{ rate: 0, net: 300, tax: 0 }])
|
|
})
|
|
|
|
it('falls back to a 25% bucket for unrecognizable mixes', () => {
|
|
expect(fallbackVatBreakdown(500, 50)).toEqual([{ rate: 25, net: 450, tax: 50 }])
|
|
})
|
|
})
|
|
|
|
describe('buildOrderBookingLines', () => {
|
|
it('books a SEK 25% order: gross to mapped account, net to 3001, VAT to 2611', () => {
|
|
const lines = buildOrderBookingLines({ order: makeOrder(), settings })
|
|
expect(lines).toHaveLength(3)
|
|
expect(lineFor(lines, '1930')).toMatchObject({ debit_amount: 500, credit_amount: 0 })
|
|
expect(lineFor(lines, '3001')).toMatchObject({ debit_amount: 0, credit_amount: 400 })
|
|
expect(lineFor(lines, '2611')).toMatchObject({ debit_amount: 0, credit_amount: 100 })
|
|
expect(sumDebits(lines)).toBe(sumCredits(lines))
|
|
})
|
|
|
|
it('splits mixed VAT rates across 3001/3002/3003 + 2611/2621/2631', () => {
|
|
const lines = buildOrderBookingLines({
|
|
order: makeOrder({
|
|
total: 723,
|
|
total_tax: 87,
|
|
total_sek: 723,
|
|
vat_breakdown: [
|
|
{ rate: 25, net: 300, tax: 75 },
|
|
{ rate: 12, net: 100, tax: 12 },
|
|
{ rate: 6, net: 200, tax: 12 },
|
|
{ rate: 0, net: 24, tax: 0 },
|
|
],
|
|
}),
|
|
settings,
|
|
})
|
|
expect(lineFor(lines, '3001')?.credit_amount).toBe(300)
|
|
expect(lineFor(lines, '3002')?.credit_amount).toBe(100)
|
|
expect(lineFor(lines, '3003')?.credit_amount).toBe(200)
|
|
expect(lineFor(lines, '3004')?.credit_amount).toBe(24)
|
|
expect(lineFor(lines, '2611')?.credit_amount).toBe(75)
|
|
expect(lineFor(lines, '2621')?.credit_amount).toBe(12)
|
|
expect(lineFor(lines, '2631')?.credit_amount).toBe(12)
|
|
expect(sumDebits(lines)).toBe(sumCredits(lines))
|
|
})
|
|
|
|
it('sends rounding residual to 3740 and stays balanced', () => {
|
|
const lines = buildOrderBookingLines({
|
|
order: makeOrder({
|
|
total: 500.05,
|
|
total_sek: 500.05,
|
|
vat_breakdown: [{ rate: 25, net: 400, tax: 100 }],
|
|
}),
|
|
settings,
|
|
})
|
|
expect(lineFor(lines, '3740')?.credit_amount).toBe(0.05)
|
|
expect(sumDebits(lines)).toBe(sumCredits(lines))
|
|
})
|
|
|
|
it('mirrors refund rows: credit the payment account, debit revenue and VAT', () => {
|
|
const lines = buildOrderBookingLines({
|
|
order: makeOrder({
|
|
row_type: 'refund',
|
|
total: -500,
|
|
total_tax: -100,
|
|
total_sek: -500,
|
|
vat_breakdown: [{ rate: 25, net: 400, tax: 100 }],
|
|
}),
|
|
settings,
|
|
})
|
|
expect(lineFor(lines, '1930')).toMatchObject({ debit_amount: 0, credit_amount: 500 })
|
|
expect(lineFor(lines, '3001')).toMatchObject({ debit_amount: 400, credit_amount: 0 })
|
|
expect(lineFor(lines, '2611')).toMatchObject({ debit_amount: 100, credit_amount: 0 })
|
|
expect(sumDebits(lines)).toBe(sumCredits(lines))
|
|
})
|
|
|
|
it('books non-SEK orders in SEK with currency metadata on money lines only', () => {
|
|
const lines = buildOrderBookingLines({
|
|
order: makeOrder({
|
|
currency: 'EUR',
|
|
total: 100,
|
|
total_tax: 20,
|
|
total_sek: 1153,
|
|
exchange_rate: 11.53,
|
|
vat_breakdown: [{ rate: 25, net: 80, tax: 20 }],
|
|
}),
|
|
settings,
|
|
})
|
|
const gross = lineFor(lines, '1930')
|
|
expect(gross).toMatchObject({
|
|
debit_amount: 1153,
|
|
currency: 'EUR',
|
|
amount_in_currency: 100,
|
|
exchange_rate: 11.53,
|
|
})
|
|
expect(lineFor(lines, '3001')).toMatchObject({
|
|
credit_amount: round(80 * 11.53),
|
|
amount_in_currency: 80,
|
|
})
|
|
const rounding = lineFor(lines, '3740')
|
|
if (rounding) expect(rounding.currency).toBeUndefined()
|
|
expect(sumDebits(lines)).toBe(sumCredits(lines))
|
|
})
|
|
|
|
it('honors an explicit payment-account override from the dialog', () => {
|
|
const lines = buildOrderBookingLines({
|
|
order: makeOrder(),
|
|
settings,
|
|
paymentAccount: '1686',
|
|
})
|
|
expect(lineFor(lines, '1686')?.debit_amount).toBe(500)
|
|
})
|
|
|
|
it('uses the fallback breakdown when the sync produced none', () => {
|
|
const lines = buildOrderBookingLines({
|
|
order: makeOrder({ vat_breakdown: [] }),
|
|
settings,
|
|
})
|
|
expect(lineFor(lines, '3001')?.credit_amount).toBe(400)
|
|
expect(lineFor(lines, '2611')?.credit_amount).toBe(100)
|
|
expect(sumDebits(lines)).toBe(sumCredits(lines))
|
|
})
|
|
|
|
it('books a NEGATIVE discount bucket on the opposite side, never abs-flipped', () => {
|
|
// Gift-card/discount plugin: 25% product 500+125, 0% discount -100.
|
|
// The old abs() logic booked C 3004 100 + D 3740 200: balanced, wrong.
|
|
const lines = buildOrderBookingLines({
|
|
order: makeOrder({
|
|
total: 525,
|
|
total_tax: 125,
|
|
total_sek: 525,
|
|
vat_breakdown: [
|
|
{ rate: 25, net: 500, tax: 125 },
|
|
{ rate: 0, net: -100, tax: 0 },
|
|
],
|
|
}),
|
|
settings,
|
|
})
|
|
expect(lineFor(lines, '1930')).toMatchObject({ debit_amount: 525 })
|
|
expect(lineFor(lines, '3001')).toMatchObject({ credit_amount: 500 })
|
|
expect(lineFor(lines, '2611')).toMatchObject({ credit_amount: 125 })
|
|
expect(lineFor(lines, '3004')).toMatchObject({ debit_amount: 100, credit_amount: 0 })
|
|
expect(lineFor(lines, '3740')).toBeUndefined()
|
|
expect(sumDebits(lines)).toBe(sumCredits(lines))
|
|
})
|
|
|
|
it('throws when a non-SEK order has no resolved SEK amount', () => {
|
|
expect(() =>
|
|
buildOrderBookingLines({
|
|
order: makeOrder({ currency: 'EUR', total_sek: null, exchange_rate: null }),
|
|
settings,
|
|
}),
|
|
).toThrow(/exchange rate/i)
|
|
})
|
|
})
|
|
|
|
describe('resolveBookingWarnings', () => {
|
|
it('flags a 0%-amount to a known non-SE country', () => {
|
|
expect(
|
|
resolveBookingWarnings({
|
|
currency: 'SEK',
|
|
total_tax: 0,
|
|
vat_breakdown: [{ rate: 0, net: 2000, tax: 0 }],
|
|
customer_country: 'NO',
|
|
}),
|
|
).toEqual(['zero_rate_foreign'])
|
|
})
|
|
|
|
it('stays quiet for domestic momsfri and unknown countries', () => {
|
|
expect(
|
|
resolveBookingWarnings({
|
|
currency: 'SEK',
|
|
total_tax: 0,
|
|
vat_breakdown: [{ rate: 0, net: 2000, tax: 0 }],
|
|
customer_country: 'SE',
|
|
}),
|
|
).toEqual([])
|
|
expect(
|
|
resolveBookingWarnings({
|
|
currency: 'SEK',
|
|
total_tax: 0,
|
|
vat_breakdown: [{ rate: 0, net: 2000, tax: 0 }],
|
|
customer_country: null,
|
|
}),
|
|
).toEqual([])
|
|
})
|
|
|
|
it('flags VAT charged on a non-SEK order (OSS check)', () => {
|
|
expect(
|
|
resolveBookingWarnings({
|
|
currency: 'EUR',
|
|
total_tax: 20,
|
|
vat_breakdown: [{ rate: 25, net: 80, tax: 20 }],
|
|
customer_country: 'DK',
|
|
}),
|
|
).toEqual(['foreign_vat'])
|
|
})
|
|
})
|