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.

Added proper add line item dialog with variant fuzzy search

Damian Legawiec04499dba7609
diff --git a/packages/admin-sdk/src/admin-client.ts b/packages/admin-sdk/src/admin-client.ts
index bcad77dc53..35d0ab3872 100644
--- a/packages/admin-sdk/src/admin-client.ts
+++ b/packages/admin-sdk/src/admin-client.ts
@@ -69,7 +69,7 @@ export interface MeResponse {
};
permissions: PermissionRule[];
}
-import type { Store, Product, Order, Media, Category, TaxCategory, Country } from './types';
+import type { Store, Product, Order, Media, Category, TaxCategory, Country, Variant } from './types';
import type {
StoreUpdateParams,
ProductUpdateParams,
@@ -255,6 +255,24 @@ export class AdminClient {
}),
};
+ // ============================================
+ // Variants (top-level, for search/autocomplete)
+ // ============================================
+
+ readonly variants = {
+ list: (params?: ListParams & Record<string, unknown>, options?: RequestOptions): Promise<PaginatedResponse<Variant>> =>
+ this.request<PaginatedResponse<Variant>>('GET', '/variants', {
+ ...options,
+ params: params ? transformListParams(params) : undefined,
+ }),
+
+ get: (id: string, params?: { expand?: string[] }, options?: RequestOptions): Promise<Variant> =>
+ this.request<Variant>('GET', `/variants/${id}`, {
+ ...options,
+ params: getParams(params),
+ }),
+ };
+
// ============================================
// Tax Categories
// ============================================
diff --git a/packages/admin-sdk/src/types/generated/Category.ts b/packages/admin-sdk/src/types/generated/Category.ts
index 2745cf1ab5..da05d5c629 100644
--- a/packages/admin-sdk/src/types/generated/Category.ts
+++ b/packages/admin-sdk/src/types/generated/Category.ts
@@ -1,4 +1,4 @@
-// Typelizer digest 4b7f1380ab5aa7abae6af0861be6a562
+// Typelizer digest 409b9dc5ff6bcdcdca67d8d42db59313
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
import type {CustomField} from '@/types'
@@ -6,7 +6,6 @@ import type {CustomField} from '@/types'
interface Category {
id: string;
name: string;
- pretty_name: string;
permalink: string;
position: number;
depth: number;
@@ -26,10 +25,13 @@ interface Category {
children?: Array<Category>;
ancestors?: Array<Category>;
custom_fields?: Array<CustomField>;
+ pretty_name: string;
lft: number;
rgt: number;
- created_at: string;
- updated_at: string;
+ hide_from_nav: boolean;
+ sort_order: string;
+ rules_match_policy: string;
+ automatic: boolean;
}
export default Category;
diff --git a/packages/admin-sdk/src/types/generated/OptionType.ts b/packages/admin-sdk/src/types/generated/OptionType.ts
index e5694629f3..be57c72bc9 100644
--- a/packages/admin-sdk/src/types/generated/OptionType.ts
+++ b/packages/admin-sdk/src/types/generated/OptionType.ts
@@ -1,4 +1,4 @@
-// Typelizer digest b67ef90e0d3df34451e901209ceb5e6e
+// Typelizer digest 48a3b3751e01501ddfb330ed86b365e4
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
import type {OptionValue} from '@/types'
@@ -11,7 +11,7 @@ interface OptionType {
kind: string;
created_at: string;
updated_at: string;
- option_values?: Array<OptionValue>;
+ option_values: Array<OptionValue>;
}
export default OptionType;
diff --git a/packages/admin-sdk/src/types/generated/Order.ts b/packages/admin-sdk/src/types/generated/Order.ts
index bb9ad5b601..b50237f0a6 100644
--- a/packages/admin-sdk/src/types/generated/Order.ts
+++ b/packages/admin-sdk/src/types/generated/Order.ts
@@ -1,4 +1,4 @@
-// Typelizer digest 7ae2eca4c659b4865ab3541c6b91cf9f
+// Typelizer digest c38cefd348e0e85a6edd0b207d7294c2
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
import type {Discount, LineItem, Fulfillment, Payment, Address, GiftCard, Market, PaymentMethod, Customer, Adjustment, ReturnAuthorization, Reimbursement} from '@/types'
@@ -50,13 +50,11 @@ interface Order {
considered_risky: boolean;
confirmation_delivered: boolean;
store_owner_notification_delivered: boolean;
- internal_note: string | null;
payment_total: string;
display_payment_total: string;
canceled_at: string | null;
approved_at: string | null;
- created_at: string;
- updated_at: string;
+ internal_note: string | null;
metadata: Record<string, unknown> | null;
approver_id: string | null;
canceler_id: string | null;
diff --git a/packages/admin-sdk/src/types/generated/Price.ts b/packages/admin-sdk/src/types/generated/Price.ts
index 3d0d98f8c6..ebe9c257f4 100644
--- a/packages/admin-sdk/src/types/generated/Price.ts
+++ b/packages/admin-sdk/src/types/generated/Price.ts
@@ -1,6 +1,7 @@
-// Typelizer digest 63bfc856c6af5eeee775270d4ee46c73
+// Typelizer digest afe024e84fb613e6dfd091fc69e09c9e
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
+import type {Variant} from '@/types'
interface Price {
id: string;
@@ -15,6 +16,7 @@ interface Price {
variant_id: string | null;
created_at: string;
updated_at: string;
+ variant?: Variant;
}
export default Price;
diff --git a/packages/admin-sdk/src/types/generated/ShippingCategory.ts b/packages/admin-sdk/src/types/generated/ShippingCategory.ts
deleted file mode 100644
index be4551f66e..0000000000
--- a/packages/admin-sdk/src/types/generated/ShippingCategory.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Typelizer digest 3f4e629432bf26d461da760bf634fae2
-//
-// DO NOT MODIFY: This file was automatically generated by Typelizer.
-
-interface ShippingCategory {
- id: string;
- name: string;
- created_at: string;
- updated_at: string;
-}
-
-export default ShippingCategory;
diff --git a/packages/admin-sdk/src/types/generated/Store.ts b/packages/admin-sdk/src/types/generated/Store.ts
index 05becf1016..a4eb92321c 100644
--- a/packages/admin-sdk/src/types/generated/Store.ts
+++ b/packages/admin-sdk/src/types/generated/Store.ts
@@ -2,7 +2,7 @@
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
-type Store = {
+interface Store {
id: string;
name: string;
url: string;
diff --git a/packages/admin-sdk/src/types/generated/Variant.ts b/packages/admin-sdk/src/types/generated/Variant.ts
index 998ccc33e0..79d3525e24 100644
--- a/packages/admin-sdk/src/types/generated/Variant.ts
+++ b/packages/admin-sdk/src/types/generated/Variant.ts
@@ -1,4 +1,4 @@
-// Typelizer digest 1aecfc086e4cce3f916a556c9b27b960
+// Typelizer digest 63a3c10ff6fb4f3bcde508c7ce86f6d4
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
import type {Price, PriceHistory, Media, OptionValue, CustomField} from '@/types'
@@ -33,6 +33,8 @@ interface Variant {
deleted_at: string | null;
created_at: string;
updated_at: string;
+ product_name: string;
+ display_price: string | null;
prices?: Array<Price>;
}
diff --git a/packages/admin-sdk/src/types/generated/index.ts b/packages/admin-sdk/src/types/generated/index.ts
index 97de9dc2a1..222318a4d5 100644
--- a/packages/admin-sdk/src/types/generated/index.ts
+++ b/packages/admin-sdk/src/types/generated/index.ts
@@ -1,4 +1,4 @@
-// Typelizer digest 3d6cfbd10466fcce81d2d1aec3b111e7
+// Typelizer digest f06581f4deb5822d41b29acfdb441494
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
export type { default as Address } from './Address'
@@ -32,10 +32,10 @@ export type { default as Product } from './Product'
export type { default as Refund } from './Refund'
export type { default as Reimbursement } from './Reimbursement'
export type { default as ReturnAuthorization } from './ReturnAuthorization'
-export type { default as ShippingCategory } from './ShippingCategory'
export type { default as State } from './State'
export type { default as StockItem } from './StockItem'
export type { default as StockLocation } from './StockLocation'
export type { default as StoreCredit } from './StoreCredit'
+export type { default as Store } from './Store'
export type { default as TaxCategory } from './TaxCategory'
export type { default as Variant } from './Variant'
diff --git a/packages/admin/src/components/date-range-picker.tsx b/packages/admin/src/components/date-range-picker.tsx
index ddbc3817d1..e0f1b606de 100644
--- a/packages/admin/src/components/date-range-picker.tsx
+++ b/packages/admin/src/components/date-range-picker.tsx
@@ -72,7 +72,7 @@ export function DateRangePicker({ value, onChange }: DateRangePickerProps) {
return (
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
- <Button variant="outline" size="sm" className="h-8 gap-2 text-sm font-normal">
+ <Button size="sm" variant="outline" className="h-8 gap-2 text-sm font-normal">
<CalendarIcon className="size-3.5" />
{activePresetLabel}
<ChevronDownIcon className="size-3.5 text-muted-foreground" />
@@ -119,7 +119,6 @@ export function DateRangePicker({ value, onChange }: DateRangePickerProps) {
</div>
<div className="flex gap-2">
<Button
- variant="outline"
size="sm"
onClick={() => setSelecting('presets')}
>
@@ -127,6 +126,7 @@ export function DateRangePicker({ value, onChange }: DateRangePickerProps) {
</Button>
<Button
size="sm"
+
disabled={!customRange?.from || !customRange?.to}
onClick={handleCustomApply}
>
diff --git a/packages/admin/src/components/ui/button.tsx b/packages/admin/src/components/ui/button.tsx
index e18f7f1364..1e31d4591f 100644
--- a/packages/admin/src/components/ui/button.tsx
+++ b/packages/admin/src/components/ui/button.tsx
@@ -10,10 +10,7 @@ const buttonVariants = cva(
variants: {
variant: {
default: 'bg-primary text-primary-foreground shadow-xs hover:bg-zinc-800',
- outline:
- 'border-border bg-muted text-foreground shadow-xs hover:bg-gray-100 hover:text-foreground aria-expanded:bg-gray-100',
- secondary:
- 'bg-blue-50/50 text-blue-900 border-blue-100/75 shadow-xs hover:border-blue-100 hover:bg-blue-50/75',
+ outline: 'border-border bg-muted text-foreground shadow-xs hover:bg-gray-100 hover:text-foreground aria-expanded:bg-gray-100',
ghost: 'hover:bg-accent hover:text-accent-foreground aria-expanded:bg-accent',
destructive: 'text-destructive bg-muted border-border shadow-xs hover:bg-red-100',
link: 'text-primary underline-offset-4 hover:underline',
diff --git a/packages/admin/src/components/ui/card.tsx b/packages/admin/src/components/ui/card.tsx
index 9c17ec3178..4023ed3f7f 100644
--- a/packages/admin/src/components/ui/card.tsx
+++ b/packages/admin/src/components/ui/card.tsx
@@ -20,7 +20,7 @@ function CardHeader({ className, ...props }: React.ComponentProps<'div'>) {
<div
data-slot="card-header"
className={cn(
- 'flex items-center p-3 pr-3 h-12 border-b border-gray-100 rounded-t-[calc(var(--radius-xl)-1px)]',
+ 'group/card-header @container/card-header grid auto-rows-min items-start gap-1 group-data-[size=sm]/card:px-3 has-data-[slot=card-action]:grid-cols-[1fr_auto] has-data-[slot=card-description]:grid-rows-[auto_auto] p-3 border-b border-gray-100 rounded-t-[calc(var(--radius-2xl)-1px)]',
className,
)}
{...props}
@@ -42,7 +42,7 @@ function CardDescription({ className, ...props }: React.ComponentProps<'div'>) {
return (
<div
data-slot="card-description"
- className={cn('text-sm text-muted-foreground', className)}
+ className={cn('text-sm text-muted-foreground text-left', className)}
{...props}
/>
)
diff --git a/packages/admin/src/components/ui/date-picker.tsx b/packages/admin/src/components/ui/date-picker.tsx
index f5eba152ff..3784d36dd3 100644
--- a/packages/admin/src/components/ui/date-picker.tsx
+++ b/packages/admin/src/components/ui/date-picker.tsx
@@ -2,9 +2,9 @@ import { format, parseISO } from 'date-fns'
import { CalendarIcon, XIcon } from 'lucide-react'
import { useState } from 'react'
import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
import { Calendar } from '@/components/ui/calendar'
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { cn } from '@/lib/utils'
interface DatePickerProps {
value?: string | null
@@ -19,7 +19,7 @@ function DatePicker({
value,
onChange,
placeholder = 'Pick a date',
- className,
+ className: _,
disabled = false,
includeTime = false,
}: DatePickerProps) {
@@ -66,10 +66,6 @@ function DatePicker({
type="button"
variant="outline"
data-empty={!isValidDate}
- className={cn(
- 'w-full justify-start text-left font-normal data-[empty=true]:text-gray-500',
- className,
- )}
>
<CalendarIcon className="size-4 shrink-0 text-gray-400" />
<span className="flex-1 truncate">
@@ -98,11 +94,10 @@ function DatePicker({
/>
{includeTime && (
<div className="border-t border-gray-200 px-3 py-2">
- <input
+ <Input
type="time"
value={timeValue}
onChange={handleTimeChange}
- className="block w-full rounded-md border border-gray-200 bg-white px-2.5 py-1.5 text-sm outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-1"
/>
</div>
)}
diff --git a/packages/admin/src/components/ui/dialog.tsx b/packages/admin/src/components/ui/dialog.tsx
index 066d3b6aa6..035abe6559 100644
--- a/packages/admin/src/components/ui/dialog.tsx
+++ b/packages/admin/src/components/ui/dialog.tsx
@@ -165,7 +165,7 @@ function DialogFooter({
{children}
{showCloseButton && (
<DialogPrimitive.Close render={
- <Button variant="outline">Close</Button>
+ <Button>Close</Button>
} />
)}
</div>
diff --git a/packages/admin/src/components/ui/pagination.tsx b/packages/admin/src/components/ui/pagination.tsx
index 9b4df77583..e60b5bfb86 100644
--- a/packages/admin/src/components/ui/pagination.tsx
+++ b/packages/admin/src/components/ui/pagination.tsx
@@ -72,8 +72,8 @@ export function Pagination({
</span>
<div className="flex items-center gap-1">
<Button
- variant="outline"
size="icon-sm"
+ variant="outline"
className="hidden lg:flex"
disabled={!meta.previous}
onClick={() => onPageChange(1)}
@@ -82,8 +82,8 @@ export function Pagination({
<ChevronsLeftIcon />
</Button>
<Button
- variant="outline"
size="icon-sm"
+ variant="outline"
disabled={!meta.previous}
onClick={() => meta.previous && onPageChange(meta.previous)}
>
@@ -91,8 +91,8 @@ export function Pagination({
<ChevronLeftIcon />
</Button>
<Button
- variant="outline"
size="icon-sm"
+ variant="outline"
disabled={!meta.next}
onClick={() => meta.next && onPageChange(meta.next)}
>
@@ -100,9 +100,9 @@ export function Pagination({
<ChevronRightIcon />
</Button>
<Button
- variant="outline"
size="icon-sm"
className="hidden lg:flex"
+ variant="outline"
disabled={!meta.next}
onClick={() => onPageChange(meta.pages)}
>
diff --git a/packages/admin/src/components/ui/select.tsx b/packages/admin/src/components/ui/select.tsx
index c3c4871b74..a6844f2bdb 100644
--- a/packages/admin/src/components/ui/select.tsx
+++ b/packages/admin/src/components/ui/select.tsx
@@ -120,7 +120,7 @@ function SelectItem({
<SelectPrimitive.Item
data-slot="select-item"
className={cn(
- "relative flex w-full cursor-default items-center gap-1.5 rounded-md py-2 pr-8 pl-2 text-sm outline-hidden select-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+ "relative flex w-full cursor-default items-center gap-1.5 rounded-md py-1 pr-8 pl-2 text-sm outline-hidden select-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
className,
)}
{...props}
diff --git a/packages/admin/src/lib/formatters.ts b/packages/admin/src/lib/formatters.ts
index d94f3a731c..8460427817 100644
--- a/packages/admin/src/lib/formatters.ts
+++ b/packages/admin/src/lib/formatters.ts
@@ -1,3 +1,5 @@
+import { formatDistanceToNow } from 'date-fns'
+
export function formatPrice(
price: { amount?: string; currency?: string; display?: string } | null,
) {
@@ -6,21 +8,5 @@ export function formatPrice(
}
export function formatRelativeTime(iso: string) {
- const date = new Date(iso)
- const now = new Date()
- const diffMs = now.getTime() - date.getTime()
- const diffMins = Math.floor(diffMs / 60000)
- const diffHours = Math.floor(diffMins / 60)
- const diffDays = Math.floor(diffHours / 24)
-
- if (diffMins < 1) return 'just now'
- if (diffMins < 60) return `${diffMins}m ago`
- if (diffHours < 24) return `${diffHours}h ago`
- if (diffDays < 30) return `${diffDays}d ago`
-
- return date.toLocaleDateString('en-US', {
- month: 'short',
- day: 'numeric',
- year: date.getFullYear() !== now.getFullYear() ? 'numeric' : undefined,
- })
+ return formatDistanceToNow(new Date(iso), { addSuffix: true })
}
diff --git a/packages/admin/src/routes/_authenticated/$storeId/index.tsx b/packages/admin/src/routes/_authenticated/$storeId/index.tsx
index 77b864f026..424bb259fb 100644
--- a/packages/admin/src/routes/_authenticated/$storeId/index.tsx
+++ b/packages/admin/src/routes/_authenticated/$storeId/index.tsx
@@ -92,7 +92,7 @@ function AnalyticsChart({ data }: { data: DashboardAnalytics }) {
return (
<Card>
- <CardHeader className="flex h-auto flex-col border-b p-0 sm:flex-row">
+ <CardHeader className="flex h-auto flex-col border-b p-0 sm:flex-row gap-0">
{chartTabs.map((tab) => (
<button
key={tab.key}
diff --git a/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx b/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx
index e367c99e62..55ddb1b7f1 100644
--- a/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx
+++ b/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx
@@ -1,4 +1,4 @@
-import type { Order } from '@spree/admin-sdk'
+import type { Order, Variant } from '@spree/admin-sdk'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { createFileRoute } from '@tanstack/react-router'
import { AddressBlock } from '@/components/address-block'
@@ -22,6 +22,7 @@ import {
import { type FormEvent, useState } from 'react'
import { useConfirm } from '@/components/confirm-dialog'
import { adminClient } from '@/client'
+import { formatRelativeTime } from '@/lib/formatters'
import { Badge, StatusBadge } from '@/components/ui/badge'
import { Button } from '@/components/ui/button'
import { Card, CardAction, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
@@ -41,6 +42,14 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu'
+import {
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from '@/components/ui/sheet'
import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
import { Input } from '@/components/ui/input'
import { Separator } from '@/components/ui/separator'
@@ -107,16 +116,6 @@ function formatDate(iso: string | null) {
})
}
-function timeAgo(iso: string | null) {
- if (!iso) return ''
- const diff = Date.now() - new Date(iso).getTime()
- const minutes = Math.floor(diff / 60000)
- if (minutes < 60) return `${minutes}m ago`
- const hours = Math.floor(minutes / 60)
- if (hours < 24) return `${hours}h ago`
- const days = Math.floor(hours / 24)
- return `${days}d ago`
-}
// ---------------------------------------------------------------------------
// Page
@@ -182,14 +181,14 @@ function OrderHeader({ order }: { order: Order }) {
{order.completed_at && (
<span className="text-sm text-muted-foreground">
- Completed {timeAgo(order.completed_at)}
+ Completed {order.completed_at ? formatRelativeTime(order.completed_at) : ''}
</span>
)}
<div className="ml-auto">
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <Button variant="outline" size="icon-sm">
+ <Button size="icon-sm" variant="outline">
<EllipsisVerticalIcon className="size-4" />
</Button>
</DropdownMenuTrigger>
@@ -244,6 +243,18 @@ function AddLineItemDialog({
open: boolean
onOpenChange: (open: boolean) => void
}) {
+ const [search, setSearch] = useState('')
+ const [selectedVariant, setSelectedVariant] = useState<Variant | null>(null)
+ const [quantity, setQuantity] = useState(1)
+
+ const { data: variantsData } = useQuery({
+ queryKey: ['variants', 'search', search],
+ queryFn: () => adminClient.variants.list({ search, limit: 10 }),
+ enabled: search.length >= 3,
+ staleTime: 30_000,
+ })
+
+ const variants = variantsData?.data ?? []
const mutation = useOrderMutation(orderId, (params: { variant_id: string; quantity: number }) =>
adminClient.orders.lineItems.create(orderId, params),
@@ -251,44 +262,114 @@ function AddLineItemDialog({
function handleSubmit(e: FormEvent<HTMLFormElement>) {
e.preventDefault()
- const fd = new FormData(e.currentTarget)
+ if (!selectedVariant) return
mutation.mutate(
- { variant_id: fd.get('variant_id') as string, quantity: Number(fd.get('quantity')) || 1 },
- { onSuccess: () => onOpenChange(false) },
+ { variant_id: selectedVariant.id, quantity },
+ {
+ onSuccess: () => {
+ onOpenChange(false)
+ setSelectedVariant(null)
+ setSearch('')
+ setQuantity(1)
+ },
+ },
)
}
return (
- <Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent>
- <DialogHeader>
- <DialogTitle>Add Line Item</DialogTitle>
- <DialogDescription>Add a product variant to this order.</DialogDescription>
- </DialogHeader>
- <form onSubmit={handleSubmit}>
- <DialogBody>
+ <Sheet open={open} onOpenChange={(o) => onOpenChange(o as boolean)}>
+ <SheetContent side="right">
+ <SheetHeader>
+ <SheetTitle>Add Line Item</SheetTitle>
+ <SheetDescription>Search for a product variant to add to this order.</SheetDescription>
+ </SheetHeader>
+ <form onSubmit={handleSubmit} className="flex flex-col flex-1 overflow-hidden">
+ <div className="flex-1 overflow-y-auto p-4">
<FieldGroup>
<Field>
- <FieldLabel htmlFor="variant_id">Variant ID</FieldLabel>
- <Input id="variant_id" name="variant_id" placeholder="variant_xxx" required />
+ <FieldLabel>Search variant</FieldLabel>
+ <Input
+ placeholder="Type product name or SKU (min 3 chars)..."
+ value={search}
+ onChange={(e) => {
+ setSearch(e.target.value)
+ setSelectedVariant(null)
+ }}
+ autoFocus
+ />
+ {search.length >= 3 && variants.length > 0 && !selectedVariant && (
+ <div className="mt-1 rounded-lg border border-gray-200 bg-white shadow-xs max-h-[280px] overflow-y-auto">
+ {variants.map((v) => (
+ <button
+ key={v.id}
+ type="button"
+ onClick={() => {
+ setSelectedVariant(v)
+ setSearch('')
+ }}
+ className="flex w-full items-center gap-3 px-3 py-2.5 text-left text-sm hover:bg-muted transition-colors border-b last:border-0"
+ >
+ <div className="min-w-0 flex-1">
+ <div className="font-medium truncate">{v.product_name ?? v.sku}</div>
+ <div className="text-xs text-muted-foreground">
+ {v.options_text && <span>{v.options_text} · </span>}
+ SKU: {v.sku || '—'}
+ </div>
+ </div>
+ <div className="text-sm font-medium whitespace-nowrap">
+ {v.display_price ?? ''}
+ </div>
+ </button>
+ ))}
+ </div>
+ )}
+ {search.length >= 3 && variants.length === 0 && !selectedVariant && (
+ <p className="mt-1 text-xs text-muted-foreground">No variants found</p>
+ )}
</Field>
+
+ {selectedVariant && (
+ <div className="rounded-lg border border-blue-200 bg-blue-50 p-3 flex items-center justify-between">
+ <div>
+ <div className="font-medium text-sm">{selectedVariant.product_name ?? selectedVariant.sku}</div>
+ <div className="text-xs text-muted-foreground">
+ {selectedVariant.options_text && <span>{selectedVariant.options_text} · </span>}
+ SKU: {selectedVariant.sku || '—'} · {selectedVariant.display_price ?? ''}
+ </div>
+ </div>
+ <button
+ type="button"
+ onClick={() => setSelectedVariant(null)}
+ className="p-1 rounded hover:bg-blue-100 text-blue-600"
+ >
+ <XCircleIcon className="size-4" />
+ </button>
+ </div>
+ )}
+
<Field>
<FieldLabel htmlFor="quantity">Quantity</FieldLabel>
- <Input id="quantity" name="quantity" type="number" min={1} defaultValue={1} />
+ <Input
+ id="quantity"
+ type="number"
+ min={1}
+ value={quantity}
+ onChange={(e) => setQuantity(Number(e.target.value) || 1)}
+ />
</Field>
</FieldGroup>
- </DialogBody>
- <DialogFooter>
+ </div>
+ <SheetFooter>
<Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
Cancel
</Button>
- <Button type="submit" disabled={mutation.isPending}>
+ <Button type="submit" disabled={!selectedVariant || mutation.isPending}>
{mutation.isPending ? 'Adding…' : 'Add Item'}
</Button>
- </DialogFooter>
+ </SheetFooter>
</form>
- </DialogContent>
- </Dialog>
+ </SheetContent>
+ </Sheet>
)
}
@@ -374,10 +455,10 @@ function LineItemsCard({ order }: { order: Order }) {
<CardTitle>
<ShoppingCartIcon className="size-4" />
Line Items
+ {items.length > 0 && <Badge>{items.length}</Badge>}
</CardTitle>
<CardAction className="flex items-center gap-2">
- {items.length > 0 && <Badge variant="info">{items.length}</Badge>}
- <Button size="sm" variant="secondary" onClick={() => setAddOpen(true)}>
+ <Button size="sm" variant="outline" onClick={() => setAddOpen(true)}>
<PlusIcon data-icon="inline-start" />
Add Item
</Button>
@@ -576,10 +657,10 @@ function ShipmentsCard({ order }: { order: Order }) {
<CardHeader>
<CardTitle>
<TruckIcon className="size-4" />
- Shipments
+ Fulfillments
+ <Badge>{fulfillments.length}</Badge>
</CardTitle>
<CardAction className="flex items-center gap-2">
- <Badge variant="info">{fulfillments.length}</Badge>
{order.fulfillment_status && <StatusBadge status={order.fulfillment_status} />}
</CardAction>
</CardHeader>
@@ -672,7 +753,7 @@ function ShipmentsCard({ order }: { order: Order }) {
{fulfillment.fulfilled_at && (
<span className="text-xs text-muted-foreground">
- Shipped {timeAgo(fulfillment.fulfilled_at)}
+ Shipped {fulfillment.fulfilled_at ? formatRelativeTime(fulfillment.fulfilled_at) : ''}
</span>
)}
</div>
@@ -718,9 +799,9 @@ function PaymentsCard({ order }: { order: Order }) {
<CardTitle>
<CreditCardIcon className="size-4" />
Payments
+ <Badge>{payments.length}</Badge>
</CardTitle>
<CardAction className="flex items-center gap-2">
- <Badge variant="info">{payments.length}</Badge>
{order.payment_status && <StatusBadge status={order.payment_status} />}
</CardAction>
</CardHeader>
@@ -889,8 +970,8 @@ function AdjustmentsCard({ order }: { order: Order }) {
Adjustments
</CardTitle>
<CardAction className="flex items-center gap-2">
- {adjustments.length > 0 && <Badge variant="info">{adjustments.length}</Badge>}
- <Button size="sm" variant="secondary" onClick={() => setAddOpen(true)}>
+ {adjustments.length > 0 && <Badge>{adjustments.length}</Badge>}
+ <Button size="sm" variant="outline" onClick={() => setAddOpen(true)}>
<PlusIcon data-icon="inline-start" />
Add
</Button>
diff --git a/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx b/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx
index 08c0da76a9..6b392ed742 100644
--- a/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx
+++ b/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx
@@ -178,7 +178,7 @@ function ProductForm({ product }: { product: Product }) {
<div className="ml-auto flex items-center gap-2">
<Button
type="button"
- variant="outline"
+ variant="destructive"
size="sm"
onClick={handleDelete}
disabled={deleteProduct.isPending}
@@ -188,6 +188,7 @@ function ProductForm({ product }: { product: Product }) {
</Button>
<Button
type="submit"
+
size="sm"
disabled={updateProduct.isPending || !form.formState.isDirty}
>
diff --git a/packages/sdk/src/types/generated/CustomField.ts b/packages/sdk/src/types/generated/CustomField.ts
index 6d7662bdf2..578f383235 100644
--- a/packages/sdk/src/types/generated/CustomField.ts
+++ b/packages/sdk/src/types/generated/CustomField.ts
@@ -1,4 +1,4 @@
-// Typelizer digest 3ac7ee503478b30fbadc8402bc8452bf
+// Typelizer digest bf1a183ba12220f3ff56dafa12252c55
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
diff --git a/spree/api/app/controllers/spree/api/v3/admin/variants_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/variants_controller.rb
new file mode 100644
index 0000000000..8d70e11c52
--- /dev/null
+++ b/spree/api/app/controllers/spree/api/v3/admin/variants_controller.rb
@@ -0,0 +1,31 @@
+module Spree
+ module Api
+ module V3
+ module Admin
+ class VariantsController < ResourceController
+ protected
+
+ def model_class
+ Spree::Variant
+ end
+
+ def serializer_class
+ Spree.api.admin_variant_serializer
+ end
+
+ def scope
+ current_store.variants.eligible
+ end
+
+ def scope_includes
+ [
+ :prices, stock_items: :stock_location,
+ option_values: :option_type,
+ primary_media: [attachment_attachment: :blob]
+ ]
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rb
index 86b45e8113..ac835c47d8 100644
--- a/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rb
+++ b/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rb
@@ -7,7 +7,8 @@ module Spree
class VariantSerializer < V3::VariantSerializer
# Additional type hints for admin-only attributes
- typelize position: :number, tax_category_id: [:string, nullable: true],
+ typelize product_name: :string, display_price: [:string, nullable: true],
+ position: :number, tax_category_id: [:string, nullable: true],
cost_price: [:string, nullable: true], cost_currency: [:string, nullable: true],
total_on_hand: [:number, nullable: true],
deleted_at: [:string, nullable: true]
@@ -16,6 +17,14 @@ module Spree
attributes :position, :total_on_hand, :tax_category_id, :cost_price, :cost_currency, deleted_at: :iso8601,
created_at: :iso8601, updated_at: :iso8601
+ attribute :product_name do |variant|
+ variant.product&.name
+ end
+
+ attribute :display_price do |variant|
+ variant.display_price&.to_s
+ end
+
# Override inherited associations to use admin serializers
one :primary_media,
resource: Spree.api.admin_media_serializer,
diff --git a/spree/api/config/routes.rb b/spree/api/config/routes.rb
index 07e514241e..baad86071c 100644
--- a/spree/api/config/routes.rb
+++ b/spree/api/config/routes.rb
@@ -129,6 +129,9 @@ Spree::Core::Engine.add_routes do
# Tax Categories
resources :tax_categories, only: [:index, :show]
+ # Variants (top-level, for search/autocomplete across all products)
+ resources :variants, only: [:index, :show]
+
# Countries (with ?expand=states for state/province dropdown)
resources :countries, only: [:index, :show]
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/variants_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/variants_controller_spec.rb
new file mode 100644
index 0000000000..619d2cdd3c
--- /dev/null
+++ b/spree/api/spec/controllers/spree/api/v3/admin/variants_controller_spec.rb
@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Api::V3::Admin::VariantsController, type: :controller do
+ render_views
+
+ include_context 'API v3 Admin authenticated'
+
+ let!(:product) { create(:product, stores: [store]) }
+ let!(:variant) { create(:variant, product: product) }
+
+ before { request.headers.merge!(headers) }
+
+ describe 'GET #index' do
+ subject { get :index, as: :json }
+
+ it 'returns variants' do
+ subject
+ expect(response).to have_http_status(:ok)
+ expect(json_response['data']).to be_an(Array)
+ expect(json_response['data'].map { |v| v['id'] }).to include(variant.prefixed_id)
+ end
+
+ it 'excludes master variants' do
+ subject
+ master_ids = product.master.prefixed_id
+ returned_ids = json_response['data'].map { |v| v['id'] }
+ expect(returned_ids).not_to include(master_ids)
+ end
+
+ it 'returns pagination metadata' do
+ subject
+ expect(json_response['meta']).to include('page', 'limit', 'count', 'pages')
+ end
+
+ context 'with search query' do
+ let!(:searchable_variant) { create(:variant, product: product, sku: 'UNIQUE-SKU-12345') }
+
+ it 'filters variants by SKU' do
+ get :index, params: { q: { search: 'UNIQUE-SKU' } }, as: :json
+
+ expect(response).to have_http_status(:ok)
+ ids = json_response['data'].map { |v| v['id'] }
+ expect(ids).to include(searchable_variant.prefixed_id)
+ end
+
+ it 'filters variants by product name' do
+ get :index, params: { q: { search: product.name[0..4] } }, as: :json
+
+ expect(response).to have_http_status(:ok)
+ expect(json_response['data'].length).to be >= 1
+ end
+
+ it 'returns empty when search has no matches' do
+ get :index, params: { q: { search: 'xqzwkj999' } }, as: :json
+
+ expect(response).to have_http_status(:ok)
+ expect(json_response['data']).to eq([])
+ end
+ end
+
+ context 'without authentication' do
+ let(:headers) { {} }
+
+ it 'returns unauthorized' do
+ subject
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+ end
+
+ describe 'GET #show' do
+ subject { get :show, params: { id: variant.prefixed_id }, as: :json }
+
+ it 'returns the variant' do
+ subject
+ expect(response).to have_http_status(:ok)
+ expect(json_response['id']).to eq(variant.prefixed_id)
+ expect(json_response['sku']).to eq(variant.sku)
+ end
+
+ context 'with non-existent variant' do
+ it 'returns 404' do
+ get :show, params: { id: 'variant_nonexistent' }, as: :json
+ expect(response).to have_http_status(:not_found)
+ end
+ end
+ end
+end
diff --git a/spree/core/app/models/spree/variant.rb b/spree/core/app/models/spree/variant.rb
index 3dc876c6bc..57050a31b0 100644
--- a/spree/core/app/models/spree/variant.rb
+++ b/spree/core/app/models/spree/variant.rb
@@ -169,7 +169,7 @@ module Spree
self.whitelisted_ransackable_associations = %w[option_values product tax_category prices default_price]
self.whitelisted_ransackable_attributes = %w[weight depth width height sku discontinue_on is_master cost_price cost_currency track_inventory
deleted_at]
- self.whitelisted_ransackable_scopes = %i(product_name_or_sku_cont search_by_product_name_or_sku)
+ self.whitelisted_ransackable_scopes = %i(product_name_or_sku_cont search_by_product_name_or_sku search)
def self.product_name_or_sku_cont(query)
sanitized_query = ActiveRecord::Base.sanitize_sql_like(query.to_s.downcase.strip)