@cartbase/storefront 0.22.0 → 0.23.0

package/src/checkout/pickup-points.ts

@@ -0,0 +1,64 @@
+import type { StorefrontClient } from "../api/http"
+import { listPickupPoints, type PickupPointsResponse, type StorePickupPoint } from "../api/integrations"
+import { distanceMeters, normalizeForMatch } from "./geocode"
+
+// The reference pickers cache the full catalogue. Scope it to the SDK client
+// (the store), carrier, mode and language instead of sharing one global list.
+const catalogues = new WeakMap<StorefrontClient, Map<string, {
+  expires: number
+  promise: Promise<PickupPointsResponse>
+}>>()
+
+export function loadPickupPoints(
+  client: StorefrontClient,
+  provider: string,
+  mode: "office" | "locker",
+  locale: string
+): Promise<PickupPointsResponse> {
+  let cache = catalogues.get(client)
+  if (!cache) catalogues.set(client, cache = new Map())
+  const key = JSON.stringify([provider, mode, locale])
+  const hit = cache.get(key)
+  if (hit && hit.expires > Date.now()) return hit.promise
+  const promise = listPickupPoints(client, provider, { mode, catalogue: true, locale })
+    .catch((error) => {
+      if (cache.get(key)?.promise === promise) cache.delete(key)
+      throw error
+    })
+  cache.set(key, { expires: Date.now() + 10 * 60 * 1000, promise })
+  return promise
+}
+
+/** A city-scoped adapter's eligible points, comparing both scripts. */
+export function pickupPointsInCity(points: StorePickupPoint[], city: string): StorePickupPoint[] {
+  const needle = normalizeForMatch(city.trim())
+  if (!needle) return points
+  return points.filter((point) => normalizeForMatch(point.city).includes(needle))
+}
+
+/** The reference's full catalogue → distance sort → nearest three, in that order. */
+export function nearestPickupPoints(
+  points: StorePickupPoint[],
+  position: { lat: number; lng: number } | null,
+  city: string
+): Array<{ point: StorePickupPoint; distance: number | null }> {
+  if (position && Number.isFinite(position.lat) && Number.isFinite(position.lng)) {
+    const located = points.filter((p) =>
+      p.latitude !== null && p.longitude !== null &&
+      Number.isFinite(p.latitude) && Number.isFinite(p.longitude)
+    )
+    if (located.length) return located.map((point) => ({ point,
+      distance: distanceMeters(position.lat, position.lng, point.latitude!, point.longitude!),
+    })).sort((a, b) => a.distance - b.distance).slice(0, 3)
+  }
+  return pickupPointsInCity(points, city).slice(0, 3).map((point) => ({ point, distance: null }))
+}
+
+/** The same catalogue powers search, including streets and either script. */
+export function searchPickupPoints(points: StorePickupPoint[], search: string): StorePickupPoint[] {
+  const needle = normalizeForMatch(search.trim())
+  if (needle.length < 2) return []
+  return points.filter((point) => normalizeForMatch(
+    [point.name, point.city, point.address, point.postal_code].join(" ")
+  ).includes(needle)).slice(0, 8)
+}

package/src/checkout/shipping-method-list.tsx

@@ -1,41 +1,33 @@
 "use client"
 
