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 Select labels (Base UI) + provider names + move Stock Transfers to Products
Damian Legawiec8396bbff4796
diff --git a/packages/admin/src/nav/default.ts b/packages/admin/src/nav/default.tsindex e4cd03544f..3bd917587e 100644--- a/packages/admin/src/nav/default.ts+++ b/packages/admin/src/nav/default.ts@@ -65,6 +65,13 @@ nav.add({subject: Subject.OptionType,position: 400,},+ {+ key: 'products.stock',+ label: 'Stock',+ path: '/products/stock/transfers',+ subject: Subject.StockTransfer,+ position: 500,+ },],})diff --git a/packages/admin/src/nav/settings.ts b/packages/admin/src/nav/settings.tsindex c3fd6f4cf6..5cdc58fd97 100644--- a/packages/admin/src/nav/settings.ts+++ b/packages/admin/src/nav/settings.ts@@ -1,5 +1,4 @@import {- ArrowLeftRightIcon,CreditCardIcon,KeyRoundIcon,PercentIcon,@@ -55,16 +54,6 @@ settingsNav.add({subject: Subject.StockLocation,})-settingsNav.add({- key: 'settings.stock-transfers',- label: 'Stock transfers',- path: '/stock-transfers',- icon: ArrowLeftRightIcon,- group: 'fulfillment',- position: 200,- subject: Subject.StockTransfer,-})-settingsNav.add({key: 'settings.staff',label: 'Staff',diff --git a/packages/admin/src/routeTree.gen.ts b/packages/admin/src/routeTree.gen.tsindex 2c84bbf8d4..7602c0cd31 100644--- a/packages/admin/src/routeTree.gen.ts+++ b/packages/admin/src/routeTree.gen.ts@@ -23,7 +23,6 @@ import { Route as AuthenticatedStoreIdOrdersIndexRouteImport } from './routes/_aimport { Route as AuthenticatedStoreIdCustomersIndexRouteImport } from './routes/_authenticated/$storeId/customers/index'import { Route as AuthenticatedStoreIdSettingsTaxCategoriesRouteImport } from './routes/_authenticated/$storeId/settings/tax-categories'import { Route as AuthenticatedStoreIdSettingsStoreRouteImport } from './routes/_authenticated/$storeId/settings/store'-import { Route as AuthenticatedStoreIdSettingsStockTransfersRouteImport } from './routes/_authenticated/$storeId/settings/stock-transfers'import { Route as AuthenticatedStoreIdSettingsStockLocationsRouteImport } from './routes/_authenticated/$storeId/settings/stock-locations'import { Route as AuthenticatedStoreIdSettingsStaffRouteImport } from './routes/_authenticated/$storeId/settings/staff'import { Route as AuthenticatedStoreIdSettingsPaymentMethodsRouteImport } from './routes/_authenticated/$storeId/settings/payment-methods'@@ -35,6 +34,7 @@ import { Route as AuthenticatedStoreIdOrdersNewRouteImport } from './routes/_autimport { Route as AuthenticatedStoreIdOrdersDraftsRouteImport } from './routes/_authenticated/$storeId/orders/drafts'import { Route as AuthenticatedStoreIdOrdersOrderIdRouteImport } from './routes/_authenticated/$storeId/orders/$orderId'import { Route as AuthenticatedStoreIdCustomersCustomerIdRouteImport } from './routes/_authenticated/$storeId/customers/$customerId'+import { Route as AuthenticatedStoreIdProductsStockTransfersRouteImport } from './routes/_authenticated/$storeId/products/stock/transfers'const LoginRoute = LoginRouteImport.update({id: '/login',@@ -115,12 +115,6 @@ const AuthenticatedStoreIdSettingsStoreRoute =path: '/store',getParentRoute: () => AuthenticatedStoreIdSettingsRoute,} as any)-const AuthenticatedStoreIdSettingsStockTransfersRoute =- AuthenticatedStoreIdSettingsStockTransfersRouteImport.update({- id: '/stock-transfers',- path: '/stock-transfers',- getParentRoute: () => AuthenticatedStoreIdSettingsRoute,- } as any)const AuthenticatedStoreIdSettingsStockLocationsRoute =AuthenticatedStoreIdSettingsStockLocationsRouteImport.update({id: '/stock-locations',@@ -187,6 +181,12 @@ const AuthenticatedStoreIdCustomersCustomerIdRoute =path: '/customers/$customerId',getParentRoute: () => AuthenticatedStoreIdRoute,} as any)+const AuthenticatedStoreIdProductsStockTransfersRoute =+ AuthenticatedStoreIdProductsStockTransfersRouteImport.update({+ id: '/products/stock/transfers',+ path: '/products/stock/transfers',+ getParentRoute: () => AuthenticatedStoreIdRoute,+ } as any)export interface FileRoutesByFullPath {'/': typeof AuthenticatedIndexRoute@@ -206,7 +206,6 @@ export interface FileRoutesByFullPath {'/$storeId/settings/payment-methods': typeof AuthenticatedStoreIdSettingsPaymentMethodsRoute'/$storeId/settings/staff': typeof AuthenticatedStoreIdSettingsStaffRoute'/$storeId/settings/stock-locations': typeof AuthenticatedStoreIdSettingsStockLocationsRoute- '/$storeId/settings/stock-transfers': typeof AuthenticatedStoreIdSettingsStockTransfersRoute'/$storeId/settings/store': typeof AuthenticatedStoreIdSettingsStoreRoute'/$storeId/settings/tax-categories': typeof AuthenticatedStoreIdSettingsTaxCategoriesRoute'/$storeId/customers/': typeof AuthenticatedStoreIdCustomersIndexRoute@@ -214,6 +213,7 @@ export interface FileRoutesByFullPath {'/$storeId/products/': typeof AuthenticatedStoreIdProductsIndexRoute'/$storeId/promotions/': typeof AuthenticatedStoreIdPromotionsIndexRoute'/$storeId/settings/': typeof AuthenticatedStoreIdSettingsIndexRoute+ '/$storeId/products/stock/transfers': typeof AuthenticatedStoreIdProductsStockTransfersRoute}export interface FileRoutesByTo {'/login': typeof LoginRoute@@ -231,7 +231,6 @@ export interface FileRoutesByTo {'/$storeId/settings/payment-methods': typeof AuthenticatedStoreIdSettingsPaymentMethodsRoute'/$storeId/settings/staff': typeof AuthenticatedStoreIdSettingsStaffRoute'/$storeId/settings/stock-locations': typeof AuthenticatedStoreIdSettingsStockLocationsRoute- '/$storeId/settings/stock-transfers': typeof AuthenticatedStoreIdSettingsStockTransfersRoute'/$storeId/settings/store': typeof AuthenticatedStoreIdSettingsStoreRoute'/$storeId/settings/tax-categories': typeof AuthenticatedStoreIdSettingsTaxCategoriesRoute'/$storeId/customers': typeof AuthenticatedStoreIdCustomersIndexRoute@@ -239,6 +238,7 @@ export interface FileRoutesByTo {'/$storeId/products': typeof AuthenticatedStoreIdProductsIndexRoute'/$storeId/promotions': typeof AuthenticatedStoreIdPromotionsIndexRoute'/$storeId/settings': typeof AuthenticatedStoreIdSettingsIndexRoute+ '/$storeId/products/stock/transfers': typeof AuthenticatedStoreIdProductsStockTransfersRoute}export interface FileRoutesById {__root__: typeof rootRouteImport@@ -260,7 +260,6 @@ export interface FileRoutesById {'/_authenticated/$storeId/settings/payment-methods': typeof AuthenticatedStoreIdSettingsPaymentMethodsRoute'/_authenticated/$storeId/settings/staff': typeof AuthenticatedStoreIdSettingsStaffRoute'/_authenticated/$storeId/settings/stock-locations': typeof AuthenticatedStoreIdSettingsStockLocationsRoute- '/_authenticated/$storeId/settings/stock-transfers': typeof AuthenticatedStoreIdSettingsStockTransfersRoute'/_authenticated/$storeId/settings/store': typeof AuthenticatedStoreIdSettingsStoreRoute'/_authenticated/$storeId/settings/tax-categories': typeof AuthenticatedStoreIdSettingsTaxCategoriesRoute'/_authenticated/$storeId/customers/': typeof AuthenticatedStoreIdCustomersIndexRoute@@ -268,6 +267,7 @@ export interface FileRoutesById {'/_authenticated/$storeId/products/': typeof AuthenticatedStoreIdProductsIndexRoute'/_authenticated/$storeId/promotions/': typeof AuthenticatedStoreIdPromotionsIndexRoute'/_authenticated/$storeId/settings/': typeof AuthenticatedStoreIdSettingsIndexRoute+ '/_authenticated/$storeId/products/stock/transfers': typeof AuthenticatedStoreIdProductsStockTransfersRoute}export interface FileRouteTypes {fileRoutesByFullPath: FileRoutesByFullPath@@ -289,7 +289,6 @@ export interface FileRouteTypes {| '/$storeId/settings/payment-methods'| '/$storeId/settings/staff'| '/$storeId/settings/stock-locations'- | '/$storeId/settings/stock-transfers'| '/$storeId/settings/store'| '/$storeId/settings/tax-categories'| '/$storeId/customers/'@@ -297,6 +296,7 @@ export interface FileRouteTypes {| '/$storeId/products/'| '/$storeId/promotions/'| '/$storeId/settings/'+ | '/$storeId/products/stock/transfers'fileRoutesByTo: FileRoutesByToto:| '/login'@@ -314,7 +314,6 @@ export interface FileRouteTypes {| '/$storeId/settings/payment-methods'| '/$storeId/settings/staff'| '/$storeId/settings/stock-locations'- | '/$storeId/settings/stock-transfers'| '/$storeId/settings/store'| '/$storeId/settings/tax-categories'| '/$storeId/customers'@@ -322,6 +321,7 @@ export interface FileRouteTypes {| '/$storeId/products'| '/$storeId/promotions'| '/$storeId/settings'+ | '/$storeId/products/stock/transfers'id:| '__root__'| '/_authenticated'@@ -342,7 +342,6 @@ export interface FileRouteTypes {| '/_authenticated/$storeId/settings/payment-methods'| '/_authenticated/$storeId/settings/staff'| '/_authenticated/$storeId/settings/stock-locations'- | '/_authenticated/$storeId/settings/stock-transfers'| '/_authenticated/$storeId/settings/store'| '/_authenticated/$storeId/settings/tax-categories'| '/_authenticated/$storeId/customers/'@@ -350,6 +349,7 @@ export interface FileRouteTypes {| '/_authenticated/$storeId/products/'| '/_authenticated/$storeId/promotions/'| '/_authenticated/$storeId/settings/'+ | '/_authenticated/$storeId/products/stock/transfers'fileRoutesById: FileRoutesById}export interface RootRouteChildren {@@ -458,13 +458,6 @@ declare module '@tanstack/react-router' {preLoaderRoute: typeof AuthenticatedStoreIdSettingsStoreRouteImportparentRoute: typeof AuthenticatedStoreIdSettingsRoute}- '/_authenticated/$storeId/settings/stock-transfers': {- id: '/_authenticated/$storeId/settings/stock-transfers'- path: '/stock-transfers'- fullPath: '/$storeId/settings/stock-transfers'- preLoaderRoute: typeof AuthenticatedStoreIdSettingsStockTransfersRouteImport- parentRoute: typeof AuthenticatedStoreIdSettingsRoute- }'/_authenticated/$storeId/settings/stock-locations': {id: '/_authenticated/$storeId/settings/stock-locations'path: '/stock-locations'@@ -542,6 +535,13 @@ declare module '@tanstack/react-router' {preLoaderRoute: typeof AuthenticatedStoreIdCustomersCustomerIdRouteImportparentRoute: typeof AuthenticatedStoreIdRoute}+ '/_authenticated/$storeId/products/stock/transfers': {+ id: '/_authenticated/$storeId/products/stock/transfers'+ path: '/products/stock/transfers'+ fullPath: '/$storeId/products/stock/transfers'+ preLoaderRoute: typeof AuthenticatedStoreIdProductsStockTransfersRouteImport+ parentRoute: typeof AuthenticatedStoreIdRoute+ }}}@@ -550,7 +550,6 @@ interface AuthenticatedStoreIdSettingsRouteChildren {AuthenticatedStoreIdSettingsPaymentMethodsRoute: typeof AuthenticatedStoreIdSettingsPaymentMethodsRouteAuthenticatedStoreIdSettingsStaffRoute: typeof AuthenticatedStoreIdSettingsStaffRouteAuthenticatedStoreIdSettingsStockLocationsRoute: typeof AuthenticatedStoreIdSettingsStockLocationsRoute- AuthenticatedStoreIdSettingsStockTransfersRoute: typeof AuthenticatedStoreIdSettingsStockTransfersRouteAuthenticatedStoreIdSettingsStoreRoute: typeof AuthenticatedStoreIdSettingsStoreRouteAuthenticatedStoreIdSettingsTaxCategoriesRoute: typeof AuthenticatedStoreIdSettingsTaxCategoriesRouteAuthenticatedStoreIdSettingsIndexRoute: typeof AuthenticatedStoreIdSettingsIndexRoute@@ -566,8 +565,6 @@ const AuthenticatedStoreIdSettingsRouteChildren: AuthenticatedStoreIdSettingsRouAuthenticatedStoreIdSettingsStaffRoute,AuthenticatedStoreIdSettingsStockLocationsRoute:AuthenticatedStoreIdSettingsStockLocationsRoute,- AuthenticatedStoreIdSettingsStockTransfersRoute:- AuthenticatedStoreIdSettingsStockTransfersRoute,AuthenticatedStoreIdSettingsStoreRoute:AuthenticatedStoreIdSettingsStoreRoute,AuthenticatedStoreIdSettingsTaxCategoriesRoute:@@ -595,6 +592,7 @@ interface AuthenticatedStoreIdRouteChildren {AuthenticatedStoreIdOrdersIndexRoute: typeof AuthenticatedStoreIdOrdersIndexRouteAuthenticatedStoreIdProductsIndexRoute: typeof AuthenticatedStoreIdProductsIndexRouteAuthenticatedStoreIdPromotionsIndexRoute: typeof AuthenticatedStoreIdPromotionsIndexRoute+ AuthenticatedStoreIdProductsStockTransfersRoute: typeof AuthenticatedStoreIdProductsStockTransfersRoute}const AuthenticatedStoreIdRouteChildren: AuthenticatedStoreIdRouteChildren = {@@ -620,6 +618,8 @@ const AuthenticatedStoreIdRouteChildren: AuthenticatedStoreIdRouteChildren = {AuthenticatedStoreIdProductsIndexRoute,AuthenticatedStoreIdPromotionsIndexRoute:AuthenticatedStoreIdPromotionsIndexRoute,+ AuthenticatedStoreIdProductsStockTransfersRoute:+ AuthenticatedStoreIdProductsStockTransfersRoute,}const AuthenticatedStoreIdRouteWithChildren =diff --git a/packages/admin/src/routes/_authenticated/$storeId/settings/stock-transfers.tsx b/packages/admin/src/routes/_authenticated/$storeId/products/stock/transfers.tsxsimilarity index 99%rename from packages/admin/src/routes/_authenticated/$storeId/settings/stock-transfers.tsxrename to packages/admin/src/routes/_authenticated/$storeId/products/stock/transfers.tsxindex 1de4ac4096..83aa894db6 100644--- a/packages/admin/src/routes/_authenticated/$storeId/settings/stock-transfers.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/products/stock/transfers.tsx@@ -44,7 +44,7 @@ const stockTransfersSearchSchema = resourceSearchSchema.extend({new: z.coerce.boolean().optional(),})-export const Route = createFileRoute('/_authenticated/$storeId/settings/stock-transfers')({+export const Route = createFileRoute('/_authenticated/$storeId/products/stock/transfers')({validateSearch: stockTransfersSearchSchema,component: StockTransfersPage,})diff --git a/packages/admin/src/routes/_authenticated/$storeId/promotions/$promotionId.tsx b/packages/admin/src/routes/_authenticated/$storeId/promotions/$promotionId.tsxindex 614ec3560a..b1f8e1a19e 100644--- a/packages/admin/src/routes/_authenticated/$storeId/promotions/$promotionId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/promotions/$promotionId.tsx@@ -63,6 +63,11 @@ interface BasicsFormValues {advertise: boolean}+const MATCH_POLICY_OPTIONS = [+ { value: 'all', label: 'All rules must match' },+ { value: 'any', label: 'Any rule may match' },+] as const+function EditPromotionPage() {const { storeId, promotionId } = Route.useParams()const navigate = useNavigate()@@ -252,13 +257,20 @@ function PromotionBasicsCard({ form, promotion }: PromotionBasicsCardProps) {name="match_policy"control={form.control}render={({ field }) => (- <Select value={field.value} onValueChange={field.onChange}>+ <Select+ items={MATCH_POLICY_OPTIONS}+ value={field.value}+ onValueChange={field.onChange}+ ><SelectTrigger id="match_policy"><SelectValue /></SelectTrigger><SelectContent>- <SelectItem value="all">All rules must match</SelectItem>- <SelectItem value="any">Any rule may match</SelectItem>+ {MATCH_POLICY_OPTIONS.map((o) => (+ <SelectItem key={o.value} value={o.value}>+ {o.label}+ </SelectItem>+ ))}</SelectContent></Select>)}diff --git a/packages/admin/src/routes/_authenticated/$storeId/promotions/new.tsx b/packages/admin/src/routes/_authenticated/$storeId/promotions/new.tsxindex d3fe0eb0e9..75ccac3dd9 100644--- a/packages/admin/src/routes/_authenticated/$storeId/promotions/new.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/promotions/new.tsx@@ -57,6 +57,16 @@ const formSchema = ztype FormValues = z.infer<typeof formSchema>+const KIND_OPTIONS = [+ { value: 'coupon_code', label: 'Coupon code' },+ { value: 'automatic', label: 'Automatic (no code)' },+] as const++const MATCH_POLICY_OPTIONS = [+ { value: 'all', label: 'All rules must match' },+ { value: 'any', label: 'Any rule may match' },+] as const+// Server expects a coherent set: automatic clears all coupon fields,// single-code sets `code`, multi-code sets `number_of_codes` + optional// prefix. Centralized so the create body stays flat.@@ -196,13 +206,20 @@ function NewPromotionPage() {name="kind"control={form.control}render={({ field }) => (- <Select value={field.value} onValueChange={field.onChange}>+ <Select+ items={KIND_OPTIONS}+ value={field.value}+ onValueChange={field.onChange}+ ><SelectTrigger id="kind"><SelectValue /></SelectTrigger><SelectContent>- <SelectItem value="coupon_code">Coupon code</SelectItem>- <SelectItem value="automatic">Automatic (no code)</SelectItem>+ {KIND_OPTIONS.map((o) => (+ <SelectItem key={o.value} value={o.value}>+ {o.label}+ </SelectItem>+ ))}</SelectContent></Select>)}@@ -329,13 +346,20 @@ function NewPromotionPage() {name="match_policy"control={form.control}render={({ field }) => (- <Select value={field.value} onValueChange={field.onChange}>+ <Select+ items={MATCH_POLICY_OPTIONS}+ value={field.value}+ onValueChange={field.onChange}+ ><SelectTrigger id="match_policy"><SelectValue /></SelectTrigger><SelectContent>- <SelectItem value="all">All rules must match</SelectItem>- <SelectItem value="any">Any rule may match</SelectItem>+ {MATCH_POLICY_OPTIONS.map((o) => (+ <SelectItem key={o.value} value={o.value}>+ {o.label}+ </SelectItem>+ ))}</SelectContent></Select>)}diff --git a/packages/admin/src/routes/_authenticated/$storeId/settings/payment-methods.tsx b/packages/admin/src/routes/_authenticated/$storeId/settings/payment-methods.tsxindex ba852d8cd2..4b733464fd 100644--- a/packages/admin/src/routes/_authenticated/$storeId/settings/payment-methods.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/settings/payment-methods.tsx@@ -209,7 +209,11 @@ function CreatePaymentMethodSheet({render={({ field }) => (<Select value={field.value} onValueChange={field.onChange}><SelectTrigger id="type" aria-invalid={!!form.formState.errors.type}>- <SelectValue placeholder={loadingTypes ? 'Loading…' : 'Select a provider'} />+ <SelectValue placeholder={loadingTypes ? 'Loading…' : 'Select a provider'}>+ {(value) =>+ providerTypes.find((t) => t.type === value)?.label ?? (value as string)+ }+ </SelectValue></SelectTrigger><SelectContent>{providerTypes.map((t) => (@@ -425,7 +429,7 @@ function PaymentMethodFormFields({name="display_on"control={form.control}render={({ field }) => (- <Select value={field.value} onValueChange={field.onChange}>+ <Select items={DISPLAY_ON_OPTIONS} value={field.value} onValueChange={field.onChange}><SelectTrigger id="display_on"><SelectValue /></SelectTrigger>diff --git a/spree/core/app/models/concerns/spree/preference_schema.rb b/spree/core/app/models/concerns/spree/preference_schema.rbindex 105fb29a6e..7c3cd1131d 100644--- a/spree/core/app/models/concerns/spree/preference_schema.rb+++ b/spree/core/app/models/concerns/spree/preference_schema.rb@@ -46,13 +46,24 @@ module Spreeregistered_subclasses.map do |klass|{type: klass.to_s,- label: klass.respond_to?(:model_name) ? klass.model_name.human : klass.to_s.demodulize,+ label: subclass_label(klass),description: klass.respond_to?(:description) ? klass.description : nil,preference_schema: klass.respond_to?(:preference_schema) ? klass.preference_schema : []}end.sort_by { |entry| entry[:label] }end+ # STI subclasses share the parent's `model_name`, so calling+ # `klass.model_name.human` would return "Payment Method" for every+ # entry. Derive a human label from the demodulized class name+ # ("Spree::PaymentMethod::BogusGateway" → "Bogus Gateway") and let+ # individual subclasses override via a class-level `display_name`.+ def subclass_label(klass)+ return klass.display_name if klass.respond_to?(:display_name) && klass.display_name.present?++ klass.to_s.demodulize.titleize+ end+private# Each STI parent (PaymentMethod, PromotionAction, PromotionRule)