* feat(shopify): port the order sync from the transactions feed to webshop_orders Shopify orders now land as rich rows on the Orders page (platform 'shopify'), the same surface WooCommerce uses, instead of opaque bank-feed rows on the 1584 cash account: - order-sync.ts writes through the shared upsertWebshopOrders service; the 1584/ensureManualCashAccount wiring is gone (prod has zero Shopify feed rows). Cursor/overlap/dedup, revoked classification and the frozen external_id formats are unchanged. - vat_breakdown is reconstructed from the order-level taxLines (net = tax/rate, remainder as a 0%-bucket, refuse on unusable data); refund VAT is prorated from the parent order's mix. The line-item snapshot is stored only when it reconstructs the charged total to the ore, else the invoice conversion falls back to one aggregate line. - GraphQL query gains createdAt, taxesIncluded, taxLines, lineItems and shippingLines (all non-PII; page size 100 -> 25 for query cost). - Nav gate counts active shopify_connections; the Orders empty-state CTA goes to the platform-neutral /import hub; panel/manifest copy now points at the Orders page (sv + en). - Paid-only qualification and the 90-day backfill stay; the bookkeeping-lock row filter is dropped (lock is enforced at booking, parity with WooCommerce). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(shopify): carry the prorated parent tax on refunds when per-rate bucketing is refused A refund whose parent vat_breakdown was refused (unreported rates) stored total_tax 0 and prefilled a 0%-refund with no moms reversal. The parent's total tax is now prorated into the refund row, so the booking dialog's ratio-inference fallback presents an editable bucket with the reversal instead (CodeRabbit + Swedish review + skeptic finding). Adds the mixed-rate line and truncated shipping-page tests CodeRabbit asked for. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
427 lines
14 KiB
TypeScript
427 lines
14 KiB
TypeScript
'use client'
|
||
|
||
import { useCallback, useEffect, useState } from 'react'
|
||
import dynamic from 'next/dynamic'
|
||
import Link from 'next/link'
|
||
import { useTranslations } from 'next-intl'
|
||
import { ShoppingCart } from 'lucide-react'
|
||
import { PageHeader } from '@/components/ui/page-header'
|
||
import { Badge } from '@/components/ui/badge'
|
||
import { Button } from '@/components/ui/button'
|
||
import { EmptyState } from '@/components/ui/empty-state'
|
||
import { Skeleton } from '@/components/ui/skeleton'
|
||
import { ContextPicker } from '@/components/common/ContextPicker'
|
||
import { TH_CLASS, TD_CLASS } from '@/components/ui/dry-table'
|
||
import { cn, formatCurrency, formatDate } from '@/lib/utils'
|
||
import { useCanWrite } from '@/lib/hooks/use-can-write'
|
||
import type { WebshopOrder, WebshopStoreSettings } from '@/types'
|
||
|
||
const OrderBookingDialog = dynamic(() => import('@/components/orders/OrderBookingDialog'), {
|
||
ssr: false,
|
||
})
|
||
const CreateInvoiceFromOrderDialog = dynamic(
|
||
() => import('@/components/orders/CreateInvoiceFromOrderDialog'),
|
||
{ ssr: false },
|
||
)
|
||
|
||
interface StoreFacet {
|
||
platform: string
|
||
store_scope: string
|
||
store_label: string | null
|
||
}
|
||
|
||
type StatusTab = 'all' | 'unpaid' | 'paid' | 'refunds' | 'booked'
|
||
|
||
const PAGE_SIZE = 50
|
||
|
||
/** Server-side query params per status tab (pagination stays correct). */
|
||
function tabQuery(tab: StatusTab): string {
|
||
switch (tab) {
|
||
case 'unpaid':
|
||
return '&paid=unpaid'
|
||
case 'paid':
|
||
return '&paid=paid&booked=unbooked'
|
||
case 'refunds':
|
||
return '&row_type=refund'
|
||
case 'booked':
|
||
return '&booked=booked'
|
||
default:
|
||
return ''
|
||
}
|
||
}
|
||
|
||
export default function OrdersPage() {
|
||
const t = useTranslations('webshop_orders')
|
||
const { canWrite } = useCanWrite()
|
||
const [rows, setRows] = useState<WebshopOrder[]>([])
|
||
const [stores, setStores] = useState<StoreFacet[]>([])
|
||
const [settings, setSettings] = useState<WebshopStoreSettings[]>([])
|
||
const [count, setCount] = useState(0)
|
||
const [loading, setLoading] = useState(true)
|
||
// A transient fetch failure must not render as "no orders" with a connect
|
||
// CTA (review finding): failure gets its own retry state.
|
||
const [loadFailed, setLoadFailed] = useState(false)
|
||
const [tab, setTab] = useState<StatusTab>('all')
|
||
const [storeScope, setStoreScope] = useState<string | null>(null)
|
||
const [page, setPage] = useState(0)
|
||
const [bookingOrder, setBookingOrder] = useState<WebshopOrder | null>(null)
|
||
const [invoicingOrder, setInvoicingOrder] = useState<WebshopOrder | null>(null)
|
||
|
||
const load = useCallback(async () => {
|
||
setLoading(true)
|
||
try {
|
||
const storeParam = storeScope ? `&store_scope=${encodeURIComponent(storeScope)}` : ''
|
||
const res = await fetch(
|
||
`/api/webshop-orders?limit=${PAGE_SIZE}&offset=${page * PAGE_SIZE}${tabQuery(tab)}${storeParam}`,
|
||
)
|
||
if (!res.ok) throw new Error(`list failed: ${res.status}`)
|
||
const json = (await res.json()) as {
|
||
data: WebshopOrder[]
|
||
count: number | null
|
||
stores: StoreFacet[]
|
||
}
|
||
setRows(json.data)
|
||
setCount(json.count ?? json.data.length)
|
||
setStores(json.stores)
|
||
setLoadFailed(false)
|
||
} catch {
|
||
setRows([])
|
||
setCount(0)
|
||
setLoadFailed(true)
|
||
} finally {
|
||
setLoading(false)
|
||
}
|
||
}, [tab, storeScope, page])
|
||
|
||
useEffect(() => {
|
||
void load()
|
||
}, [load])
|
||
|
||
useEffect(() => {
|
||
fetch('/api/webshop-orders/settings')
|
||
.then((r) => (r.ok ? r.json() : { data: [] }))
|
||
.then((json: { data: WebshopStoreSettings[] }) => setSettings(json.data ?? []))
|
||
.catch(() => setSettings([]))
|
||
}, [])
|
||
|
||
const visibleRows = rows
|
||
|
||
const multiStore = stores.length > 1
|
||
const activeStore = stores.find((s) => s.store_scope === storeScope) ?? null
|
||
const storeItems = [
|
||
{ id: 'all', label: t('all_stores') },
|
||
...stores.map((s) => ({ id: s.store_scope, label: s.store_label || s.store_scope })),
|
||
]
|
||
|
||
const settingsFor = useCallback(
|
||
(order: WebshopOrder) =>
|
||
settings.find(
|
||
(s) => s.platform === order.platform && s.store_scope === order.store_scope,
|
||
) ?? null,
|
||
[settings],
|
||
)
|
||
|
||
const tabs: Array<{ key: StatusTab; label: string }> = [
|
||
{ key: 'all', label: t('tab_all') },
|
||
{ key: 'unpaid', label: t('tab_unpaid') },
|
||
{ key: 'paid', label: t('tab_to_book') },
|
||
{ key: 'refunds', label: t('tab_refunds') },
|
||
{ key: 'booked', label: t('tab_booked') },
|
||
]
|
||
|
||
return (
|
||
<div className="space-y-8">
|
||
<PageHeader title={t('title')} />
|
||
|
||
<div className="flex flex-wrap items-center gap-2">
|
||
<div className="flex flex-wrap items-center gap-1">
|
||
{tabs.map(({ key, label }) => (
|
||
<button
|
||
key={key}
|
||
type="button"
|
||
onClick={() => {
|
||
setTab(key)
|
||
setPage(0)
|
||
}}
|
||
className={cn(
|
||
'rounded-full px-3 py-[5px] text-[13px] transition-colors duration-150',
|
||
tab === key
|
||
? 'bg-secondary text-foreground'
|
||
: 'text-muted-foreground hover:bg-secondary/60 hover:text-foreground',
|
||
)}
|
||
>
|
||
{label}
|
||
</button>
|
||
))}
|
||
</div>
|
||
<div className="ml-auto">
|
||
<ContextPicker
|
||
items={storeItems}
|
||
value={storeScope ?? 'all'}
|
||
onChange={(id) => {
|
||
setStoreScope(id === 'all' ? null : id)
|
||
setPage(0)
|
||
}}
|
||
triggerLabel={
|
||
activeStore ? activeStore.store_label || activeStore.store_scope : t('all_stores')
|
||
}
|
||
ariaLabel={t('store_picker_aria')}
|
||
/>
|
||
</div>
|
||
</div>
|
||
|
||
{loading ? (
|
||
<div className="space-y-2">
|
||
<Skeleton className="h-9 w-full" />
|
||
<Skeleton className="h-9 w-full" />
|
||
<Skeleton className="h-9 w-full" />
|
||
</div>
|
||
) : loadFailed ? (
|
||
<div className="space-y-4 py-8 text-center">
|
||
<p className="text-sm text-muted-foreground">{t('load_failed')}</p>
|
||
<Button variant="outline" size="sm" onClick={() => void load()}>
|
||
{t('retry')}
|
||
</Button>
|
||
</div>
|
||
) : visibleRows.length === 0 ? (
|
||
<EmptyState
|
||
icon={ShoppingCart}
|
||
title={t('empty_title')}
|
||
description={t('empty_description')}
|
||
actionLabel={t('empty_action')}
|
||
// The import hub's e-handel section lists every connectable
|
||
// platform; deep-linking one platform's connect panel here would
|
||
// send Shopify users into the WooCommerce flow.
|
||
actionHref="/import"
|
||
/>
|
||
) : (
|
||
<div className="stagger-enter overflow-x-auto">
|
||
<table className="w-full border-collapse text-[13px]">
|
||
<thead>
|
||
<tr>
|
||
<th className={TH_CLASS}>{t('col_date')}</th>
|
||
<th className={TH_CLASS}>{t('col_order')}</th>
|
||
{multiStore && <th className={TH_CLASS}>{t('col_store')}</th>}
|
||
<th className={TH_CLASS}>{t('col_customer')}</th>
|
||
<th className={TH_CLASS}>{t('col_payment_method')}</th>
|
||
<th className={cn(TH_CLASS, 'text-right')}>{t('col_total')}</th>
|
||
<th className={TH_CLASS}>{t('col_status')}</th>
|
||
<th className={cn(TH_CLASS, 'w-0')} />
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
{visibleRows.map((order) => (
|
||
<OrderRow
|
||
key={order.id}
|
||
order={order}
|
||
multiStore={multiStore}
|
||
canWrite={canWrite}
|
||
onBook={() => setBookingOrder(order)}
|
||
onInvoice={() => setInvoicingOrder(order)}
|
||
t={t}
|
||
/>
|
||
))}
|
||
</tbody>
|
||
</table>
|
||
{count > PAGE_SIZE && (
|
||
<div className="mt-4 flex items-center justify-between text-[12.5px] text-muted-foreground">
|
||
<span>
|
||
{t('pagination', {
|
||
from: page * PAGE_SIZE + 1,
|
||
to: Math.min((page + 1) * PAGE_SIZE, count),
|
||
total: count,
|
||
})}
|
||
</span>
|
||
<div className="flex gap-2">
|
||
<Button
|
||
variant="outline"
|
||
size="sm"
|
||
disabled={page === 0}
|
||
onClick={() => setPage((p) => p - 1)}
|
||
>
|
||
{t('prev')}
|
||
</Button>
|
||
<Button
|
||
variant="outline"
|
||
size="sm"
|
||
disabled={(page + 1) * PAGE_SIZE >= count}
|
||
onClick={() => setPage((p) => p + 1)}
|
||
>
|
||
{t('next')}
|
||
</Button>
|
||
</div>
|
||
</div>
|
||
)}
|
||
</div>
|
||
)}
|
||
|
||
{bookingOrder && (
|
||
<OrderBookingDialog
|
||
open={!!bookingOrder}
|
||
onOpenChange={(open) => {
|
||
if (!open) setBookingOrder(null)
|
||
}}
|
||
order={bookingOrder}
|
||
storeSettings={settingsFor(bookingOrder)}
|
||
onBooked={() => {
|
||
setBookingOrder(null)
|
||
void load()
|
||
}}
|
||
onSettingsSaved={(updated) => {
|
||
setSettings((prev) => {
|
||
const rest = prev.filter(
|
||
(s) => !(s.platform === updated.platform && s.store_scope === updated.store_scope),
|
||
)
|
||
return [...rest, updated]
|
||
})
|
||
}}
|
||
/>
|
||
)}
|
||
{invoicingOrder && (
|
||
<CreateInvoiceFromOrderDialog
|
||
open={!!invoicingOrder}
|
||
onOpenChange={(open) => {
|
||
if (!open) setInvoicingOrder(null)
|
||
}}
|
||
order={invoicingOrder}
|
||
onCreated={() => {
|
||
setInvoicingOrder(null)
|
||
void load()
|
||
}}
|
||
/>
|
||
)}
|
||
</div>
|
||
)
|
||
}
|
||
|
||
function OrderRow({
|
||
order,
|
||
multiStore,
|
||
canWrite,
|
||
onBook,
|
||
onInvoice,
|
||
t,
|
||
}: {
|
||
order: WebshopOrder
|
||
multiStore: boolean
|
||
canWrite: boolean
|
||
onBook: () => void
|
||
onInvoice: () => void
|
||
t: ReturnType<typeof useTranslations<'webshop_orders'>>
|
||
}) {
|
||
const isRefund = order.row_type === 'refund'
|
||
const booked = order.journal_entry_id !== null
|
||
const invoiced = order.invoice_id !== null
|
||
// Cross-marked rows (legacy_transaction_id) keep their action buttons: the
|
||
// server guard decides (it allows booking once the feed row is booked-
|
||
// elsewhere-no, ignored-yes) and its 409 message explains what to do.
|
||
// Hiding the button would be a dead-end soft guard.
|
||
const bookable = canWrite && !booked && !invoiced && (isRefund || order.is_paid)
|
||
const invoiceable = canWrite && !isRefund && !booked && !invoiced
|
||
|
||
return (
|
||
<tr className="group transition-colors duration-150 hover:bg-secondary/35">
|
||
<td className={cn(TD_CLASS, 'whitespace-nowrap tabular-nums text-muted-foreground')}>
|
||
{formatDate(order.order_date)}
|
||
</td>
|
||
<td className={cn(TD_CLASS, 'whitespace-nowrap')}>
|
||
{isRefund ? (
|
||
<span className="text-muted-foreground">
|
||
{t('refund_prefix')} {order.order_number}
|
||
</span>
|
||
) : (
|
||
<span>{order.order_number}</span>
|
||
)}
|
||
</td>
|
||
{multiStore && (
|
||
<td className={cn(TD_CLASS, 'max-w-[160px] truncate text-muted-foreground')}>
|
||
{order.store_label || order.store_scope}
|
||
</td>
|
||
)}
|
||
{/* One-line rows (design convention 4): the full beställningsuppgifter
|
||
(kontaktperson, orgnr, e-post) live in the native tooltip. */}
|
||
<td
|
||
className={cn(TD_CLASS, 'max-w-[220px] truncate')}
|
||
title={
|
||
[
|
||
order.customer_company ? order.customer_name : null,
|
||
order.customer_orgnr,
|
||
order.customer_email,
|
||
]
|
||
.filter(Boolean)
|
||
.join(' · ') || undefined
|
||
}
|
||
>
|
||
{order.customer_company || order.customer_name || (
|
||
<span className="text-muted-foreground">{'–'}</span>
|
||
)}
|
||
</td>
|
||
<td className={cn(TD_CLASS, 'whitespace-nowrap text-muted-foreground')}>
|
||
{order.payment_method_title || order.payment_method || ''}
|
||
</td>
|
||
<td className={cn(TD_CLASS, 'whitespace-nowrap text-right tabular-nums')}>
|
||
{formatCurrency(order.total, order.currency)}
|
||
</td>
|
||
<td className={cn(TD_CLASS, 'whitespace-nowrap')}>
|
||
<OrderStatus order={order} t={t} />
|
||
</td>
|
||
{/* One action per row: Bokför when the money event is bookable, else
|
||
Skapa faktura for unpaid invoice-flow orders. Two buttons side by
|
||
side pushed the table past the panel width and the overflow clip
|
||
swallowed single-button cells. */}
|
||
<td className={cn(TD_CLASS, 'whitespace-nowrap text-right')}>
|
||
{bookable ? (
|
||
<Button variant="outline" size="sm" onClick={onBook}>
|
||
{t('action_book')}
|
||
</Button>
|
||
) : invoiceable ? (
|
||
<Button variant="outline" size="sm" onClick={onInvoice}>
|
||
{t('action_create_invoice')}
|
||
</Button>
|
||
) : null}
|
||
</td>
|
||
</tr>
|
||
)
|
||
}
|
||
|
||
/**
|
||
* Chips mark exceptions only (design convention 5): booked rows render as
|
||
* muted text; deviations (unbooked-but-paid, unpaid, legacy overlap, remote
|
||
* drift) get a Badge.
|
||
*/
|
||
function OrderStatus({
|
||
order,
|
||
t,
|
||
}: {
|
||
order: WebshopOrder
|
||
t: ReturnType<typeof useTranslations<'webshop_orders'>>
|
||
}) {
|
||
if (order.remote_changed_after_freeze) {
|
||
return <Badge variant="warning">{t('status_remote_changed')}</Badge>
|
||
}
|
||
if (order.journal_entry_id) {
|
||
return <span className="text-xs text-muted-foreground">{t('status_booked')}</span>
|
||
}
|
||
if (order.invoice_id) {
|
||
return (
|
||
<Link
|
||
href={`/invoices/${order.invoice_id}`}
|
||
className="text-xs text-muted-foreground underline decoration-border underline-offset-4 hover:text-foreground"
|
||
>
|
||
{t('status_invoiced')}
|
||
</Link>
|
||
)
|
||
}
|
||
if (order.legacy_transaction_id) {
|
||
return (
|
||
<Link href="/transactions">
|
||
<Badge variant="outline">{t('status_in_transactions')}</Badge>
|
||
</Link>
|
||
)
|
||
}
|
||
if (!order.is_paid && order.row_type === 'order') {
|
||
return <Badge variant="secondary">{t('status_unpaid')}</Badge>
|
||
}
|
||
return <Badge variant="warning">{t('status_to_book')}</Badge>
|
||
}
|