-import type { StorefrontClient } from "../api/http"
-import type { StoreShippingOption } from "../api/checkout"
-import type { BoxNowLocker, PigeonOffice } from "../api/integrations"
-import { Price } from "../lib/price"
-import { cn } from "../lib/utils"
-import { useCheckoutLabels } from "./context"
-import {
-  EcontOfficeSelector,
-  type EcontOffice,
-} from "./econt-office-selector"
-import { BoxNowLockerSelector } from "./boxnow-locker-selector"
-import { PigeonOfficeSelector } from "./pigeon-office-selector"
-import {
-  PickupPointSelector,
-  type PickupPoint,
+import type { StorefrontClient } from "../api/http"
+import type { StoreShippingOption } from "../api/checkout"
+import { Price } from "../lib/price"
+import { cn } from "../lib/utils"
+import { useCheckoutLabels } from "./context"
+import {
+  PickupPointSelector,
+  type PickupPoint,
 } from "./pickup-point-selector"
 import type { PickupPointKeys } from "../api/integrations"
-import { pickupOptionOf, type PickupOption } from "./pickup-option"
-import { fulfillmentOptionId } from "./fulfillment-option"
-import { ErrorMessage } from "./error-message"
+import { pickupOptionOf, type PickupOption } from "./pickup-option"
+import { fulfillmentOptionId } from "./fulfillment-option"
+import { carrierMark } from "./carrier-marks"
+import { ErrorMessage } from "./error-message"
 
 /**
  * CheckoutShippingMethodList — radio-style list of shipping options.
- * When the user selects an Econt-office / BoxNow-locker option, the
- * matching picker expands inline inside that row.
+ * When the user selects an adapter-declared office or locker option, the
+ * shared picker expands inline inside that row.
  *
  * Ported from `@1click/ui/src/checkout/shipping-method-list.tsx` (v2.3.1)
  * with the Cartbase data seam: options are `StoreShippingOption` rows from
  * `checkout.listShippingOptions(client, {cart_id})` — rule-filtered and
  * display-ordered SERVER-SIDE (checkout rules + `checkout_method_order`,
  * docs/storefront/checkout.md); this component only renders what arrives.
- * The BoxNow picker needs the SDK transport (its locker directory is a
- * store-API call), so the `boxnow` config gains a `client`.
- *
- * Detection uses the stable fulfillment-option id set by the backend
- * provider (`shipping_option.data.id`) — NOT the display name. Admins
+ * Pickup catalogues use the SDK transport through one shared picker.
+ * Detection uses the adapter-resolved fulfillment option returned by the
+ * backend, never the display name. Admins
  * rename options freely, and Bulgarian labels overlap ("До точен адрес с
  * ЕКОНТ" contains "еконт" but is address delivery, not office).
  *
@@ -52,42 +44,10 @@ type CheckoutShippingMethodListProps = {
   onSelect: (id: string) => void
   addressReady: boolean
   currencyCode: string
-  /** Optional: Econt office state + handler for inline-expand rows */
-  econt?: {
-    detect?: (option: StoreShippingOption) => boolean
-    selectedOffice: EcontOffice | null
-    onSelectOffice: (office: EcontOffice | null) => void
-    userCity: string
-    userAddress: string
-  }
-  /** Optional: BoxNow locker state + handler for inline-expand rows */
-  boxnow?: {
-    detect?: (option: StoreShippingOption) => boolean
-    /** SDK transport for the locker-directory fetch. */
-    client: StorefrontClient
-    selectedLocker: BoxNowLocker | null
-    onSelectLocker: (locker: BoxNowLocker | null) => void
-    userCity: string
-    userAddress: string
-  }
-  /** Optional: Pigeon Express office state + handler for inline-expand rows */
-  pigeon?: {
-    detect?: (option: StoreShippingOption) => boolean
-    /** SDK transport for the pickup-point directory (the carrier's own
-     * catalogue is credentialed, so it is served by the platform). */
-    client: StorefrontClient
-    selectedOffice: PigeonOffice | null
-    onSelectOffice: (office: PigeonOffice | null) => void
-    userCity: string
-    userAddress: string
-  }
   /**
-   * The pickup picker, for EVERY carrier (2026-09-18). One entry replaces
-   * the three above: the option's own id says which carrier and whether it
-   * is an office or a locker, and the platform answers for all of them
-   * through one door, so a carrier connected tomorrow opens its picker with
-   * nothing added here. The three above stay for stores that mount them;
-   * where both are given, the carrier-specific one wins for its own carrier.
+   * The pickup picker for every carrier. The option's resolved carrier
+   * contract says whether it is an office or locker, and the platform
+   * answers through one catalogue door.
    */
   pickup?: {
     /** SDK transport — the catalogue is the store's answer, not the
@@ -103,11 +63,8 @@ type CheckoutShippingMethodListProps = {
     userAddress: string
   }
   /**
-   * Optional per-store carrier branding. Keyed by the stable fulfillment
-   * option id (shipping_option.data.id) — "econt-office", "boxnow-locker",
-   * etc. If a match is found, a small logo renders between the radio and
-   * the option name. Stores that don't supply a map get the unbranded
-   * (radio + text only) layout.
+   * Optional per-store carrier branding override, keyed by the stable
+   * fulfillment option id. Without one, the adapter's mark renders.
    */
   logoByFulfillmentOptionId?: Record<string, { src: string; alt: string }>
   /** Show the shipping options as a read-only price PREVIEW before the
@@ -116,7 +73,7 @@ type CheckoutShippingMethodListProps = {
    * non-selectable — a hint tells the shopper to enter their address to
    * choose. For flat-priced stores this lets people see the cost up front
    * (a common reason carts stall) without letting them pick a method that
-   * needs a city (Econt office / BoxNow locker). Default `false` keeps the
+   * needs a city (office or locker). Default `false` keeps the
    * classic address-gated placeholder for every existing store. */
   previewWhenAddressNotReady?: boolean
 }
@@ -126,21 +83,9 @@ type CheckoutShippingMethodListProps = {
 const getFulfillmentOptionId = (option: StoreShippingOption): string | null =>
   fulfillmentOptionId(option)
 
-const defaultEcontDetect = (option: StoreShippingOption): boolean => {
-  return getFulfillmentOptionId(option) === "econt-office"
-}
-
-const defaultBoxnowDetect = (option: StoreShippingOption): boolean => {
-  return getFulfillmentOptionId(option) === "boxnow-locker"
-}
-
-const defaultPigeonDetect = (option: StoreShippingOption): boolean => {
-  return getFulfillmentOptionId(option) === "pigeon-office"
-}
-
-/** Which carrier, and which kind of point, from the option's own id. */
-const detectPickup = (option: StoreShippingOption): PickupOption | null =>
-  pickupOptionOf(getFulfillmentOptionId(option))
+/** Which carrier, which point kind and scope, from its adapter contract. */
+const detectPickup = (option: StoreShippingOption): PickupOption | null =>
+  pickupOptionOf(option)
 
 export function CheckoutShippingMethodList({
   shippingMethods,
@@ -152,18 +97,11 @@ export function CheckoutShippingMethodList({
   onSelect,
   addressReady,
   currencyCode,
-  econt,
-  boxnow,
-  pigeon,
-  pickup,
+  pickup,
   logoByFulfillmentOptionId,
   previewWhenAddressNotReady = false,
 }: CheckoutShippingMethodListProps) {
   const labels = useCheckoutLabels()
-  const detectEcont = econt?.detect ?? defaultEcontDetect
-  const detectBoxnow = boxnow?.detect ?? defaultBoxnowDetect
-  const detectPigeon = pigeon?.detect ?? defaultPigeonDetect
-
   // Preview mode: address not filled yet, but the store wants the options
   // shown as a read-only price preview rather than a placeholder. Rows are
   // rendered but locked (no selection) — see `previewWhenAddressNotReady`.
@@ -244,26 +182,14 @@ export function CheckoutShippingMethodList({
                 ? option.amount
                 : calculatedPricesMap[option.id]
             const isFree = price === 0
-            const isEcontOffice = econt && detectEcont(option)
-            const isBoxnowLocker =
-              boxnow && !isEcontOffice && detectBoxnow(option)
-            const isPigeonOffice =
-              pigeon && !isEcontOffice && !isBoxnowLocker && detectPigeon(option)
-            // Any option that delivers to a point, whatever the carrier
-            // (2026-09-18). The three flags above are the same question asked
-            // per carrier, which is why Speedy had no picker; this one reads
-            // the option's own id, so a carrier connected tomorrow opens its
-            // picker with no line added here. It yields to a legacy picker
-            // when the store still mounts one for that carrier.
-            const pickupOption = pickup ? detectPickup(option) : null
-            const isPickup =
-              !!pickupOption && !isEcontOffice && !isBoxnowLocker && !isPigeonOffice
-            const hasExpanded =
-              selected &&
-              (isEcontOffice || isBoxnowLocker || isPigeonOffice || isPickup)
-            const logo = logoByFulfillmentOptionId
-              ? logoByFulfillmentOptionId[getFulfillmentOptionId(option) ?? ""]
-              : undefined
+            // Any option whose adapter resolves to a pickup destination.
+            const pickupOption = pickup ? detectPickup(option) : null
+            const isPickup = !!pickupOption
+            const hasExpanded = selected && isPickup
+            const logo =
+              logoByFulfillmentOptionId?.[getFulfillmentOptionId(option) ?? ""] ??
+              carrierMark(option) ??
+              undefined
 
             return (
               <div
@@ -312,22 +238,7 @@ export function CheckoutShippingMethodList({
                     <span className="text-sm font-medium text-foreground">
                       {option.name}
                     </span>
-                    {selected && isEcontOffice && econt?.selectedOffice && (
-                      <p className="text-xs text-muted-foreground mt-0.5">
-                        {econt.selectedOffice.name}
-                      </p>
-                    )}
-                    {selected && isBoxnowLocker && boxnow?.selectedLocker && (
-                      <p className="text-xs text-muted-foreground mt-0.5">
-                        {boxnow.selectedLocker.title}
-                      </p>
-                    )}
-                    {selected && isPigeonOffice && pigeon?.selectedOffice && (
-                      <p className="text-xs text-muted-foreground mt-0.5">
-                        {pigeon.selectedOffice.name}
-                      </p>
-                    )}
-                    {selected && isPickup && pickup?.selectedPoint && (
+                    {selected && isPickup && pickup?.selectedPoint && (
                       <p className="text-xs text-muted-foreground mt-0.5">
                         {pickup.selectedPoint.name}
                       </p>
@@ -371,40 +282,12 @@ export function CheckoutShippingMethodList({
                   </span>
                 </button>
 
-                {hasExpanded && isEcontOffice && econt && (
-                  <EcontOfficeSelector
-                    userCity={econt.userCity}
-                    userAddress={econt.userAddress}
-                    selectedOffice={econt.selectedOffice}
-                    onSelect={econt.onSelectOffice}
-                  />
-                )}
-
-                {hasExpanded && isBoxnowLocker && boxnow && (
-                  <BoxNowLockerSelector
-                    client={boxnow.client}
-                    userCity={boxnow.userCity}
-                    userAddress={boxnow.userAddress}
-                    selectedLocker={boxnow.selectedLocker}
-                    onSelect={boxnow.onSelectLocker}
-                  />
-                )}
-
-                {hasExpanded && isPigeonOffice && pigeon && (
-                  <PigeonOfficeSelector
-                    client={pigeon.client}
-                    userCity={pigeon.userCity}
-                    userAddress={pigeon.userAddress}
-                    selectedOffice={pigeon.selectedOffice}
-                    onSelect={pigeon.onSelectOffice}
-                  />
-                )}
-
-                {hasExpanded && isPickup && pickup && pickupOption && (
+                {hasExpanded && isPickup && pickup && pickupOption && (
                   <PickupPointSelector
                     client={pickup.client}
-                    provider={pickupOption.provider}
-                    mode={pickupOption.mode}
+                    provider={pickupOption.provider}
+                    mode={pickupOption.mode}
+                    scope={pickupOption.scope}
                     userCity={pickup.userCity}
                     userAddress={pickup.userAddress}
                     selectedPoint={pickup.selectedPoint}

package/src/checkout/use-checkout-orchestration.ts

@@ -49,11 +49,9 @@ import { clearCartCookie } from "../lib/cookie-names"
 import { useCartDrawer } from "../cart-drawer/context"
 import compareAddresses from "./compare-addresses"
 import { translateAddressError } from "./address-error-copy"
-import { translatePaymentError } from "./payment-error-copy"
-import { useCheckoutLabels, useOrderConfirmedPath } from "./context"
-import type { EcontOffice } from "./econt-office-selector"
-import type { BoxNowLocker, PigeonOffice } from "../api/integrations"
-import { fulfillmentOptionId } from "./fulfillment-option"
+import { translatePaymentError } from "./payment-error-copy"
+import { useCheckoutLabels, useOrderConfirmedPath } from "./context"
+import { fulfillmentOptionId } from "./fulfillment-option"
 import { useCheckoutFunnel } from "./use-checkout-funnel"
 import { amountDueAfterTender, isNothingToPay } from "./summary-math"
 import { forgetFiredEvents } from "../tracking/once"
@@ -931,72 +929,7 @@ export function useCheckoutOrchestration({
   // Server-side, prepare-checkout removes the PREVIOUS prepare's carrier
   // keys before merging (the `_prepared_carrier_keys` marker), so
   // switching carriers can never leak stale fields into the order.
-  const [selectedEcontOffice, setSelectedEcontOffice] =
-    useState<EcontOffice | null>(
-      cart?.metadata?.econt_office_code
-        ? ({
-            code: cart.metadata.econt_office_code as string,
-            name: cart.metadata.econt_office_name as string,
-          } as EcontOffice)
-        : null
-    )
-
-  const handleSelectEcontOffice = useCallback(
-    (office: EcontOffice | null) => {
-      setSelectedEcontOffice(office)
-    },
-    []
-  )
-
-  const [selectedBoxnowLocker, setSelectedBoxnowLocker] =
-    useState<BoxNowLocker | null>(
-      cart?.metadata?.boxnow_locker_id
-        ? ({
-            id: cart.metadata.boxnow_locker_id as string,
-            title: (cart.metadata.boxnow_locker_title as string) ?? "",
-            addressLine1:
-              (cart.metadata.boxnow_locker_address as string) ?? "",
-            addressLine2: "",
-            postalCode: (cart.metadata.boxnow_locker_postal as string) ?? "",
-            country: "",
-            lat: null,
-            lng: null,
-            note: "",
-          } as BoxNowLocker)
-        : null
-    )
-
-  const handleSelectBoxnowLocker = useCallback(
-    (locker: BoxNowLocker | null) => {
-      setSelectedBoxnowLocker(locker)
-    },
-    []
-  )
-
-  // Pigeon Express keeps offices and lockers in ONE catalogue, told apart by
-  // which id key the order carries (`pigeon_office_id` here; the platform's
-  // destination registry owns both names).
-  const [selectedPigeonOffice, setSelectedPigeonOffice] =
-    useState<PigeonOffice | null>(
-      cart?.metadata?.pigeon_office_id
-        ? ({
-            id: cart.metadata.pigeon_office_id as string,
-            name: (cart.metadata.pigeon_point_name as string) ?? "",
-            type: "office",
-            city: (cart.metadata.pigeon_point_city as string) ?? "",
-            address: (cart.metadata.pigeon_point_address as string) ?? "",
-          } as PigeonOffice)
-        : null
-    )
-
-  const handleSelectPigeonOffice = useCallback(
-    (office: PigeonOffice | null) => {
-      setSelectedPigeonOffice(office)
-    },
-    []
-  )
-
-  /**
+  /**
    * THE pickup point, whatever the carrier (2026-09-18).
    *
    * The three states above are one state per carrier, written into one
@@ -1172,9 +1105,7 @@ export function useCheckoutOrchestration({
       // specific destination (e.g. picking direct address after BoxNow
       // locker). The carrier's own keys are never eagerly written, so only
       // our own note is cleared beside the state.
-      setSelectedBoxnowLocker(null)
-      setSelectedEcontOffice(null)
-      setSelectedPickupPoint(null)
+      setSelectedPickupPoint(null)
       setPickupKeys(null)
       rememberChoice({
         _checkout_shipping_option: id,
@@ -1207,9 +1138,6 @@ export function useCheckoutOrchestration({
   const selectedFulfillmentOptionId = useMemo(() => {
     return fulfillmentOptionId(selectedShippingOption)
   }, [selectedShippingOption])
-  const selectedIsBoxnow = selectedFulfillmentOptionId === "boxnow-locker"
-  const selectedIsEcont = selectedFulfillmentOptionId === "econt-office"
-  const selectedIsPigeon = selectedFulfillmentOptionId === "pigeon-office"
 
   /**
    * WHICH carrier and WHICH kind of point this option delivers to, read from
@@ -1218,38 +1146,28 @@ export function useCheckoutOrchestration({
    * them that way, so a carrier connected tomorrow is understood here without
    * a line being added. `address` is the door and has no point to pick.
    */
-  const selectedPickup = useMemo(
-    () => pickupOptionOf(selectedFulfillmentOptionId),
-    [selectedFulfillmentOptionId]
-  )
-
-  // Defensive: trust cart.metadata for locker/office IDs in addition to
-  // local React state. On mobile the BoxNow locker selector was seen
-  // firing its onSelect handler in a way that updated cart.metadata
-  // cleanly but left the local `selectedBoxnowLocker` stale (touch event
-  // timing / hydration race). Without this fallback, the local-null kept
+  const selectedPickup = useMemo(
+    () => pickupOptionOf(selectedShippingOption),
+    [selectedShippingOption]
+  )
+
+  // Defensive: trust cart.metadata for locker/office IDs in addition to
+  // local React state. A mobile picker can update cart.metadata while its
+  // local point remains stale after a touch/hydration race. Without this
+  // fallback, the local-null kept
   // `deliveryReady` false and the entire payment section turned into a
   // ghost — even though the cart server-side knew the locker was set.
-  const hasBoxnowLockerInCart = !!cart?.metadata?.boxnow_locker_id
-  const hasEcontOfficeInCart = !!cart?.metadata?.econt_office_code
-  const hasPigeonOfficeInCart = !!cart?.metadata?.pigeon_office_id
-
-  // An option that delivers to a point is not ready until the point is
-  // named, whatever the carrier. The three lines under it are the same rule
-  // written per carrier, kept for stores still mounting the old components;
-  // a store on the shared picker is answered by the first.
+
+  // An option that delivers to a point is not ready until the point is
+  // named, whatever the carrier.
   const pickupSatisfied =
     !selectedPickup ||
     (!!selectedPickupPoint && selectedPickupPoint.provider === selectedPickup.provider)
 
-  const deliveryReady =
-    (!!selectedShippingMethod ||
-      (cart?.shipping_methods?.length ?? 0) > 0) &&
-    (pickupSatisfied ||
-      // The legacy pickers answer for their own carriers.
-      (selectedIsBoxnow && (!!selectedBoxnowLocker || hasBoxnowLockerInCart)) ||
-      (selectedIsEcont && (!!selectedEcontOffice || hasEcontOfficeInCart)) ||
-      (selectedIsPigeon && (!!selectedPigeonOffice || hasPigeonOfficeInCart)))
+  const deliveryReady =
+    (!!selectedShippingMethod ||
+      (cart?.shipping_methods?.length ?? 0) > 0) &&
+    pickupSatisfied
 
   // Reconcile paymentTab with currently-available methods. When the
   // store's paymentMethodFilter strips a method in response to a shipping
@@ -1511,39 +1429,7 @@ export function useCheckoutOrchestration({
   // state. Called by PaymentButton on click.
   const buildPrepareCheckoutPayload =
     useCallback((): PrepareCheckoutInput => {
-      const carrierMetadata: Record<string, unknown> = {}
-      if (selectedEcontOffice) {
-        const addr = [
-          selectedEcontOffice.address?.street,
-          selectedEcontOffice.address?.num,
-        ]
-          .filter(Boolean)
-          .join(" ")
-        carrierMetadata.econt_office_code = selectedEcontOffice.code
-        carrierMetadata.econt_office_name = selectedEcontOffice.name
-        carrierMetadata.econt_office_city =
-          selectedEcontOffice.address?.city?.name || ""
-        carrierMetadata.econt_office_address = addr
-        carrierMetadata.econt_office_phone =
-          selectedEcontOffice.phones?.[0] || ""
-      }
-      if (selectedBoxnowLocker) {
-        carrierMetadata.boxnow_locker_id = selectedBoxnowLocker.id
-        carrierMetadata.boxnow_locker_title = selectedBoxnowLocker.title
-        carrierMetadata.boxnow_locker_address =
-          selectedBoxnowLocker.addressLine1 ?? ""
-        carrierMetadata.boxnow_locker_postal =
-          selectedBoxnowLocker.postalCode ?? ""
-      }
-      if (selectedPigeonOffice) {
-        // The platform's destination registry owns these names: the id key
-        // says office or locker, and the three label keys are what the order
-        // page and the waybill read back (src/lib/shipping/destinations.ts).
-        carrierMetadata.pigeon_office_id = String(selectedPigeonOffice.id)
-        carrierMetadata.pigeon_point_name = selectedPigeonOffice.name
-        carrierMetadata.pigeon_point_city = selectedPigeonOffice.city ?? ""
-        carrierMetadata.pigeon_point_address = selectedPigeonOffice.address ?? ""
-      }
+      const carrierMetadata: Record<string, unknown> = {}
       // The carrier-agnostic pickup point (2026-09-18). The names come from
       // the platform's destination registry with the point itself, so this
       // writes what THIS carrier's booking reads without knowing which
@@ -1606,12 +1492,11 @@ export function useCheckoutOrchestration({
         ...tender,
       }
     }, [
-      formData,
-      selectedShippingMethod,
-      selectedEcontOffice,
-      selectedBoxnowLocker,
-      selectedPigeonOffice,
-      paymentTab,
+      formData,
+      selectedShippingMethod,
+      selectedPickupPoint,
+      pickupKeys,
+      paymentTab,
       cardId,
       codMethodId,
       nothingToPay,
@@ -1658,18 +1543,16 @@ export function useCheckoutOrchestration({
       const stateSnapshot = {
         cart_id: cart.id,
         paymentTab,
-        cardId,
-        codMethodId,
-        selectedShippingMethod,
-        selectedEcontOffice: selectedEcontOffice
-          ? { code: selectedEcontOffice.code, name: selectedEcontOffice.name }
-          : null,
-        selectedBoxnowLocker: selectedBoxnowLocker
-          ? {
-              id: selectedBoxnowLocker.id,
-              title: selectedBoxnowLocker.title,
-            }
-          : null,
+        cardId,
+        codMethodId,
+        selectedShippingMethod,
+        selectedPickupPoint: selectedPickupPoint
+          ? {
+              provider: selectedPickupPoint.provider,
+              id: selectedPickupPoint.id,
+              name: selectedPickupPoint.name,
+            }
+          : null,
         hasStripeBundle: !!stripeBundle,
       }
       dbg("[buy-click] STATE", stateSnapshot)
@@ -1853,11 +1736,9 @@ export function useCheckoutOrchestration({
       cart.id,
       paymentTab,
       cardId,
-      codMethodId,
-      selectedShippingMethod,
-      selectedEcontOffice,
-      selectedBoxnowLocker,
-      selectedPigeonOffice,
+      codMethodId,
+      selectedShippingMethod,
+      selectedPickupPoint,
       flushAddressSave,
       buildPrepareCheckoutPayload,
       placeOrder,
@@ -1891,12 +1772,9 @@ export function useCheckoutOrchestration({
     shippingMethods,
     calculatedPricesMap,
     isLoadingPrices,
-    selectedShippingMethod,
-    selectedShippingOption,
-    selectedFulfillmentOptionId,
-    selectedIsBoxnow,
-    selectedIsEcont,
-    selectedIsPigeon,
+    selectedShippingMethod,
+    selectedShippingOption,
+    selectedFulfillmentOptionId,
     shippingLoading,
     shippingError,
     optimisticShippingCost,
@@ -1904,13 +1782,7 @@ export function useCheckoutOrchestration({
     handleSelectShipping,
 
     // Carriers
-    selectedEcontOffice,
-    handleSelectEcontOffice,
-    selectedBoxnowLocker,
-    handleSelectBoxnowLocker,
-    selectedPigeonOffice,
-    handleSelectPigeonOffice,
-    /** The pickup point, whatever the carrier, and which carrier and kind of
+    /** The pickup point, whatever the carrier, and which carrier and kind of
      * point the chosen option asks for. Null on a door delivery. */
     selectedPickupPoint,
     handleSelectPickupPoint,