feat(woo): select multiple orders and book them with one template sweep (#1900)
* feat(woo): select multiple orders and book them with one template sweep Adds bulk booking to the orders page (issue #1880): hover-reveal checkbox column, a bulkbar with select-all/clear, and a confirm dialog that books every selected order with the standard order template (per-store payment- method mapping, optionally one override account for the whole selection). Server side, POST /api/webshop-orders/bulk-book books each order as its OWN verifikat through the exact same flow as the single-order endpoint: the guards, FX retry and race-free draft -> claim -> commit sequence are extracted to lib/webshop-orders/book-order.ts and shared by both routes, so nothing added to the single path can miss the bulk path. Partial failure is reported per order and never aborts the batch. Fixes #1880 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(woo): replace mangled NUL byte in bulk dialog grouping key with a pipe The account-group key template literal picked up a raw 0x00 byte during generation (known escape-mangling hazard), making git treat the file as binary. Same grouping semantics, plain '|' separator. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(woo): bulk sweep only books derived lines, never guessed ones (skeptic findings) The sweep has no reviewing user, so everything the single dialog relies on a human to catch is now refused per order or aborted: - empty vat_breakdown: the ratio-inferred fallback split (a 25%+6% mixed sale classified as 12%, refunds reversing zero moms via 3004) is only allowed as the single dialog's editable prefill; bulk refuses with WEBSHOP_ORDER_VAT_BREAKDOWN_MISSING - invoice-mode payment methods: booking would foreclose Skapa faktura and post a wrong clearing leg; refused with WEBSHOP_ORDER_INVOICE_MODE_METHOD (the account override does not bypass the merchant's configured flow) - 3740 residual above ore scale (gift-card gaps booked as 'oresavrundning'): refused with WEBSHOP_ORDER_RESIDUAL_TOO_LARGE - settings-fetch failure now aborts the sweep instead of silently rebooking every order to 1686 against the confirmed dialog - maxDuration 300 so a platform kill cannot strand an order between claim and commit - per-order guard details (e.g. journal_entry_id) survive into the failure envelope The dialog mirrors the skip rules up front (named order numbers, not an anonymous count) so the confirmation describes exactly what will book. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(woo): refuse non-Swedish VAT-rate buckets in the bulk sweep A foreign OSS bucket (e.g. German 19%) passes the non-empty breakdown gate with zero residual, but the rate-to-account maps would fall back to the 25% accounts and book foreign VAT as Swedish utgaende moms 2611 (skeptic finding). The sweep now refuses such orders per order with WEBSHOP_ORDER_UNSUPPORTED_VAT_RATE (details.rates names the offending rates); the dialog mirrors the rule and names the skipped orders. Only the single dialog may show that prefill, as an editable guess. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- 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
5fc0be9ed7
commit
c634430677
@@ -0,0 +1,407 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect, useMemo, useState } from 'react'
|
||||
import { useLocale, useTranslations } from 'next-intl'
|
||||
import { Loader2 } from 'lucide-react'
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from '@/components/ui/dialog'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Checkbox } from '@/components/ui/checkbox'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { useToast } from '@/components/ui/use-toast'
|
||||
import { getErrorMessage } from '@/lib/errors/get-error-message'
|
||||
import {
|
||||
resolveBookingWarnings,
|
||||
resolvePaymentAccount,
|
||||
unsupportedVatRates,
|
||||
} from '@/lib/webshop-orders/booking-lines'
|
||||
import { ACCOUNT_NUMBER_RE } from '@/lib/invariants/account-number'
|
||||
import { roundOre } from '@/lib/money'
|
||||
import { formatCurrency } from '@/lib/utils'
|
||||
import type { WebshopOrder, WebshopStoreSettings } from '@/types'
|
||||
|
||||
interface BulkBookOrderResult {
|
||||
order_id: string
|
||||
order_number: string | null
|
||||
success: boolean
|
||||
journal_entry_id?: string
|
||||
voucher_series?: string | null
|
||||
voucher_number?: number | null
|
||||
error?: { code: string; message: string; message_en?: string }
|
||||
}
|
||||
|
||||
interface BulkOrderBookingDialogProps {
|
||||
open: boolean
|
||||
onOpenChange: (open: boolean) => void
|
||||
orders: WebshopOrder[]
|
||||
settingsFor: (order: WebshopOrder) => WebshopStoreSettings | null
|
||||
/** Called after the server processed the batch (also on partial failure). */
|
||||
onBooked: () => void
|
||||
}
|
||||
|
||||
/**
|
||||
* Book N selected orders with the standard order template in one sweep
|
||||
* (confirm up front, convention 10). Each order still becomes its own
|
||||
* verifikat server-side via the same flow as the single-order dialog; this
|
||||
* dialog only chooses the payment counter-account policy: per-store mapping
|
||||
* (default) or one explicit account for the whole selection. Partial failure
|
||||
* is surfaced per order in a result list instead of aborting the batch.
|
||||
*/
|
||||
export default function BulkOrderBookingDialog({
|
||||
open,
|
||||
onOpenChange,
|
||||
orders,
|
||||
settingsFor,
|
||||
onBooked,
|
||||
}: BulkOrderBookingDialogProps) {
|
||||
const t = useTranslations('webshop_orders')
|
||||
const locale = useLocale()
|
||||
const { toast } = useToast()
|
||||
|
||||
const [overrideEnabled, setOverrideEnabled] = useState(false)
|
||||
const [overrideAccount, setOverrideAccount] = useState('')
|
||||
const [submitting, setSubmitting] = useState(false)
|
||||
const [results, setResults] = useState<BulkBookOrderResult[] | null>(null)
|
||||
|
||||
// Client-side mirror of the server's review guards, so the confirmation
|
||||
// describes exactly what will book (convention 10) instead of promising a
|
||||
// sweep the server then partially refuses:
|
||||
// - empty vat_breakdown: the prefill would be a ratio-inferred GUESS that
|
||||
// only the single dialog's editable form may show;
|
||||
// - a non-Swedish VAT rate (foreign OSS bucket): the account map would
|
||||
// silently fall back to the 25% accounts;
|
||||
// - invoice-mode mapping: the store routes this method through the invoice
|
||||
// flow, and booking would foreclose Skapa faktura for the order.
|
||||
// The server enforces the same rules for non-UI callers.
|
||||
const {
|
||||
bookableOrders,
|
||||
skippedMissingBreakdown,
|
||||
skippedUnsupportedRate,
|
||||
skippedInvoiceMode,
|
||||
} = useMemo(() => {
|
||||
const missing: WebshopOrder[] = []
|
||||
const badRate: WebshopOrder[] = []
|
||||
const invoiceMode: WebshopOrder[] = []
|
||||
const bookable: WebshopOrder[] = []
|
||||
for (const order of orders) {
|
||||
if (order.vat_breakdown.length === 0) missing.push(order)
|
||||
else if (unsupportedVatRates(order.vat_breakdown).length > 0) badRate.push(order)
|
||||
else if (resolvePaymentAccount(order, settingsFor(order)).invoiceMode)
|
||||
invoiceMode.push(order)
|
||||
else bookable.push(order)
|
||||
}
|
||||
return {
|
||||
bookableOrders: bookable,
|
||||
skippedMissingBreakdown: missing,
|
||||
skippedUnsupportedRate: badRate,
|
||||
skippedInvoiceMode: invoiceMode,
|
||||
}
|
||||
}, [orders, settingsFor])
|
||||
|
||||
// Signed sum per currency: refunds carry negative totals and reduce the
|
||||
// batch total honestly instead of inflating it.
|
||||
const currencyTotals = useMemo(() => {
|
||||
const byCurrency = new Map<string, number>()
|
||||
for (const order of bookableOrders) {
|
||||
const code = order.currency.toUpperCase()
|
||||
byCurrency.set(code, roundOre((byCurrency.get(code) ?? 0) + order.total))
|
||||
}
|
||||
return Array.from(byCurrency.entries()).sort(([a], [b]) => a.localeCompare(b))
|
||||
}, [bookableOrders])
|
||||
|
||||
// Payment-method groups with their resolved counter-account, so the user
|
||||
// sees exactly which account each slice of the selection will book against
|
||||
// before confirming.
|
||||
const accountGroups = useMemo(() => {
|
||||
const groups = new Map<string, { label: string; account: string; count: number }>()
|
||||
for (const order of bookableOrders) {
|
||||
const { account } = resolvePaymentAccount(order, settingsFor(order))
|
||||
const label = order.payment_method_title || order.payment_method || ''
|
||||
const key = `${label}|${account}`
|
||||
const existing = groups.get(key)
|
||||
if (existing) existing.count += 1
|
||||
else groups.set(key, { label, account, count: 1 })
|
||||
}
|
||||
return Array.from(groups.values()).sort((a, b) => a.label.localeCompare(b.label))
|
||||
}, [bookableOrders, settingsFor])
|
||||
|
||||
// Advisory VAT warnings stay per order, not an anonymous count: the user
|
||||
// must be able to tell WHICH orders deserve the single-dialog review.
|
||||
const warningOrderNumbers = useMemo(
|
||||
() =>
|
||||
bookableOrders
|
||||
.filter((o) => resolveBookingWarnings(o).length > 0)
|
||||
.map((o) => o.order_number),
|
||||
[bookableOrders],
|
||||
)
|
||||
|
||||
const uniformAccount =
|
||||
accountGroups.length > 0 &&
|
||||
accountGroups.every((g) => g.account === accountGroups[0].account)
|
||||
? accountGroups[0].account
|
||||
: null
|
||||
|
||||
// Reset per open so a second sweep starts clean.
|
||||
useEffect(() => {
|
||||
if (open) {
|
||||
setOverrideEnabled(false)
|
||||
setOverrideAccount(uniformAccount ?? '')
|
||||
setSubmitting(false)
|
||||
setResults(null)
|
||||
}
|
||||
// uniformAccount is derived from the selection the dialog opened with.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [open])
|
||||
|
||||
const overrideValid = ACCOUNT_NUMBER_RE.test(overrideAccount)
|
||||
const canConfirm =
|
||||
!submitting && bookableOrders.length > 0 && (!overrideEnabled || overrideValid)
|
||||
|
||||
async function handleConfirm() {
|
||||
if (!canConfirm) return
|
||||
setSubmitting(true)
|
||||
try {
|
||||
const response = await fetch('/api/webshop-orders/bulk-book', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
order_ids: bookableOrders.map((o) => o.id),
|
||||
...(overrideEnabled && overrideValid
|
||||
? { payment_account: overrideAccount }
|
||||
: {}),
|
||||
}),
|
||||
})
|
||||
if (!response.ok) {
|
||||
const body = await response.json().catch(() => null)
|
||||
toast({
|
||||
title: t('bulk_error_title'),
|
||||
description: getErrorMessage(body, { statusCode: response.status }),
|
||||
variant: 'destructive',
|
||||
})
|
||||
return
|
||||
}
|
||||
const body = (await response.json()) as {
|
||||
data: {
|
||||
results: BulkBookOrderResult[]
|
||||
booked_count: number
|
||||
failed_count: number
|
||||
}
|
||||
}
|
||||
if (body.data.failed_count === 0) {
|
||||
toast({
|
||||
title: t('bulk_success_title'),
|
||||
description: t('bulk_success_description', { count: body.data.booked_count }),
|
||||
variant: 'success',
|
||||
})
|
||||
onBooked()
|
||||
onOpenChange(false)
|
||||
return
|
||||
}
|
||||
// Partial failure: keep the dialog open on the per-order report; the
|
||||
// list behind refreshes so the booked rows leave "att bokföra".
|
||||
setResults(body.data.results)
|
||||
onBooked()
|
||||
} catch (err) {
|
||||
toast({
|
||||
title: t('bulk_error_title'),
|
||||
description: getErrorMessage(err),
|
||||
variant: 'destructive',
|
||||
})
|
||||
} finally {
|
||||
setSubmitting(false)
|
||||
}
|
||||
}
|
||||
|
||||
if (orders.length === 0) return null
|
||||
|
||||
const failures = (results ?? []).filter((r) => !r.success)
|
||||
const bookedCount = (results ?? []).filter((r) => r.success).length
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={onOpenChange}>
|
||||
<DialogContent className="max-h-[85vh] sm:max-w-[560px] overflow-y-auto">
|
||||
<DialogHeader>
|
||||
<DialogTitle>{t('bulk_title', { count: bookableOrders.length })}</DialogTitle>
|
||||
<DialogDescription>{t('bulk_description')}</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
{results ? (
|
||||
<div className="space-y-4">
|
||||
<p className="text-sm">
|
||||
{t('bulk_partial_summary', {
|
||||
booked: bookedCount,
|
||||
failed: failures.length,
|
||||
})}
|
||||
</p>
|
||||
<div className="space-y-2">
|
||||
<p className="text-xs font-medium text-muted-foreground">
|
||||
{t('bulk_failed_heading')}
|
||||
</p>
|
||||
<ul className="space-y-1">
|
||||
{failures.map((r) => (
|
||||
<li key={r.order_id} className="text-xs" data-ph-mask="">
|
||||
<span className="tabular-nums">{r.order_number ?? r.order_id}</span>
|
||||
{': '}
|
||||
<span className="text-muted-foreground">
|
||||
{locale === 'en' && r.error?.message_en
|
||||
? r.error.message_en
|
||||
: (r.error?.message ?? t('bulk_unknown_error'))}
|
||||
</span>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-y-4">
|
||||
{bookableOrders.length > 0 && (
|
||||
<>
|
||||
<div className="rounded-lg border border-border bg-card p-3">
|
||||
<p className="text-xs font-medium text-muted-foreground">
|
||||
{t('bulk_totals_label')}
|
||||
</p>
|
||||
<ul className="mt-2 space-y-1">
|
||||
{currencyTotals.map(([code, total]) => (
|
||||
<li
|
||||
key={code}
|
||||
className="flex items-center justify-between text-sm tabular-nums"
|
||||
>
|
||||
<span className="font-mono text-xs text-muted-foreground">{code}</span>
|
||||
<span>{formatCurrency(total, code)}</span>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<p className="text-xs font-medium text-muted-foreground">
|
||||
{t('bulk_account_plan_label')}
|
||||
</p>
|
||||
<ul className="space-y-1">
|
||||
{accountGroups.map((g) => (
|
||||
<li
|
||||
key={`${g.label}-${g.account}`}
|
||||
className="flex items-center justify-between text-sm"
|
||||
>
|
||||
<span className="truncate">
|
||||
{g.label || t('bulk_no_method')}
|
||||
</span>
|
||||
<span className="tabular-nums text-muted-foreground">
|
||||
{overrideEnabled && overrideValid ? overrideAccount : g.account}
|
||||
{' · '}
|
||||
{t('bulk_group_count', { count: g.count })}
|
||||
</span>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<label className="flex items-center gap-2 text-[12.5px] text-muted-foreground">
|
||||
<Checkbox
|
||||
checked={overrideEnabled}
|
||||
onCheckedChange={(v) => setOverrideEnabled(v === true)}
|
||||
/>
|
||||
{t('bulk_override_label')}
|
||||
</label>
|
||||
{overrideEnabled && (
|
||||
<div className="space-y-1">
|
||||
<Label htmlFor="bulk-order-payment-account" className="text-xs">
|
||||
{t('payment_account_label')}
|
||||
</Label>
|
||||
<Input
|
||||
id="bulk-order-payment-account"
|
||||
value={overrideAccount}
|
||||
onChange={(e) => setOverrideAccount(e.target.value.trim())}
|
||||
inputMode="numeric"
|
||||
maxLength={4}
|
||||
className="w-28 tabular-nums"
|
||||
aria-invalid={!overrideValid}
|
||||
aria-describedby={
|
||||
!overrideValid ? 'bulk-order-payment-account-error' : undefined
|
||||
}
|
||||
/>
|
||||
{!overrideValid && (
|
||||
<p
|
||||
id="bulk-order-payment-account-error"
|
||||
className="text-xs text-destructive"
|
||||
role="alert"
|
||||
>
|
||||
{t('invalid_account')}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* Skip notices: these selected orders will NOT be part of the
|
||||
sweep (mirrored server-side); the escape hatch is the
|
||||
single-order dialog where the lines are reviewable. */}
|
||||
{skippedMissingBreakdown.length > 0 && (
|
||||
<p className="attn text-[12.5px]" data-ph-mask="">
|
||||
{t('bulk_skipped_missing_breakdown', {
|
||||
numbers: skippedMissingBreakdown.map((o) => o.order_number).join(', '),
|
||||
})}
|
||||
</p>
|
||||
)}
|
||||
{skippedUnsupportedRate.length > 0 && (
|
||||
<p className="attn text-[12.5px]" data-ph-mask="">
|
||||
{t('bulk_skipped_unsupported_rate', {
|
||||
numbers: skippedUnsupportedRate.map((o) => o.order_number).join(', '),
|
||||
})}
|
||||
</p>
|
||||
)}
|
||||
{skippedInvoiceMode.length > 0 && (
|
||||
<p className="attn text-[12.5px]" data-ph-mask="">
|
||||
{t('bulk_skipped_invoice_mode', {
|
||||
numbers: skippedInvoiceMode.map((o) => o.order_number).join(', '),
|
||||
})}
|
||||
</p>
|
||||
)}
|
||||
{/* Advisory only (soft-guard rule): the sweep still books these;
|
||||
the named orders are better reviewed one by one. */}
|
||||
{warningOrderNumbers.length > 0 && (
|
||||
<p className="attn text-[12.5px]" data-ph-mask="">
|
||||
{t('bulk_warning_orders', { numbers: warningOrderNumbers.join(', ') })}
|
||||
</p>
|
||||
)}
|
||||
{bookableOrders.length === 0 && (
|
||||
<p className="text-sm text-muted-foreground">{t('bulk_none_bookable')}</p>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<DialogFooter>
|
||||
{results ? (
|
||||
<Button variant="outline" onClick={() => onOpenChange(false)}>
|
||||
{t('bulk_close')}
|
||||
</Button>
|
||||
) : (
|
||||
<>
|
||||
<Button
|
||||
variant="outline"
|
||||
onClick={() => onOpenChange(false)}
|
||||
disabled={submitting}
|
||||
>
|
||||
{t('cancel')}
|
||||
</Button>
|
||||
<Button onClick={() => void handleConfirm()} disabled={!canConfirm}>
|
||||
{submitting && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
|
||||
{t('bulk_confirm', { count: bookableOrders.length })}
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user