c35b2547fb
* 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>
214 lines
7.6 KiB
TypeScript
214 lines
7.6 KiB
TypeScript
'use client'
|
|
|
|
import { useMemo, useState } from 'react'
|
|
import { useTranslations } from 'next-intl'
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogDescription,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
} from '@/components/ui/dialog'
|
|
import { Checkbox } from '@/components/ui/checkbox'
|
|
import { Input } from '@/components/ui/input'
|
|
import { Label } from '@/components/ui/label'
|
|
import JournalEntryForm, { type FormLine } from '@/components/bookkeeping/JournalEntryForm'
|
|
import {
|
|
buildOrderBookingLines,
|
|
resolveBookingWarnings,
|
|
resolvePaymentAccount,
|
|
} from '@/lib/webshop-orders/booking-lines'
|
|
import { formatCurrency, formatDate } from '@/lib/utils'
|
|
import { ACCOUNT_NUMBER_RE } from '@/lib/invariants/account-number'
|
|
import type { WebshopOrder, WebshopStoreSettings } from '@/types'
|
|
|
|
interface OrderBookingDialogProps {
|
|
open: boolean
|
|
onOpenChange: (open: boolean) => void
|
|
order: WebshopOrder
|
|
storeSettings: WebshopStoreSettings | null
|
|
onBooked: () => void
|
|
onSettingsSaved: (settings: WebshopStoreSettings) => void
|
|
}
|
|
|
|
/**
|
|
* Books one order/refund row: prefilled lines from the per-store payment-
|
|
* method mapping, fully editable in the shared JournalEntryForm (manual-base
|
|
* doctrine: prefill never auto-books). The "remember" opt-in writes the
|
|
* chosen counter-account back to the store mapping AFTER a successful
|
|
* booking, mirroring the prefill-plus-explicit-override editor pattern.
|
|
*/
|
|
export default function OrderBookingDialog({
|
|
open,
|
|
onOpenChange,
|
|
order,
|
|
storeSettings,
|
|
onBooked,
|
|
onSettingsSaved,
|
|
}: OrderBookingDialogProps) {
|
|
const t = useTranslations('webshop_orders')
|
|
const resolved = useMemo(
|
|
() => resolvePaymentAccount(order, storeSettings),
|
|
[order, storeSettings],
|
|
)
|
|
const [paymentAccount, setPaymentAccount] = useState(resolved.account)
|
|
const [remember, setRemember] = useState(false)
|
|
|
|
const isRefund = order.row_type === 'refund'
|
|
const fxUnresolved = order.currency.toUpperCase() !== 'SEK' && order.total_sek === null
|
|
const accountValid = ACCOUNT_NUMBER_RE.test(paymentAccount)
|
|
|
|
const initialLines = useMemo<FormLine[] | null>(() => {
|
|
if (fxUnresolved || !accountValid) return null
|
|
try {
|
|
return buildOrderBookingLines({
|
|
order,
|
|
settings: storeSettings,
|
|
paymentAccount,
|
|
}).map((line) => ({
|
|
account_number: line.account_number,
|
|
debit_amount: line.debit_amount ? line.debit_amount.toFixed(2) : '',
|
|
credit_amount: line.credit_amount ? line.credit_amount.toFixed(2) : '',
|
|
line_description: line.line_description ?? '',
|
|
...(line.currency
|
|
? {
|
|
currency: line.currency,
|
|
amount_in_currency: line.amount_in_currency,
|
|
exchange_rate: line.exchange_rate,
|
|
}
|
|
: {}),
|
|
}))
|
|
} catch {
|
|
return null
|
|
}
|
|
}, [order, storeSettings, paymentAccount, fxUnresolved, accountValid])
|
|
|
|
const methodLabel = order.payment_method_title || order.payment_method || ''
|
|
|
|
async function persistMapping() {
|
|
if (!order.payment_method) return
|
|
const map = {
|
|
...(storeSettings?.payment_method_account_map ?? {}),
|
|
[order.payment_method]: { mode: 'book' as const, account: paymentAccount },
|
|
}
|
|
try {
|
|
const res = await fetch('/api/webshop-orders/settings', {
|
|
method: 'PUT',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify({
|
|
platform: order.platform,
|
|
store_scope: order.store_scope,
|
|
payment_method_account_map: map,
|
|
}),
|
|
})
|
|
if (res.ok) {
|
|
const json = (await res.json()) as { data: WebshopStoreSettings }
|
|
onSettingsSaved(json.data)
|
|
}
|
|
} catch {
|
|
// Remember is best-effort; the booking itself already succeeded.
|
|
}
|
|
}
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
|
<DialogContent className="max-h-[90vh] max-w-3xl overflow-y-auto">
|
|
<DialogHeader>
|
|
<DialogTitle>
|
|
{isRefund
|
|
? t('book_refund_title', { number: order.order_number })
|
|
: t('book_title', { number: order.order_number })}
|
|
</DialogTitle>
|
|
<DialogDescription>
|
|
{formatDate(order.paid_date ?? order.order_date)}
|
|
{' · '}
|
|
{formatCurrency(order.total, order.currency)}
|
|
{methodLabel ? ` · ${methodLabel}` : ''}
|
|
</DialogDescription>
|
|
</DialogHeader>
|
|
|
|
{fxUnresolved ? (
|
|
<p className="text-sm text-muted-foreground">{t('fx_unresolved')}</p>
|
|
) : (
|
|
<div className="space-y-4">
|
|
{/* One attn line (convention 6), priority order: a VAT compliance
|
|
warning always outranks the invoice-mode convenience hint
|
|
(Swedish review: the hint must never suppress a real
|
|
cross-border VAT advisory). */}
|
|
{(() => {
|
|
const warnings = resolveBookingWarnings(order)
|
|
if (warnings.length > 0) {
|
|
return (
|
|
<p className="attn text-[12.5px]">{t(`warning_${warnings[0]}`)}</p>
|
|
)
|
|
}
|
|
if (resolved.invoiceMode && !isRefund) {
|
|
return <p className="attn text-[12.5px]">{t('invoice_mode_hint')}</p>
|
|
}
|
|
return null
|
|
})()}
|
|
<div className="flex flex-wrap items-end gap-4">
|
|
<div className="space-y-1">
|
|
<Label htmlFor="order-payment-account" className="text-xs">
|
|
{t('payment_account_label')}
|
|
</Label>
|
|
<Input
|
|
id="order-payment-account"
|
|
value={paymentAccount}
|
|
onChange={(e) => setPaymentAccount(e.target.value.trim())}
|
|
inputMode="numeric"
|
|
maxLength={4}
|
|
className="w-28 tabular-nums"
|
|
aria-invalid={!accountValid}
|
|
aria-describedby={!accountValid ? 'order-payment-account-error' : undefined}
|
|
/>
|
|
{!accountValid && (
|
|
<p
|
|
id="order-payment-account-error"
|
|
className="text-xs text-destructive"
|
|
role="alert"
|
|
>
|
|
{t('invalid_account')}
|
|
</p>
|
|
)}
|
|
</div>
|
|
{order.payment_method && (
|
|
<label className="flex items-center gap-2 pb-2 text-[12.5px] text-muted-foreground">
|
|
<Checkbox
|
|
checked={remember}
|
|
onCheckedChange={(v) => setRemember(v === true)}
|
|
/>
|
|
{t('remember_account', { method: methodLabel })}
|
|
</label>
|
|
)}
|
|
</div>
|
|
|
|
{initialLines && (
|
|
<JournalEntryForm
|
|
key={`${order.id}-${paymentAccount}`}
|
|
bare
|
|
initialLines={initialLines}
|
|
initialDate={order.paid_date ?? order.order_date}
|
|
initialDescription={
|
|
isRefund
|
|
? `Återbetalning order ${order.order_number}`
|
|
: methodLabel
|
|
? `Order ${order.order_number} (${methodLabel})`
|
|
: `Order ${order.order_number}`
|
|
}
|
|
sourceType="webshop_order"
|
|
sourceId={order.id}
|
|
submitUrl={`/api/webshop-orders/${order.id}/book`}
|
|
onEntryCreated={() => {
|
|
if (remember) void persistMapping()
|
|
onBooked()
|
|
}}
|
|
/>
|
|
)}
|
|
</div>
|
|
)}
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|