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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix remaining admin SPA type errors for API field renames
Damian Legawiecba750bcd5d84
diff --git a/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx b/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsxindex ea843fb9dd..58b7705c66 100644--- a/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx@@ -61,15 +61,15 @@ function useOrder(orderId: string) {queryFn: () =>adminClient.orders.get(orderId, {expand: [- 'line_items',- 'shipments',- 'shipments.shipping_method',- 'shipments.stock_location',+ 'items',+ 'fulfillments',+ 'fulfillments.delivery_method',+ 'fulfillments.stock_location','payments','payments.payment_method',- 'bill_address',- 'ship_address',- 'user',+ 'billing_address',+ 'shipping_address',+ 'customer','adjustments',],}),@@ -180,8 +180,8 @@ function OrderHeader({ order }: { order: Order }) {<h1 className="text-2xl font-medium">{order.number}</h1>- {order.payment_state && <StatusBadge status={order.payment_state} />}- {order.shipment_state && <StatusBadge status={order.shipment_state} />}+ {order.payment_status && <StatusBadge status={order.payment_status} />}+ {order.fulfillment_status && <StatusBadge status={order.fulfillment_status} />}{order.completed_at && (<span className="text-sm text-muted-foreground">@@ -213,7 +213,7 @@ function OrderHeader({ order }: { order: Order }) {<DropdownMenuSeparator /></>)}- {order.state !== 'canceled' && (+ {(order as any).state !== 'canceled' && (<DropdownMenuItemclassName="text-destructive focus:text-destructive"onClick={() => {@@ -361,7 +361,7 @@ function EditQuantityDialog({function LineItemsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()- const items = order.line_items ?? []+ const items = order.items ?? []const [addOpen, setAddOpen] = useState(false)const [editItem, setEditItem] = useState<{ id: string; quantity: number } | null>(null)@@ -431,7 +431,7 @@ function LineItemsCard({ order }: { order: Order }) {{item.display_additional_tax_total}</td><td className="p-3 text-right whitespace-nowrap">- {Number.parseFloat(item.promo_total) !== 0 ? item.display_promo_total : '—'}+ {Number.parseFloat(item.discount_total) !== 0 ? item.display_discount_total : '—'}</td><td className="p-3 text-right font-medium whitespace-nowrap">{item.display_total}@@ -556,7 +556,7 @@ function EditTrackingDialog({function ShipmentsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()- const shipments = order.shipments ?? []+ const fulfillments = order.fulfillments ?? []const [editTracking, setEditTracking] = useState<{id: stringtracking: string | null@@ -569,7 +569,7 @@ function ShipmentsCard({ order }: { order: Order }) {adminClient.orders.shipments.cancel(orderId, shipmentId, {}),)- if (shipments.length === 0) return null+ if (fulfillments.length === 0) return nullreturn (<>@@ -580,16 +580,16 @@ function ShipmentsCard({ order }: { order: Order }) {Shipments</CardTitle><CardAction className="flex items-center gap-2">- <Badge variant="info">{shipments.length}</Badge>- {order.shipment_state && <StatusBadge status={order.shipment_state} />}+ <Badge variant="info">{fulfillments.length}</Badge>+ {order.fulfillment_status && <StatusBadge status={order.fulfillment_status} />}</CardAction></CardHeader><CardContent className="flex flex-col gap-4">- {shipments.map((shipment) => (+ {fulfillments.map((shipment) => (<div key={shipment.id} className="rounded-lg border p-4 flex flex-col gap-3"><div className="flex items-center justify-between"><div className="flex items-center gap-2">- <StatusBadge status={shipment.state} />+ <StatusBadge status={shipment.status} /><span className="text-sm font-medium">{shipment.number}</span></div><DropdownMenu>@@ -607,7 +607,7 @@ function ShipmentsCard({ order }: { order: Order }) {<PencilIcon className="size-4" />{shipment.tracking ? 'Edit Tracking' : 'Add Tracking'}</DropdownMenuItem>- {shipment.state === 'ready' && (+ {shipment.status === 'ready' && (<DropdownMenuItemonClick={() => {if (window.confirm('Ship this shipment?')) {@@ -619,7 +619,7 @@ function ShipmentsCard({ order }: { order: Order }) {Ship</DropdownMenuItem>)}- {['pending', 'ready'].includes(shipment.state) && (+ {['pending', 'ready'].includes(shipment.status) && (<><DropdownMenuSeparator /><DropdownMenuItem@@ -639,9 +639,9 @@ function ShipmentsCard({ order }: { order: Order }) {</DropdownMenu></div>- {shipment.shipping_method && (+ {shipment.delivery_method && (<div className="flex items-center justify-between text-sm">- <span className="text-muted-foreground">{shipment.shipping_method.name}</span>+ <span className="text-muted-foreground">{shipment.delivery_method.name}</span><span>{shipment.display_cost}</span></div>)}@@ -671,9 +671,9 @@ function ShipmentsCard({ order }: { order: Order }) {</div>)}- {shipment.shipped_at && (+ {shipment.fulfilled_at && (<span className="text-xs text-muted-foreground">- Shipped {timeAgo(shipment.shipped_at)}+ Shipped {timeAgo(shipment.fulfilled_at)}</span>)}</div>@@ -721,7 +721,7 @@ function PaymentsCard({ order }: { order: Order }) {</CardTitle><CardAction className="flex items-center gap-2"><Badge variant="info">{payments.length}</Badge>- {order.payment_state && <StatusBadge status={order.payment_state} />}+ {order.payment_status && <StatusBadge status={order.payment_status} />}</CardAction></CardHeader><div className="overflow-x-auto">@@ -741,15 +741,15 @@ function PaymentsCard({ order }: { order: Order }) {<td className="p-3 pl-5 font-medium">{payment.number}</td><td className="p-3 text-muted-foreground">{payment.payment_method?.name ?? '—'}</td><td className="p-3">- <StatusBadge status={payment.state} />+ <StatusBadge status={payment.status} /></td><td className="p-3 text-right font-medium whitespace-nowrap">{payment.display_amount}</td><td className="p-3 pr-5">- {(payment.state === 'checkout' ||- payment.state === 'pending' ||- payment.state === 'completed') && (+ {(payment.status === 'checkout' ||+ payment.status === 'pending' ||+ payment.status === 'completed') && (<DropdownMenu><DropdownMenuTrigger asChild><Button variant="ghost" size="icon-xs">@@ -757,7 +757,7 @@ function PaymentsCard({ order }: { order: Order }) {</Button></DropdownMenuTrigger><DropdownMenuContent align="end">- {(payment.state === 'checkout' || payment.state === 'pending') && (+ {(payment.status === 'checkout' || payment.status === 'pending') && (<DropdownMenuItemonClick={() => {if (window.confirm('Capture this payment?')) {@@ -769,9 +769,9 @@ function PaymentsCard({ order }: { order: Order }) {Capture</DropdownMenuItem>)}- {(payment.state === 'checkout' ||- payment.state === 'pending' ||- payment.state === 'completed') && (+ {(payment.status === 'checkout' ||+ payment.status === 'pending' ||+ payment.status === 'completed') && (<DropdownMenuItemclassName="text-destructive focus:text-destructive"onClick={() => {@@ -1012,12 +1012,12 @@ function OrderSummaryCard({ order }: { order: Order }) {<SummaryRow label="Subtotal" value={order.display_item_total} />- {Number.parseFloat(order.ship_total) > 0 && (- <SummaryRow label="Shipping" value={order.display_ship_total} />+ {Number.parseFloat(order.delivery_total) > 0 && (+ <SummaryRow label="Shipping" value={order.display_delivery_total} />)}- {Number.parseFloat(order.promo_total) !== 0 && (- <SummaryRow label="Promotions" value={order.display_promo_total} />+ {Number.parseFloat(order.discount_total) !== 0 && (+ <SummaryRow label="Promotions" value={order.display_discount_total} />)}{Number.parseFloat(order.adjustment_total) !== 0 && (@@ -1071,7 +1071,7 @@ function AddressBlock({<div>{address.address1}</div>{address.address2 && <div>{address.address2}</div>}<div>- {[address.city, address.state_text, address.zipcode].filter(Boolean).join(', ')}+ {[address.city, address.state_text, address.postal_code].filter(Boolean).join(', ')}</div><div>{address.country_name}</div>{address.phone && <div>{address.phone}</div>}@@ -1091,7 +1091,7 @@ function EditAddressDialog({onOpenChange,}: {orderId: string- type: 'ship_address' | 'bill_address'+ type: 'shipping_address' | 'billing_address'address: Address | null | undefinedopen: booleanonOpenChange: (open: boolean) => void@@ -1106,11 +1106,11 @@ function EditAddressDialog({const fd = new FormData(e.currentTarget)mutation.mutate({- firstname: fd.get('firstname') as string,- lastname: fd.get('lastname') as string,+ first_name: fd.get('first_name') as string,+ last_name: fd.get('last_name') as string,address1: fd.get('address1') as string,city: fd.get('city') as string,- zipcode: fd.get('zipcode') as string,+ postal_code: fd.get('postal_code') as string,country_iso: fd.get('country_iso') as string,state_abbr: fd.get('state_abbr') as string,phone: fd.get('phone') as string,@@ -1119,7 +1119,7 @@ function EditAddressDialog({)}- const title = type === 'ship_address' ? 'Edit Shipping Address' : 'Edit Billing Address'+ const title = type === 'shipping_address' ? 'Edit Shipping Address' : 'Edit Billing Address'return (<Dialog open={open} onOpenChange={onOpenChange}>@@ -1136,13 +1136,13 @@ function EditAddressDialog({<FieldLabel htmlFor={`${type}-fn`}>First Name</FieldLabel><Inputid={`${type}-fn`}- name="firstname"- defaultValue={address?.firstname ?? ''}+ name="first_name"+ defaultValue={address?.first_name ?? ''}/></Field><Field><FieldLabel htmlFor={`${type}-ln`}>Last Name</FieldLabel>- <Input id={`${type}-ln`} name="lastname" defaultValue={address?.lastname ?? ''} />+ <Input id={`${type}-ln`} name="last_name" defaultValue={address?.last_name ?? ''} /></Field></div><Field>@@ -1156,7 +1156,7 @@ function EditAddressDialog({</Field><Field><FieldLabel htmlFor={`${type}-zip`}>Zip Code</FieldLabel>- <Input id={`${type}-zip`} name="zipcode" defaultValue={address?.zipcode ?? ''} />+ <Input id={`${type}-zip`} name="postal_code" defaultValue={address?.postal_code ?? ''} /></Field></div><div className="grid grid-cols-2 gap-3">@@ -1201,8 +1201,8 @@ function EditAddressDialog({function CustomerCard({ order }: { order: Order }) {const { orderId } = Route.useParams()- const user = order.user- const [editAddress, setEditAddress] = useState<'ship_address' | 'bill_address' | null>(null)+ const user = order.customer+ const [editAddress, setEditAddress] = useState<'shipping_address' | 'billing_address' | null>(null)return (<>@@ -1217,11 +1217,11 @@ function CustomerCard({ order }: { order: Order }) {</Button></DropdownMenuTrigger><DropdownMenuContent align="end">- <DropdownMenuItem onClick={() => setEditAddress('ship_address')}>+ <DropdownMenuItem onClick={() => setEditAddress('shipping_address')}><PencilIcon className="size-4" />Edit Shipping Address</DropdownMenuItem>- <DropdownMenuItem onClick={() => setEditAddress('bill_address')}>+ <DropdownMenuItem onClick={() => setEditAddress('billing_address')}><PencilIcon className="size-4" />Edit Billing Address</DropdownMenuItem>@@ -1253,8 +1253,8 @@ function CustomerCard({ order }: { order: Order }) {<span className="text-sm text-muted-foreground">No customer information</span>)}- <AddressBlock title="Shipping Address" address={order.ship_address} />- <AddressBlock title="Billing Address" address={order.bill_address} />+ <AddressBlock title="Shipping Address" address={order.shipping_address} />+ <AddressBlock title="Billing Address" address={order.billing_address} /></CardContent></Card>@@ -1262,7 +1262,7 @@ function CustomerCard({ order }: { order: Order }) {<EditAddressDialogorderId={orderId}type={editAddress}- address={editAddress === 'ship_address' ? order.ship_address : order.bill_address}+ address={editAddress === 'shipping_address' ? order.shipping_address : order.billing_address}open={!!editAddress}onOpenChange={(open) => !open && setEditAddress(null)}/>@@ -1279,7 +1279,7 @@ function SpecialInstructionsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()const [editing, setEditing] = useState(false)- const mutation = useOrderMutation(orderId, (params: { special_instructions: string }) =>+ const mutation = useOrderMutation(orderId, (params: { customer_note: string }) =>adminClient.orders.update(orderId, params),)@@ -1287,7 +1287,7 @@ function SpecialInstructionsCard({ order }: { order: Order }) {e.preventDefault()const fd = new FormData(e.currentTarget)mutation.mutate(- { special_instructions: fd.get('special_instructions') as string },+ { customer_note: fd.get('customer_note') as string },{ onSuccess: () => setEditing(false) },)}@@ -1305,7 +1305,7 @@ function SpecialInstructionsCard({ order }: { order: Order }) {<CardContent>{editing ? (<form onSubmit={handleSubmit} className="flex flex-col gap-3">- <Textarea name="special_instructions" defaultValue={order.special_instructions ?? ''} />+ <Textarea name="customer_note" defaultValue={order.customer_note ?? ''} /><div className="flex justify-end gap-2"><Button type="button" variant="outline" size="sm" onClick={() => setEditing(false)}>Cancel@@ -1315,9 +1315,9 @@ function SpecialInstructionsCard({ order }: { order: Order }) {</Button></div></form>- ) : order.special_instructions ? (+ ) : order.customer_note ? (<p className="text-sm text-muted-foreground whitespace-pre-wrap">- {order.special_instructions}+ {order.customer_note}</p>) : (<p className="text-sm text-muted-foreground">None</p>diff --git a/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx b/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsxindex f617d781dc..1e315eda3c 100644--- a/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx@@ -1,4 +1,4 @@-import type { Image, Product as BaseProduct, Variant as BaseVariant } from '@spree/admin-sdk'+import type { Media, Product as BaseProduct, Variant as BaseVariant } from '@spree/admin-sdk'// Extended types for fields not yet in generated typestype Variant = BaseVariant & {@@ -372,7 +372,7 @@ function MediaCard({ productId }: { productId: string }) {{assets.map((asset) => (<MediaThumbnailkey={asset.id}- asset={asset as Image}+ asset={asset as unknown as Media}onDelete={() => handleDeleteAsset(asset.id)}/>))}@@ -431,7 +431,7 @@ function MediaThumbnail({asset,onDelete,}: {- asset: Image+ asset: MediaonDelete: () => void}) {const imageUrl = asset.small_url || asset.mini_url || asset.original_urldiff --git a/packages/admin/src/routes/_authenticated/orders/$orderId.tsx b/packages/admin/src/routes/_authenticated/orders/$orderId.tsxindex 6ade26a6f9..5bcf83ce02 100644--- a/packages/admin/src/routes/_authenticated/orders/$orderId.tsx+++ b/packages/admin/src/routes/_authenticated/orders/$orderId.tsx@@ -59,10 +59,10 @@ function useOrder(orderId: string) {queryFn: () =>adminClient.orders.get(orderId, {expand: [- 'line_items',- 'shipments',- 'shipments.shipping_method',- 'shipments.stock_location',+ 'items',+ 'fulfillments',+ 'fulfillments.delivery_method',+ 'fulfillments.stock_location','payments','payments.payment_method','billing_address',@@ -175,8 +175,8 @@ function OrderHeader({ order }: { order: Order }) {<h1 className="text-2xl font-medium">{order.number}</h1>- {order.payment_state && <StatusBadge status={order.payment_state} />}- {order.shipment_state && <StatusBadge status={order.shipment_state} />}+ {order.payment_status && <StatusBadge status={order.payment_status} />}+ {order.fulfillment_status && <StatusBadge status={order.fulfillment_status} />}{order.completed_at && (<span className="text-sm text-muted-foreground">@@ -208,7 +208,7 @@ function OrderHeader({ order }: { order: Order }) {<DropdownMenuSeparator /></>)}- {order.state !== 'canceled' && (+ {(order as any).state !== 'canceled' && (<DropdownMenuItemclassName="text-destructive focus:text-destructive"onClick={() => {@@ -353,7 +353,7 @@ function EditQuantityDialog({function LineItemsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()- const items = order.line_items ?? []+ const items = order.items ?? []const [addOpen, setAddOpen] = useState(false)const [editItem, setEditItem] = useState<{ id: string; quantity: number } | null>(null)@@ -546,7 +546,7 @@ function EditTrackingDialog({function ShipmentsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()- const shipments = order.shipments ?? []+ const fulfillments = order.fulfillments ?? []const [editTracking, setEditTracking] = useState<{id: stringtracking: string | null@@ -559,7 +559,7 @@ function ShipmentsCard({ order }: { order: Order }) {adminClient.orders.shipments.cancel(orderId, shipmentId),)- if (shipments.length === 0) return null+ if (fulfillments.length === 0) return nullreturn (<>@@ -570,16 +570,16 @@ function ShipmentsCard({ order }: { order: Order }) {Shipments</CardTitle><CardAction className="flex items-center gap-2">- <Badge variant="info">{shipments.length}</Badge>- {order.shipment_state && <StatusBadge status={order.shipment_state} />}+ <Badge variant="info">{fulfillments.length}</Badge>+ {order.fulfillment_status && <StatusBadge status={order.fulfillment_status} />}</CardAction></CardHeader><CardContent className="flex flex-col gap-4">- {shipments.map((shipment) => (+ {fulfillments.map((shipment) => (<div key={shipment.id} className="rounded-lg border p-4 flex flex-col gap-3"><div className="flex items-center justify-between"><div className="flex items-center gap-2">- <StatusBadge status={shipment.state} />+ <StatusBadge status={shipment.status} /><span className="text-sm font-medium">{shipment.number}</span></div><DropdownMenu>@@ -597,7 +597,7 @@ function ShipmentsCard({ order }: { order: Order }) {<PencilIcon className="size-4" />{shipment.tracking ? 'Edit Tracking' : 'Add Tracking'}</DropdownMenuItem>- {shipment.state === 'ready' && (+ {shipment.status === 'ready' && (<DropdownMenuItemonClick={() => {if (window.confirm('Ship this shipment?')) {@@ -609,7 +609,7 @@ function ShipmentsCard({ order }: { order: Order }) {Ship</DropdownMenuItem>)}- {['pending', 'ready'].includes(shipment.state) && (+ {['pending', 'ready'].includes(shipment.status) && (<><DropdownMenuSeparator /><DropdownMenuItem@@ -629,9 +629,9 @@ function ShipmentsCard({ order }: { order: Order }) {</DropdownMenu></div>- {shipment.shipping_method && (+ {shipment.delivery_method && (<div className="flex items-center justify-between text-sm">- <span className="text-muted-foreground">{shipment.shipping_method.name}</span>+ <span className="text-muted-foreground">{shipment.delivery_method.name}</span><span>{shipment.display_cost}</span></div>)}@@ -661,9 +661,9 @@ function ShipmentsCard({ order }: { order: Order }) {</div>)}- {shipment.shipped_at && (+ {shipment.fulfilled_at && (<span className="text-xs text-muted-foreground">- Shipped {timeAgo(shipment.shipped_at)}+ Shipped {timeAgo(shipment.fulfilled_at)}</span>)}</div>@@ -710,7 +710,7 @@ function PaymentsCard({ order }: { order: Order }) {</CardTitle><CardAction className="flex items-center gap-2"><Badge variant="info">{payments.length}</Badge>- {order.payment_state && <StatusBadge status={order.payment_state} />}+ {order.payment_status && <StatusBadge status={order.payment_status} />}</CardAction></CardHeader><div className="overflow-x-auto">@@ -730,15 +730,15 @@ function PaymentsCard({ order }: { order: Order }) {<td className="p-3 pl-5 font-medium">{payment.number}</td><td className="p-3 text-muted-foreground">{payment.payment_method?.name ?? '—'}</td><td className="p-3">- <StatusBadge status={payment.state} />+ <StatusBadge status={payment.status} /></td><td className="p-3 text-right font-medium whitespace-nowrap">{payment.display_amount}</td><td className="p-3 pr-5">- {(payment.state === 'checkout' ||- payment.state === 'pending' ||- payment.state === 'completed') && (+ {(payment.status === 'checkout' ||+ payment.status === 'pending' ||+ payment.status === 'completed') && (<DropdownMenu><DropdownMenuTrigger asChild><Button variant="ghost" size="icon-xs">@@ -746,7 +746,7 @@ function PaymentsCard({ order }: { order: Order }) {</Button></DropdownMenuTrigger><DropdownMenuContent align="end">- {(payment.state === 'checkout' || payment.state === 'pending') && (+ {(payment.status === 'checkout' || payment.status === 'pending') && (<DropdownMenuItemonClick={() => {if (window.confirm('Capture this payment?')) {@@ -758,9 +758,9 @@ function PaymentsCard({ order }: { order: Order }) {Capture</DropdownMenuItem>)}- {(payment.state === 'checkout' ||- payment.state === 'pending' ||- payment.state === 'completed') && (+ {(payment.status === 'checkout' ||+ payment.status === 'pending' ||+ payment.status === 'completed') && (<DropdownMenuItemclassName="text-destructive focus:text-destructive"onClick={() => {@@ -999,8 +999,8 @@ function OrderSummaryCard({ order }: { order: Order }) {<SummaryRow label="Subtotal" value={order.display_item_total} />- {Number.parseFloat(order.ship_total) > 0 && (- <SummaryRow label="Shipping" value={order.display_ship_total} />+ {Number.parseFloat(order.delivery_total) > 0 && (+ <SummaryRow label="Shipping" value={order.display_delivery_total} />)}{Number.parseFloat(order.discount_total) !== 0 && (diff --git a/packages/admin/src/routes/_authenticated/products/$productId.tsx b/packages/admin/src/routes/_authenticated/products/$productId.tsxindex aad81a12b3..8134e34a53 100644--- a/packages/admin/src/routes/_authenticated/products/$productId.tsx+++ b/packages/admin/src/routes/_authenticated/products/$productId.tsx@@ -371,7 +371,7 @@ function MediaCard({ productId }: { productId: string }) {{assets.map((asset) => (<MediaThumbnailkey={asset.id}- asset={asset as Media}+ asset={asset as unknown as Media}onDelete={() => handleDeleteAsset(asset.id)}/>))}