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.

Offer Delete on a draft transfer or order where you are standing

Łukasz Adamczykb25cd8a30899
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/purchase-orders/$purchaseOrderId/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/purchase-orders/$purchaseOrderId/index.tsx
index cc80687c7b..60f5649c17 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/purchase-orders/$purchaseOrderId/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/purchase-orders/$purchaseOrderId/index.tsx
@@ -17,8 +17,8 @@ import {
TableRow,
useConfirm,
} from '@spree/dashboard-ui'
-import { PencilIcon, XCircleIcon } from '@spree/dashboard-ui/icons'
-import { createFileRoute, Link } from '@tanstack/react-router'
+import { PencilIcon, Trash2Icon, XCircleIcon } from '@spree/dashboard-ui/icons'
+import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { InventoryStatusBadge } from '../../../../../../components/spree/inventory-status-badge'
@@ -27,6 +27,7 @@ import { StockHistoryCard } from '../../../../../../components/spree/stock-histo
import { VariantLink } from '../../../../../../components/spree/variant-link'
import {
useCancelPurchaseOrder,
+ useDeletePurchaseOrder,
useMarkPurchaseOrderOrdered,
usePurchaseOrder,
useReceivePurchaseOrder,
@@ -311,8 +312,10 @@ function PurchaseOrderHeader({ purchaseOrder }: { purchaseOrder: PurchaseOrder }
const { t } = useTranslation()
const { storeId } = useStore()
const confirm = useConfirm()
+ const navigate = useNavigate()
const markOrdered = useMarkPurchaseOrderOrdered(purchaseOrder.id)
const cancelOrder = useCancelPurchaseOrder(purchaseOrder.id)
+ const deleteOrder = useDeletePurchaseOrder()
const open = !isClosed(purchaseOrder.status)
@@ -339,6 +342,28 @@ function PurchaseOrderHeader({ purchaseOrder }: { purchaseOrder: PurchaseOrder }
await cancelOrder.mutateAsync({}).catch(() => undefined)
}
+ // Back to the list on success: the record this page describes is gone, and
+ // re-fetching it would 404.
+ async function handleDelete() {
+ const ok = await confirm({
+ title: t('admin.purchase_orders.delete_confirm.title'),
+ message: t('admin.purchase_orders.delete_confirm.message', {
+ number: purchaseOrder.number,
+ }),
+ variant: 'destructive',
+ confirmLabel: t('admin.actions.delete'),
+ })
+ if (!ok) return
+
+ const deleted = await deleteOrder
+ .mutateAsync(purchaseOrder.id)
+ .then(() => true)
+ .catch(() => false)
+ if (!deleted) return
+
+ navigate({ to: '/$storeId/products/purchase-orders', params: { storeId } })
+ }
+
return (
<PageHeader
title={purchaseOrder.number}
@@ -374,16 +399,34 @@ function PurchaseOrderHeader({ purchaseOrder }: { purchaseOrder: PurchaseOrder }
}
destructiveItems={
open && (
- <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>
+ <>
+ {/* 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}>
+ <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={handleCancel}
+ disabled={cancelOrder.isPending}
+ >
+ <XCircleIcon className="size-4" />
+ {t('admin.purchase_orders.actions.cancel_order')}
+ </DropdownMenuItem>
+ </Can>
+ </>
)
}
resource={{ id: purchaseOrder.id, number: purchaseOrder.number }}
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers/$transferId/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers/$transferId/index.tsx
index 68f0fd9294..5be6629263 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers/$transferId/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers/$transferId/index.tsx
@@ -22,8 +22,8 @@ import {
TableRow,
useConfirm,
} from '@spree/dashboard-ui'
-import { PencilIcon, XCircleIcon } from '@spree/dashboard-ui/icons'
-import { createFileRoute, Link } from '@tanstack/react-router'
+import { PencilIcon, Trash2Icon, 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 { InventoryStatusBadge } from '../../../../../../components/spree/inventory-status-badge'
@@ -32,6 +32,7 @@ import { StockHistoryCard } from '../../../../../../components/spree/stock-histo
import { TransferCancelDialog } from '../../../../../../components/spree/transfer-cancel-dialog'
import { VariantLink } from '../../../../../../components/spree/variant-link'
import {
+ useDeleteStockTransfer,
useMarkStockTransferInTransit,
useMarkStockTransferReady,
useReceiveStockTransfer,
@@ -422,8 +423,10 @@ function TransferHeader({ transfer }: { transfer: StockTransfer }) {
const { t } = useTranslation()
const { storeId } = useStore()
const confirm = useConfirm()
+ const navigate = useNavigate()
const markReady = useMarkStockTransferReady(transfer.id)
const markInTransit = useMarkStockTransferInTransit(transfer.id)
+ const deleteTransfer = useDeleteStockTransfer()
const [cancelOpen, setCancelOpen] = useState(false)
const open = !isClosed(transfer.status)
@@ -441,6 +444,26 @@ function TransferHeader({ transfer }: { transfer: StockTransfer }) {
await markInTransit.mutateAsync({}).catch(() => undefined)
}
+ // Back to the list on success: the record this page describes is gone, and
+ // re-fetching it would 404.
+ async function handleDelete() {
+ const ok = await confirm({
+ title: t('admin.stock_transfers.delete_confirm.title'),
+ message: t('admin.stock_transfers.delete_confirm.message', { number: transfer.number }),
+ variant: 'destructive',
+ confirmLabel: t('admin.actions.delete'),
+ })
+ if (!ok) return
+
+ const deleted = await deleteTransfer
+ .mutateAsync(transfer.id)
+ .then(() => true)
+ .catch(() => false)
+ if (!deleted) return
+
+ navigate({ to: '/$storeId/products/transfers', params: { storeId } })
+ }
+
return (
<>
{cancelOpen && (
@@ -489,12 +512,31 @@ function TransferHeader({ transfer }: { transfer: StockTransfer }) {
}
destructiveItems={
open && (
- <Can I="update" a={Subject.StockTransfer}>
- <DropdownMenuItem variant="destructive" onClick={() => setCancelOpen(true)}>
- <XCircleIcon className="size-4" />
- {t('admin.stock_transfers.actions.cancel_transfer')}
- </DropdownMenuItem>
- </Can>
+ <>
+ {/* A draft moved nothing, so it can simply be thrown away — the
+ same action the list offers. Past draft the transfer
+ describes a box that physically exists, which is what
+ cancelling is for, so both are offered on a draft and only
+ cancelling after it. */}
+ {transfer.status === 'draft' && (
+ <Can I="destroy" a={Subject.StockTransfer}>
+ <DropdownMenuItem
+ variant="destructive"
+ onClick={handleDelete}
+ disabled={deleteTransfer.isPending}
+ >
+ <Trash2Icon className="size-4" />
+ {t('admin.actions.delete')}
+ </DropdownMenuItem>
+ </Can>
+ )}
+ <Can I="update" a={Subject.StockTransfer}>
+ <DropdownMenuItem variant="destructive" onClick={() => setCancelOpen(true)}>
+ <XCircleIcon className="size-4" />
+ {t('admin.stock_transfers.actions.cancel_transfer')}
+ </DropdownMenuItem>
+ </Can>
+ </>
)
}
resource={{ id: transfer.id, number: transfer.number }}