diff --git a/packages/admin/dashboard/src/hooks/api/order-edits.tsx b/packages/admin/dashboard/src/hooks/api/order-edits.tsx index a7ae2e7c69..144a0bde48 100644 --- a/packages/admin/dashboard/src/hooks/api/order-edits.tsx +++ b/packages/admin/dashboard/src/hooks/api/order-edits.tsx @@ -131,7 +131,7 @@ export const useCancelOrderEdit = ( }) queryClient.invalidateQueries({ - queryKey: ordersQueryKeys.lineItems(id), + queryKey: ordersQueryKeys.lineItems(orderId), }) options?.onSuccess?.(data, variables, context) }, diff --git a/packages/admin/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx b/packages/admin/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx index 8e2054ef7a..98836a30dd 100644 --- a/packages/admin/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx +++ b/packages/admin/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx @@ -347,7 +347,10 @@ const Fulfillment = ({ label: t("actions.cancel"), icon: , onClick: handleCancel, - disabled: !!fulfillment.canceled_at, + disabled: + !!fulfillment.canceled_at || + !!fulfillment.shipped_at || + !!fulfillment.delivered_at, }, ], },