@spree/dashboard-core 1.0.0-beta.3 → 1.0.0-beta.5

package/src/locales/fr.json

@@ -125,6 +125,11 @@
         "title": "Bon retour"
       },
       "logout": "Se déconnecter",
+      "no_store_access": {
+        "description": "Vous êtes connecté, mais votre compte n'est encore membre d'aucune boutique. Demandez à un administrateur de boutique de vous inviter, ou connectez-vous avec un autre compte.",
+        "signed_in_as": "Connecté en tant que {{email}}",
+        "title": "Vous n'avez accès à aucune boutique"
+      },
       "reset_password": {
         "confirm_password_label": "Confirmer le nouveau mot de passe",
         "error": "Une erreur s'est produite. Veuillez réessayer.",
@@ -429,7 +434,6 @@
         "filter_select_placeholder": "Sélectionner…",
         "filter_text_placeholder": "Filtrer…",
         "filter_to_placeholder": "Filtrer sur…",
-        "more_conditions": "Autres conditions",
         "operators": {
           "after": "après",
           "before": "avant",
@@ -686,6 +690,32 @@
       "quantity": {
         "label": "Quantité"
       },
+      "setup": {
+        "country_code": {
+          "help": "D'où vous expédiez. Votre boutique peut vendre dans le monde entier — ceci définit seulement la devise, l'entrepôt et les zones de livraison de départ, tous modifiables ensuite.",
+          "label": "Pays",
+          "placeholder": "Rechercher un pays"
+        },
+        "currency": {
+          "help": "Votre devise par défaut. Ajoutez-en d’autres quand vous voulez.",
+          "label": "Devise",
+          "placeholder": "Rechercher une devise"
+        },
+        "locale": {
+          "help": "Votre langue par défaut. Ajoutez-en d’autres quand vous voulez.",
+          "label": "Langue"
+        },
+        "password_confirmation": {
+          "label": "Confirmer le mot de passe"
+        },
+        "sample_data": {
+          "help": "Ajoute en arrière-plan des produits, catégories, clients et commandes de démonstration pour explorer le tableau de bord. Le chargement prend quelques minutes et télécharge les images des produits.",
+          "label": "Charger des données d’exemple"
+        },
+        "store_name": {
+          "label": "Nom de la boutique"
+        }
+      },
       "shipping": {
         "label": "Livraison"
       },
@@ -1882,7 +1912,7 @@
         },
         "create_line_items": {
           "name": "Créer des lignes d'article",
-          "description": "Ajoute au panier la quantité spécifiée de la variante"
+          "description": "Ajoute gratuitement au panier la quantité spécifiée de la variante"
         },
         "free_shipping": {
           "name": "Livraison gratuite",

package/src/locales/pl.json

@@ -125,6 +125,11 @@
         "title": "Witaj ponownie"
       },
       "logout": "Wyloguj się",
+      "no_store_access": {
+        "description": "Jesteś zalogowany, ale Twoje konto nie należy jeszcze do żadnego sklepu. Poproś administratora sklepu o zaproszenie lub zaloguj się na inne konto.",
+        "signed_in_as": "Zalogowano jako {{email}}",
+        "title": "Nie masz dostępu do żadnego sklepu"
+      },
       "reset_password": {
         "confirm_password_label": "Potwierdź nowe hasło",
         "error": "Coś poszło nie tak. Spróbuj ponownie.",
@@ -430,7 +435,6 @@
         "filter_select_placeholder": "Wybierz…",
         "filter_text_placeholder": "Filtruj…",
         "filter_to_placeholder": "Filtruj do…",
-        "more_conditions": "Więcej warunków",
         "operators": {
           "after": "po",
           "before": "przed",
@@ -687,6 +691,32 @@
       "quantity": {
         "label": "Ilość"
       },
+      "setup": {
+        "country_code": {
+          "help": "Skąd wysyłasz. Twój sklep może sprzedawać na całym świecie — to ustala tylko początkową walutę, magazyn i strefy dostawy, które później zmienisz.",
+          "label": "Kraj",
+          "placeholder": "Szukaj krajów"
+        },
+        "currency": {
+          "help": "Twoja domyślna waluta. Kolejne dodasz w każdej chwili.",
+          "label": "Waluta",
+          "placeholder": "Szukaj walut"
+        },
+        "locale": {
+          "help": "Twój domyślny język. Kolejne dodasz w każdej chwili.",
+          "label": "Język"
+        },
+        "password_confirmation": {
+          "label": "Potwierdź hasło"
+        },
+        "sample_data": {
+          "help": "Dodaje w tle przykładowe produkty, kategorie, klientów i zamówienia, aby można było poznać panel. Trwa kilka minut i pobiera zdjęcia produktów.",
+          "label": "Wczytaj dane przykładowe"
+        },
+        "store_name": {
+          "label": "Nazwa sklepu"
+        }
+      },
       "shipping": {
         "label": "Wysyłka"
       },
@@ -1911,7 +1941,7 @@
         },
         "create_line_items": {
           "name": "Utwórz pozycje zamówienia",
-          "description": "Dodaje do koszyka określoną ilość wariantu"
+          "description": "Dodaje do koszyka określoną ilość wariantu za darmo"
         },
         "free_shipping": {
           "name": "Darmowa wysyłka",

package/src/locales/zh-CN.json

@@ -125,6 +125,11 @@
         "title": "欢迎回来"
       },
       "logout": "退出登录",
+      "no_store_access": {
+        "description": "您已登录，但您的账户尚未加入任何店铺。请联系店铺管理员邀请您，或使用其他账户登录。",
+        "signed_in_as": "当前登录账户：{{email}}",
+        "title": "您无权访问任何店铺"
+      },
       "reset_password": {
         "confirm_password_label": "确认新密码",
         "error": "出了点问题，请重试。",
@@ -429,7 +434,6 @@
         "filter_select_placeholder": "选择…",
         "filter_text_placeholder": "筛选…",
         "filter_to_placeholder": "筛选至…",
-        "more_conditions": "更多条件",
         "operators": {
           "after": "晚于",
           "before": "早于",
@@ -686,6 +690,32 @@
       "quantity": {
         "label": "数量"
       },
+      "setup": {
+        "country_code": {
+          "help": "您的发货地。您的商店可以面向全球销售——这只设置初始货币、仓库和配送区域，之后均可修改。",
+          "label": "国家/地区",
+          "placeholder": "搜索国家/地区"
+        },
+        "currency": {
+          "help": "您的默认货币。随时可添加更多。",
+          "label": "货币",
+          "placeholder": "搜索货币"
+        },
+        "locale": {
+          "help": "您的默认语言。随时可添加更多。",
+          "label": "语言"
+        },
+        "password_confirmation": {
+          "label": "确认密码"
+        },
+        "sample_data": {
+          "help": "在后台添加演示商品、分类、客户和订单，方便您浏览后台。需要几分钟并会下载商品图片。",
+          "label": "加载示例数据"
+        },
+        "store_name": {
+          "label": "商店名称"
+        }
+      },
       "shipping": {
         "label": "运费"
       },
@@ -1881,7 +1911,7 @@
         },
         "create_line_items": {
           "name": "创建订单项",
-          "description": "向购物车填充指定数量的变体"
+          "description": "将指定数量的变体免费加入购物车"
         },
         "free_shipping": {
           "name": "免运费",

package/src/pages/package-types.tsx

@@ -461,23 +461,25 @@ function UnitField({
       <Controller
         control={form.control}
         name={name}
-        render={({ field }) => {
-          const options = units.map((unit) => ({ value: unit, label: unit }))
-          return (
-            <Select items={options} value={field.value ?? ''} onValueChange={field.onChange}>
-              <SelectTrigger id={`package-type-${name}`}>
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent>
-                {options.map((option) => (
-                  <SelectItem key={option.value} value={option.value}>
-                    {option.label}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          )
-        }}
+        render={({ field }) => (
+          <Select
+            value={field.value ?? ''}
+            onValueChange={(value) => field.onChange(value || undefined)}
+          >
+            <SelectTrigger id={`package-type-${name}`}>
+              {/* Nothing picked reads as an em dash rather than a blank
+                  trigger, the way the variant editor's units do. */}
+              <SelectValue>{(value) => (value as string) || '—'}</SelectValue>
+            </SelectTrigger>
+            <SelectContent>
+              {units.map((unit) => (
+                <SelectItem key={unit} value={unit}>
+                  {unit}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        )}
       />
     </Field>
   )

package/src/products/normalize-money.test.ts

@@ -14,6 +14,15 @@ describe('normalizeMoneyInput', () => {
     expect(normalizeMoneyInput('1.000.000,00', 'de')).toBe('1000000.00')
   })
 
+  it('reads a lone group separator not followed by three digits as the decimal', () => {
+    expect(normalizeMoneyInput('19.50', 'de')).toBe('19.50')
+    expect(normalizeMoneyInput('0.5', 'de')).toBe('0.5')
+    expect(normalizeMoneyInput('19.50 €', 'de')).toBe('19.50')
+    expect(normalizeMoneyInput('19,50', 'en')).toBe('19.50')
+    expect(normalizeMoneyInput('1.500 €', 'de')).toBe('1500')
+    expect(normalizeMoneyInput('1.234.567', 'de')).toBe('1234567')
+  })
+
   it('handles fr narrow-space grouping', () => {
     // fr groups with U+202F (narrow no-break space) and uses a comma decimal.
     expect(normalizeMoneyInput('1 234,56', 'fr')).toBe('1234.56')

package/src/products/normalize-money.ts

@@ -30,6 +30,7 @@ function separatorsFor(locale: string): { decimal: string; group: string } {
  * - `"1.234,56"` under `de` → `"1234.56"`
  * - `"1 234,56"` under `fr` → `"1234.56"` (narrow-space grouping)
  * - `"19.99"` under `en` → `"19.99"`
+ * - `"19.50"` under `de` → `"19.50"` (a period can't be grouping before two digits)
  * - `""` / whitespace → `""`
  *
  * Strips the locale's group separator and any whitespace, standardizes the
@@ -48,6 +49,17 @@ export function normalizeMoneyInput(raw: string | null | undefined, locale: stri
   const { decimal, group } = separatorsFor(locale)
 
   let out = trimmed
+  // A group separator is always followed by exactly three digits, so a lone
+  // one that is not (`19.50` under `de`) is the merchant typing the other
+  // decimal mark. `1.500` stays ambiguous and is read the locale's way.
+  const groupParts = group.trim() === '' ? [] : out.split(group)
+  if (
+    groupParts.length === 2 &&
+    !out.includes(decimal) &&
+    groupParts[1].replace(/\D/g, '').length !== 3
+  ) {
+    out = groupParts.join(decimal)
+  }
   // Remove the locale's grouping separator (explicit char) plus any whitespace
   // (covers narrow/no-break spaces used by some locales as the group char).
   if (group) out = out.split(group).join('')

package/src/products/product-form-cards.tsx

@@ -52,14 +52,21 @@ import {
   useConfirm,
 } from '@spree/dashboard-ui'
 import {
+  BanknoteIcon,
   DownloadIcon,
+  EyeIcon,
   FilmIcon,
+  FolderTreeIcon,
+  ImageIcon,
   ImagePlusIcon,
   LibraryIcon,
   Loader2Icon,
   PencilIcon,
   PlayIcon,
+  ReceiptTextIcon,
+  SearchIcon,
   TrashIcon,
+  WarehouseIcon,
 } from '@spree/dashboard-ui/icons'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { type Control, Controller, type UseFormReturn, useWatch } from 'react-hook-form'
@@ -118,9 +125,6 @@ export function GeneralCard({
   const { errors } = form.formState
   return (
     <Card>
-      <CardHeader>
-        <CardTitle>{t('admin.pages.products.section_basics')}</CardTitle>
-      </CardHeader>
       <CardContent className="flex flex-col gap-4">
         <Field>
           <FieldLabel htmlFor="product-name">{t('admin.fields.name.label')}</FieldLabel>
@@ -204,7 +208,10 @@ export function PricesCard({
   return (
     <Card>
       <CardHeader className="flex flex-row items-center justify-between gap-3 space-y-0">
-        <CardTitle>{t('admin.common.prices')}</CardTitle>
+        <CardTitle>
+          <BanknoteIcon className="size-4" />
+          {t('admin.common.prices')}
+        </CardTitle>
         {currencies.length > 1 && (
           <Select value={currency} onValueChange={setCurrency}>
             <SelectTrigger size="sm" className="w-24">
@@ -220,12 +227,11 @@ export function PricesCard({
           </Select>
         )}
       </CardHeader>
-      {/* `p-0` like every other card holding a table: the grid draws its own
-          cell borders to the card's edges, and padding here insets it into a
-          floating block with a gutter on all four sides. */}
-      <CardContent className="p-0">
+      <CardContent>
         {currencyResolved ? (
-          <ProductBulkPriceEditor form={form} currency={currency} productName={productName} />
+          <div className="border rounded overflow-hidden">
+            <ProductBulkPriceEditor form={form} currency={currency} productName={productName} />
+          </div>
         ) : (
           <div className="m-3 h-24 animate-pulse rounded-md bg-muted" />
         )}
@@ -504,7 +510,10 @@ export function MediaCard({
     <>
       <Card className="scroll-mt-[calc(var(--spacing-header-height)+1.5rem)]">
         <CardHeader>
-          <CardTitle>{t('admin.pages.products.section_media')}</CardTitle>
+          <CardTitle>
+            <ImageIcon className="size-4" />
+            {t('admin.pages.products.section_media')}
+          </CardTitle>
         </CardHeader>
         <CardContent className="flex flex-col gap-4">
           {(items.length > 0 || pending.length > 0) && (
@@ -771,11 +780,16 @@ export function InventoryCard({
   return (
     <Card>
       <CardHeader>
-        <CardTitle>{t('admin.pages.products.section_inventory')}</CardTitle>
+        <CardTitle>
+          <WarehouseIcon className="size-4" />
+          {t('admin.pages.products.section_inventory')}
+        </CardTitle>
         {actions && <CardAction>{actions}</CardAction>}
       </CardHeader>
-      <CardContent className="p-0">
-        <InventorySection form={form} stockLocationHref={stockLocationHref} />
+      <CardContent>
+        <div className="border rounded overflow-hidden">
+          <InventorySection form={form} stockLocationHref={stockLocationHref} />
+        </div>
       </CardContent>
     </Card>
   )
@@ -804,7 +818,10 @@ export function SEOCard({ form, product }: FormCardProps & { product?: Product }
   return (
     <Card>
       <CardHeader>
-        <CardTitle>{t('admin.pages.products.section_seo')}</CardTitle>
+        <CardTitle>
+          <SearchIcon className="size-4" />
+          {t('admin.pages.products.section_seo')}
+        </CardTitle>
       </CardHeader>
       <CardContent className="flex flex-col gap-4">
         <div className="rounded-lg border border-border p-4 space-y-1">
@@ -892,6 +909,7 @@ export function StatusCard({
       control={form.control as Control<ProductFormValues>}
       name="status"
       title={t('admin.fields.status.label')}
+      icon={<EyeIcon className="size-4" />}
       label={t('admin.fields.status.label')}
       disabled={awaitingDecision}
       description={awaitingDecision ? t('admin.pages.products.status_under_review') : undefined}
@@ -978,7 +996,10 @@ export function CategorizationCard({ form }: FormCardProps) {
   return (
     <Card>
       <CardHeader>
-        <CardTitle>{t('admin.pages.products.section_categorization')}</CardTitle>
+        <CardTitle>
+          <FolderTreeIcon className="size-4" />
+          {t('admin.pages.products.section_categorization')}
+        </CardTitle>
       </CardHeader>
       <CardContent className="flex flex-col gap-4">
         {client.productTypes && (
@@ -1132,7 +1153,10 @@ export function TaxCard({ form }: FormCardProps) {
   return (
     <Card>
       <CardHeader>
-        <CardTitle>{t('admin.fields.tax.label')}</CardTitle>
+        <CardTitle>
+          <ReceiptTextIcon className="size-4" />
+          {t('admin.fields.tax.label')}
+        </CardTitle>
       </CardHeader>
       <CardContent>
         <Field>

package/src/products/product-form-mapping.test.ts

@@ -0,0 +1,72 @@
+import { describe, expect, it } from 'vitest'
+import { variantToFormValues, variantToWirePayload } from './product-form-mapping'
+import type { PanelVariant } from './product-types'
+
+// variantToFormValues reads a handful of fields; cast a minimal fixture rather
+// than fabricating the whole serialized variant it ignores.
+function variantWith(prices: PanelVariant['prices']): PanelVariant {
+  return { id: 'variant_1', sku: 'ESP-SEMI', option_values: [], prices } as unknown as PanelVariant
+}
+
+describe('variantToFormValues prices', () => {
+  it('keeps the shop price in each currency', () => {
+    const values = variantToFormValues(
+      variantWith([
+        { currency: 'USD', amount: '549.99', price_list_id: null },
+        { currency: 'EUR', amount: '509.99', price_list_id: null },
+      ]),
+      0,
+    )
+
+    expect(values.prices).toEqual([
+      { currency: 'USD', amount: '549.99', compare_at_amount: null },
+      { currency: 'EUR', amount: '509.99', compare_at_amount: null },
+    ])
+  })
+
+  // The form posts this array straight back as the variant's base prices, so a
+  // price-list row taken in here returns as the shop price and overwrites it —
+  // and a list's null-amount placeholder returns as "no price" and deletes it.
+  it('drops what a price list charges, whatever order the rows arrive in', () => {
+    const values = variantToFormValues(
+      variantWith([
+        { currency: 'USD', amount: '329.99', price_list_id: 'pl_1' },
+        { currency: 'USD', amount: '549.99', price_list_id: null },
+        { currency: 'EUR', amount: null, price_list_id: 'pl_1' },
+        { currency: 'EUR', amount: '509.99', price_list_id: null },
+        { currency: 'USD', amount: '249.99', price_list_id: 'pl_1' },
+      ]),
+      0,
+    )
+
+    expect(values.prices).toEqual([
+      { currency: 'USD', amount: '549.99', compare_at_amount: null },
+      { currency: 'EUR', amount: '509.99', compare_at_amount: null },
+    ])
+  })
+
+  it('ships only the shop prices back to the API', () => {
+    const values = variantToFormValues(
+      variantWith([
+        { currency: 'USD', amount: '549.99', price_list_id: null },
+        { currency: 'USD', amount: '329.99', price_list_id: 'pl_1' },
+      ]),
+      0,
+    )
+
+    expect(variantToWirePayload(values, 0).prices).toEqual([
+      { currency: 'USD', amount: '549.99', compare_at_amount: null },
+    ])
+  })
+
+  // A variant a price list prices but the shop does not has no shop price, and
+  // an empty array is how the form says so.
+  it('leaves no price when only a price list prices the variant', () => {
+    const values = variantToFormValues(
+      variantWith([{ currency: 'USD', amount: '89.99', price_list_id: 'pl_1' }]),
+      0,
+    )
+
+    expect(values.prices).toEqual([])
+  })
+})

package/src/products/product-form-mapping.ts

@@ -44,8 +44,10 @@ export function variantToFormValues(variant: PanelVariant, position: number): Va
     preorder_ships_at: variant.preorder_ships_at ?? null,
     backorder_limit: variant.backorder_limit ?? null,
     tax_category_id: variant.tax_category_id ?? null,
+    // Base prices only: this array is posted back as the variant's base
+    // prices, so a price-list row taken in here returns as the shop price.
     prices: (variant.prices ?? [])
-      .filter((p) => p.currency != null)
+      .filter((p) => p.currency != null && p.price_list_id == null)
       .map((p) => ({
         currency: p.currency as string,
         // Keep amounts as the canonical decimal strings the API returns.

package/src/products/product-types.ts

@@ -44,6 +44,7 @@ export interface PanelVariant {
     amount?: string | null
     currency?: string | null
     compare_at_amount?: string | null
+    price_list_id?: string | null
   }>
   cost_price?: string | null
   cost_currency?: string | null

package/src/products/variants-section.tsx

@@ -31,7 +31,7 @@ import {
   TableHeader,
   TableRow,
 } from '@spree/dashboard-ui'
-import { PencilIcon, XIcon } from '@spree/dashboard-ui/icons'
+import { PencilIcon, SwatchBookIcon, XIcon } from '@spree/dashboard-ui/icons'
 import { type CSSProperties, useEffect, useMemo, useState } from 'react'
 import { type UseFormReturn, useFieldArray, useWatch } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
@@ -343,7 +343,10 @@ export function VariantsSection({ form, seedFromType = false }: Props) {
   return (
     <Card>
       <CardHeader className="flex flex-row items-center justify-between gap-3 space-y-0">
-        <CardTitle>{t('admin.products.variants.title')}</CardTitle>
+        <CardTitle>
+          <SwatchBookIcon className="size-4" />
+          {t('admin.products.variants.title')}
+        </CardTitle>
         {fields.length > 0 && (
           <Button type="button" variant="outline" size="sm" onClick={() => setBulkOpen(true)}>
             {t('admin.products.variants.bulk_edit.trigger')}

package/src/providers/auth-provider.tsx

@@ -7,7 +7,7 @@ import type {
 } from '@spree/admin-sdk'
 import { createContext, type ReactNode, useCallback, useEffect, useRef, useState } from 'react'
 import { getApiClient, type PanelSession } from '../api-client'
-import { ADMIN_LOCALE_STORAGE_KEY, switchLocale } from '../lib/i18n'
+import { ADMIN_LOCALE_STORAGE_KEY, sessionLocale, switchLocale } from '../lib/i18n'
 import { queryClient } from '../lib/query-client'
 
 interface AuthContextValue {
@@ -95,12 +95,12 @@ export function AuthProvider({ children }: { children: ReactNode }) {
     // Compare against the persisted choice (not the live i18n.language): if they
     // already agree, the page booted in the right language and no reload is
     // needed — this also prevents a reload loop on the periodic token refresh.
-    const code = authUser.selected_locale
     const stored =
       typeof localStorage !== 'undefined'
         ? (localStorage.getItem(ADMIN_LOCALE_STORAGE_KEY) ?? 'en')
         : 'en'
-    if (code && code !== stored) switchLocale(code)
+    const target = sessionLocale(authUser.selected_locale, stored)
+    if (target) switchLocale(target)
   }, [])
 
   const updateUser = useCallback((changes: Partial<AdminUser>) => {

package/src/schemas/package-type.ts

@@ -48,10 +48,13 @@ export const PACKAGE_TYPE_DEFAULTS: PackageTypeFormValues = {
   length: '',
   width: '',
   height: '',
-  dimensions_unit: 'cm',
+  // Left unset, as the variant editor leaves a variant's. A unit reaches the
+  // API only when the merchant picked one; otherwise the store's own units
+  // are recorded on the row
+  dimensions_unit: undefined,
   weight: '',
   max_weight: '',
-  weight_unit: 'kg',
+  weight_unit: undefined,
   default: false,
 }
 
@@ -86,10 +89,10 @@ export function packageTypeToFormValues(packageType: PanelPackageType): PackageT
     length: packageType.length ?? '',
     width: packageType.width ?? '',
     height: packageType.height ?? '',
-    dimensions_unit: (packageType.dimensions_unit ?? 'cm') as PackageDimensionUnit,
+    dimensions_unit: (packageType.dimensions_unit ?? undefined) as PackageDimensionUnit | undefined,
     weight: packageType.weight ?? '',
     max_weight: packageType.max_weight ?? '',
-    weight_unit: (packageType.weight_unit ?? 'kg') as PackageWeightUnit,
+    weight_unit: (packageType.weight_unit ?? undefined) as PackageWeightUnit | undefined,
     default: packageType.default ?? false,
   }
 }