Files
accounted/components/orders/PaymentMethodMappingForm.tsx
T
Mattsson c35b2547fb feat(webshop-orders): Orders page with per-store, per-payment-method booking (#1525)
* 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>
2026-08-12 15:08:13 +02:00

217 lines
7.5 KiB
TypeScript

'use client'
import { useEffect, useMemo, useState } from 'react'
import { useTranslations } from 'next-intl'
import { Button } from '@/components/ui/button'
import { useToast } from '@/components/ui/use-toast'
import {
SettingsGroup,
SettingsRow,
SettingsRowEnd,
SettingsRowNote,
SettingsInput,
} from '@/components/settings/SettingsRows'
import { ACCOUNT_NUMBER_RE } from '@/lib/invariants/account-number'
import type { WebshopPaymentMethodPolicy, WebshopPlatform, WebshopStoreSettings } from '@/types'
interface PaymentMethodMappingFormProps {
platform: WebshopPlatform
storeScope: string
/**
* Payment methods observed on this store's orders. Omitted: derived from a
* sample of the store's synced orders.
*/
methods?: Array<{ method: string; title: string | null }>
}
type DraftPolicy = { mode: 'book'; account: string } | { mode: 'invoice' }
/**
* Per-store payment-method -> account mapping (prefill only; never books).
* Fönster language: flat hairline rows, save appears only when dirty.
* "Faktureras" marks a method as invoice-flow: the booking dialog then nudges
* toward Skapa faktura for those orders.
*/
export function PaymentMethodMappingForm({
platform,
storeScope,
methods,
}: PaymentMethodMappingFormProps) {
const t = useTranslations('webshop_orders')
const { toast } = useToast()
const [saved, setSaved] = useState<Record<string, WebshopPaymentMethodPolicy>>({})
const [draft, setDraft] = useState<Record<string, DraftPolicy>>({})
const [loading, setLoading] = useState(true)
const [saving, setSaving] = useState(false)
const [derivedMethods, setDerivedMethods] = useState<
Array<{ method: string; title: string | null }>
>([])
useEffect(() => {
if (methods !== undefined) return
let cancelled = false
fetch(
`/api/webshop-orders?platform=${platform}&store_scope=${encodeURIComponent(storeScope)}&limit=200`,
)
.then((r) => (r.ok ? r.json() : { data: [] }))
.then(
(json: {
data: Array<{ payment_method: string | null; payment_method_title: string | null }>
}) => {
if (cancelled) return
const seen = new Map<string, string | null>()
for (const row of json.data ?? []) {
if (row.payment_method && !seen.has(row.payment_method)) {
seen.set(row.payment_method, row.payment_method_title)
}
}
setDerivedMethods(
Array.from(seen.entries()).map(([method, title]) => ({ method, title })),
)
},
)
.catch(() => undefined)
return () => {
cancelled = true
}
}, [methods, platform, storeScope])
useEffect(() => {
let cancelled = false
fetch(
`/api/webshop-orders/settings?platform=${platform}&store_scope=${encodeURIComponent(storeScope)}`,
)
.then((r) => (r.ok ? r.json() : { data: [] }))
.then((json: { data: WebshopStoreSettings[] }) => {
if (cancelled) return
const map = json.data[0]?.payment_method_account_map ?? {}
setSaved(map)
setDraft(map as Record<string, DraftPolicy>)
})
.catch(() => undefined)
.finally(() => {
if (!cancelled) setLoading(false)
})
return () => {
cancelled = true
}
}, [platform, storeScope])
// Methods seen on orders plus any mapped-but-no-longer-seen leftovers.
const rows = useMemo(() => {
const source = methods ?? derivedMethods
const known = new Map(source.map((m) => [m.method, m.title]))
for (const method of Object.keys(saved)) {
if (!known.has(method)) known.set(method, null)
}
return Array.from(known.entries()).map(([method, title]) => ({ method, title }))
}, [methods, derivedMethods, saved])
const dirty = useMemo(() => JSON.stringify(draft) !== JSON.stringify(saved), [draft, saved])
const setMode = (method: string, mode: 'book' | 'invoice') => {
setDraft((prev) => {
const current = prev[method]
if (mode === 'invoice') return { ...prev, [method]: { mode: 'invoice' } }
return {
...prev,
[method]: {
mode: 'book',
account: current?.mode === 'book' ? current.account : '1680',
},
}
})
}
const setAccount = (method: string, account: string) => {
setDraft((prev) => ({ ...prev, [method]: { mode: 'book', account } }))
}
const invalid = Object.values(draft).some(
(p) => p.mode === 'book' && !ACCOUNT_NUMBER_RE.test(p.account),
)
async function save() {
setSaving(true)
try {
const res = await fetch('/api/webshop-orders/settings', {
method: 'PUT',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
platform,
store_scope: storeScope,
payment_method_account_map: draft,
}),
})
if (!res.ok) throw new Error(`save failed: ${res.status}`)
const json = (await res.json()) as { data: WebshopStoreSettings }
setSaved(json.data.payment_method_account_map)
setDraft(json.data.payment_method_account_map as Record<string, DraftPolicy>)
toast({ title: t('mapping_saved') })
} catch {
toast({ title: t('mapping_save_failed'), variant: 'destructive' })
} finally {
setSaving(false)
}
}
if (loading || rows.length === 0) return null
return (
<SettingsGroup label={t('mapping_title')}>
<p className="px-1 pb-1 text-xs leading-relaxed text-muted-foreground">
{t('mapping_intro')}
</p>
{rows.map(({ method, title }) => {
const policy = draft[method]
const mode = policy?.mode ?? 'book'
const account = policy?.mode === 'book' ? policy.account : ''
return (
<SettingsRow key={method} label={title || method}>
<SettingsRowEnd>
<select
value={policy ? mode : 'unmapped'}
onChange={(e) => {
if (e.target.value === 'unmapped') {
setDraft((prev) => {
const next = { ...prev }
delete next[method]
return next
})
} else {
setMode(method, e.target.value as 'book' | 'invoice')
}
}}
className="rounded-full border border-border bg-transparent px-3 py-[5px] text-[13px]"
aria-label={t('mapping_mode_aria', { method: title || method })}
>
<option value="unmapped">{t('mapping_mode_unmapped')}</option>
<option value="book">{t('mapping_mode_book')}</option>
<option value="invoice">{t('mapping_mode_invoice')}</option>
</select>
{policy?.mode === 'book' && (
<SettingsInput
value={account}
onChange={(e) => setAccount(method, e.target.value.trim())}
inputMode="numeric"
maxLength={4}
className="w-20 text-right tabular-nums"
aria-label={t('mapping_account_aria', { method: title || method })}
/>
)}
</SettingsRowEnd>
</SettingsRow>
)
})}
<div className="flex items-center justify-between px-1 pt-3">
<SettingsRowNote>{t('mapping_note')}</SettingsRowNote>
{dirty && (
<Button size="sm" onClick={save} disabled={saving || invalid}>
{saving ? t('mapping_saving') : t('mapping_save')}
</Button>
)}
</div>
</SettingsGroup>
)
}