From 4b7c6d7dd9fed6ff7f2882c1dcca4b2485adb749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frane=20Poli=C4=87?= <16856471+fPolic@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:13:47 +0100 Subject: [PATCH] fix(dashboard): few admin bug fixes (#11655) **What** - OE id bug - prevent canceling shipped/delivered fulfillment --- CLOSES CMRC-935 CLOSES CMRC-938 --- packages/admin/dashboard/src/hooks/api/order-edits.tsx | 2 +- .../order-fulfillment-section/order-fulfillment-section.tsx | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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, }, ], },