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.

Give the default package its own settings card with unit suffixes

Damian Legawiec4e8ae47b017d
diff --git a/packages/dashboard/src/locales/ar.json b/packages/dashboard/src/locales/ar.json
index dfde771214..ad633d66be 100644
--- a/packages/dashboard/src/locales/ar.json
+++ b/packages/dashboard/src/locales/ar.json
@@ -1182,7 +1182,7 @@
},
"preferred_default_package_weight": {
"label": "الوزن الافتراضي للطرد",
- "help": "وزن التغليف (الصندوق والحشو) الذي يُضاف إلى محتويات كل طرد عند حساب أسعار التوصيل، بوحدة وزن المتجر. اضبطه على 0 للتعطيل."
+ "help": "وزن التغليف (الصندوق والحشو) الذي يُضاف إلى محتويات كل طرد عند حساب أسعار التوصيل. اضبطه على 0 للتعطيل."
},
"preferred_default_package_dimensions": {
"label": "أبعاد الطرد الافتراضية",
@@ -2341,6 +2341,8 @@
"subtitle": "التكوين العام والإعدادات الافتراضية على مستوى المتجر.",
"tab_general": "عام",
"tab_standards": "المعايير والأشكال",
+ "tab_default_package": "الطرد الافتراضي",
+ "default_package_description": "الصندوق المعتاد للشحن. يضيف مزوّدو أسعار النقل وزنه إلى كل طرد ويستخدمون أبعاده لتسعير الوزن الحجمي.",
"tab_storefront_access": "الوصول إلى المتجر",
"title": "إعدادات المتجر"
},
diff --git a/packages/dashboard/src/locales/de.json b/packages/dashboard/src/locales/de.json
index 2f548cbaa6..4c827ede98 100644
--- a/packages/dashboard/src/locales/de.json
+++ b/packages/dashboard/src/locales/de.json
@@ -1182,7 +1182,7 @@
},
"preferred_default_package_weight": {
"label": "Standard-Paketgewicht",
- "help": "Verpackungsgewicht (Karton und Füllmaterial), das bei der Berechnung von Versandtarifen zum Inhalt jedes Pakets addiert wird, in der Gewichtseinheit des Shops. 0 deaktiviert es."
+ "help": "Verpackungsgewicht (Karton und Füllmaterial), das bei der Berechnung von Versandtarifen zum Inhalt jedes Pakets addiert wird. 0 deaktiviert es."
},
"preferred_default_package_dimensions": {
"label": "Standard-Paketabmessungen",
@@ -2341,6 +2341,8 @@
"subtitle": "Allgemeine Konfiguration und shopweite Standardwerte.",
"tab_general": "Allgemein",
"tab_standards": "Standards und Formate",
+ "tab_default_package": "Standardpaket",
+ "default_package_description": "Der Karton, in dem Sie üblicherweise versenden. Carrier-Tarifanbieter addieren sein Gewicht zu jedem Paket und nutzen seine Abmessungen für Volumengewicht-Preise.",
"tab_storefront_access": "Storefront-Zugriff",
"title": "Shop-Einstellungen"
},
diff --git a/packages/dashboard/src/locales/en.json b/packages/dashboard/src/locales/en.json
index eca697b3e3..798d27d1ac 100644
--- a/packages/dashboard/src/locales/en.json
+++ b/packages/dashboard/src/locales/en.json
@@ -1182,7 +1182,7 @@
},
"preferred_default_package_weight": {
"label": "Default package weight",
- "help": "Packaging weight (box and filler) added to every package's contents when calculating delivery rates, in the store's weight unit. Set to 0 to disable."
+ "help": "Packaging weight (box and filler) added to every package's contents when calculating delivery rates. Set to 0 to disable."
},
"preferred_default_package_dimensions": {
"label": "Default package dimensions",
@@ -2341,6 +2341,8 @@
"subtitle": "General configuration and store-wide defaults.",
"tab_general": "General",
"tab_standards": "Standards and formats",
+ "tab_default_package": "Default package",
+ "default_package_description": "The box you usually ship in. Carrier rate providers add its weight to every package and use its dimensions for dimensional-weight pricing.",
"tab_storefront_access": "Storefront access",
"title": "Store settings"
},
diff --git a/packages/dashboard/src/locales/fr.json b/packages/dashboard/src/locales/fr.json
index 7882cb872f..d4c919a557 100644
--- a/packages/dashboard/src/locales/fr.json
+++ b/packages/dashboard/src/locales/fr.json
@@ -1182,7 +1182,7 @@
},
"preferred_default_package_weight": {
"label": "Poids de colis par défaut",
- "help": "Poids d'emballage (carton et calage) ajouté au contenu de chaque colis lors du calcul des tarifs de livraison, dans l'unité de poids de la boutique. 0 pour désactiver."
+ "help": "Poids d'emballage (carton et calage) ajouté au contenu de chaque colis lors du calcul des tarifs de livraison. 0 pour désactiver."
},
"preferred_default_package_dimensions": {
"label": "Dimensions de colis par défaut",
@@ -2341,6 +2341,8 @@
"subtitle": "Configuration générale et valeurs par défaut à l'échelle de la boutique.",
"tab_general": "Général",
"tab_standards": "Normes et formats",
+ "tab_default_package": "Colis par défaut",
+ "default_package_description": "Le carton habituel d'expédition. Les transporteurs ajoutent son poids à chaque colis et utilisent ses dimensions pour le poids volumétrique.",
"tab_storefront_access": "Accès à la vitrine",
"title": "Paramètres de la boutique"
},
diff --git a/packages/dashboard/src/locales/pl.json b/packages/dashboard/src/locales/pl.json
index 4eb9dbedbf..e33960c09e 100644
--- a/packages/dashboard/src/locales/pl.json
+++ b/packages/dashboard/src/locales/pl.json
@@ -1190,7 +1190,7 @@
},
"preferred_default_package_weight": {
"label": "Domyślna waga paczki",
- "help": "Waga opakowania (karton i wypełnienie) dodawana do zawartości każdej paczki przy wyliczaniu stawek dostawy, w jednostce wagi sklepu. 0 wyłącza."
+ "help": "Waga opakowania (karton i wypełnienie) dodawana do zawartości każdej paczki przy wyliczaniu stawek dostawy. 0 wyłącza."
},
"preferred_default_package_dimensions": {
"label": "Domyślne wymiary paczki",
@@ -2367,6 +2367,8 @@
"subtitle": "Ogólna konfiguracja i domyślne ustawienia dla całego sklepu.",
"tab_general": "Ogólne",
"tab_standards": "Standardy i formaty",
+ "tab_default_package": "Domyślna paczka",
+ "default_package_description": "Karton, w którym zwykle wysyłasz. Dostawcy stawek przewoźników dodają jego wagę do każdej paczki i używają wymiarów do wyceny wagi wymiarowej.",
"tab_storefront_access": "Dostęp do sklepu",
"title": "Ustawienia sklepu"
},
diff --git a/packages/dashboard/src/locales/zh-CN.json b/packages/dashboard/src/locales/zh-CN.json
index e3041e7ad3..be5f31ca82 100644
--- a/packages/dashboard/src/locales/zh-CN.json
+++ b/packages/dashboard/src/locales/zh-CN.json
@@ -1182,7 +1182,7 @@
},
"preferred_default_package_weight": {
"label": "默认包裹重量",
- "help": "计算配送费率时加到每个包裹内容上的包装重量(纸箱与填充物),使用商店的重量单位。设为 0 可停用。"
+ "help": "计算配送费率时加到每个包裹内容上的包装重量(纸箱与填充物)。设为 0 可停用。"
},
"preferred_default_package_dimensions": {
"label": "默认包裹尺寸",
@@ -2341,6 +2341,8 @@
"subtitle": "通用配置与店铺级默认设置。",
"tab_general": "通用",
"tab_standards": "标准与格式",
+ "tab_default_package": "默认包裹",
+ "default_package_description": "常用的发货纸箱。承运商费率提供方会将其重量加到每个包裹上,并使用其尺寸计算体积重量。",
"tab_storefront_access": "店铺访问权限",
"title": "店铺设置"
},
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx
index 2b001a9b33..c6cf4f2a6e 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx
@@ -24,6 +24,9 @@ import {
FieldLabel,
FormActions,
Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
ResourceLayout,
Select,
SelectContent,
@@ -140,6 +143,10 @@ function StoreSettingsForm({ store }: { store: Store }) {
defaultValues: { ...storeToFormValues(store), ...extensionFormValues('store', store) },
})
+ // Live unit suffixes for the default-package inputs.
+ const weightUnit = form.watch('preferred_weight_unit')
+ const dimensionUnit = form.watch('preferred_unit_system') === 'metric' ? 'cm' : 'in'
+
// When unit_system flips, reset weight_unit to the first valid option for
// that system so the form never holds an inconsistent pair.
const unitSystem = form.watch('preferred_unit_system')
@@ -321,17 +328,35 @@ function StoreSettingsForm({ store }: { store: Store }) {
control={form.control}
options={weightOptions}
/>
+ </FieldGroup>
+ </CardContent>
+ </Card>
+
+ <Card>
+ <CardHeader>
+ <CardTitle>{t('admin.pages.settings.store.tab_default_package')}</CardTitle>
+ </CardHeader>
+ <CardContent>
+ <FieldGroup>
+ <FieldDescription>
+ {t('admin.pages.settings.store.default_package_description')}
+ </FieldDescription>
<Field>
<FieldLabel htmlFor="store-default-package-weight">
{t('admin.fields.store.preferred_default_package_weight.label')}
</FieldLabel>
- <Input
- id="store-default-package-weight"
- type="number"
- min="0"
- step="0.01"
- {...form.register('preferred_default_package_weight')}
- />
+ <InputGroup>
+ <InputGroupInput
+ id="store-default-package-weight"
+ type="number"
+ min="0"
+ step="0.01"
+ {...form.register('preferred_default_package_weight')}
+ />
+ <InputGroupAddon align="inline-end">
+ <span className="text-muted-foreground text-sm">{weightUnit}</span>
+ </InputGroupAddon>
+ </InputGroup>
<FieldDescription>
{t('admin.fields.store.preferred_default_package_weight.help')}
</FieldDescription>
@@ -339,6 +364,42 @@ function StoreSettingsForm({ store }: { store: Store }) {
errors={[form.formState.errors.preferred_default_package_weight]}
/>
</Field>
+ <Field>
+ <FieldLabel htmlFor="store-default-package-length">
+ {t('admin.fields.store.preferred_default_package_dimensions.label')}
+ </FieldLabel>
+ <div className="grid grid-cols-3 gap-2">
+ {(
+ [
+ ['length', 'store-default-package-length'],
+ ['width', 'store-default-package-width'],
+ ['height', 'store-default-package-height'],
+ ] as const
+ ).map(([side, id]) => (
+ <InputGroup key={side}>
+ <InputGroupInput
+ id={id}
+ type="number"
+ min="0"
+ step="0.01"
+ aria-label={t(
+ `admin.fields.store.preferred_default_package_dimensions.${side}`,
+ )}
+ placeholder={t(
+ `admin.fields.store.preferred_default_package_dimensions.${side}`,
+ )}
+ {...form.register(`preferred_default_package_${side}`)}
+ />
+ <InputGroupAddon align="inline-end">
+ <span className="text-muted-foreground text-sm">{dimensionUnit}</span>
+ </InputGroupAddon>
+ </InputGroup>
+ ))}
+ </div>
+ <FieldDescription>
+ {t('admin.fields.store.preferred_default_package_dimensions.help')}
+ </FieldDescription>
+ </Field>
</FieldGroup>
</CardContent>
</Card>