@mercurjs/vendor 2.2.0-canary.3 → 2.2.0-canary.30

package/dist/{[id]-4OBGG7OH.js → [id]-AJHD2JBG.js}

@@ -7,77 +7,82 @@ import {
 } from "./chunk-JHIMVLB2.js";
 import {
   useOrderTableColumns
-} from "./chunk-L7QKFC5N.js";
+} from "./chunk-E6W57UP3.js";
 import {
   useOrderTableQuery
-} from "./chunk-6YA3C4NB.js";
+} from "./chunk-XBKWFLJG.js";
 import {
   useOrderTableFilters
-} from "./chunk-AIZM66CG.js";
+} from "./chunk-LFX6WU4A.js";
 import {
   useCustomerGroupTableFilters
 } from "./chunk-CMHI2RPL.js";
 import "./chunk-HB3BP55W.js";
 import "./chunk-SYNUA6LQ.js";
+import "./chunk-L57USMYC.js";
 import "./chunk-LQSLDDPT.js";
-import "./chunk-PXYDR7WQ.js";
-import "./chunk-JRTZWK77.js";
-import "./chunk-FQERBIVS.js";
+import "./chunk-3BXCPHN6.js";
+import {
+  getCountryByIso2
+} from "./chunk-JRTZWK77.js";
 import "./chunk-DB6ANJBO.js";
 import "./chunk-PHOCVOZ5.js";
+import "./chunk-IQPN4PZJ.js";
+import "./chunk-FQERBIVS.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-AIF2KTEE.js";
+} from "./chunk-XRLRKSND.js";
 import "./chunk-YN3FGNJM.js";
-import "./chunk-KAZ5BYTQ.js";
-import "./chunk-3EF54XFY.js";
-import "./chunk-IQPN4PZJ.js";
+import "./chunk-KCHYLLVG.js";
+import {
+  NoRecords
+} from "./chunk-634XVU3D.js";
 import {
-  SingleColumnPage
+  TwoColumnPage
 } from "./chunk-YV6MK4PZ.js";
-import "./chunk-LRD242C7.js";
-import "./chunk-QHQWEERJ.js";
 import "./chunk-THHRRYRS.js";
+import "./chunk-LRD242C7.js";
 import {
-  SingleColumnPageSkeleton
+  TwoColumnPageSkeleton
 } from "./chunk-INNFZYX2.js";
-import "./chunk-GXIAIITP.js";
+import {
+  ActionMenu
+} from "./chunk-BDGZ4EQO.js";
+import "./chunk-LAVHRER2.js";
+import "./chunk-QHQWEERJ.js";
+import "./chunk-Y7QKP6QU.js";
+import "./chunk-LV5EZWOX.js";
 import "./chunk-F4OJN2F2.js";
 import "./chunk-LRARA622.js";
 import "./chunk-M6N4ISXL.js";
 import "./chunk-S7EKBD2C.js";
-import "./chunk-VXMOPVRH.js";
 import "./chunk-VV6IKGCN.js";
-import "./chunk-NHFEY3EI.js";
+import "./chunk-LANE4H7T.js";
 import "./chunk-BOZJOOGW.js";
+import "./chunk-IQWK723D.js";
+import "./chunk-4S6XGIC6.js";
+import "./chunk-S23FD6FA.js";
 import {
   useBatchCustomerCustomerGroups,
   useCustomer,
   useCustomerGroups,
   useRemoveCustomersFromGroup
-} from "./chunk-LWJF63JW.js";
-import "./chunk-T6LHVNWO.js";
-import "./chunk-4S6XGIC6.js";
-import "./chunk-QT7YFHCA.js";
-import "./chunk-IQWK723D.js";
-import "./chunk-UORPTGV2.js";
-import "./chunk-NXNJQZCP.js";
+} from "./chunk-LTQQRVZG.js";
+import "./chunk-RFVLS6FJ.js";
 import "./chunk-VXWN37PT.js";
-import "./chunk-RZLN2Q6G.js";
+import "./chunk-EZKHLCNR.js";
+import "./chunk-VXMOPVRH.js";
 import "./chunk-NBPMNUKZ.js";
