@open-mercato/core 0.6.4-develop.4382.1.6b4f656b77 → 0.6.4

package/dist/modules/sales/components/channels/SalesChannelOffersPanel.js

@@ -8,8 +8,10 @@ import { RowActions } from "@open-mercato/ui/backend/RowActions";
 import { Button } from "@open-mercato/ui/primitives/button";
 import { BooleanIcon } from "@open-mercato/ui/backend/ValueIcons";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
-import { readApiResultOrThrow } from "@open-mercato/ui/backend/utils/apiCall";
+import { readApiResultOrThrow, withScopedApiRequestHeaders } from "@open-mercato/ui/backend/utils/apiCall";
+import { buildOptimisticLockHeader } from "@open-mercato/ui/backend/utils/optimisticLock";
 import { deleteCrud } from "@open-mercato/ui/backend/utils/crud";
+import { surfaceRecordConflict } from "@open-mercato/ui/backend/conflicts";
 import { useT } from "@open-mercato/shared/lib/i18n/context";
 import { mapOfferRow, renderOfferPriceSummary } from "./offerTableUtils.js";
 const PAGE_SIZE = 25;
@@ -98,13 +100,18 @@ function SalesChannelOffersPanel({ channelId, channelName }) {
   }, [loadOffers, reloadToken]);
   const handleDelete = React.useCallback(async (row) => {
     try {
-      await deleteCrud("catalog/offers", row.id, {
-        errorMessage: t("sales.channels.offers.errors.delete", "Failed to delete offer.")
-      });
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(row.updatedAt),
+        () => deleteCrud("catalog/offers", row.id, {
+          errorMessage: t("sales.channels.offers.errors.delete", "Failed to delete offer.")
+        })
+      );
       flash(t("sales.channels.offers.messages.deleted", "Offer deleted."), "success");
       setReloadToken((token) => token + 1);
     } catch (err) {
+      if (surfaceRecordConflict(err, t)) return;
       console.error("sales.channels.offers.delete", err);
+      flash(t("sales.channels.offers.errors.delete", "Failed to delete offer."), "error");
     }
   }, [t]);
   const handleSearchChange = React.useCallback((value) => {

package/dist/modules/sales/components/channels/SalesChannelOffersPanel.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/sales/components/channels/SalesChannelOffersPanel.tsx"],
-  "sourcesContent": ["\"use client\"\n\nimport * as React from 'react'\nimport Link from 'next/link'\nimport { useRouter } from 'next/navigation'\nimport type { ColumnDef, SortingState } from '@tanstack/react-table'\nimport { DataTable } from '@open-mercato/ui/backend/DataTable'\nimport { RowActions } from '@open-mercato/ui/backend/RowActions'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'\nimport { deleteCrud } from '@open-mercato/ui/backend/utils/crud'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { mapOfferRow, renderOfferPriceSummary, type OfferRow } from './offerTableUtils'\n\ntype OffersResponse = {\n  items?: Array<Record<string, unknown>>\n  total?: number\n  totalPages?: number\n}\n\nconst PAGE_SIZE = 25\n\nexport function SalesChannelOffersPanel({ channelId, channelName }: { channelId: string; channelName?: string }) {\n  const t = useT()\n  const router = useRouter()\n  const [rows, setRows] = React.useState<OfferRow[]>([])\n  const [page, setPage] = React.useState(1)\n  const [total, setTotal] = React.useState(0)\n  const [totalPages, setTotalPages] = React.useState(1)\n  const [search, setSearch] = React.useState('')\n  const [isLoading, setLoading] = React.useState(true)\n  const [sorting, setSorting] = React.useState<SortingState>([])\n  const [reloadToken, setReloadToken] = React.useState(0)\n\n  const columns = React.useMemo<ColumnDef<OfferRow>[]>(() => [\n    {\n      accessorKey: 'title',\n      header: t('sales.channels.offers.table.offer', 'Offer'),\n      cell: ({ row }) => (\n        <div className=\"flex items-center gap-3\">\n          {row.original.productMediaUrl ? (\n            <img\n              src={row.original.productMediaUrl}\n              alt={row.original.productTitle ?? row.original.title}\n              className=\"h-12 w-12 rounded border object-cover\"\n            />\n          ) : (\n            <div className=\"h-12 w-12 rounded border bg-muted\" />\n          )}\n          <div className=\"flex flex-col gap-1\">\n            <div>\n              <span className=\"font-medium\">{row.original.title}</span>\n              <div className=\"text-xs text-muted-foreground\">\n                {row.original.productTitle ?? t('sales.channels.offers.table.emptyProduct', 'Unlinked product')}\n              </div>\n            </div>\n          </div>\n        </div>\n      ),\n      meta: { sticky: true },\n    },\n    {\n      accessorKey: 'pricing',\n      header: t('sales.channels.offers.table.pricing', 'Prices'),\n      cell: ({ row }) => (\n        <div className=\"text-sm\">{renderOfferPriceSummary(row.original, t as any)}</div>\n      ),\n    },\n    {\n      accessorKey: 'isActive',\n      header: t('sales.channels.offers.table.active', 'Active'),\n      cell: ({ row }) => <BooleanIcon value={row.original.isActive} />,\n    },\n    {\n      accessorKey: 'updatedAt',\n      header: t('sales.channels.offers.table.updated', 'Updated'),\n      cell: ({ row }) =>\n        row.original.updatedAt\n          ? <span className=\"text-xs text-muted-foreground\">{new Date(row.original.updatedAt).toLocaleDateString()}</span>\n          : <span className=\"text-xs text-muted-foreground\">\u2014</span>,\n    },\n  ], [t])\n\n  const loadOffers = React.useCallback(async () => {\n    if (!channelId) return\n    setLoading(true)\n    try {\n      const params = new URLSearchParams({\n        page: String(page),\n        pageSize: String(PAGE_SIZE),\n        channelId,\n      })\n      if (search.trim().length) {\n        params.set('search', search.trim())\n      }\n      const sort = sorting[0]\n      if (sort?.id) {\n        params.set('sortField', sort.id)\n        params.set('sortDir', sort.desc ? 'desc' : 'asc')\n      }\n      const payload = await readApiResultOrThrow<OffersResponse>(\n        `/api/catalog/offers?${params.toString()}`,\n        undefined,\n        { errorMessage: t('sales.channels.offers.errors.load', 'Failed to load offers.') },\n      )\n      const items = Array.isArray(payload.items) ? payload.items : []\n      setRows(items.map(mapOfferRow))\n      setTotal(typeof payload.total === 'number' ? payload.total : items.length)\n      setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : Math.max(1, Math.ceil(items.length / PAGE_SIZE)))\n    } catch (err) {\n      console.error('sales.channels.offers', err)\n      flash(t('sales.channels.offers.errors.load', 'Failed to load offers.'), 'error')\n    } finally {\n      setLoading(false)\n    }\n  }, [channelId, page, search, sorting, t])\n\n  React.useEffect(() => {\n    void loadOffers()\n  }, [loadOffers, reloadToken])\n\n  const handleDelete = React.useCallback(async (row: OfferRow) => {\n    try {\n      await deleteCrud('catalog/offers', row.id, {\n        errorMessage: t('sales.channels.offers.errors.delete', 'Failed to delete offer.'),\n      })\n      flash(t('sales.channels.offers.messages.deleted', 'Offer deleted.'), 'success')\n      setReloadToken((token) => token + 1)\n    } catch (err) {\n      console.error('sales.channels.offers.delete', err)\n    }\n  }, [t])\n\n  const handleSearchChange = React.useCallback((value: string) => {\n    setSearch(value)\n    setPage(1)\n  }, [])\n\n  const tableTitle = (\n    <div>\n      <div className=\"text-lg font-semibold\">\n        {t('sales.channels.offers.heading', 'Offers for {{name}}', { name: channelName || t('sales.channels.nav.title', 'Sales channels') })}\n      </div>\n      <p className=\"text-sm text-muted-foreground\">\n        {t('sales.channels.offers.subtitle', 'Override product presentation and pricing per channel.')}\n      </p>\n    </div>\n  )\n\n  const actions = (\n    <Button asChild>\n      <Link href={`/backend/sales/channels/${channelId}/offers/create`}>\n        {t('sales.channels.offers.actions.create', 'Add offer')}\n      </Link>\n    </Button>\n  )\n\n  return (\n    <DataTable<OfferRow>\n      title={tableTitle}\n      actions={actions}\n      columns={columns}\n      data={rows}\n      isLoading={isLoading}\n      sorting={sorting}\n      onSortingChange={setSorting}\n      searchValue={search}\n      onSearchChange={handleSearchChange}\n      searchPlaceholder={t('sales.channels.offers.table.search', 'Search offers\u2026')}\n      pagination={{\n        page,\n        pageSize: PAGE_SIZE,\n        total,\n        totalPages,\n        onPageChange: setPage,\n      }}\n      refreshButton={{\n        label: t('sales.channels.offers.table.refresh', 'Refresh'),\n        onRefresh: () => setReloadToken((token) => token + 1),\n        isRefreshing: isLoading,\n      }}\n          rowActions={(row) => (\n            <RowActions\n              items={[\n                {\n                  id: 'edit',\n                  label: t('sales.channels.offers.actions.edit', 'Edit'),\n                  href: `/backend/sales/channels/${channelId}/offers/${row.id}/edit`,\n                },\n                {\n                  id: 'delete',\n                  label: t('sales.channels.offers.actions.delete', 'Delete'),\n                  onSelect: () => handleDelete(row),\n                  destructive: true,\n            },\n          ]}\n        />\n      )}\n      onRowClick={(row) => router.push(`/backend/sales/channels/${channelId}/offers/${row.id}/edit`)}\n      emptyState={\n        <div className=\"py-10 text-center text-sm text-muted-foreground\">\n          {t('sales.channels.offers.table.empty', 'No offers for this channel yet.')}\n        </div>\n      }\n    />\n  )\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["\"use client\"\n\nimport * as React from 'react'\nimport Link from 'next/link'\nimport { useRouter } from 'next/navigation'\nimport type { ColumnDef, SortingState } from '@tanstack/react-table'\nimport { DataTable } from '@open-mercato/ui/backend/DataTable'\nimport { RowActions } from '@open-mercato/ui/backend/RowActions'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'\nimport { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'\nimport { deleteCrud } from '@open-mercato/ui/backend/utils/crud'\nimport { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { mapOfferRow, renderOfferPriceSummary, type OfferRow } from './offerTableUtils'\n\ntype OffersResponse = {\n  items?: Array<Record<string, unknown>>\n  total?: number\n  totalPages?: number\n}\n\nconst PAGE_SIZE = 25\n\nexport function SalesChannelOffersPanel({ channelId, channelName }: { channelId: string; channelName?: string }) {\n  const t = useT()\n  const router = useRouter()\n  const [rows, setRows] = React.useState<OfferRow[]>([])\n  const [page, setPage] = React.useState(1)\n  const [total, setTotal] = React.useState(0)\n  const [totalPages, setTotalPages] = React.useState(1)\n  const [search, setSearch] = React.useState('')\n  const [isLoading, setLoading] = React.useState(true)\n  const [sorting, setSorting] = React.useState<SortingState>([])\n  const [reloadToken, setReloadToken] = React.useState(0)\n\n  const columns = React.useMemo<ColumnDef<OfferRow>[]>(() => [\n    {\n      accessorKey: 'title',\n      header: t('sales.channels.offers.table.offer', 'Offer'),\n      cell: ({ row }) => (\n        <div className=\"flex items-center gap-3\">\n          {row.original.productMediaUrl ? (\n            <img\n              src={row.original.productMediaUrl}\n              alt={row.original.productTitle ?? row.original.title}\n              className=\"h-12 w-12 rounded border object-cover\"\n            />\n          ) : (\n            <div className=\"h-12 w-12 rounded border bg-muted\" />\n          )}\n          <div className=\"flex flex-col gap-1\">\n            <div>\n              <span className=\"font-medium\">{row.original.title}</span>\n              <div className=\"text-xs text-muted-foreground\">\n                {row.original.productTitle ?? t('sales.channels.offers.table.emptyProduct', 'Unlinked product')}\n              </div>\n            </div>\n          </div>\n        </div>\n      ),\n      meta: { sticky: true },\n    },\n    {\n      accessorKey: 'pricing',\n      header: t('sales.channels.offers.table.pricing', 'Prices'),\n      cell: ({ row }) => (\n        <div className=\"text-sm\">{renderOfferPriceSummary(row.original, t as any)}</div>\n      ),\n    },\n    {\n      accessorKey: 'isActive',\n      header: t('sales.channels.offers.table.active', 'Active'),\n      cell: ({ row }) => <BooleanIcon value={row.original.isActive} />,\n    },\n    {\n      accessorKey: 'updatedAt',\n      header: t('sales.channels.offers.table.updated', 'Updated'),\n      cell: ({ row }) =>\n        row.original.updatedAt\n          ? <span className=\"text-xs text-muted-foreground\">{new Date(row.original.updatedAt).toLocaleDateString()}</span>\n          : <span className=\"text-xs text-muted-foreground\">\u2014</span>,\n    },\n  ], [t])\n\n  const loadOffers = React.useCallback(async () => {\n    if (!channelId) return\n    setLoading(true)\n    try {\n      const params = new URLSearchParams({\n        page: String(page),\n        pageSize: String(PAGE_SIZE),\n        channelId,\n      })\n      if (search.trim().length) {\n        params.set('search', search.trim())\n      }\n      const sort = sorting[0]\n      if (sort?.id) {\n        params.set('sortField', sort.id)\n        params.set('sortDir', sort.desc ? 'desc' : 'asc')\n      }\n      const payload = await readApiResultOrThrow<OffersResponse>(\n        `/api/catalog/offers?${params.toString()}`,\n        undefined,\n        { errorMessage: t('sales.channels.offers.errors.load', 'Failed to load offers.') },\n      )\n      const items = Array.isArray(payload.items) ? payload.items : []\n      setRows(items.map(mapOfferRow))\n      setTotal(typeof payload.total === 'number' ? payload.total : items.length)\n      setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : Math.max(1, Math.ceil(items.length / PAGE_SIZE)))\n    } catch (err) {\n      console.error('sales.channels.offers', err)\n      flash(t('sales.channels.offers.errors.load', 'Failed to load offers.'), 'error')\n    } finally {\n      setLoading(false)\n    }\n  }, [channelId, page, search, sorting, t])\n\n  React.useEffect(() => {\n    void loadOffers()\n  }, [loadOffers, reloadToken])\n\n  const handleDelete = React.useCallback(async (row: OfferRow) => {\n    try {\n      await withScopedApiRequestHeaders(buildOptimisticLockHeader(row.updatedAt), () =>\n        deleteCrud('catalog/offers', row.id, {\n          errorMessage: t('sales.channels.offers.errors.delete', 'Failed to delete offer.'),\n        }),\n      )\n      flash(t('sales.channels.offers.messages.deleted', 'Offer deleted.'), 'success')\n      setReloadToken((token) => token + 1)\n    } catch (err) {\n      if (surfaceRecordConflict(err, t)) return\n      console.error('sales.channels.offers.delete', err)\n      flash(t('sales.channels.offers.errors.delete', 'Failed to delete offer.'), 'error')\n    }\n  }, [t])\n\n  const handleSearchChange = React.useCallback((value: string) => {\n    setSearch(value)\n    setPage(1)\n  }, [])\n\n  const tableTitle = (\n    <div>\n      <div className=\"text-lg font-semibold\">\n        {t('sales.channels.offers.heading', 'Offers for {{name}}', { name: channelName || t('sales.channels.nav.title', 'Sales channels') })}\n      </div>\n      <p className=\"text-sm text-muted-foreground\">\n        {t('sales.channels.offers.subtitle', 'Override product presentation and pricing per channel.')}\n      </p>\n    </div>\n  )\n\n  const actions = (\n    <Button asChild>\n      <Link href={`/backend/sales/channels/${channelId}/offers/create`}>\n        {t('sales.channels.offers.actions.create', 'Add offer')}\n      </Link>\n    </Button>\n  )\n\n  return (\n    <DataTable<OfferRow>\n      title={tableTitle}\n      actions={actions}\n      columns={columns}\n      data={rows}\n      isLoading={isLoading}\n      sorting={sorting}\n      onSortingChange={setSorting}\n      searchValue={search}\n      onSearchChange={handleSearchChange}\n      searchPlaceholder={t('sales.channels.offers.table.search', 'Search offers\u2026')}\n      pagination={{\n        page,\n        pageSize: PAGE_SIZE,\n        total,\n        totalPages,\n        onPageChange: setPage,\n      }}\n      refreshButton={{\n        label: t('sales.channels.offers.table.refresh', 'Refresh'),\n        onRefresh: () => setReloadToken((token) => token + 1),\n        isRefreshing: isLoading,\n      }}\n          rowActions={(row) => (\n            <RowActions\n              items={[\n                {\n                  id: 'edit',\n                  label: t('sales.channels.offers.actions.edit', 'Edit'),\n                  href: `/backend/sales/channels/${channelId}/offers/${row.id}/edit`,\n                },\n                {\n                  id: 'delete',\n                  label: t('sales.channels.offers.actions.delete', 'Delete'),\n                  onSelect: () => handleDelete(row),\n                  destructive: true,\n            },\n          ]}\n        />\n      )}\n      onRowClick={(row) => router.push(`/backend/sales/channels/${channelId}/offers/${row.id}/edit`)}\n      emptyState={\n        <div className=\"py-10 text-center text-sm text-muted-foreground\">\n          {t('sales.channels.offers.table.empty', 'No offers for this channel yet.')}\n        </div>\n      }\n    />\n  )\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/sales/components/documents/AddressesSection.js

@@ -2,7 +2,8 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import * as React from "react";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
-import { apiCall, apiCallOrThrow } from "@open-mercato/ui/backend/utils/apiCall";
+import { apiCall, apiCallOrThrow, withScopedApiRequestHeaders } from "@open-mercato/ui/backend/utils/apiCall";
+import { buildOptimisticLockHeader } from "@open-mercato/ui/backend/utils/optimisticLock";
 import { createCrud } from "@open-mercato/ui/backend/utils/crud";
 import { useGuardedMutation } from "@open-mercato/ui/backend/injection/useGuardedMutation";
 import { ErrorMessage, LoadingMessage, TabEmptyState } from "@open-mercato/ui/backend/detail";
@@ -107,6 +108,11 @@ function mapApiAddress(item, format) {
   const label = name || summary || id;
   return { id, label, summary, value, name: name || null, purpose: purpose || null };
 }
+function mergeAddressOption(options, selected) {
+  if (!selected) return options;
+  if (options.some((option) => option.id === selected.id)) return options;
+  return [selected, ...options];
+}
 function draftFromDocumentAddress(entry) {
   return {
     name: entry.name ?? "",
@@ -365,10 +371,36 @@ function SalesDocumentAddressesSection({
     },
     [addressFormat, t]
   );
+  const loadAddressOptionById = React.useCallback(
+    async (addressId) => {
+      const call = await apiCall(
+        `/api/customers/addresses?id=${encodeURIComponent(addressId)}&pageSize=1`
+      );
+      const items = Array.isArray(call.result?.items) ? call.result.items : [];
+      return items.map((item) => mapApiAddress(item, addressFormat)).find((entry) => entry?.id === addressId) ?? null;
+    },
+    [addressFormat]
+  );
   React.useEffect(() => {
     loadAddresses(customerId).catch(() => {
     });
   }, [customerId, loadAddresses]);
+  React.useEffect(() => {
+    const selectedIds = [shippingAddressIdState, billingAddressIdState].filter(
+      (id) => typeof id === "string" && id.length > 0
+    );
+    const missingIds = selectedIds.filter((id) => !addressOptions.some((option) => option.id === id));
+    if (!missingIds.length) return;
+    Promise.all(missingIds.map((id) => loadAddressOptionById(id).catch(() => null))).then((selectedOptions) => {
+      setAddressOptions(
+        (current) => selectedOptions.reduce(
+          (next, selected) => mergeAddressOption(next, selected),
+          current
+        )
+      );
+    }).catch(() => {
+    });
+  }, [addressOptions, billingAddressIdState, loadAddressOptionById, shippingAddressIdState]);
   const guardLocked = React.useCallback(() => {
     if (!locked) return false;
     if (lockedReason) {
@@ -594,14 +626,20 @@ function SalesDocumentAddressesSection({
         country: updatedValue.country
       };
       await runGuardedMutation(
-        () => apiCallOrThrow(
-          "/api/sales/document-addresses",
-          {
-            method: "PUT",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify(payload)
-          },
-          { errorMessage: t("sales.documents.detail.addresses.saveError", "Failed to update addresses.") }
+        () => (
+          // TODO(#2373-C): thread document updatedAt
+          withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(void 0),
+            () => apiCallOrThrow(
+              "/api/sales/document-addresses",
+              {
+                method: "PUT",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify(payload)
+              },
+              { errorMessage: t("sales.documents.detail.addresses.saveError", "Failed to update addresses.") }
+            )
+          )
         ),
         payload
       );
@@ -646,14 +684,20 @@ function SalesDocumentAddressesSection({
       try {
         const payload = { id, documentId, documentKind: kind };
         await runGuardedMutation(
-          () => apiCallOrThrow(
-            "/api/sales/document-addresses",
-            {
-              method: "DELETE",
-              headers: { "Content-Type": "application/json" },
-              body: JSON.stringify(payload)
-            },
-            { errorMessage: t("sales.documents.detail.addresses.deleteError", "Failed to remove address.") }
+          () => (
+            // TODO(#2373-C): thread document updatedAt
+            withScopedApiRequestHeaders(
+              buildOptimisticLockHeader(void 0),
+              () => apiCallOrThrow(
+                "/api/sales/document-addresses",
+                {
+                  method: "DELETE",
+                  headers: { "Content-Type": "application/json" },
+                  body: JSON.stringify(payload)
+                },
+                { errorMessage: t("sales.documents.detail.addresses.deleteError", "Failed to remove address.") }
+              )
+            )
           ),
           payload
         );
@@ -728,14 +772,20 @@ function SalesDocumentAddressesSection({
       payload.billingAddressId = billingSnapshot ? null : billingId;
       const endpoint = kind === "order" ? "/api/sales/orders" : "/api/sales/quotes";
       const call = await runGuardedMutation(
-        () => apiCallOrThrow(
-          endpoint,
-          {
-            method: "PUT",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify(payload)
-          },
-          { errorMessage: t("sales.documents.detail.updateError", "Failed to update document.") }
+        () => (
+          // TODO(#2373-C): thread document updatedAt
+          withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(void 0),
+            () => apiCallOrThrow(
+              endpoint,
+              {
+                method: "PUT",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify(payload)
+              },
+              { errorMessage: t("sales.documents.detail.updateError", "Failed to update document.") }
+            )
+          )
         ),
         payload
       );
@@ -774,18 +824,33 @@ function SalesDocumentAddressesSection({
     useCustomBilling,
     useCustomShipping
   ]);
-  const renderAddressSelect = (value, options, onChange, disabled) => /* @__PURE__ */ jsxs(Select, { value: value || void 0, onValueChange: (next) => onChange(next || null), disabled, children: [
-    /* @__PURE__ */ jsx(SelectTrigger, { children: /* @__PURE__ */ jsx(
-      SelectValue,
+  const renderAddressSelect = (value, options, onChange, disabled) => {
+    const selectedOption = options.find((addr) => addr.id === value) ?? null;
+    const selectedLabel = selectedOption ? selectedOption.summary ? `${selectedOption.label} \u2014 ${selectedOption.summary}` : selectedOption.label : null;
+    const optionsKey = options.map((addr) => `${addr.id}:${addr.summary ? `${addr.label} \u2014 ${addr.summary}` : addr.label}`).join("\0");
+    return /* @__PURE__ */ jsxs(
+      Select,
       {
-        placeholder: addressesLoading ? t("sales.documents.form.address.loading", "Loading addresses\u2026") : t("sales.documents.form.address.placeholder", "Select address")
-      }
-    ) }),
-    /* @__PURE__ */ jsx(SelectContent, { children: options.map((addr) => {
-      const optionLabel = addr.summary ? `${addr.label} \u2014 ${addr.summary}` : addr.label;
-      return /* @__PURE__ */ jsx(SelectItem, { value: addr.id, children: optionLabel }, addr.id);
-    }) })
-  ] });
+        value: value || void 0,
+        onValueChange: (next) => onChange(next || null),
+        disabled,
+        children: [
+          /* @__PURE__ */ jsx(SelectTrigger, { children: /* @__PURE__ */ jsx(
+            SelectValue,
+            {
+              placeholder: addressesLoading ? t("sales.documents.form.address.loading", "Loading addresses\u2026") : t("sales.documents.form.address.placeholder", "Select address"),
+              children: selectedLabel ?? void 0
+            }
+          ) }),
+          /* @__PURE__ */ jsx(SelectContent, { children: options.map((addr) => {
+            const optionLabel = addr.summary ? `${addr.label} \u2014 ${addr.summary}` : addr.label;
+            return /* @__PURE__ */ jsx(SelectItem, { value: addr.id, children: optionLabel }, addr.id);
+          }) })
+        ]
+      },
+      `address:${value}:${optionsKey}`
+    );
+  };
   return /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
     /* @__PURE__ */ jsxs("div", { className: "grid gap-4 md:grid-cols-2", children: [
       lockedReason ? /* @__PURE__ */ jsx(