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.

Drop the post-sale cards from a draft order (#14558)

Damian Legawiec9b57d53d2c04
diff --git a/packages/dashboard-ui/src/ui/accordion.tsx b/packages/dashboard-ui/src/ui/accordion.tsx
index c8a9fee20a..0c5c2a9092 100644
--- a/packages/dashboard-ui/src/ui/accordion.tsx
+++ b/packages/dashboard-ui/src/ui/accordion.tsx
@@ -45,7 +45,7 @@ function AccordionTrigger({
<AccordionPrimitive.Trigger
data-slot="accordion-trigger"
className={cn(
- 'group/accordion-trigger flex flex-1 cursor-pointer items-center gap-3 px-4 py-3.5 text-left text-base font-medium transition-colors outline-none hover:bg-accent focus-visible:bg-accent',
+ 'group/accordion-trigger flex flex-1 cursor-pointer items-center gap-3 px-4 py-3.5 text-left text-base font-medium transition-colors outline-none hover:bg-accent/50 focus-visible:bg-accent',
className,
)}
{...props}
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId/index.tsx
index 398fd7d2af..9c9b96586b 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId/index.tsx
@@ -61,9 +61,16 @@ function OrderDetailPage() {
<>
<FulfillmentsCard order={order} />
<OrderDigitalLinksCard order={order} />
- <OrderReturnsCard order={order} />
- <OrderExchangesCard order={order} />
- <OrderClaimsCard order={order} />
+ {/* Nothing can come back from an order that has not been placed:
+ all three read fulfilled units, and a draft has none, so they
+ would only ever render an empty card with a disabled action. */}
+ {order.completed_at && (
+ <>
+ <OrderReturnsCard order={order} />
+ <OrderExchangesCard order={order} />
+ <OrderClaimsCard order={order} />
+ </>
+ )}
<PaymentsCard order={order} />
<TaxLinesCard order={order} />
<OrderDiscountsCard order={order} />