+import "./chunk-3AGREI6E.js";
+import "./chunk-L5SD4XBS.js";
 import {
   useOrders
-} from "./chunk-QS6RWIBL.js";
+} from "./chunk-6AWQZ6KH.js";
 import "./chunk-3B34B2M2.js";
-import {
-  ActionMenu
-} from "./chunk-BDGZ4EQO.js";
-import "./chunk-LAVHRER2.js";
-import "./chunk-Y7QKP6QU.js";
 import {
   productsQueryKeys
-} from "./chunk-QNNJN4H6.js";
+} from "./chunk-SNVHY6HG.js";
 import "./chunk-A5DJIOHN.js";
 import {
   queryClient
@@ -106,33 +111,120 @@ var loader = async ({ params }) => {
 import { Children } from "react";
 import { useLoaderData, useParams } from "react-router-dom";
 
-// src/pages/customers/[id]/_components/customer-general-section/customer-general-section.tsx
-import { Container, Heading, StatusBadge, Text } from "@medusajs/ui";
+// src/pages/customers/[id]/_components/customer-address-section/customer-address-section.tsx
+import { Container, Heading, Text } from "@medusajs/ui";
 import { useTranslation } from "react-i18next";
 import { jsx, jsxs } from "react/jsx-runtime";
-var CustomerGeneralSection = ({
+var getAddressLabel = (address) => {
+  if (address.address_name) {
+    return address.address_name;
+  }
+  const name = [address.first_name, address.last_name].filter(Boolean).join(" ");
+  return name || "Address";
+};
+var CustomerAddressSection = ({
   customer
 }) => {
   const { t: t2 } = useTranslation();
+  const addresses = customer.addresses ?? [];
+  return /* @__PURE__ */ jsxs(Container, { className: "divide-y p-0", "data-testid": "customer-address-section", children: [
+    /* @__PURE__ */ jsx(
+      "div",
+      {
+        className: "flex items-center justify-between px-6 py-4",
+        "data-testid": "customer-address-section-header",
+        children: /* @__PURE__ */ jsx(Heading, { level: "h2", "data-testid": "customer-address-section-heading", children: t2("customers.addresses.title") })
+      }
+    ),
+    addresses.length === 0 ? /* @__PURE__ */ jsx("div", { "data-testid": "customer-address-section-empty", children: /* @__PURE__ */ jsx(
+      NoRecords,
+      {
+        className: "flex h-full flex-col overflow-hidden p-6",
+        icon: null,
+        title: t2("customers.addresses.emptyTitle"),
+        message: t2("customers.addresses.emptyMessage")
+      }
+    ) }) : /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-y-2 p-3", children: addresses.map((address) => {
+      const country = getCountryByIso2(address.country_code)?.display_name ?? address.country_code?.toUpperCase();
+      const cityLine = [address.city, address.postal_code].filter(Boolean).join(", ");
+      return /* @__PURE__ */ jsxs(
+        "div",
+        {
+          className: "bg-ui-bg-subtle border-ui-border-base flex flex-col gap-y-1 rounded-lg border px-3 py-2",
+          "data-testid": `customer-address-section-address-${address.id}`,
+          children: [
+            /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", leading: "compact", children: getAddressLabel(address) }),
+            address.address_1 && /* @__PURE__ */ jsx(
+              Text,
+              {
+                size: "small",
+                leading: "compact",
+                className: "text-ui-fg-subtle",
+                children: address.address_1
+              }
+            ),
+            address.address_2 && /* @__PURE__ */ jsx(
+              Text,
+              {
+                size: "small",
+                leading: "compact",
+                className: "text-ui-fg-subtle",
+                children: address.address_2
+              }
+            ),
+            cityLine && /* @__PURE__ */ jsx(
+              Text,
+              {
+                size: "small",
+                leading: "compact",
+                className: "text-ui-fg-subtle",
+                children: cityLine
+              }
+            ),
+            country && /* @__PURE__ */ jsx(
+              Text,
+              {
+                size: "small",
+                leading: "compact",
+                className: "text-ui-fg-subtle",
+                children: country
+              }
+            )
+          ]
+        },
+        address.id
+      );
+    }) })
+  ] });
+};
+
+// src/pages/customers/[id]/_components/customer-general-section/customer-general-section.tsx
+import { Container as Container2, Heading as Heading2, StatusBadge, Text as Text2 } from "@medusajs/ui";
+import { useTranslation as useTranslation2 } from "react-i18next";
+import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+var CustomerGeneralSection = ({
+  customer
+}) => {
+  const { t: t2 } = useTranslation2();
   const name = [customer.first_name, customer.last_name].filter(Boolean).join(" ");
   const statusColor = customer.has_account ? "green" : "orange";
   const statusText = customer.has_account ? t2("customers.fields.registered") : t2("customers.fields.guest");
-  return /* @__PURE__ */ jsxs(Container, { className: "divide-y p-0", children: [
-    /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between px-6 py-4", children: [
-      /* @__PURE__ */ jsx(Heading, { children: customer.email }),
-      /* @__PURE__ */ jsx("div", { className: "flex items-center gap-x-2", children: /* @__PURE__ */ jsx(StatusBadge, { color: statusColor, children: statusText }) })
+  return /* @__PURE__ */ jsxs2(Container2, { className: "divide-y p-0", children: [
+    /* @__PURE__ */ jsxs2("div", { className: "flex items-center justify-between px-6 py-4", children: [
+      /* @__PURE__ */ jsx2(Heading2, { children: customer.email }),
+      /* @__PURE__ */ jsx2("div", { className: "flex items-center gap-x-2", children: /* @__PURE__ */ jsx2(StatusBadge, { color: statusColor, children: statusText }) })
     ] }),
-    /* @__PURE__ */ jsxs("div", { className: "text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4", children: [
-      /* @__PURE__ */ jsx(Text, { size: "small", leading: "compact", weight: "plus", children: t2("fields.name") }),
-      /* @__PURE__ */ jsx(Text, { size: "small", leading: "compact", children: name || "-" })
+    /* @__PURE__ */ jsxs2("div", { className: "text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4", children: [
+      /* @__PURE__ */ jsx2(Text2, { size: "small", leading: "compact", weight: "plus", children: t2("fields.name") }),
+      /* @__PURE__ */ jsx2(Text2, { size: "small", leading: "compact", children: name || "-" })
     ] }),
-    /* @__PURE__ */ jsxs("div", { className: "text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4", children: [
-      /* @__PURE__ */ jsx(Text, { size: "small", leading: "compact", weight: "plus", children: t2("fields.company") }),
-      /* @__PURE__ */ jsx(Text, { size: "small", leading: "compact", children: customer.company_name || "-" })
+    /* @__PURE__ */ jsxs2("div", { className: "text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4", children: [
+      /* @__PURE__ */ jsx2(Text2, { size: "small", leading: "compact", weight: "plus", children: t2("fields.company") }),
+      /* @__PURE__ */ jsx2(Text2, { size: "small", leading: "compact", children: customer.company_name || "-" })
     ] }),
-    /* @__PURE__ */ jsxs("div", { className: "text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4", children: [
-      /* @__PURE__ */ jsx(Text, { size: "small", leading: "compact", weight: "plus", children: t2("fields.phone") }),
-      /* @__PURE__ */ jsx(Text, { size: "small", leading: "compact", children: customer.phone || "-" })
+    /* @__PURE__ */ jsxs2("div", { className: "text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4", children: [
+      /* @__PURE__ */ jsx2(Text2, { size: "small", leading: "compact", weight: "plus", children: t2("fields.phone") }),
+      /* @__PURE__ */ jsx2(Text2, { size: "small", leading: "compact", children: customer.phone || "-" })
     ] })
   ] });
 };
@@ -141,59 +233,68 @@ var CustomerGeneralSection = ({
 import {
   Button,
   Checkbox,
-  Container as Container2,
-  Heading as Heading2,
+  Container as Container3,
+  Heading as Heading3,
   toast,
   usePrompt
 } from "@medusajs/ui";
+import { keepPreviousData } from "@tanstack/react-query";
 import { createColumnHelper } from "@tanstack/react-table";
 import { t } from "i18next";
 import { useMemo, useState } from "react";
 import { PencilSquare, Trash } from "@medusajs/icons";
-import { useTranslation as useTranslation2 } from "react-i18next";
+import { useTranslation as useTranslation3 } from "react-i18next";
 import { Link } from "react-router-dom";
-import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var PAGE_SIZE = 10;
 var PREFIX = "cusgr";
+var DEFAULT_ORDER = "-created_at";
 var CustomerGroupSection = ({
   customer
 }) => {
   const prompt = usePrompt();
   const [rowSelection, setRowSelection] = useState({});
-  const { raw, searchParams } = useCustomerGroupTableQuery({
+  const { searchParams, raw } = useCustomerGroupTableQuery({
     pageSize: PAGE_SIZE,
     prefix: PREFIX
   });
+  const flatCustomerGroups = customer.groups ?? [];
+  const groupIds = useMemo(
+    () => (customer.groups ?? []).map((g) => g.id),
+    [customer.groups]
+  );
   const {
-    customer_groups: customerGroups,
+    customer_groups: customerGroups = [],
+    count = 0,
     isLoading,
     isError,
     error
   } = useCustomerGroups(
     {
       ...searchParams,
-      fields: "+customers.id"
+      id: groupIds,
+      order: searchParams.order || DEFAULT_ORDER,
+      fields: "id,name,created_at,updated_at,customers.id"
     },
-    void 0,
     {
-      created_at: searchParams.created_at,
-      updated_at: searchParams.updated_at,
-      sort: searchParams.order
+      enabled: groupIds.length > 0,
+      placeholderData: keepPreviousData
     }
   );
-  const filteredCustomerGroups = customerGroups?.filter(
-    (cg) => customer.groups?.some((g) => g.id === cg.customer_group_id)
-  );
-  const flatCustomerGroups = filteredCustomerGroups?.map((cg) => ({
-    ...cg.customer_group
-  }));
+  if (isError) {
+    throw error;
+  }
+  const customerCountByGroup = {};
+  for (const g of customerGroups) {
+    customerCountByGroup[g.id] = g.customers?.length ?? 0;
+  }
   const { mutateAsync: batchCustomerCustomerGroups } = useBatchCustomerCustomerGroups(customer.id);
   const filters = useCustomerGroupTableFilters();
-  const columns = useColumns(customer.id);
+  const columns = useColumns(customer.id, customerCountByGroup);
   const { table } = useDataTable({
-    data: flatCustomerGroups ?? [],
+    data: customerGroups,
     columns,
-    count: flatCustomerGroups?.length ?? 0,
+    count,
     getRowId: (row) => row.id,
     enablePagination: true,
     enableRowSelection: true,
@@ -206,50 +307,50 @@ var CustomerGroupSection = ({
   });
   const handleRemove = async () => {
     const selectedIds = Object.keys(rowSelection);
+    const selectedGroups = flatCustomerGroups.filter(
+      (g) => selectedIds.includes(g.id)
+    );
+    const names = selectedGroups.map((g) => g.name);
+    const isSingle = selectedGroups.length === 1;
     const res = await prompt({
-      title: t("general.areYouSure"),
-      description: t("customers.groups.removeMany", {
-        groups: flatCustomerGroups?.filter((g) => selectedIds.includes(g.id)).map((g) => g.name).join(",")
-      }),
+      title: t("customers.groups.removeTitle"),
+      description: isSingle ? t("customers.groups.remove", { name: names[0] }) : t("customers.groups.removeMany", { groups: names.join(", ") }),
       confirmText: t("actions.remove"),
       cancelText: t("actions.cancel")
     });
     if (!res) {
       return;
     }
-    const customerGroupIds = flatCustomerGroups?.filter((g) => selectedIds.includes(g.id)).map((g) => g.id) ?? [];
+    const customerGroupIds = selectedGroups.map((g) => g.id);
     await batchCustomerCustomerGroups(
       { remove: customerGroupIds, add: [] },
       {
         onSuccess: () => {
           toast.success(
-            t("customers.groups.removed.success", {
-              groups: flatCustomerGroups?.filter((g) => selectedIds.includes(g.id)).map((g) => g.name)
+            isSingle ? t("customers.groups.removed.successOne", { groups: names[0] }) : t("customers.groups.removed.successMany", {
+              groups: names.join(", ")
             })
           );
         },
-        onError: (error2) => {
-          toast.error(error2.message);
+        onError: (e) => {
+          toast.error(e.message);
         }
       }
     );
   };
-  if (isError) {
-    throw error;
-  }
-  return /* @__PURE__ */ jsxs2(Container2, { className: "divide-y p-0", children: [
-    /* @__PURE__ */ jsxs2("div", { className: "flex items-center justify-between px-6 py-4", children: [
-      /* @__PURE__ */ jsx2(Heading2, { level: "h2", children: t("customerGroups.domain") }),
-      /* @__PURE__ */ jsx2(Link, { to: `/customers/${customer.id}/add-customer-groups`, children: /* @__PURE__ */ jsx2(Button, { variant: "secondary", size: "small", children: t("general.add") }) })
+  return /* @__PURE__ */ jsxs3(Container3, { className: "divide-y p-0", children: [
+    /* @__PURE__ */ jsxs3("div", { className: "flex items-center justify-between px-6 py-4", children: [
+      /* @__PURE__ */ jsx3(Heading3, { level: "h2", children: t("customerGroups.domain") }),
+      /* @__PURE__ */ jsx3(Link, { to: `/customers/${customer.id}/add-customer-groups`, children: /* @__PURE__ */ jsx3(Button, { variant: "secondary", size: "small", children: t("general.add") }) })
     ] }),
-    /* @__PURE__ */ jsx2(
+    /* @__PURE__ */ jsx3(
       _DataTable,
       {
         table,
         columns,
         pageSize: PAGE_SIZE,
         isLoading,
-        count: flatCustomerGroups?.length ?? 0,
+        count,
         prefix: PREFIX,
         navigateTo: (row) => `/customer-groups/${row.original.id}`,
         filters,
@@ -260,6 +361,7 @@ var CustomerGroupSection = ({
           { key: "created_at", label: t("fields.createdAt") },
           { key: "updated_at", label: t("fields.updatedAt") }
         ],
+        defaultOrderBy: DEFAULT_ORDER,
         commands: [
           {
             action: handleRemove,
@@ -269,7 +371,9 @@ var CustomerGroupSection = ({
         ],
         queryObject: raw,
         noRecords: {
-          message: t("customers.groups.list.noRecordsMessage")
+          title: t("customers.groups.list.emptyTitle"),
+          message: t("customers.groups.list.noRecordsMessage"),
+          icon: null
         }
       }
     )
@@ -280,11 +384,11 @@ var CustomerGroupRowActions = ({
   customerId
 }) => {
   const prompt = usePrompt();
-  const { t: t2 } = useTranslation2();
+  const { t: t2 } = useTranslation3();
   const { mutateAsync } = useRemoveCustomersFromGroup(group.id);
   const onRemove = async () => {
     const res = await prompt({
-      title: t2("general.areYouSure"),
+      title: t2("customers.groups.removeTitle"),
       description: t2("customers.groups.remove", {
         name: group.name
       }),
@@ -295,12 +399,17 @@ var CustomerGroupRowActions = ({
       return;
     }
     await mutateAsync([customerId], {
+      onSuccess: () => {
+        toast.success(
+          t2("customers.groups.removed.successOne", { groups: group.name })
+        );
+      },
       onError: (error) => {
         toast.error(error.message);
       }
     });
   };
-  return /* @__PURE__ */ jsx2(
+  return /* @__PURE__ */ jsx3(
     ActionMenu,
     {
       groups: [
@@ -308,13 +417,13 @@ var CustomerGroupRowActions = ({
           actions: [
             {
               label: t2("actions.edit"),
-              icon: /* @__PURE__ */ jsx2(PencilSquare, {}),
+              icon: /* @__PURE__ */ jsx3(PencilSquare, {}),
               to: `/customer-groups/${group.id}/edit`
             },
             {
               label: t2("actions.remove"),
               onClick: onRemove,
-              icon: /* @__PURE__ */ jsx2(Trash, {})
+              icon: /* @__PURE__ */ jsx3(Trash, {})
             }
           ]
         }
@@ -323,14 +432,14 @@ var CustomerGroupRowActions = ({
   );
 };
 var columnHelper = createColumnHelper();
-var useColumns = (customerId) => {
-  const { t: t2 } = useTranslation2();
+var useColumns = (customerId, customerCountByGroup = {}) => {
+  const { t: t2 } = useTranslation3();
   return useMemo(
     () => [
       columnHelper.display({
         id: "select",
         header: ({ table }) => {
-          return /* @__PURE__ */ jsx2(
+          return /* @__PURE__ */ jsx3(
             Checkbox,
             {
               checked: table.getIsSomePageRowsSelected() ? "indeterminate" : table.getIsAllPageRowsSelected(),
@@ -339,7 +448,7 @@ var useColumns = (customerId) => {
           );
         },
         cell: ({ row }) => {
-          return /* @__PURE__ */ jsx2(
+          return /* @__PURE__ */ jsx3(
             Checkbox,
             {
               checked: row.getIsSelected(),
@@ -352,14 +461,21 @@ var useColumns = (customerId) => {
         }
       }),
       columnHelper.accessor("name", {
-        header: () => /* @__PURE__ */ jsx2(TextHeader, { text: t2("fields.name") }),
+        header: () => /* @__PURE__ */ jsx3(TextHeader, { text: t2("fields.name") }),
+        cell: ({ row }) => {
+          return /* @__PURE__ */ jsx3(TextCell, { text: row.original?.name || "-" });
+        }
+      }),
+      columnHelper.display({
+        id: "customers",
+        header: () => /* @__PURE__ */ jsx3(TextHeader, { text: t2("customers.domain") }),
         cell: ({ row }) => {
-          return /* @__PURE__ */ jsx2(TextCell, { text: row.original?.name || "-" });
+          return /* @__PURE__ */ jsx3(TextCell, { text: `${customerCountByGroup[row.original.id] ?? 0}` });
         }
       }),
       columnHelper.display({
         id: "actions",
-        cell: ({ row }) => /* @__PURE__ */ jsx2(
+        cell: ({ row }) => /* @__PURE__ */ jsx3(
           CustomerGroupRowActions,
           {
             group: row.original,
@@ -368,15 +484,15 @@ var useColumns = (customerId) => {
         )
       })
     ],
-    [customerId, t2]
+    [customerId, t2, customerCountByGroup]
   );
 };
 
 // src/pages/customers/[id]/_components/customer-order-section/customer-order-section.tsx
-import { Container as Container3, Heading as Heading3 } from "@medusajs/ui";
+import { Container as Container4, Heading as Heading4 } from "@medusajs/ui";
 import { useMemo as useMemo2 } from "react";
-import { useTranslation as useTranslation3 } from "react-i18next";
-import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
+import { useTranslation as useTranslation4 } from "react-i18next";
+import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 var PREFIX2 = "cusord";
 var PAGE_SIZE2 = 10;
 var DEFAULT_RELATIONS = "*customer,*items,*sales_channel";
@@ -384,23 +500,18 @@ var DEFAULT_FIELDS = "id,status,display_id,created_at,updated_at,email,fulfillme
 var CustomerOrderSection = ({
   customer
 }) => {
-  const { t: t2 } = useTranslation3();
+  const { t: t2 } = useTranslation4();
   const { searchParams, raw } = useOrderTableQuery({
     pageSize: PAGE_SIZE2,
     prefix: PREFIX2
   });
-  const { orders, isLoading, isError, error } = useOrders({
+  const { orders, count, isLoading, isError, error } = useOrders({
     fields: DEFAULT_FIELDS + "," + DEFAULT_RELATIONS,
-    limit: searchParams.limit,
-    offset: searchParams.offset,
-    created_at: searchParams.created_at,
-    updated_at: searchParams.updated_at,
-    order: searchParams.order,
+    ...searchParams,
     customer_id: customer.id
   });
   const columns = useColumns2();
   const filters = useOrderTableFilters();
-  const count = orders?.length || 0;
   const { table } = useDataTable({
     data: orders ?? [],
     columns,
@@ -412,14 +523,15 @@ var CustomerOrderSection = ({
   if (isError) {
     throw error;
   }
-  return /* @__PURE__ */ jsxs3(Container3, { className: "divide-y p-0", children: [
-    /* @__PURE__ */ jsx3("div", { className: "flex items-center justify-between px-6 py-4", children: /* @__PURE__ */ jsx3(Heading3, { level: "h2", children: t2("orders.domain") }) }),
-    /* @__PURE__ */ jsx3(
+  return /* @__PURE__ */ jsxs4(Container4, { className: "divide-y p-0", children: [
+    /* @__PURE__ */ jsx4("div", { className: "flex items-center justify-between px-6 py-4", children: /* @__PURE__ */ jsx4(Heading4, { level: "h2", children: t2("orders.domain") }) }),
+    /* @__PURE__ */ jsx4(
       _DataTable,
       {
         columns,
         table,
         pagination: true,
+        search: true,
         navigateTo: (row) => `/orders/${row.original.id}`,
         filters,
         count,
@@ -439,6 +551,7 @@ var CustomerOrderSection = ({
             label: t2("fields.updatedAt")
           }
         ],
+        defaultOrderBy: "-display_id",
         queryObject: raw,
         prefix: PREFIX2
       }
@@ -453,7 +566,7 @@ var useColumns2 = () => {
 };
 
 // src/pages/customers/[id]/customer-detail-page.tsx
-import { Fragment, jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
+import { Fragment, jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
 var Root = ({ children }) => {
   const { id } = useParams();
   const initialData = useLoaderData();
@@ -462,17 +575,26 @@ var Root = ({ children }) => {
     {},
     { initialData }
   );
-  if (isLoading || !customer) return /* @__PURE__ */ jsx4(SingleColumnPageSkeleton, { sections: 2 });
+  if (isLoading || !customer) {
+    return /* @__PURE__ */ jsx5(TwoColumnPageSkeleton, { mainSections: 3, sidebarSections: 1 });
+  }
   if (isError) throw error;
-  return /* @__PURE__ */ jsx4(Fragment, { children: Children.count(children) > 0 ? children : /* @__PURE__ */ jsxs4(SingleColumnPage, { data: customer, hasOutlet: true, children: [
-    /* @__PURE__ */ jsx4(CustomerGeneralSection, { customer }),
-    /* @__PURE__ */ jsx4(CustomerOrderSection, { customer })
+  return /* @__PURE__ */ jsx5(Fragment, { children: Children.count(children) > 0 ? children : /* @__PURE__ */ jsxs5(TwoColumnPage, { data: customer, showJSON: true, hasOutlet: true, children: [
+    /* @__PURE__ */ jsxs5(TwoColumnPage.Main, { children: [
+      /* @__PURE__ */ jsx5(CustomerGeneralSection, { customer }),
+      /* @__PURE__ */ jsx5(CustomerOrderSection, { customer }),
+      /* @__PURE__ */ jsx5(CustomerGroupSection, { customer })
+    ] }),
+    /* @__PURE__ */ jsx5(TwoColumnPage.Sidebar, { children: /* @__PURE__ */ jsx5(CustomerAddressSection, { customer }) })
   ] }) });
 };
 var CustomerDetailPage = Object.assign(Root, {
+  Main: TwoColumnPage.Main,
+  Sidebar: TwoColumnPage.Sidebar,
   GeneralSection: CustomerGeneralSection,
   OrderSection: CustomerOrderSection,
-  GroupSection: CustomerGroupSection
+  GroupSection: CustomerGroupSection,
+  AddressSection: CustomerAddressSection
 });
 export {
   CustomerDetailPage,