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.

Count a delivery in the way the dock does

Damian Legawiec8c0f17e8b8b6
diff --git a/docs/developer/core-concepts/inventory.mdx b/docs/developer/core-concepts/inventory.mdx
index 3d58fedaa4..6816594912 100644
--- a/docs/developer/core-concepts/inventory.mdx
+++ b/docs/developer/core-concepts/inventory.mdx
@@ -189,14 +189,23 @@ const transfer = await adminClient.stockTransfers.create({
// The units leave the source here — and are on no shelf until they arrive.
await adminClient.stockTransfers.markInTransit(transfer.id)
-// Eight of the ten made it. The transfer stays open for the rest.
-await adminClient.stockTransfers.receive(transfer.id, {
- items: [{ id: 'sti_xxx', quantity_received: 8, discrepancy_reason: 'damaged_in_transit' }],
+// Eight of the ten made it intact and two were crushed. Each delivery is a
+// stock receipt: this delivery's counts, not a running total.
+await adminClient.stockTransfers.stockReceipts.create(transfer.id, {
+ items: [{ id: 'sti_xxx', quantity_accepted: 8, quantity_rejected: 2, rejection_reason: 'damaged' }],
})
```
Two things follow from the middle step. Availability at the destination does not rise until somebody counts the goods in, which is what makes the number trustworthy. And cancelling a transfer whose units have already left is a decision rather than an undo: either they come back to the source, or they are written off as lost.
+Every delivery is a **stock receipt** — numbered, dated, carrying the packing-slip reference — with what it accepted and what it refused per line. Refused units are recorded but never stocked. A transfer is `received` once everything that left has arrived, in whatever state; `over_received` if more arrived than was sent; and it can be **closed short** when the missing units are not going to turn up:
+
+```typescript Admin SDK
+await adminClient.stockTransfers.close(transfer.id, { reason: 'Two fell off the van' })
+```
+
+A transfer that is packed but not yet sent can go back to draft (`markDraft`) if the plan changes.
+
## Buying stock in
Stock that comes from a supplier is a purchase order, not a transfer — it has a supplier, a cost per unit and a date it was promised for, none of which apply to moving goods you already own.
@@ -210,10 +219,17 @@ const order = await adminClient.purchaseOrders.create({
})
await adminClient.purchaseOrders.markOrdered(order.id)
-await adminClient.purchaseOrders.receive(order.id)
+
+// A delivery arrives: 58 accepted, 2 refused. The order stays open for the rest.
+await adminClient.purchaseOrders.stockReceipts.create(order.id, {
+ reference: 'DN-4471',
+ items: [{ id: 'poi_xxx', quantity_accepted: 58, quantity_rejected: 2, rejection_reason: 'damaged' }],
+})
```
-Ordered stock is never available stock. Nothing reaches `count_on_hand` until a delivery is received, because a merchant who has ordered goods does not have them — and suppliers under-ship often enough that receiving in parts is the ordinary case.
+Ordered stock is never available stock. Nothing reaches `count_on_hand` until a delivery is received, because a merchant who has ordered goods does not have them — and suppliers under-ship often enough that receiving in parts is the ordinary case. Unlike a transfer, a supplier's refused units are still owed: the order stays `partially_received` until they are replaced, or the merchant closes it short (`close`, with a reason) because the balance is not coming. A supplier that sends more than was ordered leaves the order `over_received`. An order that was placed but has had no delivery can go back to draft (`markDraft`).
+
+Orders carry an optional `cancel_by` date — the day after which the goods are no longer wanted — and the dashboard lists filter on *Overdue* (expected date passed) and *Past cancel-by*. Nothing cancels automatically. Purchase orders can be exported to CSV, one row per line, and imported from one: rows sharing a `reference` become one draft order, naming the supplier, warehouse and SKU by name.
Suppliers themselves are an address book, kept per store:
diff --git a/packages/dashboard-core/src/locales/ar.json b/packages/dashboard-core/src/locales/ar.json
index 9385f6f792..0f87af138a 100644
--- a/packages/dashboard-core/src/locales/ar.json
+++ b/packages/dashboard-core/src/locales/ar.json
@@ -977,7 +977,8 @@
"customers": "العملاء",
"price_list_prices": "أسعار قائمة الأسعار",
"product_translations": "ترجمات المنتجات",
- "products": "المنتجات"
+ "products": "المنتجات",
+ "purchase_orders": "أوامر الشراء"
},
"wizard_title": "الاستيراد"
},
diff --git a/packages/dashboard-core/src/locales/de.json b/packages/dashboard-core/src/locales/de.json
index ca9a9895e9..44199827e8 100644
--- a/packages/dashboard-core/src/locales/de.json
+++ b/packages/dashboard-core/src/locales/de.json
@@ -977,7 +977,8 @@
"customers": "Kunden",
"price_list_prices": "Preislistenpreise",
"product_translations": "Produktübersetzungen",
- "products": "Produkte"
+ "products": "Produkte",
+ "purchase_orders": "Bestellungen"
},
"wizard_title": "Import"
},
diff --git a/packages/dashboard-core/src/locales/en.json b/packages/dashboard-core/src/locales/en.json
index 4824a4f4b4..c7b811634d 100644
--- a/packages/dashboard-core/src/locales/en.json
+++ b/packages/dashboard-core/src/locales/en.json
@@ -979,7 +979,8 @@
"customers": "Customers",
"price_list_prices": "Price list prices",
"product_translations": "Product translations",
- "products": "Products"
+ "products": "Products",
+ "purchase_orders": "Purchase orders"
},
"wizard_title": "Import"
},
diff --git a/packages/dashboard-core/src/locales/fr.json b/packages/dashboard-core/src/locales/fr.json
index d260626f44..3da9b6c313 100644
--- a/packages/dashboard-core/src/locales/fr.json
+++ b/packages/dashboard-core/src/locales/fr.json
@@ -977,7 +977,8 @@
"customers": "Clients",
"price_list_prices": "Prix des listes de prix",
"product_translations": "Traductions de produits",
- "products": "Produits"
+ "products": "Produits",
+ "purchase_orders": "Bons de commande"
},
"wizard_title": "Import"
},
diff --git a/packages/dashboard-core/src/locales/pl.json b/packages/dashboard-core/src/locales/pl.json
index f05e723333..5bdbbdd5b0 100644
--- a/packages/dashboard-core/src/locales/pl.json
+++ b/packages/dashboard-core/src/locales/pl.json
@@ -978,7 +978,8 @@
"customers": "Klienci",
"price_list_prices": "Ceny cennika",
"product_translations": "Tłumaczenia produktów",
- "products": "Produkty"
+ "products": "Produkty",
+ "purchase_orders": "Zamówienia zakupu"
},
"wizard_title": "Import"
},
diff --git a/packages/dashboard-core/src/locales/zh-CN.json b/packages/dashboard-core/src/locales/zh-CN.json
index 314cd47e41..65d1b4ebd4 100644
--- a/packages/dashboard-core/src/locales/zh-CN.json
+++ b/packages/dashboard-core/src/locales/zh-CN.json
@@ -977,7 +977,8 @@
"customers": "客户",
"price_list_prices": "价目表价格",
"product_translations": "产品翻译",
- "products": "产品"
+ "products": "产品",
+ "purchase_orders": "采购订单"
},
"wizard_title": "导入"
},
diff --git a/packages/dashboard/e2e/stock-transfers.spec.ts b/packages/dashboard/e2e/stock-transfers.spec.ts
index 4dabe9af95..131c2ef5fc 100644
--- a/packages/dashboard/e2e/stock-transfers.spec.ts
+++ b/packages/dashboard/e2e/stock-transfers.spec.ts
@@ -43,7 +43,7 @@ test.describe('stock transfers', () => {
await expect(page.getByText(/choose the warehouse it leaves from first/i)).toBeVisible()
})
- test('sends a draft, then receives less than was sent', async ({ page }) => {
+ test('sends a draft, then counts in a delivery with damage', async ({ page }) => {
const creds = await login(page)
const transfer = await createInTransitTransfer(page, creds.accessToken, 10)
@@ -56,16 +56,18 @@ test.describe('stock transfers', () => {
// Gone from the source, not yet at the destination.
await expect(page.getByText('0 received of 10 shipped')).toBeVisible()
- // Count in eight of the ten, and say why two are missing.
- await page.getByLabel(/^received$/i).fill('8')
- const discrepancy = page.getByLabel(/discrepancy/i)
- await discrepancy.click()
- await page.getByRole('option', { name: /damaged in transit/i }).click()
+ // Count in eight of the ten intact; the other two arrived crushed.
+ await page.getByLabel(/^accepted$/i).fill('8')
+ await page.getByLabel(/^rejected$/i).fill('2')
+ await page.getByLabel(/^reason$/i).click()
+ await page.getByRole('option', { name: /^damaged$/i }).click()
await page.getByRole('button', { name: /^receive$/i }).click()
- // Short, so the trip stays open rather than closing.
- await expect(page.getByText(/^partially received$/i).first()).toBeVisible({ timeout: 15_000 })
+ // Everything that left has arrived, so the trip is over — with the two
+ // refused units on the delivery's record, not the shelf.
+ await expect(page.getByText(/^received$/i).first()).toBeVisible({ timeout: 15_000 })
await expect(page.getByText('8 received of 10 shipped')).toBeVisible()
+ await expect(page.getByText(/8 accepted · 2 rejected/i)).toBeVisible()
})
test('a draft can be corrected, a shipped one cannot', async ({ page }) => {
diff --git a/packages/dashboard/src/components/spree/close-short-dialog.tsx b/packages/dashboard/src/components/spree/close-short-dialog.tsx
new file mode 100644
index 0000000000..2427d392f3
--- /dev/null
+++ b/packages/dashboard/src/components/spree/close-short-dialog.tsx
@@ -0,0 +1,76 @@
+import {
+ Button,
+ Dialog,
+ DialogBody,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ Field,
+ FieldLabel,
+ Textarea,
+} from '@spree/dashboard-ui'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+/**
+ * Ending a transfer or an order whose missing units are not coming. Nothing
+ * moves; the outstanding count stays on each line as the record of the gap,
+ * and the reason goes on the document.
+ */
+export function CloseShortDialog({
+ title,
+ description,
+ pending,
+ onConfirm,
+ onClose,
+}: {
+ title: string
+ description: string
+ pending: boolean
+ onConfirm: (reason: string | undefined) => Promise<unknown>
+ onClose: () => void
+}) {
+ const { t } = useTranslation()
+ const [reason, setReason] = useState('')
+
+ async function handleConfirm() {
+ const closed = await onConfirm(reason.trim() || undefined)
+ .then(() => true)
+ .catch(() => false)
+ if (closed) onClose()
+ }
+
+ return (
+ <Dialog open onOpenChange={(open) => !open && onClose()}>
+ <DialogContent>
+ <DialogHeader>
+ <DialogTitle>{title}</DialogTitle>
+ <DialogDescription>{description}</DialogDescription>
+ </DialogHeader>
+ <DialogBody>
+ <Field>
+ <FieldLabel htmlFor="close-short-reason">
+ {t('admin.stock_receipts.close_short.reason_label')}
+ </FieldLabel>
+ <Textarea
+ id="close-short-reason"
+ value={reason}
+ placeholder={t('admin.stock_receipts.close_short.reason_placeholder')}
+ onChange={(event) => setReason(event.target.value)}
+ />
+ </Field>
+ </DialogBody>
+ <DialogFooter>
+ <Button type="button" variant="outline" onClick={onClose} disabled={pending}>
+ {t('admin.actions.cancel')}
+ </Button>
+ <Button type="button" onClick={handleConfirm} disabled={pending}>
+ {pending ? t('admin.actions.saving') : t('admin.stock_receipts.close_short.confirm')}
+ </Button>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+ )
+}
diff --git a/packages/dashboard/src/components/spree/inventory-status-badge.tsx b/packages/dashboard/src/components/spree/inventory-status-badge.tsx
index da90f148dd..9c2068e8ab 100644
--- a/packages/dashboard/src/components/spree/inventory-status-badge.tsx
+++ b/packages/dashboard/src/components/spree/inventory-status-badge.tsx
@@ -6,7 +6,8 @@ import { useTranslation } from 'react-i18next'
*
* `received` gets an explicit success tone: the shared tone map reads that code
* as a return awaiting a refund, which is amber, and a finished transfer is
- * not amber.
+ * not amber. `over_received` is finished too, but with more on the shelf than
+ * was asked for — worth a look, so it stays amber.
*/
export function InventoryStatusBadge({
status,
@@ -16,12 +17,9 @@ export function InventoryStatusBadge({
resource: 'stock_transfers' | 'purchase_orders'
}) {
const { t } = useTranslation()
-
+ const tone =
+ status === 'received' ? 'success' : status === 'over_received' ? 'warning' : undefined
return (
- <StatusBadge
- status={status}
- label={t(`admin.${resource}.statuses.${status}`)}
- tone={status === 'received' ? 'success' : undefined}
- />
+ <StatusBadge status={status} label={t(`admin.${resource}.statuses.${status}`)} tone={tone} />
)
}
diff --git a/packages/dashboard/src/components/spree/purchase-order-form.tsx b/packages/dashboard/src/components/spree/purchase-order-form.tsx
index 558fe28be0..794ccaf30e 100644
--- a/packages/dashboard/src/components/spree/purchase-order-form.tsx
+++ b/packages/dashboard/src/components/spree/purchase-order-form.tsx
@@ -37,6 +37,7 @@ export interface PurchaseOrderFormValues {
destinationId: string
currency?: string
expectedAt?: string
+ cancelBy?: string
reference: string
notes: string
lines: VariantLine[]
@@ -47,6 +48,7 @@ export const EMPTY_PURCHASE_ORDER: PurchaseOrderFormValues = {
destinationId: '',
currency: undefined,
expectedAt: undefined,
+ cancelBy: undefined,
reference: '',
notes: '',
lines: [],
@@ -96,6 +98,7 @@ export function PurchaseOrderForm({
const [destinationId, setDestinationId] = useState(initial.destinationId)
const [currency, setCurrency] = useState<string | undefined>(initial.currency)
const [expectedAt, setExpectedAt] = useState<string | undefined>(initial.expectedAt)
+ const [cancelBy, setCancelBy] = useState<string | undefined>(initial.cancelBy)
const [reference, setReference] = useState(initial.reference)
const [notes, setNotes] = useState(initial.notes)
const [lines, setLines] = useState<VariantLine[]>(initial.lines)
@@ -194,6 +197,17 @@ export function PurchaseOrderForm({
/>
</Field>
+ <Field>
+ <FieldLabel>{t('admin.purchase_orders.fields.cancel_by')}</FieldLabel>
+ {/* The day after which the goods are no longer wanted — a date for
+ the same reason the expected day is. Nothing cancels itself. */}
+ <StoreDatePicker
+ value={cancelBy}
+ onChange={(value) => setCancelBy(value ?? undefined)}
+ placeholder={t('admin.purchase_orders.fields.cancel_by_placeholder')}
+ />
+ </Field>
+
<Field>
<FieldLabel htmlFor="reference">
{t('admin.purchase_orders.fields.reference')}
@@ -262,6 +276,7 @@ export function PurchaseOrderForm({
destinationId,
currency,
expectedAt,
+ cancelBy,
reference,
notes,
lines,
diff --git a/packages/dashboard/src/components/spree/receive-delivery-card.tsx b/packages/dashboard/src/components/spree/receive-delivery-card.tsx
new file mode 100644
index 0000000000..39cc4eaa98
--- /dev/null
+++ b/packages/dashboard/src/components/spree/receive-delivery-card.tsx
@@ -0,0 +1,264 @@
+import type { StockReceiptCreateParams } from '@spree/admin-sdk'
+import { Can, StoreDatePicker, type SubjectName } from '@spree/dashboard-core'
+import {
+ Button,
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ Field,
+ FieldLabel,
+ Input,
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from '@spree/dashboard-ui'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { REJECTION_REASONS, type RejectionReason } from '../../schemas/inventory-operations'
+import { QuantityCell, QuantityHead } from './quantity-cell'
+import { VariantLink } from './variant-link'
+
+/**
+ * What a purchase order line and a transfer line have in common once a
+ * delivery is being counted against them. The promised quantity has a
+ * different name on each, so callers map it to `quantity_expected`.
+ */
+export interface ReceivableLine {
+ id: string
+ product_id: string | null
+ variant_name: string | null
+ variant_sku: string | null
+ thumbnail_url: string | null
+ quantity_expected: number
+ quantity_received: number
+ quantity_rejected: number
+ outstanding: number
+}
+
+interface Count {
+ accepted: number
+ rejected: number
+ reason: RejectionReason | ''
+}
+
+/**
+ * One delivery, as the dock counts it: what arrived intact, what was refused
+ * and why, per line — this delivery's figures, not running totals. Submitting
+ * books a stock receipt; a second delivery starts from zero again.
+ */
+export function ReceiveDeliveryCard({
+ lines,
+ expectedLabel,
+ subject,
+ pending,
+ onReceive,
+}: {
+ lines: ReceivableLine[]
+ /** The column heading for the promised quantity: "Ordered" or "Shipped". */
+ expectedLabel: string
+ subject: SubjectName
+ pending: boolean
+ onReceive: (params: StockReceiptCreateParams) => Promise<unknown>
+}) {
+ const { t } = useTranslation()
+ const [counts, setCounts] = useState<Record<string, Count>>({})
+ const [reference, setReference] = useState('')
+ const [receivedAt, setReceivedAt] = useState<string | undefined>(undefined)
+ const [notes, setNotes] = useState('')
+
+ const countFor = (id: string): Count => counts[id] ?? { accepted: 0, rejected: 0, reason: '' }
+ const setCount = (id: string, patch: Partial<Count>) =>
+ setCounts((prev) => ({ ...prev, [id]: { ...countFor(id), ...patch } }))
+
+ const accepted = lines.reduce((sum, line) => sum + countFor(line.id).accepted, 0)
+ const rejected = lines.reduce((sum, line) => sum + countFor(line.id).rejected, 0)
+ // A refusal has to say why; the server refuses it otherwise.
+ const missingReason = lines.some((line) => {
+ const count = countFor(line.id)
+ return count.rejected > 0 && !count.reason
+ })
+
+ async function handleReceive() {
+ const items = lines
+ .filter((line) => countFor(line.id).accepted > 0 || countFor(line.id).rejected > 0)
+ .map((line) => {
+ const count = countFor(line.id)
+ return {
+ id: line.id,
+ quantity_accepted: count.accepted,
+ quantity_rejected: count.rejected,
+ rejection_reason: count.rejected > 0 ? count.reason || undefined : undefined,
+ }
+ })
+
+ const booked = await onReceive({
+ items,
+ reference: reference.trim() || undefined,
+ received_at: receivedAt,
+ notes: notes.trim() || undefined,
+ })
+ .then(() => true)
+ .catch(() => false)
+ if (!booked) return
+
+ setCounts({})
+ setReference('')
+ setReceivedAt(undefined)
+ setNotes('')
+ }
+
+ return (
+ <Card>
+ <CardHeader>
+ <CardTitle>{t('admin.stock_receipts.receive_title')}</CardTitle>
+ </CardHeader>
+ <CardContent className="flex flex-col gap-4 p-0">
+ <div className="grid gap-4 px-4 pt-4 md:grid-cols-3">
+ <Field>
+ <FieldLabel htmlFor="receipt-reference">
+ {t('admin.stock_receipts.fields.reference')}
+ </FieldLabel>
+ <Input
+ id="receipt-reference"
+ value={reference}
+ placeholder={t('admin.stock_receipts.fields.reference_placeholder')}
+ onChange={(event) => setReference(event.target.value)}
+ />
+ </Field>
+ <Field>
+ <FieldLabel>{t('admin.stock_receipts.fields.received_at')}</FieldLabel>
+ {/* Left blank, the server stamps now — the usual case. */}
+ <StoreDatePicker
+ value={receivedAt}
+ onChange={(value) => setReceivedAt(value ?? undefined)}
+ includeTime
+ placeholder={t('admin.stock_receipts.fields.received_at_placeholder')}
+ />
+ </Field>
+ <Field>
+ <FieldLabel htmlFor="receipt-notes">
+ {t('admin.stock_receipts.fields.notes')}
+ </FieldLabel>
+ <Input
+ id="receipt-notes"
+ value={notes}
+ onChange={(event) => setNotes(event.target.value)}
+ />
+ </Field>
+ </div>
+
+ <Table scrollX>
+ <TableHeader>
+ <TableRow>
+ <TableHead>{t('admin.inventory_lines.columns.variant')}</TableHead>
+ <TableHead className="text-right">{expectedLabel}</TableHead>
+ <TableHead className="text-right">
+ {t('admin.stock_receipts.columns.received_so_far')}
+ </TableHead>
+ <QuantityHead>{t('admin.stock_receipts.columns.accepted')}</QuantityHead>
+ <QuantityHead>{t('admin.stock_receipts.columns.rejected')}</QuantityHead>
+ <TableHead>{t('admin.stock_receipts.columns.reason')}</TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {lines.map((line) => {
+ const count = countFor(line.id)
+ return (
+ <TableRow key={line.id}>
+ <TableCell>
+ <VariantLink
+ productId={line.product_id}
+ name={line.variant_name}
+ sku={line.variant_sku}
+ thumbnailUrl={line.thumbnail_url}
+ />
+ </TableCell>
+ <TableCell className="text-right tabular-nums">
+ {line.quantity_expected}
+ </TableCell>
+ <TableCell className="text-right tabular-nums">
+ {line.quantity_received}
+ {line.quantity_rejected > 0 && (
+ <span className="ml-1 text-muted-foreground text-xs">
+ {t('admin.stock_receipts.rejected_so_far', {
+ count: line.quantity_rejected,
+ })}
+ </span>
+ )}
+ </TableCell>
+ {/* No ceiling: a supplier sending more than was ordered is a
+ fact to record, not a typo to refuse. */}
+ <QuantityCell
+ editable
+ value={count.accepted}
+ min={0}
+ label={t('admin.stock_receipts.columns.accepted')}
+ onChange={(value) => setCount(line.id, { accepted: value })}
+ />
+ <QuantityCell
+ editable
+ value={count.rejected}
+ min={0}
+ label={t('admin.stock_receipts.columns.rejected')}
+ onChange={(value) => setCount(line.id, { rejected: value })}
+ />
+ <TableCell>
+ {count.rejected > 0 ? (
+ <Select
+ items={REJECTION_REASONS.map((value) => ({
+ value,
+ label: t(`admin.stock_receipts.rejection_reasons.${value}`),
+ }))}
+ value={count.reason}
+ onValueChange={(value) =>
+ setCount(line.id, { reason: (value as RejectionReason | null) ?? '' })
+ }
+ >
+ <SelectTrigger aria-label={t('admin.stock_receipts.columns.reason')}>
+ <SelectValue placeholder={t('admin.stock_receipts.reason_placeholder')} />
+ </SelectTrigger>
+ <SelectContent>
+ {REJECTION_REASONS.map((value) => (
+ <SelectItem key={value} value={value}>
+ {t(`admin.stock_receipts.rejection_reasons.${value}`)}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ ) : (
+ <span className="text-muted-foreground">—</span>
+ )}
+ </TableCell>
+ </TableRow>
+ )
+ })}
+ </TableBody>
+ </Table>
+
+ <div className="flex items-center justify-between px-4 pb-4">
+ <p className="text-muted-foreground text-sm tabular-nums">
+ {t('admin.stock_receipts.delivery_total', { accepted, rejected })}
+ </p>
+ <Can I="update" a={subject}>
+ <Button
+ type="button"
+ onClick={handleReceive}
+ disabled={pending || (accepted === 0 && rejected === 0) || missingReason}
+ >
+ {pending ? t('admin.actions.saving') : t('admin.stock_receipts.actions.receive')}
+ </Button>
+ </Can>
+ </div>
+ </CardContent>
+ </Card>
+ )
+}
diff --git a/packages/dashboard/src/components/spree/stock-receipts-card.tsx b/packages/dashboard/src/components/spree/stock-receipts-card.tsx
new file mode 100644
index 0000000000..c9c9b6a287
--- /dev/null
+++ b/packages/dashboard/src/components/spree/stock-receipts-card.tsx
@@ -0,0 +1,121 @@
+import type { PaginatedResponse, StockReceipt } from '@spree/admin-sdk'
+import {
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ RelativeTime,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from '@spree/dashboard-ui'
+import { useQuery } from '@tanstack/react-query'
+import { useTranslation } from 'react-i18next'
+import { VariantLink } from './variant-link'
+
+/**
+ * The deliveries booked against a purchase order or a transfer, newest first,
+ * each with the lines it counted. The document's running totals say where it
+ * stands; this says how it got there.
+ */
+export function StockReceiptsCard({
+ queryKey,
+ fetch,
+}: {
+ queryKey: readonly unknown[]
+ fetch: () => Promise<PaginatedResponse<StockReceipt>>
+}) {
+ const { t } = useTranslation()
+ const { data, isError } = useQuery({ queryKey, queryFn: fetch })
+ const receipts = data?.data ?? []
+
+ return (
+ <Card>
+ <CardHeader>
+ <CardTitle>
+ {t('admin.stock_receipts.title')}
+ {receipts.length > 0 && (
+ <span className="ml-2 font-normal text-muted-foreground text-sm">
+ {receipts.length}
+ </span>
+ )}
+ </CardTitle>
+ </CardHeader>
+ <CardContent className="flex flex-col p-0">
+ {/* A failed request is not an empty list: saying "no deliveries" over an
+ error would tell the merchant something false about their stock. */}
+ {isError ? (
+ <p className="p-4 text-destructive text-sm">{t('admin.stock_receipts.load_failed')}</p>
+ ) : receipts.length === 0 ? (
+ <p className="p-4 text-muted-foreground text-sm">{t('admin.stock_receipts.empty')}</p>
+ ) : (
+ receipts.map((receipt) => (
+ <div key={receipt.id} className="border-t first:border-t-0">
+ <div className="flex flex-wrap items-baseline gap-x-3 gap-y-1 px-4 py-3 text-sm">
+ <span className="font-medium tabular-nums">{receipt.number}</span>
+ <RelativeTime iso={receipt.received_at} className="text-muted-foreground" />
+ {receipt.reference && (
+ <span className="text-muted-foreground">{receipt.reference}</span>
+ )}
+ <span className="ml-auto text-muted-foreground tabular-nums">
+ {t('admin.stock_receipts.summary', {
+ accepted: receipt.quantity_accepted_total,
+ rejected: receipt.quantity_rejected_total,
+ })}
+ </span>
+ </div>
+ {receipt.items && receipt.items.length > 0 && (
+ <Table scrollX>
+ <TableHeader>
+ <TableRow>
+ <TableHead>{t('admin.inventory_lines.columns.variant')}</TableHead>
+ <TableHead className="text-right">
+ {t('admin.stock_receipts.columns.accepted')}
+ </TableHead>
+ <TableHead className="text-right">
+ {t('admin.stock_receipts.columns.rejected')}
+ </TableHead>
+ <TableHead>{t('admin.stock_receipts.columns.reason')}</TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {receipt.items.map((item) => (
+ <TableRow key={item.id}>
+ <TableCell>
+ <VariantLink
+ name={item.variant_name}
+ sku={item.variant_sku}
+ thumbnailUrl={item.thumbnail_url}
+ />
+ </TableCell>
+ <TableCell className="text-right tabular-nums">
+ {item.quantity_accepted}
+ </TableCell>
+ <TableCell className="text-right tabular-nums">
+ {item.quantity_rejected}
+ </TableCell>
+ <TableCell>
+ {item.rejection_reason
+ ? t(`admin.stock_receipts.rejection_reasons.${item.rejection_reason}`, {
+ defaultValue: item.rejection_reason,
+ })
+ : '—'}
+ </TableCell>
+ </TableRow>
+ ))}
+ </TableBody>
+ </Table>
+ )}
+ {receipt.notes && (
+ <p className="px-4 pb-3 text-muted-foreground text-sm">{receipt.notes}</p>
+ )}
+ </div>
+ ))
+ )}
+ </CardContent>
+ </Card>
+ )
+}
diff --git a/packages/dashboard/src/hooks/use-purchase-orders.ts b/packages/dashboard/src/hooks/use-purchase-orders.ts
index 68d9902d56..110aa5ae55 100644
--- a/packages/dashboard/src/hooks/use-purchase-orders.ts
+++ b/packages/dashboard/src/hooks/use-purchase-orders.ts
@@ -1,8 +1,10 @@
import type {
PurchaseOrder,
PurchaseOrderCreateParams,
- PurchaseOrderReceiveParams,
PurchaseOrderUpdateParams,
+ ReceivableCloseParams,
+ StockReceipt,
+ StockReceiptCreateParams,
} from '@spree/admin-sdk'
import {
adminClient,
@@ -74,13 +76,23 @@ export function useMarkPurchaseOrderOrdered(id: string) {
})
}
+/** The deliveries booked against an order, with their lines. */
+export function usePurchaseOrderReceipts(id: string) {
+ return useQuery({
+ queryKey: useResourceKey('purchase-orders', id, 'stock-receipts'),
+ queryFn: () => adminClient.purchaseOrders.stockReceipts.list(id, { expand: ['items'] }),
+ })
+}
+
/** The first moment purchased goods count toward availability. */
-export function useReceivePurchaseOrder(id: string) {
- return useResourceMutation<PurchaseOrder, Error, PurchaseOrderReceiveParams | undefined>({
- mutationFn: (params) => adminClient.purchaseOrders.receive(id, params ?? undefined),
+export function useCreatePurchaseOrderReceipt(id: string) {
+ return useResourceMutation<StockReceipt, Error, StockReceiptCreateParams | undefined>({
+ mutationFn: (params) =>
+ adminClient.purchaseOrders.stockReceipts.create(id, params ?? undefined),
invalidate: [
['purchase-orders'],
['purchase-orders', id],
+ ['purchase-orders', id, 'stock-receipts'],
['stock-levels'],
['stock-movements'],
],
@@ -91,6 +103,28 @@ export function useReceivePurchaseOrder(id: string) {
})
}
+/** Ends an order whose balance the supplier will not deliver. */
+export function useClosePurchaseOrder(id: string) {
+ return useResourceMutation<PurchaseOrder, Error, ReceivableCloseParams | undefined>({
+ mutationFn: (params) => adminClient.purchaseOrders.close(id, params ?? undefined),
+ invalidate: [['purchase-orders'], ['purchase-orders', id]],
+ successMessage: i18n.t('admin.purchase_orders.messages.closed'),
+ errorMessage: i18n.t('admin.purchase_orders.errors.failed_to_close'),
+ showValidationErrors: true,
+ })
+}
+
+/** Reopens a placed order for editing, while no delivery has been booked. */
+export function useMarkPurchaseOrderDraft(id: string) {
+ return useResourceMutation<PurchaseOrder, Error, void>({
+ mutationFn: () => adminClient.purchaseOrders.markDraft(id),
+ invalidate: [['purchase-orders'], ['purchase-orders', id]],
+ successMessage: i18n.t('admin.purchase_orders.messages.marked_draft'),
+ errorMessage: i18n.t('admin.purchase_orders.errors.failed_to_mark_draft'),
+ showValidationErrors: true,
+ })
+}
+
export function useCancelPurchaseOrder(id: string) {
return useResourceMutation<PurchaseOrder, Error, { reason?: string } | undefined>({
mutationFn: (params) => adminClient.purchaseOrders.cancel(id, params ?? undefined),
diff --git a/packages/dashboard/src/hooks/use-stock-transfers.ts b/packages/dashboard/src/hooks/use-stock-transfers.ts
index ae1b639a84..4c26335e9d 100644
--- a/packages/dashboard/src/hooks/use-stock-transfers.ts
+++ b/packages/dashboard/src/hooks/use-stock-transfers.ts
@@ -1,8 +1,10 @@
import type {
+ ReceivableCloseParams,
+ StockReceipt,
+ StockReceiptCreateParams,
StockTransfer,
StockTransferCancelParams,
StockTransferCreateParams,
- StockTransferReceiveParams,
StockTransferUpdateParams,
} from '@spree/admin-sdk'
import {
@@ -95,12 +97,23 @@ export function useMarkStockTransferInTransit(id: string) {
})
}
-export function useReceiveStockTransfer(id: string) {
- return useResourceMutation<StockTransfer, Error, StockTransferReceiveParams | undefined>({
- mutationFn: (params) => adminClient.stockTransfers.receive(id, params ?? undefined),
+/** The deliveries the destination counted in, with their lines. */
+export function useStockTransferReceipts(id: string) {
+ return useQuery({
+ queryKey: useResourceKey('stock-transfers', id, 'stock-receipts'),
+ queryFn: () => adminClient.stockTransfers.stockReceipts.list(id, { expand: ['items'] }),
+ })
+}
+
+/** Lands what the destination counted in; partial receipt is normal. */
+export function useCreateStockTransferReceipt(id: string) {
+ return useResourceMutation<StockReceipt, Error, StockReceiptCreateParams | undefined>({
+ mutationFn: (params) =>
+ adminClient.stockTransfers.stockReceipts.create(id, params ?? undefined),
invalidate: [
['stock-transfers'],
['stock-transfers', id],
+ ['stock-transfers', id, 'stock-receipts'],
['stock-levels'],
['stock-movements'],
],
@@ -111,6 +124,28 @@ export function useReceiveStockTransfer(id: string) {
})
}
+/** Ends a transfer whose missing units are not going to turn up. */
+export function useCloseStockTransfer(id: string) {
+ return useResourceMutation<StockTransfer, Error, ReceivableCloseParams | undefined>({
+ mutationFn: (params) => adminClient.stockTransfers.close(id, params ?? undefined),
+ invalidate: [['stock-transfers'], ['stock-transfers', id]],
+ successMessage: i18n.t('admin.stock_transfers.messages.closed'),
+ errorMessage: i18n.t('admin.stock_transfers.errors.failed_to_close'),
+ showValidationErrors: true,
+ })
+}
+
+/** Unfreezes a packed transfer; nothing has left the source yet. */
+export function useMarkStockTransferDraft(id: string) {
+ return useResourceMutation<StockTransfer, Error, void>({
+ mutationFn: () => adminClient.stockTransfers.markDraft(id),
+ invalidate: [['stock-transfers'], ['stock-transfers', id]],
+ successMessage: i18n.t('admin.stock_transfers.messages.marked_draft'),
+ errorMessage: i18n.t('admin.stock_transfers.errors.failed_to_mark_draft'),
+ showValidationErrors: true,
+ })
+}
+
export function useCancelStockTransfer(id: string) {
return useResourceMutation<StockTransfer, Error, StockTransferCancelParams | undefined>({
mutationFn: (params) => adminClient.stockTransfers.cancel(id, params ?? undefined),
diff --git a/packages/dashboard/src/lib/import-types.ts b/packages/dashboard/src/lib/import-types.ts
index 903561272e..ec7d76fb36 100644
--- a/packages/dashboard/src/lib/import-types.ts
+++ b/packages/dashboard/src/lib/import-types.ts
@@ -17,6 +17,8 @@ export function importTypeDestination(
switch (importTypeKey(type)) {
case 'customers':
return { to: '/$storeId/customers' }
+ case 'purchase_orders':
+ return { to: '/$storeId/purchase-orders' }
case 'price_list_prices':
return imp?.price_list_id
? {
diff --git a/packages/dashboard/src/locales/ar.json b/packages/dashboard/src/locales/ar.json
index e279a17d2b..773adeda14 100644
--- a/packages/dashboard/src/locales/ar.json
+++ b/packages/dashboard/src/locales/ar.json
@@ -5075,7 +5075,8 @@
"quantity_shipped": "المُرسَل",
"quantity_to_ship": "للإرسال",
"quantity_received": "المستلَم",
- "discrepancy": "الفرق"
+ "quantity_rejected": "مرفوض",
+ "quantity_over": "زيادة"
},
"direction": {
"external_receive": "استلام خارجي",
@@ -5092,7 +5093,9 @@
"failed_to_receive": "تعذّر استلام التحويل",
"failed_to_cancel": "تعذّر إلغاء التحويل",
"not_editable": "تم تجهيز هذا النقل، ومحتواه الآن سجل ثابت. ألغِه إذا لم يكن ينبغي إرساله.",
- "failed_to_load": "تعذّر تحميل هذا النقل."
+ "failed_to_load": "تعذّر تحميل هذا النقل.",
+ "failed_to_mark_draft": "تعذّرت الإعادة إلى المسودة",
+ "failed_to_close": "تعذّر الإغلاق بالنقص"
},
"messages": {
"deleted": "تم حذف التحويل",
@@ -5102,7 +5105,9 @@
"marked_ready": "التحويل جاهز للإرسال",
"marked_in_transit": "التحويل في الطريق — غادرت الوحدات المستودع المصدر",
"received": "تم استلام التحويل",
- "canceled": "تم إلغاء التحويل"
+ "canceled": "تم إلغاء التحويل",
+ "marked_draft": "عاد إلى المسودة",
+ "closed": "أُغلق بالنقص — ما وصل يبقى، والباقي يُشطب"
},
"table": {
"empty": "لا يوجد تحويلات الأسهم حتى الآن",
@@ -5117,20 +5122,14 @@
"receive_title": "الاستلام",
"history_title": "حركات المخزون لهذا النقل",
"units_summary": "تم استلام {{received}} من {{shipped}} وحدة مُرسَلة",
- "receive_running_total": "تم عدّ {{counted}} من {{shipped}} وحدة مُرسَلة",
- "discrepancy_placeholder": "سبب نقص الكمية الواصلة",
"statuses": {
"draft": "مسودة",
"ready_to_ship": "جاهز للإرسال",
"in_transit": "في الطريق",
"partially_received": "مستلَم جزئيًا",
"received": "مستلَم",
- "canceled": "ملغى"
- },
- "discrepancy_reasons": {
- "damaged_in_transit": "تضرر أثناء النقل",
- "lost_in_transit": "فُقد أثناء النقل",
- "undercount": "خطأ في العدّ عند الإرسال"
+ "canceled": "ملغى",
+ "over_received": "تم الاستلام بزيادة"
},
"in_transit_resolutions": {
"restock": "إرجاع الوحدات إلى المستودع المصدر",
@@ -5148,14 +5147,18 @@
"shipped_at": "تاريخ الإرسال",
"received_at": "تاريخ الاستلام",
"in_transit_resolution": "الوحدات غادرت المستودع بالفعل. ماذا حدث لها؟",
- "source_locked": "ثابت ما دامت هناك بنود: اختيرت لهذا المستودع. أزلها لتغييره."
+ "source_locked": "ثابت ما دامت هناك بنود: اختيرت لهذا المستودع. أزلها لتغييره.",
+ "closed_short": "أُغلق بالنقص",
+ "close_reason": "السبب"
},
"actions": {
"create_draft": "إنشاء مسودة",
"mark_ready": "تعيين كجاهز للإرسال",
"mark_in_transit": "تعيين كفي الطريق",
"receive": "استلام",
- "cancel_transfer": "إلغاء التحويل"
+ "cancel_transfer": "إلغاء التحويل",
+ "mark_draft": "العودة إلى المسودة",
+ "close_short": "إغلاق بالنقص"
},
"delete_confirm": {
"title": "حذف هذا التحويل؟",
@@ -5176,7 +5179,11 @@
"in_flight_restock": "ستعود الوحدات إلى رفّ المستودع المصدر، كأن التحويل لم يُرسَل أبدًا.",
"in_flight_write_off": "تبقى الوحدات مشطوبة كخسارة. لن يُضاف أي شيء في أي مكان."
},
- "edit_title": "تعديل النقل {{number}}"
+ "edit_title": "تعديل النقل {{number}}",
+ "close_confirm": {
+ "title": "إغلاق هذا التحويل بالنقص؟",
+ "message": "ما عدّه المستودع الوجهة يبقى. تُشطب الوحدات التي ما زالت في الطريق وعددها {{outstanding}} كمفقودة ويُعلَّم التحويل كمستلَم."
+ }
},
"store": {
"load_failed_title": "فشل تحميل إعدادات المتجر",
@@ -5504,7 +5511,6 @@
"receive_title": "الاستلام",
"history_title": "حركات المخزون لأمر الشراء هذا",
"units_summary": "تم استلام {{received}} من {{ordered}} وحدة مطلوبة",
- "receive_running_total": "تم عدّ {{counted}} من {{ordered}} وحدة مطلوبة",
"table": {
"empty": "لا توجد أوامر شراء بعد",
"search_placeholder": "ابحث بالرقم أو المرجع…"
@@ -5517,14 +5523,20 @@
"expected": "متوقع",
"quantity_ordered": "المطلوب",
"quantity_received": "المستلَم",
- "line_total": "إجمالي البند"
+ "line_total": "إجمالي البند",
+ "quantity_rejected": "مرفوض",
+ "quantity_over": "زيادة",
+ "cancel_by": "الإلغاء بعد",
+ "overdue": "متأخر",
+ "past_cancel_by": "تجاوز تاريخ الإلغاء"
},
"statuses": {
"draft": "مسودة",
"ordered": "مطلوب",
"partially_received": "مستلَم جزئيًا",
"received": "مستلَم",
- "canceled": "ملغى"
+ "canceled": "ملغى",
+ "over_received": "تم الاستلام بزيادة"
},
"fields": {
"supplier": "المورد",
@@ -5541,13 +5553,19 @@
"subtotal": "الإجمالي",
"ordered_at": "تاريخ الطلب",
"received_at": "تاريخ الاستلام",
- "currency_locked": "ثابتة بعد إنشاء الأمر: كل بند مُسعَّر بها."
+ "currency_locked": "ثابتة بعد إنشاء الأمر: كل بند مُسعَّر بها.",
+ "closed_short": "أُغلق بالنقص",
+ "close_reason": "السبب",
+ "cancel_by": "الإلغاء بعد",
+ "cancel_by_placeholder": "اليوم الذي لا تعود البضاعة مطلوبة بعده"
},
"actions": {
"create_draft": "إنشاء مسودة",
"mark_ordered": "تعيين كمطلوب",
"receive": "استلام",
- "cancel_order": "إلغاء الأمر"
+ "cancel_order": "إلغاء الأمر",
+ "mark_draft": "العودة إلى المسودة",
+ "close_short": "إغلاق بالنقص"
},
"messages": {
"created": "تم إنشاء أمر الشراء",
@@ -5555,7 +5573,9 @@
"deleted": "تم حذف أمر الشراء",
"ordered": "تم إرسال أمر الشراء",
"received": "تم تسجيل التوريد",
- "canceled": "تم إلغاء أمر الشراء"
+ "canceled": "تم إلغاء أمر الشراء",
+ "marked_draft": "عاد إلى المسودة",
+ "closed": "أُغلق بالنقص — ما وصل يبقى، والباقي يُشطب"
},
"errors": {
"failed_to_create": "تعذّر إنشاء أمر الشراء",
@@ -5565,7 +5585,9 @@
"failed_to_receive": "تعذّر تسجيل التوريد",
"failed_to_cancel": "تعذّر إلغاء أمر الشراء",
"not_editable": "أُرسل هذا الأمر إلى المورّد، وبنوده الآن التزام بين شركتين. ألغِه إذا لم يكن ينبغي أن يستمر.",
- "failed_to_load": "تعذّر تحميل أمر الشراء هذا."
+ "failed_to_load": "تعذّر تحميل أمر الشراء هذا.",
+ "failed_to_mark_draft": "تعذّرت الإعادة إلى المسودة",
+ "failed_to_close": "تعذّر الإغلاق بالنقص"
},
"delete_confirm": {
"title": "حذف أمر الشراء هذا؟",
@@ -5579,7 +5601,17 @@
"title": "إلغاء أمر الشراء هذا؟",
"message": "يُلغى ما تبقّى غير مستلَم. الوحدات المستلَمة بالفعل تبقى في المخزون."
},
- "edit_title": "تعديل أمر الشراء {{number}}"
+ "edit_title": "تعديل أمر الشراء {{number}}",
+ "close_confirm": {
+ "title": "إغلاق هذا الطلب بالنقص؟",
+ "message": "ما وصل يبقى على الرف. تُشطب الوحدات المتبقية وعددها {{outstanding}} ويُعلَّم الطلب كمستلَم."
+ },
+ "filters": {
+ "overdue": "متأخر",
+ "not_overdue": "في الموعد",
+ "past_cancel_by": "تجاوز تاريخ الإلغاء",
+ "not_past_cancel_by": "ضمن تاريخ الإلغاء"
+ }
},
"suppliers": {
"title": "الموردون",
@@ -5622,6 +5654,43 @@
"title": "حذف هذا المورد؟",
"message": "سيتم إزالة {{name}} من قائمة الموردين."
}
+ },
+ "stock_receipts": {
+ "title": "التسليمات",
+ "receive_title": "استلام تسليم",
+ "empty": "لا توجد تسليمات بعد",
+ "columns": {
+ "accepted": "مقبول",
+ "rejected": "مرفوض",
+ "reason": "السبب",
+ "received_so_far": "المستلَم حتى الآن"
+ },
+ "fields": {
+ "reference": "إشعار التسليم",
+ "reference_placeholder": "رقم إشعار التسليم أو قائمة التعبئة",
+ "received_at": "تاريخ الاستلام",
+ "received_at_placeholder": "الآن",
+ "notes": "ملاحظات"
+ },
+ "delivery_total": "{{accepted}} مقبول، {{rejected}} مرفوض في هذا التسليم",
+ "rejected_so_far": "({{count}} مرفوض)",
+ "summary": "{{accepted}} مقبول · {{rejected}} مرفوض",
+ "reason_placeholder": "سبب الرفض",
+ "rejection_reasons": {
+ "damaged": "تالف",
+ "wrong_item": "صنف خاطئ",
+ "expired": "منتهي الصلاحية",
+ "other": "أخرى"
+ },
+ "actions": {
+ "receive": "استلام"
+ },
+ "close_short": {
+ "reason_label": "السبب",
+ "reason_placeholder": "ما الذي حدث للباقي",
+ "confirm": "إغلاق بالنقص"
+ },
+ "load_failed": "تعذّر تحميل التسليمات."
}
}
}
diff --git a/packages/dashboard/src/locales/de.json b/packages/dashboard/src/locales/de.json
index 3cb182a82a..a0f90715af 100644
--- a/packages/dashboard/src/locales/de.json
+++ b/packages/dashboard/src/locales/de.json
@@ -5053,7 +5053,8 @@
"quantity_shipped": "Versandt",
"quantity_to_ship": "Zu versenden",
"quantity_received": "Eingegangen",
- "discrepancy": "Abweichung"
+ "quantity_rejected": "Abgelehnt",
+ "quantity_over": "Zu viel"
},
"direction": {
"external_receive": "Externer Wareneingang",
@@ -5070,7 +5071,9 @@
"failed_to_receive": "Wareneingang konnte nicht gebucht werden",
"failed_to_cancel": "Umlagerung konnte nicht abgebrochen werden",
"not_editable": "Diese Umbuchung ist gepackt, ihr Inhalt ist damit dokumentiert. Storniere sie, wenn sie nicht gehen soll.",
- "failed_to_load": "Diese Umbuchung konnte nicht geladen werden."
+ "failed_to_load": "Diese Umbuchung konnte nicht geladen werden.",
+ "failed_to_mark_draft": "Konnte nicht in den Entwurf zurückgesetzt werden",
+ "failed_to_close": "Konnte nicht vorzeitig abgeschlossen werden"
},
"messages": {
"deleted": "Umlagerung gelöscht",
@@ -5080,7 +5083,9 @@
"marked_ready": "Umlagerung ist versandbereit",
"marked_in_transit": "Umlagerung ist unterwegs – die Einheiten haben das Quelllager verlassen",
"received": "Wareneingang gebucht",
- "canceled": "Umlagerung abgebrochen"
+ "canceled": "Umlagerung abgebrochen",
+ "marked_draft": "Wieder im Entwurf",
+ "closed": "Vorzeitig abgeschlossen — das Gelieferte bleibt, der Rest wird abgeschrieben"
},
"table": {
"empty": "Noch keine Lagerumbuchungen",
@@ -5095,20 +5100,14 @@
"receive_title": "Wareneingang",
"history_title": "Bestandsbewegungen dieser Umbuchung",
"units_summary": "{{received}} von {{shipped}} versandten Einheiten eingegangen",
- "receive_running_total": "{{counted}} von {{shipped}} versandten Einheiten gezählt",
- "discrepancy_placeholder": "Warum weniger eingetroffen ist",
"statuses": {
"draft": "Entwurf",
"ready_to_ship": "Versandbereit",
"in_transit": "Unterwegs",
"partially_received": "Teilweise eingegangen",
"received": "Eingegangen",
- "canceled": "Abgebrochen"
- },
- "discrepancy_reasons": {
- "damaged_in_transit": "Auf dem Transport beschädigt",
- "lost_in_transit": "Auf dem Transport verloren",
- "undercount": "Beim Versand falsch gezählt"
+ "canceled": "Abgebrochen",
+ "over_received": "Mehr erhalten als bestellt"
},
"in_transit_resolutions": {
"restock": "Einheiten zurück ins Quelllager buchen",
@@ -5126,14 +5125,18 @@
"shipped_at": "Versandt",
"received_at": "Eingegangen",
"in_transit_resolution": "Die Einheiten haben das Lager verlassen. Was ist mit ihnen passiert?",
- "source_locked": "Fest, solange Positionen vorhanden sind: sie wurden für dieses Lager gewählt. Zum Ändern zuerst entfernen."
+ "source_locked": "Fest, solange Positionen vorhanden sind: sie wurden für dieses Lager gewählt. Zum Ändern zuerst entfernen.",
+ "closed_short": "Vorzeitig abgeschlossen",
+ "close_reason": "Grund"
},
"actions": {
"create_draft": "Entwurf erstellen",
"mark_ready": "Als versandbereit markieren",
"mark_in_transit": "Als unterwegs markieren",
"receive": "Wareneingang buchen",
- "cancel_transfer": "Umlagerung abbrechen"
+ "cancel_transfer": "Umlagerung abbrechen",
+ "mark_draft": "Zurück zum Entwurf",
+ "close_short": "Vorzeitig abschließen"
},
"delete_confirm": {
"title": "Diese Umlagerung löschen?",
@@ -5150,7 +5153,11 @@
"in_flight_restock": "Die Einheiten werden zurück ins Quelllager gebucht, als wäre die Umlagerung nie versandt worden.",
"in_flight_write_off": "Die Einheiten bleiben als Verlust ausgebucht. Es wird nirgends etwas zurückgebucht."
},
- "edit_title": "Umbuchung {{number}} bearbeiten"
+ "edit_title": "Umbuchung {{number}} bearbeiten",
+ "close_confirm": {
+ "title": "Diese Umlagerung vorzeitig abschließen?",
+ "message": "Was das Ziel gezählt hat, bleibt. Die {{outstanding}} noch unterwegs befindlichen Einheiten werden als verloren abgeschrieben und die Umlagerung als erhalten markiert."
+ }
},
"store": {
"load_failed_title": "Laden der Store-Einstellungen fehlgeschlagen",
@@ -5475,7 +5482,6 @@
"receive_title": "Wareneingang",
"history_title": "Bestandsbewegungen dieser Bestellung",
"units_summary": "{{received}} von {{ordered}} bestellten Einheiten eingegangen",
- "receive_running_total": "{{counted}} von {{ordered}} bestellten Einheiten gezählt",
"table": {
"empty": "Noch keine Bestellungen",
"search_placeholder": "Nach Nummer oder Referenz suchen…"
@@ -5488,14 +5494,20 @@
"expected": "Erwartet",
"quantity_ordered": "Bestellt",
"quantity_received": "Eingegangen",
- "line_total": "Positionssumme"
+ "line_total": "Positionssumme",
+ "quantity_rejected": "Abgelehnt",
+ "quantity_over": "Zu viel",
+ "cancel_by": "Stornieren bis",
+ "overdue": "Überfällig",
+ "past_cancel_by": "Stornofrist überschritten"
},
"statuses": {
"draft": "Entwurf",
"ordered": "Bestellt",
"partially_received": "Teilweise eingegangen",
"received": "Eingegangen",
- "canceled": "Abgebrochen"
+ "canceled": "Abgebrochen",
+ "over_received": "Mehr erhalten als bestellt"
},
"fields": {
"supplier": "Lieferant",
@@ -5512,13 +5524,19 @@
"subtotal": "Gesamt",
"ordered_at": "Bestellt",
"received_at": "Eingegangen",
- "currency_locked": "Fest nach dem Anlegen: jede Position ist in dieser Währung bepreist."
+ "currency_locked": "Fest nach dem Anlegen: jede Position ist in dieser Währung bepreist.",
+ "closed_short": "Vorzeitig abgeschlossen",
+ "close_reason": "Grund",
+ "cancel_by": "Stornieren bis",
+ "cancel_by_placeholder": "Der Tag, ab dem die Ware nicht mehr gewünscht ist"
},
"actions": {
"create_draft": "Entwurf erstellen",
"mark_ordered": "Als bestellt markieren",
"receive": "Wareneingang buchen",
- "cancel_order": "Bestellung abbrechen"
+ "cancel_order": "Bestellung abbrechen",
+ "mark_draft": "Zurück zum Entwurf",
+ "close_short": "Vorzeitig abschließen"
},
"messages": {
"created": "Bestellung erstellt",
@@ -5526,7 +5544,9 @@
"deleted": "Bestellung gelöscht",
"ordered": "Bestellung aufgegeben",
"received": "Lieferung eingebucht",
- "canceled": "Bestellung abgebrochen"
+ "canceled": "Bestellung abgebrochen",
+ "marked_draft": "Wieder im Entwurf",
+ "closed": "Vorzeitig abgeschlossen — das Gelieferte bleibt, der Rest wird abgeschrieben"
},
"errors": {
"failed_to_create": "Bestellung konnte nicht erstellt werden",
@@ -5536,7 +5556,9 @@
"failed_to_receive": "Lieferung konnte nicht eingebucht werden",
"failed_to_cancel": "Bestellung konnte nicht abgebrochen werden",
"not_editable": "Diese Bestellung liegt beim Lieferanten, ihre Positionen sind damit verbindlich. Storniere sie, wenn sie nicht gelten soll.",
- "failed_to_load": "Diese Bestellung konnte nicht geladen werden."
+ "failed_to_load": "Diese Bestellung konnte nicht geladen werden.",
+ "failed_to_mark_draft": "Konnte nicht in den Entwurf zurückgesetzt werden",
+ "failed_to_close": "Konnte nicht vorzeitig abgeschlossen werden"
},
"delete_confirm": {
"title": "Diese Bestellung löschen?",
@@ -5550,7 +5572,17 @@
"title": "Diese Bestellung abbrechen?",
"message": "Alles Offene wird abgesagt. Bereits eingegangene Einheiten bleiben im Bestand."
},
- "edit_title": "Bestellung {{number}} bearbeiten"
+ "edit_title": "Bestellung {{number}} bearbeiten",
+ "close_confirm": {
+ "title": "Diese Bestellung vorzeitig abschließen?",
+ "message": "Das Gelieferte bleibt im Lager. Die noch ausstehenden {{outstanding}} Einheiten werden abgeschrieben und die Bestellung als erhalten markiert."
+ },
+ "filters": {
+ "overdue": "Überfällig",
+ "not_overdue": "Pünktlich",
+ "past_cancel_by": "Stornofrist überschritten",
+ "not_past_cancel_by": "Innerhalb der Stornofrist"
+ }
},
"suppliers": {
"title": "Lieferanten",
@@ -5593,6 +5625,43 @@
"title": "Diesen Lieferanten löschen?",
"message": "{{name}} wird aus Ihrer Lieferantenliste entfernt."
}
+ },
+ "stock_receipts": {
+ "title": "Lieferungen",
+ "receive_title": "Lieferung annehmen",
+ "empty": "Noch keine Lieferungen",
+ "columns": {
+ "accepted": "Angenommen",
+ "rejected": "Abgelehnt",
+ "reason": "Grund",
+ "received_so_far": "Bisher erhalten"
+ },
+ "fields": {
+ "reference": "Lieferschein",
+ "reference_placeholder": "Lieferschein- oder Packzettelnummer",
+ "received_at": "Erhalten am",
+ "received_at_placeholder": "Jetzt",
+ "notes": "Notizen"
+ },
+ "delivery_total": "{{accepted}} angenommen, {{rejected}} abgelehnt in dieser Lieferung",
+ "rejected_so_far": "({{count}} abgelehnt)",
+ "summary": "{{accepted}} angenommen · {{rejected}} abgelehnt",
+ "reason_placeholder": "Grund der Ablehnung",
+ "rejection_reasons": {
+ "damaged": "Beschädigt",
+ "wrong_item": "Falscher Artikel",
+ "expired": "Abgelaufen",
+ "other": "Sonstiges"
+ },
+ "actions": {
+ "receive": "Annehmen"
+ },
+ "close_short": {
+ "reason_label": "Grund",
+ "reason_placeholder": "Was mit dem Rest passiert ist",
+ "confirm": "Vorzeitig abschließen"
+ },
+ "load_failed": "Die Lieferungen konnten nicht geladen werden."
}
}
}
diff --git a/packages/dashboard/src/locales/en.json b/packages/dashboard/src/locales/en.json
index 9f61fc42cf..e5ed49c959 100644
--- a/packages/dashboard/src/locales/en.json
+++ b/packages/dashboard/src/locales/en.json
@@ -5053,7 +5053,8 @@
"quantity_shipped": "Shipped",
"quantity_to_ship": "To ship",
"quantity_received": "Received",
- "discrepancy": "Discrepancy"
+ "quantity_rejected": "Rejected",
+ "quantity_over": "Over"
},
"direction": {
"external_receive": "External receive",
@@ -5070,7 +5071,9 @@
"failed_to_receive": "Failed to receive the transfer",
"failed_to_cancel": "Failed to cancel the transfer",
"not_editable": "This transfer has been packed, so what is in it is now a matter of record. Cancel it if it should not go.",
- "failed_to_load": "This transfer could not be loaded."
+ "failed_to_load": "This transfer could not be loaded.",
+ "failed_to_mark_draft": "Could not take it back to draft",
+ "failed_to_close": "Could not close it short"
},
"messages": {
"deleted": "Transfer deleted",
@@ -5080,7 +5083,9 @@
"marked_ready": "Transfer is ready to ship",
"marked_in_transit": "Transfer is in transit — the units have left the source",
"received": "Transfer received",
- "canceled": "Transfer cancelled"
+ "canceled": "Transfer cancelled",
+ "marked_draft": "Back in draft",
+ "closed": "Closed short — what arrived stays, the rest is written off"
},
"table": {
"empty": "No stock transfers yet",
@@ -5095,20 +5100,14 @@
"receive_title": "Receive",
"history_title": "Stock movements for this transfer",
"units_summary": "{{received}} received of {{shipped}} shipped",
- "receive_running_total": "{{counted}} counted of {{shipped}} shipped",
- "discrepancy_placeholder": "Why fewer arrived",
"statuses": {
"draft": "Draft",
"ready_to_ship": "Ready to ship",
"in_transit": "In transit",
"partially_received": "Partially received",
"received": "Received",
- "canceled": "Cancelled"
- },
- "discrepancy_reasons": {
- "damaged_in_transit": "Damaged in transit",
- "lost_in_transit": "Lost in transit",
- "undercount": "Miscounted when shipped"
+ "canceled": "Cancelled",
+ "over_received": "Over-received"
},
"in_transit_resolutions": {
"restock": "Put the units back at the source",
@@ -5126,14 +5125,18 @@
"shipped_at": "Shipped",
"received_at": "Received",
"in_transit_resolution": "The units have already left. What happened to them?",
- "source_locked": "Fixed while the transfer has lines: they were picked for this warehouse. Remove them to change it."
+ "source_locked": "Fixed while the transfer has lines: they were picked for this warehouse. Remove them to change it.",
+ "closed_short": "Closed short",
+ "close_reason": "Reason"
},
"actions": {
"create_draft": "Create draft",
"mark_ready": "Mark as ready to ship",
"mark_in_transit": "Mark in transit",
"receive": "Receive",
- "cancel_transfer": "Cancel transfer"
+ "cancel_transfer": "Cancel transfer",
+ "mark_draft": "Back to draft",
+ "close_short": "Close short"
},
"delete_confirm": {
"title": "Delete this transfer?",
@@ -5150,7 +5153,11 @@
"in_flight_restock": "The units will go back onto the source warehouse's shelf, as if the transfer had never shipped.",
"in_flight_write_off": "The units stay off the books as lost. Nothing is added back anywhere."
},
- "edit_title": "Edit transfer {{number}}"
+ "edit_title": "Edit transfer {{number}}",
+ "close_confirm": {
+ "title": "Close this transfer short?",
+ "message": "What the destination counted in stays. The {{outstanding}} units still on the road are written off as lost and the transfer is marked received."
+ }
},
"store": {
"load_failed_title": "Failed to load store settings",
@@ -5475,7 +5482,6 @@
"receive_title": "Receive",
"history_title": "Stock movements for this order",
"units_summary": "{{received}} received of {{ordered}} ordered",
- "receive_running_total": "{{counted}} counted of {{ordered}} ordered",
"table": {
"empty": "No purchase orders yet",
"search_placeholder": "Search by number or reference…"
@@ -5488,14 +5494,20 @@
"expected": "Expected",
"quantity_ordered": "Ordered",
"quantity_received": "Received",
- "line_total": "Line total"
+ "line_total": "Line total",
+ "quantity_rejected": "Rejected",
+ "quantity_over": "Over",
+ "cancel_by": "Cancel by",
+ "overdue": "Overdue",
+ "past_cancel_by": "Past cancel-by"
},
"statuses": {
"draft": "Draft",
"ordered": "Ordered",
"partially_received": "Partially received",
"received": "Received",
- "canceled": "Cancelled"
+ "canceled": "Cancelled",
+ "over_received": "Over-received"
},
"fields": {
"supplier": "Supplier",
@@ -5512,13 +5524,19 @@
"subtotal": "Total",
"ordered_at": "Ordered",
"received_at": "Received",
- "currency_locked": "Fixed after the order is opened: every line cost is priced in it."
+ "currency_locked": "Fixed after the order is opened: every line cost is priced in it.",
+ "closed_short": "Closed short",
+ "close_reason": "Reason",
+ "cancel_by": "Cancel by",
+ "cancel_by_placeholder": "The day after which you no longer want the goods"
},
"actions": {
"create_draft": "Create draft",
"mark_ordered": "Mark as ordered",
"receive": "Receive",
- "cancel_order": "Cancel order"
+ "cancel_order": "Cancel order",
+ "mark_draft": "Back to draft",
+ "close_short": "Close short"
},
"messages": {
"created": "Purchase order created",
@@ -5526,7 +5544,9 @@
"deleted": "Purchase order deleted",
"ordered": "Purchase order placed",
"received": "Delivery booked in",
- "canceled": "Purchase order cancelled"
+ "canceled": "Purchase order cancelled",
+ "marked_draft": "Back in draft",
+ "closed": "Closed short — what arrived stays, the rest is written off"
},
"errors": {
"failed_to_create": "Failed to create the purchase order",
@@ -5536,7 +5556,9 @@
"failed_to_receive": "Failed to book in the delivery",
"failed_to_cancel": "Failed to cancel the purchase order",
"not_editable": "This order has gone to the supplier, so its lines are a matter of record between two businesses. Cancel it if it should not stand.",
- "failed_to_load": "This purchase order could not be loaded."
+ "failed_to_load": "This purchase order could not be loaded.",
+ "failed_to_mark_draft": "Could not take it back to draft",
+ "failed_to_close": "Could not close it short"
},
"delete_confirm": {
"title": "Delete this purchase order?",
@@ -5550,7 +5572,17 @@
"title": "Cancel this purchase order?",
"message": "What is still outstanding is called off. Units already received stay on the shelf."
},
- "edit_title": "Edit order {{number}}"
+ "edit_title": "Edit order {{number}}",
+ "close_confirm": {
+ "title": "Close this order short?",
+ "message": "What arrived stays on the shelf. The {{outstanding}} units still owed are written off and the order is marked received."
+ },
+ "filters": {
+ "overdue": "Overdue",
+ "not_overdue": "On time",
+ "past_cancel_by": "Past cancel-by",
+ "not_past_cancel_by": "Within cancel-by"
+ }
},
"suppliers": {
"title": "Suppliers",
@@ -5593,6 +5625,43 @@
"title": "Delete this supplier?",
"message": "{{name}} will be removed from your supplier list."
}
+ },
+ "stock_receipts": {
+ "title": "Deliveries",
+ "receive_title": "Receive a delivery",
+ "empty": "No deliveries yet",
+ "columns": {
+ "accepted": "Accepted",
+ "rejected": "Rejected",
+ "reason": "Reason",
+ "received_so_far": "Received so far"
+ },
+ "fields": {
+ "reference": "Delivery note",
+ "reference_placeholder": "Packing slip or delivery note number",
+ "received_at": "Received on",
+ "received_at_placeholder": "Now",
+ "notes": "Notes"
+ },
+ "delivery_total": "{{accepted}} accepted, {{rejected}} rejected in this delivery",
+ "rejected_so_far": "({{count}} rejected)",
+ "summary": "{{accepted}} accepted · {{rejected}} rejected",
+ "reason_placeholder": "Why refused",
+ "rejection_reasons": {
+ "damaged": "Damaged",
+ "wrong_item": "Wrong item",
+ "expired": "Expired",
+ "other": "Other"
+ },
+ "actions": {
+ "receive": "Receive"
+ },
+ "close_short": {
+ "reason_label": "Reason",
+ "reason_placeholder": "What happened to the rest",
+ "confirm": "Close short"
+ },
+ "load_failed": "The deliveries could not be loaded."
}
}
}
diff --git a/packages/dashboard/src/locales/fr.json b/packages/dashboard/src/locales/fr.json
index 5062e9b4c7..088315388e 100644
--- a/packages/dashboard/src/locales/fr.json
+++ b/packages/dashboard/src/locales/fr.json
@@ -5053,7 +5053,8 @@
"quantity_shipped": "Expédiées",
"quantity_to_ship": "À expédier",
"quantity_received": "Reçues",
- "discrepancy": "Écart"
+ "quantity_rejected": "Refusé",
+ "quantity_over": "En excès"
},
"direction": {
"external_receive": "Réception externe",
@@ -5070,7 +5071,9 @@
"failed_to_receive": "Échec de la réception du transfert",
"failed_to_cancel": "Échec de l'annulation du transfert",
"not_editable": "Ce transfert est emballé : son contenu fait désormais foi. Annulez-le s'il ne doit pas partir.",
- "failed_to_load": "Ce transfert n'a pas pu être chargé."
+ "failed_to_load": "Ce transfert n'a pas pu être chargé.",
+ "failed_to_mark_draft": "Impossible de repasser en brouillon",
+ "failed_to_close": "Impossible de clôturer en l'état"
},
"messages": {
"deleted": "Transfert supprimé",
@@ -5080,7 +5083,9 @@
"marked_ready": "Le transfert est prêt à expédier",
"marked_in_transit": "Transfert en transit — les unités ont quitté l'entrepôt d'origine",
"received": "Transfert réceptionné",
- "canceled": "Transfert annulé"
+ "canceled": "Transfert annulé",
+ "marked_draft": "De retour en brouillon",
+ "closed": "Clôturé en l'état — ce qui est arrivé reste, le reste est passé en perte"
},
"table": {
"empty": "Aucun transfert de stock pour le moment",
@@ -5095,20 +5100,14 @@
"receive_title": "Réception",
"history_title": "Mouvements de stock de ce transfert",
"units_summary": "{{received}} reçues sur {{shipped}} expédiées",
- "receive_running_total": "{{counted}} comptées sur {{shipped}} expédiées",
- "discrepancy_placeholder": "Pourquoi il en manque",
"statuses": {
"draft": "Brouillon",
"ready_to_ship": "Prêt à expédier",
"in_transit": "En transit",
"partially_received": "Partiellement reçu",
"received": "Reçu",
- "canceled": "Annulé"
- },
- "discrepancy_reasons": {
- "damaged_in_transit": "Endommagé en transit",
- "lost_in_transit": "Perdu en transit",
- "undercount": "Mal compté au départ"
+ "canceled": "Annulé",
+ "over_received": "Reçu en excès"
},
"in_transit_resolutions": {
"restock": "Remettre les unités à l'entrepôt d'origine",
@@ -5126,14 +5125,18 @@
"shipped_at": "Expédié",
"received_at": "Reçu",
"in_transit_resolution": "Les unités sont déjà parties. Que leur est-il arrivé ?",
- "source_locked": "Figé tant qu'il y a des lignes : elles ont été choisies pour cet entrepôt. Retirez-les pour le changer."
+ "source_locked": "Figé tant qu'il y a des lignes : elles ont été choisies pour cet entrepôt. Retirez-les pour le changer.",
+ "closed_short": "Clôturé en l'état",
+ "close_reason": "Motif"
},
"actions": {
"create_draft": "Créer le brouillon",
"mark_ready": "Marquer prêt à expédier",
"mark_in_transit": "Marquer en transit",
"receive": "Réceptionner",
- "cancel_transfer": "Annuler le transfert"
+ "cancel_transfer": "Annuler le transfert",
+ "mark_draft": "Repasser en brouillon",
+ "close_short": "Clôturer en l'état"
},
"delete_confirm": {
"title": "Supprimer ce transfert ?",
@@ -5150,7 +5153,11 @@
"in_flight_restock": "Les unités retourneront dans l'entrepôt d'origine, comme si le transfert n'avait jamais été expédié.",
"in_flight_write_off": "Les unités restent sorties du stock, en perte. Rien n'est réintégré."
},
- "edit_title": "Modifier le transfert {{number}}"
+ "edit_title": "Modifier le transfert {{number}}",
+ "close_confirm": {
+ "title": "Clôturer ce transfert en l'état ?",
+ "message": "Ce que la destination a compté reste. Les {{outstanding}} unités encore en route sont passées en perte et le transfert est marqué reçu."
+ }
},
"store": {
"load_failed_title": "Échec du chargement des paramètres de la boutique",
@@ -5475,7 +5482,6 @@
"receive_title": "Réception",
"history_title": "Mouvements de stock de ce bon de commande",
"units_summary": "{{received}} reçues sur {{ordered}} commandées",
- "receive_running_total": "{{counted}} comptées sur {{ordered}} commandées",
"table": {
"empty": "Aucun bon de commande",
"search_placeholder": "Rechercher par numéro ou référence…"
@@ -5488,14 +5494,20 @@
"expected": "Attendu",
"quantity_ordered": "Commandées",
"quantity_received": "Reçues",
- "line_total": "Total ligne"
+ "line_total": "Total ligne",
+ "quantity_rejected": "Refusé",
+ "quantity_over": "En excès",
+ "cancel_by": "Annuler après le",
+ "overdue": "En retard",
+ "past_cancel_by": "Date d'annulation dépassée"
},
"statuses": {
"draft": "Brouillon",
"ordered": "Commandé",
"partially_received": "Partiellement reçu",
"received": "Reçu",
- "canceled": "Annulé"
+ "canceled": "Annulé",
+ "over_received": "Reçu en excès"
},
"fields": {
"supplier": "Fournisseur",
@@ -5512,13 +5524,19 @@
"subtotal": "Total",
"ordered_at": "Commandé",
"received_at": "Reçu",
- "currency_locked": "Figée après l'ouverture : chaque ligne est chiffrée dans cette devise."
+ "currency_locked": "Figée après l'ouverture : chaque ligne est chiffrée dans cette devise.",
+ "closed_short": "Clôturé en l'état",
+ "close_reason": "Motif",
+ "cancel_by": "Annuler après le",
+ "cancel_by_placeholder": "Le jour à partir duquel la marchandise n'est plus souhaitée"
},
"actions": {
"create_draft": "Créer le brouillon",
"mark_ordered": "Marquer comme commandé",
"receive": "Réceptionner",
- "cancel_order": "Annuler la commande"
+ "cancel_order": "Annuler la commande",
+ "mark_draft": "Repasser en brouillon",
+ "close_short": "Clôturer en l'état"
},
"messages": {
"created": "Bon de commande créé",
@@ -5526,7 +5544,9 @@
"deleted": "Bon de commande supprimé",
"ordered": "Commande passée",
"received": "Livraison enregistrée",
- "canceled": "Bon de commande annulé"
+ "canceled": "Bon de commande annulé",
+ "marked_draft": "De retour en brouillon",
+ "closed": "Clôturé en l'état — ce qui est arrivé reste, le reste est passé en perte"
},
"errors": {
"failed_to_create": "Échec de la création du bon de commande",
@@ -5536,7 +5556,9 @@
"failed_to_receive": "Échec de l'enregistrement de la livraison",
"failed_to_cancel": "Échec de l'annulation du bon de commande",
"not_editable": "Ce bon est parti chez le fournisseur : ses lignes engagent les deux parties. Annulez-le s'il ne doit pas être maintenu.",
- "failed_to_load": "Ce bon de commande n'a pas pu être chargé."
+ "failed_to_load": "Ce bon de commande n'a pas pu être chargé.",
+ "failed_to_mark_draft": "Impossible de repasser en brouillon",
+ "failed_to_close": "Impossible de clôturer en l'état"
},
"delete_confirm": {
"title": "Supprimer ce bon de commande ?",
@@ -5550,7 +5572,17 @@
"title": "Annuler ce bon de commande ?",
"message": "Ce qui reste dû est annulé. Les unités déjà reçues restent en stock."
},
- "edit_title": "Modifier le bon de commande {{number}}"
+ "edit_title": "Modifier le bon de commande {{number}}",
+ "close_confirm": {
+ "title": "Clôturer ce bon de commande en l'état ?",
+ "message": "Ce qui est arrivé reste en stock. Les {{outstanding}} unités encore dues sont passées en perte et la commande est marquée reçue."
+ },
+ "filters": {
+ "overdue": "En retard",
+ "not_overdue": "Dans les temps",
+ "past_cancel_by": "Date d'annulation dépassée",
+ "not_past_cancel_by": "Avant la date d'annulation"
+ }
},
"suppliers": {
"title": "Fournisseurs",
@@ -5593,6 +5625,43 @@
"title": "Supprimer ce fournisseur ?",
"message": "{{name}} sera retiré de votre liste de fournisseurs."
}
+ },
+ "stock_receipts": {
+ "title": "Livraisons",
+ "receive_title": "Réceptionner une livraison",
+ "empty": "Aucune livraison pour le moment",
+ "columns": {
+ "accepted": "Accepté",
+ "rejected": "Refusé",
+ "reason": "Motif",
+ "received_so_far": "Reçu à ce jour"
+ },
+ "fields": {
+ "reference": "Bon de livraison",
+ "reference_placeholder": "Numéro de bon de livraison ou de colisage",
+ "received_at": "Reçu le",
+ "received_at_placeholder": "Maintenant",
+ "notes": "Notes"
+ },
+ "delivery_total": "{{accepted}} accepté(s), {{rejected}} refusé(s) dans cette livraison",
+ "rejected_so_far": "({{count}} refusé(s))",
+ "summary": "{{accepted}} accepté(s) · {{rejected}} refusé(s)",
+ "reason_placeholder": "Motif du refus",
+ "rejection_reasons": {
+ "damaged": "Endommagé",
+ "wrong_item": "Mauvais article",
+ "expired": "Périmé",
+ "other": "Autre"
+ },
+ "actions": {
+ "receive": "Réceptionner"
+ },
+ "close_short": {
+ "reason_label": "Motif",
+ "reason_placeholder": "Ce qu'il est advenu du reste",
+ "confirm": "Clôturer en l'état"
+ },
+ "load_failed": "Les livraisons n'ont pas pu être chargées."
}
}
}
diff --git a/packages/dashboard/src/locales/pl.json b/packages/dashboard/src/locales/pl.json
index cd03419817..8dcdda9736 100644
--- a/packages/dashboard/src/locales/pl.json
+++ b/packages/dashboard/src/locales/pl.json
@@ -5111,7 +5111,8 @@
"quantity_shipped": "Wysłano",
"quantity_to_ship": "Do wysłania",
"quantity_received": "Przyjęto",
- "discrepancy": "Rozbieżność"
+ "quantity_rejected": "Odrzucone",
+ "quantity_over": "Nadwyżka"
},
"direction": {
"external_receive": "Przyjęcie zewnętrzne",
@@ -5128,7 +5129,9 @@
"failed_to_receive": "Nie udało się przyjąć przesunięcia",
"failed_to_cancel": "Nie udało się anulować przesunięcia",
"not_editable": "Ten transfer jest zapakowany, więc jego zawartość jest już zapisem. Anuluj go, jeśli nie ma jechać.",
- "failed_to_load": "Nie udało się wczytać tego transferu."
+ "failed_to_load": "Nie udało się wczytać tego transferu.",
+ "failed_to_mark_draft": "Nie udało się cofnąć do wersji roboczej",
+ "failed_to_close": "Nie udało się zamknąć z brakami"
},
"messages": {
"deleted": "Przesunięcie usunięte",
@@ -5138,7 +5141,9 @@
"marked_ready": "Przesunięcie gotowe do wysyłki",
"marked_in_transit": "Przesunięcie w drodze — jednostki opuściły magazyn źródłowy",
"received": "Przesunięcie przyjęte",
- "canceled": "Przesunięcie anulowane"
+ "canceled": "Przesunięcie anulowane",
+ "marked_draft": "Znów w wersji roboczej",
+ "closed": "Zamknięto z brakami — to, co dotarło, zostaje, reszta jest spisana"
},
"table": {
"empty": "Brak transferów magazynowych",
@@ -5153,20 +5158,14 @@
"receive_title": "Przyjęcie",
"history_title": "Ruchy magazynowe tego transferu",
"units_summary": "przyjęto {{received}} z {{shipped}} wysłanych",
- "receive_running_total": "policzono {{counted}} z {{shipped}} wysłanych",
- "discrepancy_placeholder": "Dlaczego dotarło mniej",
"statuses": {
"draft": "Szkic",
"ready_to_ship": "Gotowe do wysyłki",
"in_transit": "W drodze",
"partially_received": "Częściowo przyjęte",
"received": "Przyjęte",
- "canceled": "Anulowane"
- },
- "discrepancy_reasons": {
- "damaged_in_transit": "Uszkodzone w transporcie",
- "lost_in_transit": "Zagubione w transporcie",
- "undercount": "Błędnie policzone przy wysyłce"
+ "canceled": "Anulowane",
+ "over_received": "Otrzymano więcej"
},
"in_transit_resolutions": {
"restock": "Zwróć jednostki do magazynu źródłowego",
@@ -5184,14 +5183,18 @@
"shipped_at": "Wysłano",
"received_at": "Przyjęto",
"in_transit_resolution": "Jednostki już wyjechały. Co się z nimi stało?",
- "source_locked": "Zablokowany, dopóki są pozycje: wybrano je dla tego magazynu. Usuń je, aby zmienić."
+ "source_locked": "Zablokowany, dopóki są pozycje: wybrano je dla tego magazynu. Usuń je, aby zmienić.",
+ "closed_short": "Zamknięto z brakami",
+ "close_reason": "Powód"
},
"actions": {
"create_draft": "Utwórz szkic",
"mark_ready": "Oznacz jako gotowe do wysyłki",
"mark_in_transit": "Oznacz jako w drodze",
"receive": "Przyjmij",
- "cancel_transfer": "Anuluj przesunięcie"
+ "cancel_transfer": "Anuluj przesunięcie",
+ "mark_draft": "Wróć do wersji roboczej",
+ "close_short": "Zamknij z brakami"
},
"delete_confirm": {
"title": "Usunąć to przesunięcie?",
@@ -5210,7 +5213,11 @@
"in_flight_restock": "Jednostki wrócą na półkę magazynu źródłowego, tak jakby przesunięcie nigdy nie wyjechało.",
"in_flight_write_off": "Jednostki pozostaną odpisane jako strata. Nic nie zostanie nigdzie dodane."
},
- "edit_title": "Edytuj transfer {{number}}"
+ "edit_title": "Edytuj transfer {{number}}",
+ "close_confirm": {
+ "title": "Zamknąć ten transfer z brakami?",
+ "message": "To, co policzył magazyn docelowy, zostaje. Brakujące {{outstanding}} szt. w drodze zostaną spisane jako utracone, a transfer oznaczony jako otrzymany."
+ }
},
"store": {
"load_failed_title": "Nie udało się załadować ustawień sklepu",
@@ -5537,7 +5544,6 @@
"receive_title": "Przyjęcie",
"history_title": "Ruchy magazynowe tego zamówienia",
"units_summary": "przyjęto {{received}} z {{ordered}} zamówionych",
- "receive_running_total": "policzono {{counted}} z {{ordered}} zamówionych",
"table": {
"empty": "Brak zamówień zakupu",
"search_placeholder": "Szukaj po numerze lub referencji…"
@@ -5550,14 +5556,20 @@
"expected": "Oczekiwane",
"quantity_ordered": "Zamówiono",
"quantity_received": "Przyjęto",
- "line_total": "Suma pozycji"
+ "line_total": "Suma pozycji",
+ "quantity_rejected": "Odrzucone",
+ "quantity_over": "Nadwyżka",
+ "cancel_by": "Anuluj po",
+ "overdue": "Opóźnione",
+ "past_cancel_by": "Po terminie anulowania"
},
"statuses": {
"draft": "Szkic",
"ordered": "Zamówione",
"partially_received": "Częściowo przyjęte",
"received": "Przyjęte",
- "canceled": "Anulowane"
+ "canceled": "Anulowane",
+ "over_received": "Otrzymano więcej"
},
"fields": {
"supplier": "Dostawca",
@@ -5574,13 +5586,19 @@
"subtotal": "Razem",
"ordered_at": "Zamówiono",
"received_at": "Przyjęto",
- "currency_locked": "Zablokowana po utworzeniu: każda pozycja jest w niej wyceniona."
+ "currency_locked": "Zablokowana po utworzeniu: każda pozycja jest w niej wyceniona.",
+ "closed_short": "Zamknięto z brakami",
+ "close_reason": "Powód",
+ "cancel_by": "Anuluj po",
+ "cancel_by_placeholder": "Dzień, po którym towar nie jest już potrzebny"
},
"actions": {
"create_draft": "Utwórz szkic",
"mark_ordered": "Oznacz jako zamówione",
"receive": "Przyjmij",
- "cancel_order": "Anuluj zamówienie"
+ "cancel_order": "Anuluj zamówienie",
+ "mark_draft": "Wróć do wersji roboczej",
+ "close_short": "Zamknij z brakami"
},
"messages": {
"created": "Zamówienie zakupu utworzone",
@@ -5588,7 +5606,9 @@
"deleted": "Zamówienie zakupu usunięte",
"ordered": "Zamówienie złożone",
"received": "Dostawa zaksięgowana",
- "canceled": "Zamówienie zakupu anulowane"
+ "canceled": "Zamówienie zakupu anulowane",
+ "marked_draft": "Znów w wersji roboczej",
+ "closed": "Zamknięto z brakami — to, co dotarło, zostaje, reszta jest spisana"
},
"errors": {
"failed_to_create": "Nie udało się utworzyć zamówienia zakupu",
@@ -5598,7 +5618,9 @@
"failed_to_receive": "Nie udało się zaksięgować dostawy",
"failed_to_cancel": "Nie udało się anulować zamówienia zakupu",
"not_editable": "To zamówienie trafiło do dostawcy, więc jego pozycje wiążą obie strony. Anuluj je, jeśli nie ma obowiązywać.",
- "failed_to_load": "Nie udało się wczytać tego zamówienia."
+ "failed_to_load": "Nie udało się wczytać tego zamówienia.",
+ "failed_to_mark_draft": "Nie udało się cofnąć do wersji roboczej",
+ "failed_to_close": "Nie udało się zamknąć z brakami"
},
"delete_confirm": {
"title": "Usunąć to zamówienie zakupu?",
@@ -5612,7 +5634,17 @@
"title": "Anulować to zamówienie zakupu?",
"message": "To, co pozostało niedostarczone, zostanie odwołane. Przyjęte jednostki zostają w magazynie."
},
- "edit_title": "Edytuj zamówienie {{number}}"
+ "edit_title": "Edytuj zamówienie {{number}}",
+ "close_confirm": {
+ "title": "Zamknąć to zamówienie z brakami?",
+ "message": "To, co dotarło, zostaje na półce. Brakujące {{outstanding}} szt. zostaną spisane, a zamówienie oznaczone jako otrzymane."
+ },
+ "filters": {
+ "overdue": "Opóźnione",
+ "not_overdue": "Na czas",
+ "past_cancel_by": "Po terminie anulowania",
+ "not_past_cancel_by": "Przed terminem anulowania"
+ }
},
"suppliers": {
"title": "Dostawcy",
@@ -5655,6 +5687,43 @@
"title": "Usunąć tego dostawcę?",
"message": "{{name}} zostanie usunięty z listy dostawców."
}
+ },
+ "stock_receipts": {
+ "title": "Dostawy",
+ "receive_title": "Przyjmij dostawę",
+ "empty": "Brak dostaw",
+ "columns": {
+ "accepted": "Przyjęte",
+ "rejected": "Odrzucone",
+ "reason": "Powód",
+ "received_so_far": "Dotychczas otrzymane"
+ },
+ "fields": {
+ "reference": "Dokument dostawy",
+ "reference_placeholder": "Numer listu przewozowego lub WZ",
+ "received_at": "Otrzymano",
+ "received_at_placeholder": "Teraz",
+ "notes": "Uwagi"
+ },
+ "delivery_total": "{{accepted}} przyjęto, {{rejected}} odrzucono w tej dostawie",
+ "rejected_so_far": "({{count}} odrzucono)",
+ "summary": "{{accepted}} przyjęto · {{rejected}} odrzucono",
+ "reason_placeholder": "Powód odrzucenia",
+ "rejection_reasons": {
+ "damaged": "Uszkodzone",
+ "wrong_item": "Zły towar",
+ "expired": "Przeterminowane",
+ "other": "Inne"
+ },
+ "actions": {
+ "receive": "Przyjmij"
+ },
+ "close_short": {
+ "reason_label": "Powód",
+ "reason_placeholder": "Co się stało z resztą",
+ "confirm": "Zamknij z brakami"
+ },
+ "load_failed": "Nie udało się wczytać dostaw."
}
}
}
diff --git a/packages/dashboard/src/locales/zh-CN.json b/packages/dashboard/src/locales/zh-CN.json
index ce5859b373..e28e5b231f 100644
--- a/packages/dashboard/src/locales/zh-CN.json
+++ b/packages/dashboard/src/locales/zh-CN.json
@@ -5044,7 +5044,8 @@
"quantity_shipped": "已发出",
"quantity_to_ship": "待发出",
"quantity_received": "已收到",
- "discrepancy": "差异"
+ "quantity_rejected": "拒收",
+ "quantity_over": "超量"
},
"direction": {
"external_receive": "外部收货",
@@ -5061,7 +5062,9 @@
"failed_to_receive": "调拨收货失败",
"failed_to_cancel": "取消调拨失败",
"not_editable": "该调拨已打包,内容已成为记录。如果不该发出,请取消它。",
- "failed_to_load": "无法加载该调拨。"
+ "failed_to_load": "无法加载该调拨。",
+ "failed_to_mark_draft": "无法退回草稿",
+ "failed_to_close": "无法短缺结单"
},
"messages": {
"deleted": "调拨已删除",
@@ -5071,7 +5074,9 @@
"marked_ready": "调拨已待发出",
"marked_in_transit": "调拨已在途 — 货物已离开来源仓库",
"received": "调拨已收货",
- "canceled": "调拨已取消"
+ "canceled": "调拨已取消",
+ "marked_draft": "已退回草稿",
+ "closed": "已短缺结单——已到货部分保留,其余核销"
},
"table": {
"empty": "暂无库存调拨",
@@ -5086,20 +5091,14 @@
"receive_title": "收货",
"history_title": "此调拨的库存变动",
"units_summary": "已发出 {{shipped}} 件,已收到 {{received}} 件",
- "receive_running_total": "已发出 {{shipped}} 件,已清点 {{counted}} 件",
- "discrepancy_placeholder": "为何到货变少",
"statuses": {
"draft": "草稿",
"ready_to_ship": "待发出",
"in_transit": "在途",
"partially_received": "部分收货",
"received": "已收货",
- "canceled": "已取消"
- },
- "discrepancy_reasons": {
- "damaged_in_transit": "运输中损坏",
- "lost_in_transit": "运输中丢失",
- "undercount": "发货时清点有误"
+ "canceled": "已取消",
+ "over_received": "超量收货"
},
"in_transit_resolutions": {
"restock": "将数量退回来源仓库",
@@ -5117,14 +5116,18 @@
"shipped_at": "发出时间",
"received_at": "收货时间",
"in_transit_resolution": "货物已经离库。它们怎么了?",
- "source_locked": "有商品行时不可更改:这些商品是为该仓库挑选的。移除后才能更改。"
+ "source_locked": "有商品行时不可更改:这些商品是为该仓库挑选的。移除后才能更改。",
+ "closed_short": "短缺结单",
+ "close_reason": "原因"
},
"actions": {
"create_draft": "创建草稿",
"mark_ready": "标记为待发出",
"mark_in_transit": "标记为在途",
"receive": "收货",
- "cancel_transfer": "取消调拨"
+ "cancel_transfer": "取消调拨",
+ "mark_draft": "退回草稿",
+ "close_short": "短缺结单"
},
"delete_confirm": {
"title": "删除此调拨?",
@@ -5140,7 +5143,11 @@
"in_flight_restock": "数量将回到来源仓库的货架,如同从未发出。",
"in_flight_write_off": "数量保持核销为丢失,任何仓库都不会补回。"
},
- "edit_title": "编辑调拨 {{number}}"
+ "edit_title": "编辑调拨 {{number}}",
+ "close_confirm": {
+ "title": "将此调拨短缺结单?",
+ "message": "目的地已清点的部分保留。仍在途的 {{outstanding}} 件将按丢失核销,调拨标记为已收货。"
+ }
},
"store": {
"load_failed_title": "加载店铺设置失败",
@@ -5464,7 +5471,6 @@
"receive_title": "收货",
"history_title": "此采购订单的库存变动",
"units_summary": "已订购 {{ordered}} 件,已收到 {{received}} 件",
- "receive_running_total": "已订购 {{ordered}} 件,已清点 {{counted}} 件",
"table": {
"empty": "暂无采购订单",
"search_placeholder": "按编号或参考号搜索…"
@@ -5477,14 +5483,20 @@
"expected": "预计到货",
"quantity_ordered": "已订购",
"quantity_received": "已收到",
- "line_total": "行合计"
+ "line_total": "行合计",
+ "quantity_rejected": "拒收",
+ "quantity_over": "超量",
+ "cancel_by": "取消截止日",
+ "overdue": "逾期",
+ "past_cancel_by": "已过取消截止日"
},
"statuses": {
"draft": "草稿",
"ordered": "已下单",
"partially_received": "部分收货",
"received": "已收货",
- "canceled": "已取消"
+ "canceled": "已取消",
+ "over_received": "超量收货"
},
"fields": {
"supplier": "供应商",
@@ -5501,13 +5513,19 @@
"subtotal": "合计",
"ordered_at": "下单时间",
"received_at": "收货时间",
- "currency_locked": "创建后固定:每一行的成本都以该货币计价。"
+ "currency_locked": "创建后固定:每一行的成本都以该货币计价。",
+ "closed_short": "短缺结单",
+ "close_reason": "原因",
+ "cancel_by": "取消截止日",
+ "cancel_by_placeholder": "此日之后不再需要该货物"
},
"actions": {
"create_draft": "创建草稿",
"mark_ordered": "标记为已下单",
"receive": "收货",
- "cancel_order": "取消订单"
+ "cancel_order": "取消订单",
+ "mark_draft": "退回草稿",
+ "close_short": "短缺结单"
},
"messages": {
"created": "采购订单已创建",
@@ -5515,7 +5533,9 @@
"deleted": "采购订单已删除",
"ordered": "采购订单已下单",
"received": "到货已入库",
- "canceled": "采购订单已取消"
+ "canceled": "采购订单已取消",
+ "marked_draft": "已退回草稿",
+ "closed": "已短缺结单——已到货部分保留,其余核销"
},
"errors": {
"failed_to_create": "创建采购订单失败",
@@ -5525,7 +5545,9 @@
"failed_to_receive": "到货入库失败",
"failed_to_cancel": "取消采购订单失败",
"not_editable": "该订单已发给供应商,其商品行是两家企业之间的约定。如果不该继续,请取消它。",
- "failed_to_load": "无法加载该采购订单。"
+ "failed_to_load": "无法加载该采购订单。",
+ "failed_to_mark_draft": "无法退回草稿",
+ "failed_to_close": "无法短缺结单"
},
"delete_confirm": {
"title": "删除此采购订单?",
@@ -5539,7 +5561,17 @@
"title": "取消此采购订单?",
"message": "尚未到货的部分将被取消。已收到的数量仍留在库存中。"
},
- "edit_title": "编辑采购订单 {{number}}"
+ "edit_title": "编辑采购订单 {{number}}",
+ "close_confirm": {
+ "title": "将此采购订单短缺结单?",
+ "message": "已到货部分保留在库。仍欠的 {{outstanding}} 件将被核销,订单标记为已收货。"
+ },
+ "filters": {
+ "overdue": "逾期",
+ "not_overdue": "准时",
+ "past_cancel_by": "已过取消截止日",
+ "not_past_cancel_by": "未过取消截止日"
+ }
},
"suppliers": {
"title": "供应商",
@@ -5582,6 +5614,43 @@
"title": "删除此供应商?",
"message": "{{name}} 将从您的供应商列表中移除。"
}
+ },
+ "stock_receipts": {
+ "title": "到货记录",
+ "receive_title": "收货",
+ "empty": "暂无到货记录",
+ "columns": {
+ "accepted": "接收",
+ "rejected": "拒收",
+ "reason": "原因",
+ "received_so_far": "累计已收"
+ },
+ "fields": {
+ "reference": "送货单",
+ "reference_placeholder": "送货单或装箱单号",
+ "received_at": "收货时间",
+ "received_at_placeholder": "现在",
+ "notes": "备注"
+ },
+ "delivery_total": "本次到货:接收 {{accepted}},拒收 {{rejected}}",
+ "rejected_so_far": "(拒收 {{count}})",
+ "summary": "接收 {{accepted}} · 拒收 {{rejected}}",
+ "reason_placeholder": "拒收原因",
+ "rejection_reasons": {
+ "damaged": "损坏",
+ "wrong_item": "货品错误",
+ "expired": "已过期",
+ "other": "其他"
+ },
+ "actions": {
+ "receive": "收货"
+ },
+ "close_short": {
+ "reason_label": "原因",
+ "reason_placeholder": "其余货物的情况",
+ "confirm": "短缺结单"
+ },
+ "load_failed": "无法加载到货记录。"
}
}
}
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/$purchaseOrderId/edit.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/$purchaseOrderId/edit.tsx
index 804608956a..67b5cc483e 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/$purchaseOrderId/edit.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/$purchaseOrderId/edit.tsx
@@ -56,6 +56,7 @@ function EditPurchaseOrderPage() {
// Cleared rather than omitted: an emptied field has to survive the
// round trip, and omitting it would leave the old value in place.
expected_at: values.expectedAt ?? null,
+ cancel_by: values.cancelBy ?? null,
reference: values.reference.trim() || null,
notes: values.notes.trim() || null,
items: values.lines.map((line) => ({
@@ -79,6 +80,7 @@ function EditPurchaseOrderPage() {
destinationId: purchaseOrder.destination_location_id ?? '',
currency: purchaseOrder.currency,
expectedAt: purchaseOrder.expected_at ?? undefined,
+ cancelBy: purchaseOrder.cancel_by ?? undefined,
reference: purchaseOrder.reference ?? '',
notes: purchaseOrder.notes ?? '',
// The saved lines carry the same facts a search result does, under
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/$purchaseOrderId/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/$purchaseOrderId/index.tsx
index 15033478aa..550d6823f6 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/$purchaseOrderId/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/$purchaseOrderId/index.tsx
@@ -1,5 +1,12 @@
import type { PurchaseOrder, PurchaseOrderItem } from '@spree/admin-sdk'
-import { adminClient, Can, PageHeader, Subject, useStore } from '@spree/dashboard-core'
+import {
+ adminClient,
+ Can,
+ PageHeader,
+ Subject,
+ useResourceKey,
+ useStore,
+} from '@spree/dashboard-core'
import {
Button,
Card,
@@ -18,21 +25,31 @@ import {
TableRow,
useConfirm,
} from '@spree/dashboard-ui'
-import { PencilIcon, Trash2Icon, XCircleIcon } from '@spree/dashboard-ui/icons'
+import {
+ PackageCheckIcon,
+ PencilIcon,
+ Trash2Icon,
+ Undo2Icon,
+ XCircleIcon,
+} from '@spree/dashboard-ui/icons'
import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
+import { CloseShortDialog } from '../../../../../components/spree/close-short-dialog'
import { InventoryStatusBadge } from '../../../../../components/spree/inventory-status-badge'
-import { QuantityCell, QuantityHead } from '../../../../../components/spree/quantity-cell'
+import { ReceiveDeliveryCard } from '../../../../../components/spree/receive-delivery-card'
import { ResourceDetailSkeleton } from '../../../../../components/spree/route-pending'
import { StockHistoryCard } from '../../../../../components/spree/stock-history-card'
+import { StockReceiptsCard } from '../../../../../components/spree/stock-receipts-card'
import { VariantLink } from '../../../../../components/spree/variant-link'
import {
useCancelPurchaseOrder,
+ useClosePurchaseOrder,
+ useCreatePurchaseOrderReceipt,
useDeletePurchaseOrder,
+ useMarkPurchaseOrderDraft,
useMarkPurchaseOrderOrdered,
usePurchaseOrder,
- useReceivePurchaseOrder,
} from '../../../../../hooks/use-purchase-orders'
import { spreeJsonLinkResolver } from '../../../../../lib/json-link-resolver'
import { isClosed } from '../../../../../schemas/inventory-operations'
@@ -67,7 +84,12 @@ function PurchaseOrderDetailPage() {
header={<PurchaseOrderHeader purchaseOrder={purchaseOrder} />}
main={
<>
+ {(purchaseOrder.status === 'ordered' ||
+ purchaseOrder.status === 'partially_received') && (
+ <ReceiveCard purchaseOrder={purchaseOrder} />
+ )}
<ItemsCard purchaseOrder={purchaseOrder} />
+ <ReceiptsCard purchaseOrder={purchaseOrder} />
<StockHistoryCard
purchaseOrderId={purchaseOrder.id}
title={t('admin.purchase_orders.history_title')}
@@ -138,6 +160,15 @@ function SummaryCard({ purchaseOrder }: { purchaseOrder: PurchaseOrder }) {
<dt className="text-muted-foreground">{t('admin.purchase_orders.fields.expected_at')}</dt>
<dd>{purchaseOrder.expected_at ?? '—'}</dd>
+ {purchaseOrder.cancel_by && (
+ <>
+ <dt className="text-muted-foreground">
+ {t('admin.purchase_orders.fields.cancel_by')}
+ </dt>
+ <dd>{purchaseOrder.cancel_by}</dd>
+ </>
+ )}
+
{purchaseOrder.reference && (
<>
<dt className="text-muted-foreground">
@@ -163,51 +194,86 @@ function SummaryCard({ purchaseOrder }: { purchaseOrder: PurchaseOrder }) {
<dd>
{purchaseOrder.received_at ? <RelativeTime iso={purchaseOrder.received_at} /> : '—'}
</dd>
+
+ {purchaseOrder.closed_short && (
+ <>
+ <dt className="text-muted-foreground">
+ {t('admin.purchase_orders.fields.closed_short')}
+ </dt>
+ <dd>
+ <RelativeTime iso={purchaseOrder.closed_short_at as string} />
+ </dd>
+ {purchaseOrder.close_reason && (
+ <>
+ <dt className="text-muted-foreground">
+ {t('admin.purchase_orders.fields.close_reason')}
+ </dt>
+ <dd className="whitespace-pre-line">{purchaseOrder.close_reason}</dd>
+ </>
+ )}
+ </>
+ )}
</dl>
</CardContent>
</Card>
)
}
+/** What a delivery is counted against, in the receive card's vocabulary. */
+function receivableLines(purchaseOrder: PurchaseOrder) {
+ return (purchaseOrder.items ?? []).map((item) => ({
+ id: item.id,
+ product_id: item.product_id,
+ variant_name: item.variant_name,
+ variant_sku: item.variant_sku,
+ thumbnail_url: item.thumbnail_url,
+ quantity_expected: item.quantity_ordered,
+ quantity_received: item.quantity_received,
+ quantity_rejected: item.quantity_rejected,
+ outstanding: item.outstanding,
+ }))
+}
+
+function ReceiveCard({ purchaseOrder }: { purchaseOrder: PurchaseOrder }) {
+ const { t } = useTranslation()
+ const receive = useCreatePurchaseOrderReceipt(purchaseOrder.id)
+
+ return (
+ <ReceiveDeliveryCard
+ lines={receivableLines(purchaseOrder)}
+ expectedLabel={t('admin.purchase_orders.columns.quantity_ordered')}
+ subject={Subject.PurchaseOrder}
+ pending={receive.isPending}
+ onReceive={(params) => receive.mutateAsync(params)}
+ />
+ )
+}
+
+function ReceiptsCard({ purchaseOrder }: { purchaseOrder: PurchaseOrder }) {
+ const queryKey = useResourceKey('purchase-orders', purchaseOrder.id, 'stock-receipts')
+ return (
+ <StockReceiptsCard
+ queryKey={queryKey}
+ fetch={() =>
+ adminClient.purchaseOrders.stockReceipts.list(purchaseOrder.id, { expand: ['items'] })
+ }
+ />
+ )
+}
+
/**
- * The lines, and — once the order has been placed — the receive screen.
- *
- * `quantity_received` is the running total for the line, so a second delivery
- * tops it up rather than starting over — and the inputs show what has actually
- * arrived, not what was ordered.
+ * The lines as they stand: what was ordered, what each delivery has brought
+ * and refused so far, and what the merchant agreed to pay.
*/
function ItemsCard({ purchaseOrder }: { purchaseOrder: PurchaseOrder }) {
const { t } = useTranslation()
const items = purchaseOrder.items ?? []
- const receiveMutation = useReceivePurchaseOrder(purchaseOrder.id)
- const receivable =
- purchaseOrder.status === 'ordered' || purchaseOrder.status === 'partially_received'
-
- const [counts, setCounts] = useState<Record<string, number>>(() =>
- Object.fromEntries(items.map((item) => [item.id, item.quantity_received])),
- )
-
- const totalCounted = items.reduce((sum, item) => sum + (counts[item.id] ?? 0), 0)
-
- async function handleReceive() {
- await receiveMutation
- .mutateAsync({
- items: items.map((item) => ({
- id: item.id,
- quantity_received: counts[item.id] ?? item.quantity_received,
- })),
- })
- .catch(() => undefined)
- }
+ const anyOver = items.some((item) => item.quantity_over > 0)
return (
<Card>
<CardHeader>
- <CardTitle>
- {receivable
- ? t('admin.purchase_orders.receive_title')
- : t('admin.purchase_orders.items_title')}
- </CardTitle>
+ <CardTitle>{t('admin.purchase_orders.items_title')}</CardTitle>
</CardHeader>
<CardContent className="flex flex-col p-0">
{items.length === 0 ? (
@@ -215,16 +281,24 @@ function ItemsCard({ purchaseOrder }: { purchaseOrder: PurchaseOrder }) {
{t('admin.purchase_orders.items_empty')}
</p>
) : (
- /* 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 scrollX roundedBottom={!receivable}>
+ <Table scrollX roundedBottom>
<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.purchase_orders.columns.quantity_received')}
+ </TableHead>
+ <TableHead className="text-right">
+ {t('admin.purchase_orders.columns.quantity_rejected')}
+ </TableHead>
+ {anyOver && (
+ <TableHead className="text-right">
+ {t('admin.purchase_orders.columns.quantity_over')}
+ </TableHead>
+ )}
<TableHead className="text-right">
{t('admin.inventory_lines.columns.unit_cost')}
</TableHead>
@@ -235,53 +309,17 @@ function ItemsCard({ purchaseOrder }: { purchaseOrder: PurchaseOrder }) {
</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 }))}
- />
+ <ItemRow key={item.id} item={item} showOver={anyOver} />
))}
</TableBody>
</Table>
)}
-
- {receivable && items.length > 0 && (
- <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,
- })}
- </p>
- <Can I="update" a={Subject.PurchaseOrder}>
- <Button type="button" onClick={handleReceive} disabled={receiveMutation.isPending}>
- {receiveMutation.isPending
- ? t('admin.actions.saving')
- : t('admin.purchase_orders.actions.receive')}
- </Button>
- </Can>
- </div>
- )}
</CardContent>
</Card>
)
}
-function ItemRow({
- item,
- receivable,
- count,
- onCount,
-}: {
- item: PurchaseOrderItem
- receivable: boolean
- count: number
- onCount: (value: number) => void
-}) {
- const { t } = useTranslation()
-
+function ItemRow({ item, showOver }: { item: PurchaseOrderItem; showOver: boolean }) {
return (
<TableRow>
<TableCell>
@@ -293,16 +331,9 @@ function ItemRow({
/>
</TableCell>
<TableCell className="text-right tabular-nums">{item.quantity_ordered}</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.quantity_received}</TableCell>
+ <TableCell className="text-right tabular-nums">{item.quantity_rejected}</TableCell>
+ {showOver && <TableCell className="text-right tabular-nums">{item.quantity_over}</TableCell>}
<TableCell className="text-right tabular-nums">{item.display_unit_cost}</TableCell>
<TableCell className="text-right tabular-nums">{item.display_total_cost}</TableCell>
</TableRow>
@@ -321,6 +352,9 @@ function PurchaseOrderHeader({ purchaseOrder }: { purchaseOrder: PurchaseOrder }
const markOrdered = useMarkPurchaseOrderOrdered(purchaseOrder.id)
const cancelOrder = useCancelPurchaseOrder(purchaseOrder.id)
const deleteOrder = useDeletePurchaseOrder()
+ const markDraft = useMarkPurchaseOrderDraft(purchaseOrder.id)
+ const closeOrder = useClosePurchaseOrder(purchaseOrder.id)
+ const [closeOpen, setCloseOpen] = useState(false)
const open = !isClosed(purchaseOrder.status)
@@ -370,77 +404,114 @@ function PurchaseOrderHeader({ purchaseOrder }: { purchaseOrder: PurchaseOrder }
}
return (
- <PageHeader
- title={purchaseOrder.number}
- backTo="purchase-orders"
- badges={<InventoryStatusBadge status={purchaseOrder.status} resource="purchase_orders" />}
- actions={
- open && (
- <Can I="update" a={Subject.PurchaseOrder}>
- {/* A draft is the only order whose lines are still a plan rather
+ <>
+ {closeOpen && (
+ <CloseShortDialog
+ title={t('admin.purchase_orders.close_confirm.title')}
+ description={t('admin.purchase_orders.close_confirm.message', {
+ outstanding:
+ purchaseOrder.quantity_ordered_total - purchaseOrder.quantity_received_total,
+ })}
+ pending={closeOrder.isPending}
+ onConfirm={(reason) => closeOrder.mutateAsync({ reason })}
+ onClose={() => setCloseOpen(false)}
+ />
+ )}
+ <PageHeader
+ title={purchaseOrder.number}
+ backTo="purchase-orders"
+ badges={<InventoryStatusBadge status={purchaseOrder.status} resource="purchase_orders" />}
+ actions={
+ open && (
+ <Can I="update" a={Subject.PurchaseOrder}>
+ {/* A draft is the only order whose lines are still a plan rather
than a commitment to a supplier, which `editable` reports. */}
- {purchaseOrder.editable && (
- <Button variant="outline" asChild>
- <Link
- to="/$storeId/purchase-orders/$purchaseOrderId/edit"
- params={{ storeId, purchaseOrderId: purchaseOrder.id }}
+ {purchaseOrder.editable && (
+ <Button variant="outline" asChild>
+ <Link
+ to="/$storeId/purchase-orders/$purchaseOrderId/edit"
+ params={{ storeId, purchaseOrderId: purchaseOrder.id }}
+ >
+ <PencilIcon className="size-4" />
+ {t('admin.actions.edit')}
+ </Link>
+ </Button>
+ )}
+ {purchaseOrder.status === 'draft' && (
+ <Button
+ type="button"
+ onClick={handleOrder}
+ disabled={markOrdered.isPending || (purchaseOrder.items_count ?? 0) === 0}
>
- <PencilIcon className="size-4" />
- {t('admin.actions.edit')}
- </Link>
- </Button>
- )}
- {purchaseOrder.status === 'draft' && (
- <Button
- type="button"
- onClick={handleOrder}
- disabled={markOrdered.isPending || (purchaseOrder.items_count ?? 0) === 0}
- >
- {t('admin.purchase_orders.actions.mark_ordered')}
- </Button>
- )}
- </Can>
- )
- }
- destructiveItems={
- open && (
- <>
- {/* A draft is not yet a commitment to anyone, so it can simply be
+ {t('admin.purchase_orders.actions.mark_ordered')}
+ </Button>
+ )}
+ {/* Only until something arrives: the server refuses it after the
+ first delivery, and so does the screen. */}
+ {purchaseOrder.status === 'ordered' && (
+ <Button
+ type="button"
+ variant="outline"
+ onClick={() => markDraft.mutateAsync().catch(() => undefined)}
+ disabled={markDraft.isPending}
+ >
+ <Undo2Icon className="size-4" />
+ {t('admin.purchase_orders.actions.mark_draft')}
+ </Button>
+ )}
+ </Can>
+ )
+ }
+ dropdownItems={
+ purchaseOrder.status === 'partially_received' && (
+ <Can I="update" a={Subject.PurchaseOrder}>
+ <DropdownMenuItem onClick={() => setCloseOpen(true)} disabled={closeOrder.isPending}>
+ <PackageCheckIcon className="size-4" />
+ {t('admin.purchase_orders.actions.close_short')}
+ </DropdownMenuItem>
+ </Can>
+ )
+ }
+ destructiveItems={
+ open && (
+ <>
+ {/* A draft is not yet a commitment to anyone, so it can simply be
thrown away — the same action the list offers. Once placed, the
order is a matter of record with the supplier and calling it
off is the only way out. */}
- {purchaseOrder.status === 'draft' && (
- <Can I="destroy" a={Subject.PurchaseOrder}>
+ {purchaseOrder.status === 'draft' && (
+ <Can I="destroy" a={Subject.PurchaseOrder}>
+ <DropdownMenuItem
+ variant="destructive"
+ onClick={handleDelete}
+ disabled={deleteOrder.isPending}
+ >
+ <Trash2Icon className="size-4" />
+ {t('admin.actions.delete')}
+ </DropdownMenuItem>
+ </Can>
+ )}
+ <Can I="update" a={Subject.PurchaseOrder}>
<DropdownMenuItem
variant="destructive"
- onClick={handleDelete}
- disabled={deleteOrder.isPending}
+ onClick={handleCancel}
+ disabled={cancelOrder.isPending}
>
- <Trash2Icon className="size-4" />
- {t('admin.actions.delete')}
+ <XCircleIcon className="size-4" />
+ {t('admin.purchase_orders.actions.cancel_order')}
</DropdownMenuItem>
</Can>
- )}
- <Can I="update" a={Subject.PurchaseOrder}>
- <DropdownMenuItem
- variant="destructive"
- onClick={handleCancel}
- disabled={cancelOrder.isPending}
- >
- <XCircleIcon className="size-4" />
- {t('admin.purchase_orders.actions.cancel_order')}
- </DropdownMenuItem>
- </Can>
- </>
- )
- }
- resource={{ id: purchaseOrder.id, number: purchaseOrder.number }}
- jsonPreview={{
- title: purchaseOrder.number,
- fetch: () => adminClient.purchaseOrders.get(purchaseOrder.id, { expand: ['items'] }),
- endpoint: `/api/v3/admin/purchase_orders/${purchaseOrder.id}`,
- resolveLink: spreeJsonLinkResolver(storeId),
- }}
- />
+ </>
+ )
+ }
+ resource={{ id: purchaseOrder.id, number: purchaseOrder.number }}
+ jsonPreview={{
+ title: purchaseOrder.number,
+ fetch: () => adminClient.purchaseOrders.get(purchaseOrder.id, { expand: ['items'] }),
+ endpoint: `/api/v3/admin/purchase_orders/${purchaseOrder.id}`,
+ resolveLink: spreeJsonLinkResolver(storeId),
+ }}
+ />
+ </>
)
}
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/index.tsx
index b3360e5b89..b9eac98b2b 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/index.tsx
@@ -2,6 +2,8 @@ import type { PurchaseOrder } from '@spree/admin-sdk'
import {
adminClient,
Can,
+ ExportButton,
+ ImportButton,
ResourceTable,
resourceSearchSchema,
Subject,
@@ -11,11 +13,20 @@ import { Button, RowActions, useConfirm, useRowClickBridge } from '@spree/dashbo
import { EyeIcon, PlusIcon } from '@spree/dashboard-ui/icons'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { useTranslation } from 'react-i18next'
+import { ImportWizardDialog } from '../../../../components/spree/imports/import-wizard-dialog'
+import {
+ importWizardSearchSchema,
+ useImportWizardSearch,
+} from '../../../../components/spree/imports/import-wizard-search'
import { useDeletePurchaseOrder } from '../../../../hooks/use-purchase-orders'
import '../../../../tables/purchase-orders'
+const purchaseOrdersSearchSchema = resourceSearchSchema.extend({
+ ...importWizardSearchSchema.shape,
+})
+
export const Route = createFileRoute('/_authenticated/$storeId/purchase-orders/')({
- validateSearch: resourceSearchSchema,
+ validateSearch: purchaseOrdersSearchSchema,
component: PurchaseOrdersPage,
})
@@ -27,6 +38,7 @@ function PurchaseOrdersPage() {
const confirm = useConfirm()
const deleteMutation = useDeletePurchaseOrder()
const { permissions } = usePermissions()
+ const wizard = useImportWizardSearch(search)
function openDetail(id: string) {
navigate({
@@ -53,42 +65,55 @@ function PurchaseOrdersPage() {
}
return (
- <ResourceTable<PurchaseOrder>
- tableKey="purchase-orders"
- queryKey="purchase-orders"
- queryFn={(params) => adminClient.purchaseOrders.list({ ...params, expand: ['supplier'] })}
- searchParams={search}
- rowActions={(purchaseOrder) => (
- <RowActions
- actions={[
- {
- key: 'view',
- label: t('admin.actions.view_details'),
- icon: <EyeIcon className="size-4" />,
- onSelect: () => openDetail(purchaseOrder.id),
- },
- {
- key: 'delete',
- destructive: true,
- // A placed order is a matter of record with the supplier; the
- // detail page cancels it instead.
- visible:
- purchaseOrder.status === 'draft' &&
- permissions.can('destroy', Subject.PurchaseOrder),
- disabled: deleteMutation.isPending,
- onSelect: () => handleDelete(purchaseOrder),
- },
- ]}
- />
- )}
- actions={
- <Can I="create" a={Subject.PurchaseOrder}>
- <Button size="sm" className="h-[2.125rem]" onClick={openCreate}>
- <PlusIcon className="size-4" />
- {t('admin.purchase_orders.new_cta')}
- </Button>
- </Can>
- }
- />
+ <>
+ <ResourceTable<PurchaseOrder>
+ tableKey="purchase-orders"
+ queryKey="purchase-orders"
+ queryFn={(params) => adminClient.purchaseOrders.list({ ...params, expand: ['supplier'] })}
+ searchParams={search}
+ rowActions={(purchaseOrder) => (
+ <RowActions
+ actions={[
+ {
+ key: 'view',
+ label: t('admin.actions.view_details'),
+ icon: <EyeIcon className="size-4" />,
+ onSelect: () => openDetail(purchaseOrder.id),
+ },
+ {
+ key: 'delete',
+ destructive: true,
+ // A placed order is a matter of record with the supplier; the
+ // detail page cancels it instead.
+ visible:
+ purchaseOrder.status === 'draft' &&
+ permissions.can('destroy', Subject.PurchaseOrder),
+ disabled: deleteMutation.isPending,
+ onSelect: () => handleDelete(purchaseOrder),
+ },
+ ]}
+ />
+ )}
+ actions={(ctx) => (
+ <>
+ {/* A supplier's line sheet in, an order to the supplier out — one
+ row per line either way. */}
+ <ImportButton
+ type="purchase_orders"
+ subject={Subject.PurchaseOrder}
+ onCreated={(imp) => wizard.open(imp.id)}
+ />
+ <ExportButton type="purchase_orders" {...ctx} />
+ <Can I="create" a={Subject.PurchaseOrder}>
+ <Button size="sm" className="h-[2.125rem]" onClick={openCreate}>
+ <PlusIcon className="size-4" />
+ {t('admin.purchase_orders.new_cta')}
+ </Button>
+ </Can>
+ </>
+ )}
+ />
+ <ImportWizardDialog importId={wizard.importId} onClose={wizard.close} />
+ </>
)
}
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/new.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/new.tsx
index a4ebada14a..520f78aa1f 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/new.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/purchase-orders/new.tsx
@@ -25,6 +25,7 @@ function NewPurchaseOrderPage() {
destination_location_id: values.destinationId,
currency: values.currency,
expected_at: values.expectedAt,
+ cancel_by: values.cancelBy,
reference: values.reference.trim() || undefined,
notes: values.notes.trim() || undefined,
items: values.lines.map((line) => ({
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/transfers/$transferId/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/transfers/$transferId/index.tsx
index bb47609bc7..23693a0824 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/transfers/$transferId/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/transfers/$transferId/index.tsx
@@ -1,9 +1,10 @@
-import type { StockTransfer, StockTransferItem } from '@spree/admin-sdk'
+import type { StockTransfer } from '@spree/admin-sdk'
import {
adminClient,
Can,
PageHeader,
Subject,
+ useResourceKey,
useStockLocations,
useStore,
} from '@spree/dashboard-core'
@@ -17,11 +18,6 @@ import {
ErrorState,
RelativeTime,
ResourceLayout,
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
Table,
TableBody,
TableCell,
@@ -30,29 +26,35 @@ import {
TableRow,
useConfirm,
} from '@spree/dashboard-ui'
-import { PencilIcon, Trash2Icon, XCircleIcon } from '@spree/dashboard-ui/icons'
+import {
+ PackageCheckIcon,
+ PencilIcon,
+ Trash2Icon,
+ Undo2Icon,
+ XCircleIcon,
+} from '@spree/dashboard-ui/icons'
import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
+import { CloseShortDialog } from '../../../../../components/spree/close-short-dialog'
import { InventoryStatusBadge } from '../../../../../components/spree/inventory-status-badge'
-import { QuantityCell, QuantityHead } from '../../../../../components/spree/quantity-cell'
+import { ReceiveDeliveryCard } from '../../../../../components/spree/receive-delivery-card'
import { ResourceDetailSkeleton } from '../../../../../components/spree/route-pending'
import { StockHistoryCard } from '../../../../../components/spree/stock-history-card'
+import { StockReceiptsCard } from '../../../../../components/spree/stock-receipts-card'
import { TransferCancelDialog } from '../../../../../components/spree/transfer-cancel-dialog'
import { VariantLink } from '../../../../../components/spree/variant-link'
import {
+ useCloseStockTransfer,
+ useCreateStockTransferReceipt,
useDeleteStockTransfer,
+ useMarkStockTransferDraft,
useMarkStockTransferInTransit,
useMarkStockTransferReady,
- useReceiveStockTransfer,
useStockTransfer,
} from '../../../../../hooks/use-stock-transfers'
import { spreeJsonLinkResolver } from '../../../../../lib/json-link-resolver'
-import {
- DISCREPANCY_REASONS,
- isClosed,
- isInFlight,
-} from '../../../../../schemas/inventory-operations'
+import { isClosed, isInFlight } from '../../../../../schemas/inventory-operations'
export const Route = createFileRoute('/_authenticated/$storeId/transfers/$transferId/')({
component: StockTransferDetailPage,
@@ -87,7 +89,11 @@ function StockTransferDetailPage() {
{transfer.status === 'draft' || transfer.status === 'ready_to_ship' ? (
<PlannedItemsCard transfer={transfer} />
) : (
- <ReceiveCard transfer={transfer} />
+ <>
+ {isInFlight(transfer.status) && <ReceiveCard transfer={transfer} />}
+ <LinesCard transfer={transfer} />
+ <ReceiptsCard transfer={transfer} />
+ </>
)}
{/* Where the units on this trip came from and went — read on the
@@ -202,6 +208,25 @@ function SummaryCard({ transfer }: { transfer: StockTransfer }) {
<dt className="text-muted-foreground">{t('admin.stock_transfers.fields.received_at')}</dt>
<dd>{transfer.received_at ? <RelativeTime iso={transfer.received_at} /> : '—'}</dd>
+
+ {transfer.closed_short && (
+ <>
+ <dt className="text-muted-foreground">
+ {t('admin.stock_transfers.fields.closed_short')}
+ </dt>
+ <dd>
+ <RelativeTime iso={transfer.closed_short_at as string} />
+ </dd>
+ {transfer.close_reason && (
+ <>
+ <dt className="text-muted-foreground">
+ {t('admin.stock_transfers.fields.close_reason')}
+ </dt>
+ <dd className="whitespace-pre-line">{transfer.close_reason}</dd>
+ </>
+ )}
+ </>
+ )}
</dl>
</CardContent>
</Card>
@@ -258,172 +283,109 @@ function PlannedItemsCard({ transfer }: { transfer: StockTransfer }) {
)
}
-/**
- * In transit and beyond: the receive screen.
- *
- * `quantity_received` is the running total for the line, so a second delivery
- * tops it up rather than starting over. The inputs are therefore seeded with
- * what has already arrived, not with what was sent: reopening a part-received
- * transfer has to show the shelf as it is.
- */
+/** What a delivery is counted against, in the receive card's vocabulary. */
+function receivableLines(transfer: StockTransfer) {
+ return (transfer.items ?? []).map((item) => ({
+ id: item.id,
+ product_id: item.product_id,
+ variant_name: item.variant_name,
+ variant_sku: item.variant_sku,
+ thumbnail_url: item.thumbnail_url,
+ quantity_expected: item.quantity_shipped,
+ quantity_received: item.quantity_received,
+ quantity_rejected: item.quantity_rejected,
+ outstanding: item.outstanding,
+ }))
+}
+
function ReceiveCard({ transfer }: { transfer: StockTransfer }) {
const { t } = useTranslation()
- const items = transfer.items ?? []
- const receiveMutation = useReceiveStockTransfer(transfer.id)
- const editable = isInFlight(transfer.status)
+ const receive = useCreateStockTransferReceipt(transfer.id)
- const [counts, setCounts] = useState<Record<string, number>>(() =>
- Object.fromEntries(items.map((item) => [item.id, item.quantity_received])),
+ return (
+ <ReceiveDeliveryCard
+ lines={receivableLines(transfer)}
+ expectedLabel={t('admin.stock_transfers.columns.quantity_shipped')}
+ subject={Subject.StockTransfer}
+ pending={receive.isPending}
+ onReceive={(params) => receive.mutateAsync(params)}
+ />
)
- const [reasons, setReasons] = useState<Record<string, string>>(() =>
- Object.fromEntries(items.map((item) => [item.id, item.discrepancy_reason ?? ''])),
+}
+
+function ReceiptsCard({ transfer }: { transfer: StockTransfer }) {
+ const queryKey = useResourceKey('stock-transfers', transfer.id, 'stock-receipts')
+ return (
+ <StockReceiptsCard
+ queryKey={queryKey}
+ fetch={() =>
+ adminClient.stockTransfers.stockReceipts.list(transfer.id, { expand: ['items'] })
+ }
+ />
)
+}
- const totalCounted = items.reduce((sum, item) => sum + (counts[item.id] ?? 0), 0)
-
- async function handleReceive() {
- await receiveMutation
- .mutateAsync({
- items: items.map((item) => {
- const received = counts[item.id] ?? item.quantity_received
- const reason = reasons[item.id]
-
- return {
- id: item.id,
- quantity_received: received,
- // Only while the line is under-received. The select hides once the
- // count is raised, but its state survives — and a fully received
- // line carrying "damaged in transit" is simply wrong.
- discrepancy_reason: received < item.quantity_shipped ? reason || undefined : undefined,
- }
- }),
- })
- .catch(() => undefined)
- }
+/**
+ * The lines once the van has left: what was sent, what each delivery has
+ * counted in and refused so far.
+ */
+function LinesCard({ transfer }: { transfer: StockTransfer }) {
+ const { t } = useTranslation()
+ const items = transfer.items ?? []
+ const anyOver = items.some((item) => item.quantity_over > 0)
return (
<Card>
<CardHeader>
- <CardTitle>{t('admin.stock_transfers.receive_title')}</CardTitle>
+ <CardTitle>{t('admin.stock_transfers.items_title')}</CardTitle>
</CardHeader>
- <CardContent className="flex flex-col p-0">
- <Table scrollX>
+ <CardContent className="p-0">
+ <Table scrollX roundedBottom>
<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>
+ <TableHead className="text-right">
+ {t('admin.stock_transfers.columns.quantity_received')}
+ </TableHead>
+ <TableHead className="text-right">
+ {t('admin.stock_transfers.columns.quantity_rejected')}
+ </TableHead>
+ {anyOver && (
+ <TableHead className="text-right">
+ {t('admin.stock_transfers.columns.quantity_over')}
+ </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 }))}
- />
+ <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>
+ <TableCell className="text-right tabular-nums">{item.quantity_received}</TableCell>
+ <TableCell className="text-right tabular-nums">{item.quantity_rejected}</TableCell>
+ {anyOver && (
+ <TableCell className="text-right tabular-nums">{item.quantity_over}</TableCell>
+ )}
+ </TableRow>
))}
</TableBody>
</Table>
-
- {editable && (
- <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,
- })}
- </p>
- <Can I="update" a={Subject.StockTransfer}>
- <Button type="button" onClick={handleReceive} disabled={receiveMutation.isPending}>
- {receiveMutation.isPending
- ? t('admin.actions.saving')
- : t('admin.stock_transfers.actions.receive')}
- </Button>
- </Can>
- </div>
- )}
</CardContent>
</Card>
)
}
-function ReceiveRow({
- item,
- editable,
- count,
- reason,
- onCount,
- onReason,
-}: {
- item: StockTransferItem
- editable: boolean
- count: number
- reason: string
- onCount: (value: number) => void
- onReason: (value: string) => void
-}) {
- const { t } = useTranslation()
- const underReceived = count < item.quantity_shipped
-
- return (
- <TableRow>
- <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>
- {/* 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}>
- <SelectTrigger aria-label={t('admin.stock_transfers.columns.discrepancy')}>
- <SelectValue placeholder={t('admin.stock_transfers.discrepancy_placeholder')}>
- {(value) => (value ? t(`admin.stock_transfers.discrepancy_reasons.${value}`) : '')}
- </SelectValue>
- </SelectTrigger>
- <SelectContent>
- {DISCREPANCY_REASONS.map((value) => (
- <SelectItem key={value} value={value}>
- {t(`admin.stock_transfers.discrepancy_reasons.${value}`)}
- </SelectItem>
- ))}
- </SelectContent>
- </Select>
- ) : item.discrepancy_reason ? (
- <span className="text-sm">
- {t(`admin.stock_transfers.discrepancy_reasons.${item.discrepancy_reason}`, {
- defaultValue: item.discrepancy_reason,
- })}
- </span>
- ) : (
- '—'
- )}
- </TableCell>
- </TableRow>
- )
-}
-
/**
* Title, status, and the transitions — laid out the way an order's header is:
* the move that carries the transfer forward as a button on the right, the
@@ -437,7 +399,10 @@ function TransferHeader({ transfer }: { transfer: StockTransfer }) {
const markReady = useMarkStockTransferReady(transfer.id)
const markInTransit = useMarkStockTransferInTransit(transfer.id)
const deleteTransfer = useDeleteStockTransfer()
+ const markDraft = useMarkStockTransferDraft(transfer.id)
+ const closeTransfer = useCloseStockTransfer(transfer.id)
const [cancelOpen, setCancelOpen] = useState(false)
+ const [closeOpen, setCloseOpen] = useState(false)
const open = !isClosed(transfer.status)
const shippable = transfer.status === 'draft' || transfer.status === 'ready_to_ship'
@@ -479,6 +444,17 @@ function TransferHeader({ transfer }: { transfer: StockTransfer }) {
{cancelOpen && (
<TransferCancelDialog transfer={transfer} onClose={() => setCancelOpen(false)} />
)}
+ {closeOpen && (
+ <CloseShortDialog
+ title={t('admin.stock_transfers.close_confirm.title')}
+ description={t('admin.stock_transfers.close_confirm.message', {
+ outstanding: transfer.quantity_shipped_total - transfer.quantity_received_total,
+ })}
+ pending={closeTransfer.isPending}
+ onConfirm={(reason) => closeTransfer.mutateAsync({ reason })}
+ onClose={() => setCloseOpen(false)}
+ />
+ )}
<PageHeader
title={transfer.number}
backTo="transfers"
@@ -512,6 +488,18 @@ function TransferHeader({ transfer }: { transfer: StockTransfer }) {
{t('admin.stock_transfers.actions.mark_ready')}
</Button>
)}
+ {/* Nothing has left the source yet, so unpacking costs nothing. */}
+ {transfer.status === 'ready_to_ship' && (
+ <Button
+ type="button"
+ variant="outline"
+ onClick={() => markDraft.mutateAsync().catch(() => undefined)}
+ disabled={markDraft.isPending}
+ >
+ <Undo2Icon className="size-4" />
+ {t('admin.stock_transfers.actions.mark_draft')}
+ </Button>
+ )}
{shippable && (
<Button type="button" onClick={handleShip} disabled={markInTransit.isPending}>
{t('admin.stock_transfers.actions.mark_in_transit')}
@@ -520,6 +508,19 @@ function TransferHeader({ transfer }: { transfer: StockTransfer }) {
</Can>
)
}
+ dropdownItems={
+ transfer.status === 'partially_received' && (
+ <Can I="update" a={Subject.StockTransfer}>
+ <DropdownMenuItem
+ onClick={() => setCloseOpen(true)}
+ disabled={closeTransfer.isPending}
+ >
+ <PackageCheckIcon className="size-4" />
+ {t('admin.stock_transfers.actions.close_short')}
+ </DropdownMenuItem>
+ </Can>
+ )
+ }
destructiveItems={
open && (
<>
diff --git a/packages/dashboard/src/schemas/inventory-operations.ts b/packages/dashboard/src/schemas/inventory-operations.ts
index 1380d67147..f926331f0e 100644
--- a/packages/dashboard/src/schemas/inventory-operations.ts
+++ b/packages/dashboard/src/schemas/inventory-operations.ts
@@ -10,6 +10,7 @@ export const STOCK_TRANSFER_STATUSES = [
'in_transit',
'partially_received',
'received',
+ 'over_received',
'canceled',
] as const
@@ -20,19 +21,20 @@ export const PURCHASE_ORDER_STATUSES = [
'ordered',
'partially_received',
'received',
+ 'over_received',
'canceled',
] as const
export type PurchaseOrderStatus = (typeof PURCHASE_ORDER_STATUSES)[number]
/**
- * Why fewer units arrived than were shipped. Free text is allowed by the API,
- * but offering the three answers a warehouse actually gives keeps the data
- * worth reporting on.
+ * Why a delivery refused units, matching `Spree::StockReceiptItem::REJECTION_REASONS`.
+ * A closed list: the server accepts nothing else, and a fixed vocabulary is
+ * what makes the figures worth reporting on.
*/
-export const DISCREPANCY_REASONS = ['damaged_in_transit', 'lost_in_transit', 'undercount'] as const
+export const REJECTION_REASONS = ['damaged', 'wrong_item', 'expired', 'other'] as const
-export type DiscrepancyReason = (typeof DISCREPANCY_REASONS)[number]
+export type RejectionReason = (typeof REJECTION_REASONS)[number]
/** What happens to units still in flight when a shipped transfer is called off. */
export const IN_TRANSIT_RESOLUTIONS = ['restock', 'write_off'] as const
@@ -46,5 +48,5 @@ export function isInFlight(status: string): boolean {
/** Nothing more will arrive on a document in one of these. */
export function isClosed(status: string): boolean {
- return status === 'received' || status === 'canceled'
+ return status === 'received' || status === 'over_received' || status === 'canceled'
}
diff --git a/packages/dashboard/src/tables/purchase-orders.tsx b/packages/dashboard/src/tables/purchase-orders.tsx
index ec54f05da9..888c447276 100644
--- a/packages/dashboard/src/tables/purchase-orders.tsx
+++ b/packages/dashboard/src/tables/purchase-orders.tsx
@@ -1,10 +1,16 @@
import type { PurchaseOrder } from '@spree/admin-sdk'
import { defineTable } from '@spree/dashboard-core'
-import { RelativeTime, ResourceNameCell, StatusBadge } from '@spree/dashboard-ui'
+import { Badge, RelativeTime, ResourceNameCell, StatusBadge } from '@spree/dashboard-ui'
import { TruckIcon } from '@spree/dashboard-ui/icons'
import i18n from 'i18next'
import { supplierAutocompleteProps } from '../hooks/use-suppliers'
-import { PURCHASE_ORDER_STATUSES } from '../schemas/inventory-operations'
+import { isClosed, PURCHASE_ORDER_STATUSES } from '../schemas/inventory-operations'
+
+// A calendar day, compared as text: both sides are `yyyy-mm-dd`. Display
+// only — the list filters below are answered by the server's own scopes.
+function dayHasPassed(date: string | null | undefined): boolean {
+ return !!date && date < new Date().toISOString().slice(0, 10)
+}
function statusLabel(value: string): string {
return i18n.t(`admin.purchase_orders.statuses.${value}`)
@@ -48,7 +54,13 @@ defineTable<PurchaseOrder>('purchase-orders', {
<StatusBadge
status={po.status}
label={statusLabel(po.status)}
- tone={po.status === 'received' ? 'success' : undefined}
+ tone={
+ po.status === 'received'
+ ? 'success'
+ : po.status === 'over_received'
+ ? 'warning'
+ : undefined
+ }
/>
),
},
@@ -90,6 +102,58 @@ defineTable<PurchaseOrder>('purchase-orders', {
className: 'text-sm text-muted-foreground whitespace-nowrap',
render: (po) => po.expected_at ?? '—',
},
+ {
+ key: 'cancel_by',
+ label: i18n.t('admin.purchase_orders.columns.cancel_by'),
+ sortable: true,
+ filterable: true,
+ filterType: 'date',
+ className: 'text-sm text-muted-foreground whitespace-nowrap',
+ render: (po) => po.cancel_by ?? '—',
+ },
+ {
+ // A scope, not a predicate on `expected_at`: "is it late?" is one
+ // question with two answers, which is what a boolean control needs.
+ key: 'overdue',
+ label: i18n.t('admin.purchase_orders.columns.overdue'),
+ ransackAttribute: 'overdue',
+ ransackScope: true,
+ sortable: false,
+ filterable: true,
+ filterType: 'boolean',
+ booleanLabels: {
+ true: i18n.t('admin.purchase_orders.filters.overdue'),
+ false: i18n.t('admin.purchase_orders.filters.not_overdue'),
+ },
+ quickFilter: true,
+ render: (po) =>
+ !isClosed(po.status) && dayHasPassed(po.expected_at) ? (
+ <Badge variant="destructive">{i18n.t('admin.purchase_orders.filters.overdue')}</Badge>
+ ) : (
+ '—'
+ ),
+ },
+ {
+ key: 'past_cancel_by',
+ label: i18n.t('admin.purchase_orders.columns.past_cancel_by'),
+ ransackAttribute: 'past_cancel_by',
+ ransackScope: true,
+ sortable: false,
+ filterable: true,
+ filterType: 'boolean',
+ booleanLabels: {
+ true: i18n.t('admin.purchase_orders.filters.past_cancel_by'),
+ false: i18n.t('admin.purchase_orders.filters.not_past_cancel_by'),
+ },
+ render: (po) =>
+ !isClosed(po.status) && dayHasPassed(po.cancel_by) ? (
+ <Badge variant="destructive">
+ {i18n.t('admin.purchase_orders.filters.past_cancel_by')}
+ </Badge>
+ ) : (
+ '—'
+ ),
+ },
{
key: 'created_at',
label: i18n.t('admin.fields.created_at.label'),
diff --git a/packages/dashboard/src/tables/stock-transfers.tsx b/packages/dashboard/src/tables/stock-transfers.tsx
index 635940b7af..b0e698eeae 100644
--- a/packages/dashboard/src/tables/stock-transfers.tsx
+++ b/packages/dashboard/src/tables/stock-transfers.tsx
@@ -48,7 +48,13 @@ defineTable<StockTransfer>('stock-transfers', {
<StatusBadge
status={st.status}
label={statusLabel(st.status)}
- tone={st.status === 'received' ? 'success' : undefined}
+ tone={
+ st.status === 'received'
+ ? 'success'
+ : st.status === 'over_received'
+ ? 'warning'
+ : undefined
+ }
/>
),
},