Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Make the inventory tables read like the rest of the dashboard

Łukasz Adamczyk43429d47a44d
diff --git a/packages/dashboard/src/components/spree/quantity-cell.tsx b/packages/dashboard/src/components/spree/quantity-cell.tsx
new file mode 100644
index 0000000000..ffc650e15d
--- /dev/null
+++ b/packages/dashboard/src/components/spree/quantity-cell.tsx
@@ -0,0 +1,57 @@
+import { Input, TableCell, TableHead } from '@spree/dashboard-ui'
+
+/**
+ * A column of counted quantities, and its header.
+ *
+ * Both exist to solve one alignment problem. A number typed into an `<Input>`
+ * cannot sit flush with the cell's right edge — the field's own padding, and
+ * the spin buttons Chrome reserves room for, hold it inside — so a header
+ * right-aligned to the cell hangs past the digits below it. The field drops the
+ * spinners and the header takes the field's padding, which puts label, typed
+ * value and read-only value on the same right edge.
+ *
+ * The digits stay `tabular-nums` so counts line up down the column.
+ */
+const FIELD_INSET = 'pr-2.5'
+
+export function QuantityHead({ children }: { children: React.ReactNode }) {
+ return (
+ <TableHead className="text-right">
+ <span className={FIELD_INSET}>{children}</span>
+ </TableHead>
+ )
+}
+
+export function QuantityCell({
+ editable,
+ value,
+ min,
+ max,
+ label,
+ onChange,
+}: {
+ editable: boolean
+ value: number
+ min?: number
+ max?: number
+ label: string
+ onChange: (value: number) => void
+}) {
+ return (
+ <TableCell className="text-right">
+ {editable ? (
+ <Input
+ type="number"
+ min={min}
+ max={max}
+ value={value}
+ onChange={(event) => onChange(Number(event.target.value))}
+ className="ml-auto w-20 text-right tabular-nums [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
+ aria-label={label}
+ />
+ ) : (
+ <span className={`tabular-nums ${FIELD_INSET}`}>{value}</span>
+ )}
+ </TableCell>
+ )
+}
diff --git a/packages/dashboard/src/components/spree/stock-history-card.tsx b/packages/dashboard/src/components/spree/stock-history-card.tsx
index c56c77195e..0e896073f2 100644
--- a/packages/dashboard/src/components/spree/stock-history-card.tsx
+++ b/packages/dashboard/src/components/spree/stock-history-card.tsx
@@ -57,57 +57,59 @@ export function StockHistoryCard({
})
const movements = data?.data ?? []
+ const paginated = (data?.meta?.pages ?? 1) > 1
return (
<Card>
<CardHeader>
<CardTitle>{title ?? t('admin.stock_history.title')}</CardTitle>
</CardHeader>
- <CardContent>
+ <CardContent className="p-0">
{isLoading ? (
- <p className="text-sm text-muted-foreground">{t('admin.common.loading')}</p>
+ <p className="p-3 text-muted-foreground text-sm">{t('admin.common.loading')}</p>
) : movements.length === 0 ? (
- <p className="text-sm text-muted-foreground">{t('admin.stock_history.empty')}</p>
+ <p className="p-3 text-muted-foreground text-sm">{t('admin.stock_history.empty')}</p>
) : (
<>
- <div className="overflow-x-auto">
- <Table>
- <TableHeader>
- <TableRow>
- <TableHead>{t('admin.stock_history.columns.when')}</TableHead>
- <TableHead>{t('admin.stock_history.columns.change')}</TableHead>
- <TableHead>{t('admin.stock_history.columns.kind')}</TableHead>
- <TableHead>{t('admin.stock_history.columns.cause')}</TableHead>
+ {/* The pagination bar brings its own top rule and padding, so it
+ takes the card's bottom curve when it is there — and the last
+ row takes it when the history fits on one page. */}
+ <Table roundedBottom={!paginated}>
+ <TableHeader>
+ <TableRow>
+ <TableHead>{t('admin.stock_history.columns.when')}</TableHead>
+ <TableHead>{t('admin.stock_history.columns.change')}</TableHead>
+ <TableHead>{t('admin.stock_history.columns.kind')}</TableHead>
+ <TableHead>{t('admin.stock_history.columns.cause')}</TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {movements.map((movement) => (
+ <TableRow key={movement.id}>
+ <TableCell className="whitespace-nowrap text-muted-foreground text-sm">
+ <RelativeTime iso={movement.created_at} />
+ </TableCell>
+ <TableCell className="font-medium tabular-nums">
+ <QuantityChange movement={movement} />
+ </TableCell>
+ <TableCell>
+ {movement.kind ? (
+ <StatusBadge
+ status={movement.kind}
+ label={t(`admin.stock_history.kinds.${movement.kind}`)}
+ />
+ ) : (
+ '—'
+ )}
+ </TableCell>
+ <TableCell className="text-sm">
+ <MovementCause movement={movement} />
+ </TableCell>
</TableRow>
- </TableHeader>
- <TableBody>
- {movements.map((movement) => (
- <TableRow key={movement.id}>
- <TableCell className="whitespace-nowrap text-sm text-muted-foreground">
- <RelativeTime iso={movement.created_at} />
- </TableCell>
- <TableCell className="tabular-nums font-medium">
- <QuantityChange movement={movement} />
- </TableCell>
- <TableCell>
- {movement.kind ? (
- <StatusBadge
- status={movement.kind}
- label={t(`admin.stock_history.kinds.${movement.kind}`)}
- />
- ) : (
- '—'
- )}
- </TableCell>
- <TableCell className="text-sm">
- <MovementCause movement={movement} />
- </TableCell>
- </TableRow>
- ))}
- </TableBody>
- </Table>
- </div>
- {data?.meta && <Pagination meta={data.meta} onPageChange={setPage} />}
+ ))}
+ </TableBody>
+ </Table>
+ {paginated && data?.meta && <Pagination meta={data.meta} onPageChange={setPage} />}
</>
)}
</CardContent>
diff --git a/packages/dashboard/src/locales/ar.json b/packages/dashboard/src/locales/ar.json
index 760fb6a5b5..a8d27060f1 100644
--- a/packages/dashboard/src/locales/ar.json
+++ b/packages/dashboard/src/locales/ar.json
@@ -5069,6 +5069,7 @@
"units": "المستلَم / المُرسَل",
"shipped": "تاريخ الإرسال",
"quantity_shipped": "المُرسَل",
+ "quantity_to_ship": "للإرسال",
"quantity_received": "المستلَم",
"discrepancy": "الفرق"
},
diff --git a/packages/dashboard/src/locales/de.json b/packages/dashboard/src/locales/de.json
index 1f74b753b7..57742686d7 100644
--- a/packages/dashboard/src/locales/de.json
+++ b/packages/dashboard/src/locales/de.json
@@ -5047,6 +5047,7 @@
"units": "Eingegangen / versandt",
"shipped": "Versandt",
"quantity_shipped": "Versandt",
+ "quantity_to_ship": "Zu versenden",
"quantity_received": "Eingegangen",
"discrepancy": "Abweichung"
},
diff --git a/packages/dashboard/src/locales/en.json b/packages/dashboard/src/locales/en.json
index 54a2aaafa5..3057f38507 100644
--- a/packages/dashboard/src/locales/en.json
+++ b/packages/dashboard/src/locales/en.json
@@ -5047,6 +5047,7 @@
"units": "Received / shipped",
"shipped": "Shipped",
"quantity_shipped": "Shipped",
+ "quantity_to_ship": "To ship",
"quantity_received": "Received",
"discrepancy": "Discrepancy"
},
diff --git a/packages/dashboard/src/locales/fr.json b/packages/dashboard/src/locales/fr.json
index 37e16d955b..123157ed8e 100644
--- a/packages/dashboard/src/locales/fr.json
+++ b/packages/dashboard/src/locales/fr.json
@@ -5047,6 +5047,7 @@
"units": "Reçues / expédiées",
"shipped": "Expédié",
"quantity_shipped": "Expédiées",
+ "quantity_to_ship": "À expédier",
"quantity_received": "Reçues",
"discrepancy": "Écart"
},
diff --git a/packages/dashboard/src/locales/pl.json b/packages/dashboard/src/locales/pl.json
index 31819d6ef7..4823e188bd 100644
--- a/packages/dashboard/src/locales/pl.json
+++ b/packages/dashboard/src/locales/pl.json
@@ -5105,6 +5105,7 @@
"units": "Przyjęte / wysłane",
"shipped": "Wysłano",
"quantity_shipped": "Wysłano",
+ "quantity_to_ship": "Do wysłania",
"quantity_received": "Przyjęto",
"discrepancy": "Rozbieżność"
},
diff --git a/packages/dashboard/src/locales/zh-CN.json b/packages/dashboard/src/locales/zh-CN.json
index f83b73806d..c9fc6de296 100644
--- a/packages/dashboard/src/locales/zh-CN.json
+++ b/packages/dashboard/src/locales/zh-CN.json
@@ -5038,6 +5038,7 @@
"units": "已收 / 已发",
"shipped": "发出时间",
"quantity_shipped": "已发出",
+ "quantity_to_ship": "待发出",
"quantity_received": "已收到",
"discrepancy": "差异"
},
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/purchase-orders/$purchaseOrderId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/purchase-orders/$purchaseOrderId.tsx
index 2e7c3ae0db..cf769abb88 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/purchase-orders/$purchaseOrderId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/purchase-orders/$purchaseOrderId.tsx
@@ -7,7 +7,6 @@ import {
CardHeader,
CardTitle,
DropdownMenuItem,
- Input,
RelativeTime,
Table,
TableBody,
@@ -22,6 +21,7 @@ import { createFileRoute, Link } from '@tanstack/react-router'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { InventoryStatusBadge } from '../../../../../components/spree/inventory-status-badge'
+import { QuantityCell, QuantityHead } from '../../../../../components/spree/quantity-cell'
import { StockHistoryCard } from '../../../../../components/spree/stock-history-card'
import { VariantLink } from '../../../../../components/spree/variant-link'
import {
@@ -190,47 +190,47 @@ function ItemsCard({ purchaseOrder }: { purchaseOrder: PurchaseOrder }) {
: t('admin.purchase_orders.items_title')}
</CardTitle>
</CardHeader>
- <CardContent className="flex flex-col gap-4">
+ <CardContent className="flex flex-col p-0">
{items.length === 0 ? (
- <p className="text-sm text-muted-foreground">{t('admin.purchase_orders.items_empty')}</p>
+ <p className="p-3 text-muted-foreground text-sm">
+ {t('admin.purchase_orders.items_empty')}
+ </p>
) : (
- <div className="overflow-x-auto">
- <Table>
- <TableHeader>
- <TableRow>
- <TableHead>{t('admin.inventory_lines.columns.variant')}</TableHead>
- <TableHead className="text-right">
- {t('admin.purchase_orders.columns.quantity_ordered')}
- </TableHead>
- <TableHead className="text-right">
- {t('admin.purchase_orders.columns.quantity_received')}
- </TableHead>
- <TableHead className="text-right">
- {t('admin.inventory_lines.columns.unit_cost')}
- </TableHead>
- <TableHead className="text-right">
- {t('admin.purchase_orders.columns.line_total')}
- </TableHead>
- </TableRow>
- </TableHeader>
- <TableBody>
- {items.map((item) => (
- <ItemRow
- key={item.id}
- item={item}
- receivable={receivable}
- count={counts[item.id] ?? item.quantity_received}
- onCount={(value) => setCounts((prev) => ({ ...prev, [item.id]: value }))}
- />
- ))}
- </TableBody>
- </Table>
- </div>
+ /* Nothing sits below the table on a draft, so its last row carries
+ the card's own curve; on a receivable order the footer does. */
+ <Table roundedBottom={!receivable}>
+ <TableHeader>
+ <TableRow>
+ <TableHead>{t('admin.inventory_lines.columns.variant')}</TableHead>
+ <TableHead className="text-right">
+ {t('admin.purchase_orders.columns.quantity_ordered')}
+ </TableHead>
+ <QuantityHead>{t('admin.purchase_orders.columns.quantity_received')}</QuantityHead>
+ <TableHead className="text-right">
+ {t('admin.inventory_lines.columns.unit_cost')}
+ </TableHead>
+ <TableHead className="text-right">
+ {t('admin.purchase_orders.columns.line_total')}
+ </TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {items.map((item) => (
+ <ItemRow
+ key={item.id}
+ item={item}
+ receivable={receivable}
+ count={counts[item.id] ?? item.quantity_received}
+ onCount={(value) => setCounts((prev) => ({ ...prev, [item.id]: value }))}
+ />
+ ))}
+ </TableBody>
+ </Table>
)}
{receivable && items.length > 0 && (
- <div className="flex items-center justify-between">
- <p className="text-sm text-muted-foreground tabular-nums">
+ <div className="flex items-center justify-between p-3">
+ <p className="text-muted-foreground text-sm tabular-nums">
{t('admin.purchase_orders.receive_running_total', {
counted: totalCounted,
ordered: purchaseOrder.quantity_ordered_total,
@@ -274,23 +274,16 @@ function ItemRow({
/>
</TableCell>
<TableCell className="text-right tabular-nums">{item.quantity_ordered}</TableCell>
- <TableCell className="text-right">
- {receivable ? (
- <Input
- type="number"
- // Never below what is already on the shelf: taking units back off
- // is a correction, not a receive.
- min={item.quantity_received}
- max={item.quantity_ordered}
- value={count}
- onChange={(event) => onCount(Number(event.target.value))}
- className="ml-auto w-20 text-right tabular-nums"
- aria-label={t('admin.purchase_orders.columns.quantity_received')}
- />
- ) : (
- <span className="tabular-nums">{item.quantity_received}</span>
- )}
- </TableCell>
+ {/* Never below what is already on the shelf: taking units back off is a
+ correction, not a receive. */}
+ <QuantityCell
+ editable={receivable}
+ value={receivable ? count : item.quantity_received}
+ min={item.quantity_received}
+ max={item.quantity_ordered}
+ label={t('admin.purchase_orders.columns.quantity_received')}
+ onChange={onCount}
+ />
<TableCell className="text-right tabular-nums">{item.display_unit_cost}</TableCell>
<TableCell className="text-right tabular-nums">{item.display_total_cost}</TableCell>
</TableRow>
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers/$transferId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers/$transferId.tsx
index 240e8a580b..a3605717eb 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers/$transferId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers/$transferId.tsx
@@ -7,7 +7,6 @@ import {
CardHeader,
CardTitle,
DropdownMenuItem,
- Input,
RelativeTime,
Select,
SelectContent,
@@ -27,6 +26,7 @@ import { createFileRoute, Link } from '@tanstack/react-router'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { InventoryStatusBadge } from '../../../../../components/spree/inventory-status-badge'
+import { QuantityCell, QuantityHead } from '../../../../../components/spree/quantity-cell'
import { StockHistoryCard } from '../../../../../components/spree/stock-history-card'
import { TransferCancelDialog } from '../../../../../components/spree/transfer-cancel-dialog'
import { VariantLink } from '../../../../../components/spree/variant-link'
@@ -194,42 +194,40 @@ function PlannedItemsCard({ transfer }: { transfer: StockTransfer }) {
<CardHeader>
<CardTitle>{t('admin.stock_transfers.items_title')}</CardTitle>
</CardHeader>
- <CardContent>
+ <CardContent className="p-0">
{items.length === 0 ? (
- <p className="text-sm text-muted-foreground">{t('admin.stock_transfers.items_empty')}</p>
+ <p className="p-3 text-muted-foreground text-sm">
+ {t('admin.stock_transfers.items_empty')}
+ </p>
) : (
- <div className="overflow-x-auto">
- <Table>
- <TableHeader>
- <TableRow>
- <TableHead>{t('admin.inventory_lines.columns.variant')}</TableHead>
- <TableHead>{t('admin.inventory_lines.columns.sku')}</TableHead>
- <TableHead className="text-right">
- {t('admin.stock_transfers.columns.quantity_shipped')}
- </TableHead>
+ <Table roundedBottom>
+ <TableHeader>
+ <TableRow>
+ <TableHead>{t('admin.inventory_lines.columns.variant')}</TableHead>
+ {/* Nothing has shipped yet on a draft — this is what will. The
+ receive screen keeps `quantity_shipped`, where it is past
+ tense and sits opposite Received. */}
+ <TableHead className="text-right">
+ {t('admin.stock_transfers.columns.quantity_to_ship')}
+ </TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {items.map((item) => (
+ <TableRow key={item.id}>
+ <TableCell>
+ <VariantLink
+ productId={item.product_id}
+ name={item.variant_name}
+ sku={item.variant_sku}
+ thumbnailUrl={item.thumbnail_url}
+ />
+ </TableCell>
+ <TableCell className="text-right tabular-nums">{item.quantity_shipped}</TableCell>
</TableRow>
- </TableHeader>
- <TableBody>
- {items.map((item) => (
- <TableRow key={item.id}>
- <TableCell>
- <VariantLink
- productId={item.product_id}
- name={item.variant_name}
- thumbnailUrl={item.thumbnail_url}
- />
- </TableCell>
- <TableCell className="text-muted-foreground">
- {item.variant_sku ?? '—'}
- </TableCell>
- <TableCell className="text-right tabular-nums">
- {item.quantity_shipped}
- </TableCell>
- </TableRow>
- ))}
- </TableBody>
- </Table>
- </div>
+ ))}
+ </TableBody>
+ </Table>
)}
</CardContent>
</Card>
@@ -284,40 +282,36 @@ function ReceiveCard({ transfer }: { transfer: StockTransfer }) {
<CardHeader>
<CardTitle>{t('admin.stock_transfers.receive_title')}</CardTitle>
</CardHeader>
- <CardContent className="flex flex-col gap-4">
- <div className="overflow-x-auto">
- <Table>
- <TableHeader>
- <TableRow>
- <TableHead>{t('admin.inventory_lines.columns.variant')}</TableHead>
- <TableHead className="text-right">
- {t('admin.stock_transfers.columns.quantity_shipped')}
- </TableHead>
- <TableHead className="text-right">
- {t('admin.stock_transfers.columns.quantity_received')}
- </TableHead>
- <TableHead>{t('admin.stock_transfers.columns.discrepancy')}</TableHead>
- </TableRow>
- </TableHeader>
- <TableBody>
- {items.map((item) => (
- <ReceiveRow
- key={item.id}
- item={item}
- editable={editable}
- count={counts[item.id] ?? item.quantity_received}
- reason={reasons[item.id] ?? ''}
- onCount={(value) => setCounts((prev) => ({ ...prev, [item.id]: value }))}
- onReason={(value) => setReasons((prev) => ({ ...prev, [item.id]: value }))}
- />
- ))}
- </TableBody>
- </Table>
- </div>
+ <CardContent className="flex flex-col p-0">
+ <Table>
+ <TableHeader>
+ <TableRow>
+ <TableHead>{t('admin.inventory_lines.columns.variant')}</TableHead>
+ <TableHead className="text-right">
+ {t('admin.stock_transfers.columns.quantity_shipped')}
+ </TableHead>
+ <QuantityHead>{t('admin.stock_transfers.columns.quantity_received')}</QuantityHead>
+ <TableHead>{t('admin.stock_transfers.columns.discrepancy')}</TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {items.map((item) => (
+ <ReceiveRow
+ key={item.id}
+ item={item}
+ editable={editable}
+ count={counts[item.id] ?? item.quantity_received}
+ reason={reasons[item.id] ?? ''}
+ onCount={(value) => setCounts((prev) => ({ ...prev, [item.id]: value }))}
+ onReason={(value) => setReasons((prev) => ({ ...prev, [item.id]: value }))}
+ />
+ ))}
+ </TableBody>
+ </Table>
{editable && (
- <div className="flex items-center justify-between">
- <p className="text-sm text-muted-foreground tabular-nums">
+ <div className="flex items-center justify-between p-3">
+ <p className="text-muted-foreground text-sm tabular-nums">
{t('admin.stock_transfers.receive_running_total', {
counted: totalCounted,
shipped: transfer.quantity_shipped_total,
@@ -366,23 +360,16 @@ function ReceiveRow({
/>
</TableCell>
<TableCell className="text-right tabular-nums">{item.quantity_shipped}</TableCell>
- <TableCell className="text-right">
- {editable ? (
- <Input
- type="number"
- // Never below what is already on the shelf: taking units back off
- // is a correction, not a receive.
- min={item.quantity_received}
- max={item.quantity_shipped}
- value={count}
- onChange={(event) => onCount(Number(event.target.value))}
- className="ml-auto w-20 text-right tabular-nums"
- aria-label={t('admin.stock_transfers.columns.quantity_received')}
- />
- ) : (
- <span className="tabular-nums">{item.quantity_received}</span>
- )}
- </TableCell>
+ {/* Never below what is already on the shelf: taking units back off is a
+ correction, not a receive. */}
+ <QuantityCell
+ editable={editable}
+ value={editable ? count : item.quantity_received}
+ min={item.quantity_received}
+ max={item.quantity_shipped}
+ label={t('admin.stock_transfers.columns.quantity_received')}
+ onChange={onCount}
+ />
<TableCell>
{editable && underReceived ? (
<Select value={reason} onValueChange={onReason}>