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
Share one address book row between customers and companies
Damian Legawiec9031d9de5565
diff --git a/packages/dashboard-core/src/locales/ar.json b/packages/dashboard-core/src/locales/ar.jsonindex 63e11dc163..27b4ca2665 100644--- a/packages/dashboard-core/src/locales/ar.json+++ b/packages/dashboard-core/src/locales/ar.json@@ -93,6 +93,12 @@"address": {"not_located_yet": "تظهر الخريطة بعد تحديد موقع هذا العنوان."},+ "address_book": {+ "default_billing": "الفوترة الافتراضية",+ "default_shipping": "الشحن الافتراضي",+ "set_default_billing": "تعيين كعنوان فوترة افتراضي",+ "set_default_shipping": "تعيين كعنوان شحن افتراضي"+ },"auth": {"back_to_login": "العودة إلى تسجيل الدخول","forgot_password": {diff --git a/packages/dashboard-core/src/locales/de.json b/packages/dashboard-core/src/locales/de.jsonindex dfb8e49810..0243bbf3ce 100644--- a/packages/dashboard-core/src/locales/de.json+++ b/packages/dashboard-core/src/locales/de.json@@ -93,6 +93,12 @@"address": {"not_located_yet": "Die Karte erscheint, sobald diese Adresse gefunden wurde."},+ "address_book": {+ "default_billing": "Standard-Rechnung",+ "default_shipping": "Standard-Versand",+ "set_default_billing": "Als Standard-Rechnungsadresse festlegen",+ "set_default_shipping": "Als Standard-Versandadresse festlegen"+ },"auth": {"back_to_login": "Zurück zur Anmeldung","forgot_password": {diff --git a/packages/dashboard-core/src/locales/en.json b/packages/dashboard-core/src/locales/en.jsonindex 8e481ec63c..2894d7e259 100644--- a/packages/dashboard-core/src/locales/en.json+++ b/packages/dashboard-core/src/locales/en.json@@ -93,6 +93,12 @@"address": {"not_located_yet": "The map appears once this address has been located."},+ "address_book": {+ "default_billing": "Default billing",+ "default_shipping": "Default shipping",+ "set_default_billing": "Set as default billing",+ "set_default_shipping": "Set as default shipping"+ },"auth": {"back_to_login": "Back to sign in","forgot_password": {diff --git a/packages/dashboard-core/src/locales/fr.json b/packages/dashboard-core/src/locales/fr.jsonindex 73d132c5c2..17a642e76b 100644--- a/packages/dashboard-core/src/locales/fr.json+++ b/packages/dashboard-core/src/locales/fr.json@@ -93,6 +93,12 @@"address": {"not_located_yet": "La carte apparaît une fois cette adresse localisée."},+ "address_book": {+ "default_billing": "Facturation par défaut",+ "default_shipping": "Livraison par défaut",+ "set_default_billing": "Définir comme adresse de facturation par défaut",+ "set_default_shipping": "Définir comme adresse de livraison par défaut"+ },"auth": {"back_to_login": "Retour à la connexion","forgot_password": {diff --git a/packages/dashboard-core/src/locales/pl.json b/packages/dashboard-core/src/locales/pl.jsonindex 6fdd6f3e7e..e2763b97fe 100644--- a/packages/dashboard-core/src/locales/pl.json+++ b/packages/dashboard-core/src/locales/pl.json@@ -93,6 +93,12 @@"address": {"not_located_yet": "Mapa pojawi się, gdy adres zostanie zlokalizowany."},+ "address_book": {+ "default_billing": "Domyślny rozliczeniowy",+ "default_shipping": "Domyślny wysyłkowy",+ "set_default_billing": "Ustaw jako domyślny adres rozliczeniowy",+ "set_default_shipping": "Ustaw jako domyślny adres wysyłkowy"+ },"auth": {"back_to_login": "Powrót do logowania","forgot_password": {diff --git a/packages/dashboard-core/src/locales/zh-CN.json b/packages/dashboard-core/src/locales/zh-CN.jsonindex c8c661415c..6ed53fdc85 100644--- a/packages/dashboard-core/src/locales/zh-CN.json+++ b/packages/dashboard-core/src/locales/zh-CN.json@@ -93,6 +93,12 @@"address": {"not_located_yet": "定位完成后将显示地图。"},+ "address_book": {+ "default_billing": "默认账单",+ "default_shipping": "默认收货",+ "set_default_billing": "设为默认账单地址",+ "set_default_shipping": "设为默认收货地址"+ },"auth": {"back_to_login": "返回登录","forgot_password": {diff --git a/packages/dashboard-ui/src/index.ts b/packages/dashboard-ui/src/index.tsindex 7979a0aee4..5547d44e40 100644--- a/packages/dashboard-ui/src/index.ts+++ b/packages/dashboard-ui/src/index.ts@@ -24,6 +24,7 @@ export { requiredMessage } from './lib/validation-messages'// Spree composed components — headless, accept data via props// ---------------------------------------------------------------------------export * from './spree/address-block'+export * from './spree/address-book-row'export * from './spree/address-map'export * from './spree/back-button'export * from './spree/bulk-dialog'diff --git a/packages/dashboard-ui/src/spree/address-book-row.tsx b/packages/dashboard-ui/src/spree/address-book-row.tsxnew file mode 100644index 0000000000..c07266cf7f--- /dev/null+++ b/packages/dashboard-ui/src/spree/address-book-row.tsx@@ -0,0 +1,99 @@+import { EllipsisVerticalIcon, PencilIcon, TrashIcon } from 'lucide-react'+import { useTranslation } from 'react-i18next'+import { Badge } from '../ui/badge'+import { Button } from '../ui/button'+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '../ui/dropdown-menu'+import { AddressBlock, type AddressBlockValue } from './address-block'++/** What every address book row needs, whoever owns the book. */+export interface AddressBookEntry extends AddressBlockValue {+ id: string+ label?: string | null+ is_default_billing?: boolean | null+ is_default_shipping?: boolean | null+}++/**+ * One row of an address book — the labelled address, which defaults it holds,+ * and the actions on it behind a menu.+ *+ * Shared so a customer's book and a company node's read the same: they are the+ * same thing seen from different owners, and a merchant moving between them+ * should not have to learn two layouts.+ */+export function AddressBookRow({+ address,+ canEdit = true,+ onEdit,+ onRemove,+ onSetDefaultBilling,+ onSetDefaultShipping,+}: {+ address: AddressBookEntry+ canEdit?: boolean+ onEdit: () => void+ onRemove: () => void+ /** Omit either to hide that action — a book with one address has no choice. */+ onSetDefaultBilling?: () => void+ onSetDefaultShipping?: () => void+}) {+ const { t } = useTranslation()++ return (+ <div className="flex items-start justify-between gap-2 rounded-md border p-3">+ <div className="flex min-w-0 flex-col gap-1">+ <span className="flex flex-wrap items-center gap-2">+ {address.label && (+ <span className="font-medium text-foreground text-sm">{address.label}</span>+ )}+ {address.is_default_billing && (+ <Badge variant="outline">{t('admin.address_book.default_billing')}</Badge>+ )}+ {address.is_default_shipping && (+ <Badge variant="outline">{t('admin.address_book.default_shipping')}</Badge>+ )}+ </span>+ <AddressBlock address={address} />+ </div>++ {canEdit && (+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button variant="ghost" size="icon-xs" className="shrink-0">+ <EllipsisVerticalIcon className="size-4" />+ <span className="sr-only">{t('admin.actions.actions_menu')}</span>+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <DropdownMenuItem onClick={onEdit}>+ <PencilIcon className="size-4" />+ {t('admin.actions.edit')}+ </DropdownMenuItem>+ {onSetDefaultBilling && !address.is_default_billing && (+ <DropdownMenuItem onClick={onSetDefaultBilling}>+ {t('admin.address_book.set_default_billing')}+ </DropdownMenuItem>+ )}+ {onSetDefaultShipping && !address.is_default_shipping && (+ <DropdownMenuItem onClick={onSetDefaultShipping}>+ {t('admin.address_book.set_default_shipping')}+ </DropdownMenuItem>+ )}+ <DropdownMenuItem+ className="text-destructive focus:text-destructive"+ onClick={onRemove}+ >+ <TrashIcon className="size-4" />+ {t('admin.actions.delete')}+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ )}+ </div>+ )+}diff --git a/packages/dashboard/src/components/spree/company-address-sheet.tsx b/packages/dashboard/src/components/spree/company-address-sheet.tsxindex d7964e1126..27dc7282a6 100644--- a/packages/dashboard/src/components/spree/company-address-sheet.tsx+++ b/packages/dashboard/src/components/spree/company-address-sheet.tsx@@ -1,5 +1,6 @@import type { Address } from '@spree/admin-sdk'import { AddressFormDialog } from '@spree/dashboard-core'+import { useMemo } from 'react'import { useTranslation } from 'react-i18next'import { useCreateCompanyAddress, useUpdateCompanyAddress } from '../../hooks/use-companies'@@ -31,11 +32,18 @@ export function CompanyAddressSheet({// kind, so the first site it gets is the answer to both, and there is no// previous default for it to displace. The company line comes from the node,// so a new entry is born carrying it.- const address = entry ?? {- company: companyName,- is_default_billing: true,- is_default_shipping: true,- }+ //+ // Memoized because the dialog re-seeds its form when this changes identity —+ // a fresh literal each render would wipe what the merchant had typed.+ const address = useMemo(+ () =>+ entry ?? {+ company: companyName,+ is_default_billing: true,+ is_default_shipping: true,+ },+ [entry, companyName],+ )return (<AddressFormDialogdiff --git a/packages/dashboard/src/components/spree/customers/customer-addresses-card.tsx b/packages/dashboard/src/components/spree/customers/customer-addresses-card.tsxindex 05064942f4..8c6421f837 100644--- a/packages/dashboard/src/components/spree/customers/customer-addresses-card.tsx+++ b/packages/dashboard/src/components/spree/customers/customer-addresses-card.tsx@@ -1,6 +1,7 @@import type { Address, Customer } from '@spree/admin-sdk'import { AddressFormDialog, type AddressParams, useCountries } from '@spree/dashboard-core'import {+ AddressBookRow,Badge,Button,Card,@@ -8,13 +9,9 @@ import {CardContent,CardHeader,CardTitle,- DropdownMenu,- DropdownMenuContent,- DropdownMenuItem,- DropdownMenuTrigger,useConfirm,} from '@spree/dashboard-ui'-import { EllipsisVerticalIcon, PencilIcon, PlusIcon, TrashIcon } from 'lucide-react'+import { PlusIcon } from 'lucide-react'import { useMemo, useState } from 'react'import { useTranslation } from 'react-i18next'import {@@ -71,80 +68,24 @@ export function CustomerAddressesCard({ customer }: { customer: Customer }) {) : (<CardContent className="flex flex-col gap-3">{addresses.map((addr) => (- <div+ <AddressBookRowkey={addr.id}- className="flex items-start justify-between gap-2 rounded-md border p-3"- >- <div className="text-sm">- <div className="font-medium">- {addr.full_name ?? '—'}- <span className="ml-2 inline-flex gap-1">- {addr.is_default_billing && (- <Badge variant="outline">- {t('admin.customers.detail.address.default_billing')}- </Badge>- )}- {addr.is_default_shipping && (- <Badge variant="outline">- {t('admin.customers.detail.address.default_shipping')}- </Badge>- )}- </span>- </div>- <div className="text-muted-foreground">{addr.address1}</div>- {addr.address2 && <div className="text-muted-foreground">{addr.address2}</div>}- <div className="text-muted-foreground">- {[addr.city, addr.state_code, addr.postal_code].filter(Boolean).join(', ')} ·{' '}- {addr.country_code}- </div>- {addr.phone && <div className="text-muted-foreground">{addr.phone}</div>}- </div>- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button variant="ghost" size="icon-xs">- <EllipsisVerticalIcon className="size-4" />- <span className="sr-only">{t('admin.actions.actions_menu')}</span>- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent align="end">- <DropdownMenuItem onClick={() => setEditing(addr)}>- <PencilIcon className="size-4" />- {t('admin.actions.edit')}- </DropdownMenuItem>- {!addr.is_default_billing && (- <DropdownMenuItem- onClick={() => setDefault({ id: addr.id, kind: 'billing' })}- >- {t('admin.customers.detail.address.set_default_billing')}- </DropdownMenuItem>- )}- {!addr.is_default_shipping && (- <DropdownMenuItem- onClick={() => setDefault({ id: addr.id, kind: 'shipping' })}- >- {t('admin.customers.detail.address.set_default_shipping')}- </DropdownMenuItem>- )}- <DropdownMenuItem- className="text-destructive focus:text-destructive"- onClick={async () => {- if (- await confirm({- message: t('admin.customers.detail.address.delete_confirm_message'),- variant: 'destructive',- confirmLabel: t('admin.actions.delete'),- })- ) {- deleteMutation.mutate(addr.id)- }- }}- >- <TrashIcon className="size-4" />- {t('admin.actions.delete')}- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- </div>+ address={addr}+ onEdit={() => setEditing(addr)}+ onSetDefaultBilling={() => setDefault({ id: addr.id, kind: 'billing' })}+ onSetDefaultShipping={() => setDefault({ id: addr.id, kind: 'shipping' })}+ onRemove={async () => {+ if (+ await confirm({+ message: t('admin.customers.detail.address.delete_confirm_message'),+ variant: 'destructive',+ confirmLabel: t('admin.actions.delete'),+ })+ ) {+ deleteMutation.mutate(addr.id)+ }+ }}+ />))}</CardContent>)}diff --git a/packages/dashboard/src/locales/ar.json b/packages/dashboard/src/locales/ar.jsonindex 67556d6985..8aa3d61521 100644--- a/packages/dashboard/src/locales/ar.json+++ b/packages/dashboard/src/locales/ar.json@@ -431,8 +431,6 @@"company_addresses": {"add_cta": "إضافة عنوان","add_sheet_title": "عنوان جديد",- "default_billing": "الفوترة الافتراضية",- "default_shipping": "الشحن الافتراضي","edit_sheet_title": "تعديل العنوان","empty": "لا توجد عناوين بعد","messages": {@@ -559,11 +557,7 @@},"detail": {"address": {- "default_billing": "الفواتير الافتراضية",- "default_shipping": "الشحن الافتراضي",- "delete_confirm_message": "هل تريد حذف هذا العنوان؟",- "set_default_billing": "تعيين كفواتير افتراضية",- "set_default_shipping": "تعيين كشحن افتراضي"+ "delete_confirm_message": "هل تريد حذف هذا العنوان؟"},"customer_since": "العميل منذ ذلك الحين","delete_label": "حذف العميل",diff --git a/packages/dashboard/src/locales/de.json b/packages/dashboard/src/locales/de.jsonindex fe17a5cbc7..c4e97f6fc4 100644--- a/packages/dashboard/src/locales/de.json+++ b/packages/dashboard/src/locales/de.json@@ -425,8 +425,6 @@"company_addresses": {"add_cta": "Adresse hinzufügen","add_sheet_title": "Neue Adresse",- "default_billing": "Standard-Rechnung",- "default_shipping": "Standard-Lieferung","edit_sheet_title": "Adresse bearbeiten","empty": "Noch keine Adressen","messages": {@@ -553,11 +551,7 @@},"detail": {"address": {- "default_billing": "Standard-Rechnungsadresse",- "default_shipping": "Standard-Lieferadresse",- "delete_confirm_message": "Diese Adresse löschen?",- "set_default_billing": "Als Standard-Rechnungsadresse festlegen",- "set_default_shipping": "Als Standard-Lieferadresse festlegen"+ "delete_confirm_message": "Diese Adresse löschen?"},"customer_since": "Kunde seit","delete_label": "Kunde löschen",diff --git a/packages/dashboard/src/locales/en.json b/packages/dashboard/src/locales/en.jsonindex 8d6d0a2452..258ac3e451 100644--- a/packages/dashboard/src/locales/en.json+++ b/packages/dashboard/src/locales/en.json@@ -425,8 +425,6 @@"company_addresses": {"add_cta": "Add address","add_sheet_title": "New address",- "default_billing": "Default billing",- "default_shipping": "Default shipping","edit_sheet_title": "Edit address","empty": "No addresses yet","messages": {@@ -553,11 +551,7 @@},"detail": {"address": {- "default_billing": "Default billing",- "default_shipping": "Default shipping",- "delete_confirm_message": "Delete this address?",- "set_default_billing": "Set as default billing",- "set_default_shipping": "Set as default shipping"+ "delete_confirm_message": "Delete this address?"},"customer_since": "Customer since","delete_label": "Delete customer",diff --git a/packages/dashboard/src/locales/fr.json b/packages/dashboard/src/locales/fr.jsonindex b64fee5bf3..cb221fe237 100644--- a/packages/dashboard/src/locales/fr.json+++ b/packages/dashboard/src/locales/fr.json@@ -425,8 +425,6 @@"company_addresses": {"add_cta": "Ajouter une adresse","add_sheet_title": "Nouvelle adresse",- "default_billing": "Facturation par défaut",- "default_shipping": "Livraison par défaut","edit_sheet_title": "Modifier l’adresse","empty": "Aucune adresse pour le moment","messages": {@@ -553,11 +551,7 @@},"detail": {"address": {- "default_billing": "Facturation par défaut",- "default_shipping": "Livraison par défaut",- "delete_confirm_message": "Supprimer cette adresse ?",- "set_default_billing": "Définir comme facturation par défaut",- "set_default_shipping": "Définir comme livraison par défaut"+ "delete_confirm_message": "Supprimer cette adresse ?"},"customer_since": "Client depuis","delete_label": "Supprimer le client",diff --git a/packages/dashboard/src/locales/pl.json b/packages/dashboard/src/locales/pl.jsonindex 72c6b5bfeb..2daf1b35f0 100644--- a/packages/dashboard/src/locales/pl.json+++ b/packages/dashboard/src/locales/pl.json@@ -435,8 +435,6 @@"company_addresses": {"add_cta": "Dodaj adres","add_sheet_title": "Nowy adres",- "default_billing": "Domyślny rozliczeniowy",- "default_shipping": "Domyślny dostawy","edit_sheet_title": "Edytuj adres","empty": "Brak adresów","messages": {@@ -563,11 +561,7 @@},"detail": {"address": {- "default_billing": "Domyślny adres rozliczeniowy",- "default_shipping": "Domyślny adres dostawy",- "delete_confirm_message": "Usunąć ten adres?",- "set_default_billing": "Ustaw jako domyślny adres rozliczeniowy",- "set_default_shipping": "Ustaw jako domyślny adres dostawy"+ "delete_confirm_message": "Usunąć ten adres?"},"customer_since": "Klient od","delete_label": "Usuń klienta",diff --git a/packages/dashboard/src/locales/zh-CN.json b/packages/dashboard/src/locales/zh-CN.jsonindex 931a43ad18..bec13436a2 100644--- a/packages/dashboard/src/locales/zh-CN.json+++ b/packages/dashboard/src/locales/zh-CN.json@@ -423,8 +423,6 @@"company_addresses": {"add_cta": "添加地址","add_sheet_title": "新建地址",- "default_billing": "默认账单",- "default_shipping": "默认收货","edit_sheet_title": "编辑地址","empty": "暂无地址","messages": {@@ -551,11 +549,7 @@},"detail": {"address": {- "default_billing": "默认账单地址",- "default_shipping": "默认收货地址",- "delete_confirm_message": "删除此地址?",- "set_default_billing": "设为默认账单地址",- "set_default_shipping": "设为默认收货地址"+ "delete_confirm_message": "删除此地址?"},"customer_since": "注册时间","delete_label": "删除客户",diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/companies/$companyId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/companies/$companyId.tsxindex 32d547f107..16c5451a99 100644--- a/packages/dashboard/src/routes/_authenticated/$storeId/companies/$companyId.tsx+++ b/packages/dashboard/src/routes/_authenticated/$storeId/companies/$companyId.tsx@@ -9,7 +9,7 @@ import {usePermissions,} from '@spree/dashboard-core'import {- AddressBlock,+ AddressBookRow,Badge,Button,Card,@@ -45,7 +45,7 @@ import {useConfirm,} from '@spree/dashboard-ui'import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'-import { EllipsisVerticalIcon, PencilIcon, PlusIcon, TrashIcon } from 'lucide-react'+import { EllipsisVerticalIcon, PlusIcon, TrashIcon } from 'lucide-react'import { useEffect, useState } from 'react'import { Controller, useForm } from 'react-hook-form'import { useTranslation } from 'react-i18next'@@ -71,6 +71,7 @@ import {useDeleteCompanyTaxIdentifier,useRevokeCompanyInvitation,useUpdateCompany,+ useUpdateCompanyAddress,useUpdateCompanyTaxIdentifier,useValidateCompanyTaxIdentifier,} from '../../../../hooks/use-companies'@@ -506,8 +507,18 @@ function AddressBookCard({ company, canEdit }: { company: Company; canEdit: boolconst [page, setPage] = useState(1)const { data, isLoading } = useCompanyAddresses(company.id, page)const deleteMutation = useDeleteCompanyAddress(company.id)+ const updateMutation = useUpdateCompanyAddress(company.id)const [editing, setEditing] = useState<Address | 'new' | null>(null)+ // The node points at one address per kind, so promoting simply moves the+ // pointer — nothing to demote.+ function setDefault(id: string, kind: 'billing' | 'shipping') {+ return updateMutation.mutate({+ id,+ params: { [kind === 'billing' ? 'default_billing' : 'default_shipping']: true },+ })+ }+const entries = data?.data ?? []const meta = data?.meta@@ -552,45 +563,15 @@ function AddressBookCard({ company, canEdit }: { company: Company; canEdit: bool) : (<CardContent className="flex flex-col gap-4">{entries.map((entry) => (- <div key={entry.id} className="flex items-start justify-between gap-2">- <div className="flex min-w-0 flex-col gap-1">- <span className="flex items-center gap-2">- {entry.label && (- <span className="font-medium text-foreground text-sm">{entry.label}</span>- )}- {entry.is_default_billing && (- <Badge variant="outline">{t('admin.company_addresses.default_billing')}</Badge>- )}- {entry.is_default_shipping && (- <Badge variant="outline">{t('admin.company_addresses.default_shipping')}</Badge>- )}- </span>- <AddressBlock address={entry} />- </div>- {canEdit && (- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button variant="ghost" size="icon-xs" className="shrink-0">- <EllipsisVerticalIcon className="size-4" />- <span className="sr-only">{t('admin.actions.actions_menu')}</span>- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent align="end">- <DropdownMenuItem onClick={() => setEditing(entry)}>- <PencilIcon className="size-4" />- {t('admin.actions.edit')}- </DropdownMenuItem>- <DropdownMenuItem- className="text-destructive focus:text-destructive"- onClick={() => handleRemove(entry)}- >- <TrashIcon className="size-4" />- {t('admin.actions.delete')}- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- )}- </div>+ <AddressBookRow+ key={entry.id}+ address={entry}+ canEdit={canEdit}+ onEdit={() => setEditing(entry)}+ onSetDefaultBilling={() => setDefault(entry.id, 'billing')}+ onSetDefaultShipping={() => setDefault(entry.id, 'shipping')}+ onRemove={() => handleRemove(entry)}+ />))}{meta && meta.pages > 1 && <Pagination meta={meta} onPageChange={setPage} />}</CardContent>