@cimplify/sdk 0.100.0 → 0.100.2

package/dist/react.mjs

@@ -3,10 +3,10 @@ import { DURATION_UNIT, getVariantDisplayName, INPUT_FIELD_TYPE, isMultiDayServi
 export { getVariantDisplayName } from './chunk-4G5UWFC3.mjs';
 import { splitGenUIContent, messagePreview } from './chunk-U4MW6PYU.mjs';
 export { messagePreview, splitGenUIContent } from './chunk-U4MW6PYU.mjs';
-import { SESSION_CLAIMED, SESSION_CLEARED, createCimplifyClient, MUTATION_ERROR } from './chunk-GWKIDFN6.mjs';
-import { generateIdempotencyKey, ELEMENT_TYPES, EVENT_TYPES, startSignIn } from './chunk-OX5L6XE7.mjs';
-import { parsePrice, formatMoney, formatPrice, getProductCurrency, getUnitPriceAtQuantity, isOnSale, getDiscountPercentage, getBasePrice, getPriceRange, formatPriceRange } from './chunk-V5TU5JKA.mjs';
-import { isSupportedCurrency, CimplifyError } from './chunk-K5EN2W2Q.mjs';
+import { SESSION_CLAIMED, SESSION_CLEARED, createCimplifyClient, AUTH_TOKEN_CHANGED, MUTATION_ERROR } from './chunk-PJUXAUM2.mjs';
+import { generateIdempotencyKey, ELEMENT_TYPES, EVENT_TYPES, startSignIn } from './chunk-TIQLOH2B.mjs';
+import { parsePrice, formatMoney, formatPrice, getVariantUnitPrice, getProductCurrency, getUnitPriceAtQuantity, isOnSale, getDiscountPercentage, getBasePrice, getPriceRange, formatPriceRange } from './chunk-DLW3RWRK.mjs';
+import { isSupportedCurrency, currencyCode, CimplifyError } from './chunk-O3YUHLZL.mjs';
 import './chunk-3G6RQLXK.mjs';
 import React14, { createContext, lazy, memo, Suspense, useMemo, useContext, useRef, useCallback, useState, useEffect, useId, useSyncExternalStore } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
@@ -355,6 +355,26 @@ function Ad({
 }
 
 // src/utils/cart-transform.ts
+var DECIMAL_AMOUNT_PATTERN = /^([+-]?)(\d+)(?:\.(\d+))?$/;
+function multiplyDecimalByInteger(value, multiplier) {
+  if (!Number.isSafeInteger(multiplier) || multiplier < 0) {
+    throw new RangeError("Cart item quantity must be a non-negative safe integer");
+  }
+  const source = String(value).trim();
+  const match = DECIMAL_AMOUNT_PATTERN.exec(source);
+  if (!match) {
+    throw new TypeError("Cart item price must be a decimal amount");
+  }
+  const [, sign, whole, fraction = ""] = match;
+  const scaledAmount = BigInt(`${sign}${whole}${fraction}`);
+  const scaledTotal = scaledAmount * BigInt(multiplier);
+  if (fraction.length === 0) return scaledTotal.toString();
+  const negative = scaledTotal < 0n;
+  const digits = (negative ? -scaledTotal : scaledTotal).toString().padStart(fraction.length + 1, "0");
+  const splitAt = digits.length - fraction.length;
+  const formatted = `${digits.slice(0, splitAt)}.${digits.slice(splitAt)}`;
+  return negative ? `-${formatted}` : formatted;
+}
 function getSelections(item) {
   if (item.bundle_resolved?.selections?.length) {
     return item.bundle_resolved.selections.map((s) => ({
@@ -373,11 +393,12 @@ function getSelections(item) {
 }
 function mapItem(item, fx) {
   const amt = (value) => fx ? String(fx.convertPrice(value)) : String(value);
+  const currentUnitPrice = item.total_price;
   const result = {
     name: item.name,
     quantity: item.quantity,
-    unit_price: amt(item.base_price),
-    total_price: amt(item.total_price),
+    unit_price: amt(currentUnitPrice),
+    total_price: amt(multiplyDecimalByInteger(currentUnitPrice, item.quantity)),
     line_type: item.line_type
   };
   if (item.image_url) result.image_url = item.image_url;
@@ -398,9 +419,9 @@ function mapItem(item, fx) {
   }
   return result;
 }
-function transformToCheckoutCart(cart, fx) {
+function transformToCheckoutCart(cart, fx, checkout) {
   const amt = (value) => fx ? String(fx.convertPrice(value)) : String(value);
-  return {
+  const checkoutCart = {
     items: cart.items.map((item) => mapItem(item, fx)),
     subtotal: amt(cart.pricing.subtotal),
     tax_amount: amt(cart.pricing.tax_amount),
@@ -413,6 +434,7 @@ function transformToCheckoutCart(cart, fx) {
     deposit_amount: cart.pricing.deposit_amount != null ? amt(cart.pricing.deposit_amount) : void 0,
     requires_delivery: cart.requires_delivery
   };
+  return checkoutCart;
 }
 
 // src/internal/collection.ts
@@ -574,10 +596,20 @@ function lineKeyFromItem(item) {
     staffId: item.staffId
   });
 }
-function attachInternalItemMetadata(item) {
-  return { ...item, _lineKey: lineKeyFromItem(item) };
+function attachInternalItemMetadata(item, metadata = {}) {
+  const internalItem = {
+    ...item,
+    _lineKey: lineKeyFromItem(item)
+  };
+  if (metadata.quotedUnitPrice !== void 0) {
+    internalItem._quotedUnitPrice = metadata.quotedUnitPrice;
+  }
+  return internalItem;
 }
 function calculateLineSubtotal(item) {
+  if (item._quotedUnitPrice !== void 0) {
+    return roundMoney(parsePrice(item._quotedUnitPrice) * item.quantity);
+  }
   let unitPrice = parsePrice(item.product.default_price);
   if (item.variant?.price_adjustment) {
     unitPrice += parsePrice(item.variant.price_adjustment);
@@ -653,10 +685,7 @@ function emptyBase(currency, isLoading = true) {
   return { items: [], subtotal: 0, tax: 0, total: 0, currency, isLoading };
 }
 function buildStoreKey(client, locationId) {
-  return [
-    client.getPublicKey() || "__no_public_key__",
-    locationId || "__no_location__"
-  ].join(":");
+  return [client.getPublicKey() || "__no_public_key__", locationId || "__no_location__"].join(":");
 }
 function purgeLegacyCartCachesOnce() {
   if (legacyCachesPurged) return;
@@ -685,7 +714,10 @@ function toProductFromServerItem(item, businessId) {
     slug: item.item_id,
     description: item.description,
     image_url: item.image_url,
-    default_price: item.base_price,
+    // Cart price_info is the accepted item price path. Do not reconstruct it
+    // from the catalogue base after a sale or shopper-specific quote.
+    default_price: item.price_info.final_price,
+    currency: item.price_info.currency,
     type: "product",
     inventory_type: "none",
     variant_strategy: "fetch_all",
@@ -700,37 +732,44 @@ function mapServerCart(serverCart, fallbackCurrency) {
     const variant = item.variant_info || item.variant_name ? {
       id: item.variant_info?.id || item.variant_id || "",
       name: item.variant_info?.name || item.variant_name || "Variant",
-      price_adjustment: item.variant_info?.price_adjustment
+      price_adjustment: item.variant_info?.price_adjustment,
+      price_info: item.price_info
     } : void 0;
     const quoteId = typeof item.metadata?.quote_id === "string" ? item.metadata.quote_id : void 0;
-    return attachInternalItemMetadata({
-      id: item.id,
-      product: toProductFromServerItem(item, serverCart.business_id),
-      quantity: clampQuantity(item.quantity),
-      locationId: serverCart.location_id,
-      variantId: item.variant_id,
-      variant,
-      quoteId,
-      addOnOptionIds: normalizeOptionIds(item.add_on_option_ids || void 0),
-      addOnOptions: (item.add_on_options || []).map((option) => ({
-        id: option.id,
-        name: option.name,
-        default_price: option.price
-      })),
-      bundleSelections: item.bundle_selections || void 0,
-      compositeSelections: item.composite_selections || void 0,
-      specialInstructions: item.special_instructions,
-      scheduledStart: item.scheduled_start || void 0,
-      scheduledEnd: item.scheduled_end || void 0,
-      staffId: item.staff_id || void 0,
-      units: item.units || void 0,
-      lineType: item.line_type,
-      confirmationCode: item.confirmation_code || void 0,
-      serviceStatus: item.service_status || void 0,
-      bundleResolved: item.bundle_resolved || void 0,
-      compositeResolved: item.composite_resolved || void 0,
-      customerInputs: item.customer_inputs || void 0
-    });
+    return attachInternalItemMetadata(
+      {
+        id: item.id,
+        product: toProductFromServerItem(item, serverCart.business_id),
+        quantity: clampQuantity(item.quantity),
+        locationId: serverCart.location_id,
+        variantId: item.variant_id,
+        variant,
+        quoteId,
+        addOnOptionIds: normalizeOptionIds(item.add_on_option_ids || void 0),
+        addOnOptions: (item.add_on_options || []).map((option) => ({
+          id: option.id,
+          name: option.name,
+          default_price: option.price
+        })),
+        bundleSelections: item.bundle_selections || void 0,
+        compositeSelections: item.composite_selections || void 0,
+        specialInstructions: item.special_instructions,
+        scheduledStart: item.scheduled_start || void 0,
+        scheduledEnd: item.scheduled_end || void 0,
+        staffId: item.staff_id || void 0,
+        units: item.units || void 0,
+        lineType: item.line_type,
+        confirmationCode: item.confirmation_code || void 0,
+        serviceStatus: item.service_status || void 0,
+        bundleResolved: item.bundle_resolved || void 0,
+        compositeResolved: item.composite_resolved || void 0,
+        customerInputs: item.customer_inputs || void 0
+      },
+      // CartItemDetails.total_price is the accepted configured unit amount,
+      // including add-ons. It is the only safe basis for optimistic quantity
+      // changes and line rendering after the server replaces the temp item.
+      { quotedUnitPrice: item.total_price }
+    );
   });
   return {
     items,
@@ -871,24 +910,27 @@ async function performAddItem(entry, product, quantity, options) {
     addOnOptionIds: normalizeOptionIds(options.addOnOptionIds)
   };
   const lineKey = buildLineKey(product.id, normalizedOptions);
-  const tempItem = attachInternalItemMetadata({
-    id: `tmp_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`,
-    product,
-    quantity: resolvedQuantity,
-    locationId: normalizedOptions.locationId,
-    variantId: normalizedOptions.variantId,
-    variant: normalizedOptions.variant,
-    quoteId: normalizedOptions.quoteId,
-    addOnOptionIds: normalizedOptions.addOnOptionIds,
-    addOnOptions: normalizedOptions.addOnOptions,
-    bundleSelections: normalizedOptions.bundleSelections,
-    compositeSelections: normalizedOptions.compositeSelections,
-    specialInstructions: normalizedOptions.specialInstructions,
-    scheduledStart: normalizedOptions.scheduledStart,
-    scheduledEnd: normalizedOptions.scheduledEnd,
-    staffId: normalizedOptions.staffId,
-    units: normalizedOptions.units
-  });
+  const tempItem = attachInternalItemMetadata(
+    {
+      id: `tmp_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`,
+      product,
+      quantity: resolvedQuantity,
+      locationId: normalizedOptions.locationId,
+      variantId: normalizedOptions.variantId,
+      variant: normalizedOptions.variant,
+      quoteId: normalizedOptions.quoteId,
+      addOnOptionIds: normalizedOptions.addOnOptionIds,
+      addOnOptions: normalizedOptions.addOnOptions,
+      bundleSelections: normalizedOptions.bundleSelections,
+      compositeSelections: normalizedOptions.compositeSelections,
+      specialInstructions: normalizedOptions.specialInstructions,
+      scheduledStart: normalizedOptions.scheduledStart,
+      scheduledEnd: normalizedOptions.scheduledEnd,
+      staffId: normalizedOptions.staffId,
+      units: normalizedOptions.units
+    },
+    { quotedUnitPrice: normalizedOptions.quotedUnitPrice }
+  );
   const idempotencyKey = `idem_${typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}_${Math.random().toString(36).slice(2, 10)}`}`;
   const patch = { kind: "add_item", tempItem, lineKey };
   const useOptimistic = entry.optimisticEnabled;
@@ -998,12 +1040,12 @@ async function performReorder(entry, orderId) {
   return result.value;
 }
 function useCart(options = {}) {
-  const context = useOptionalCimplifyClient();
+  const context = useOptionalCimplify();
   const client = options.client ?? context?.client;
   if (!client) {
     throw new Error("useCart must be used within CimplifyProvider or passed { client }.");
   }
-  const locationId = options.locationId ?? client.getLocationId();
+  const locationId = options.locationId ?? (context?.client === client ? context.currentLocation?.id ?? (context.isReady ? null : client.getLocationId()) : client.getLocationId());
   const currency = options.currency ?? context?.currency ?? "USD";
   const optimisticEnabled = context?.optimistic ?? true;
   const entry = useMemo(
@@ -1016,6 +1058,11 @@ function useCart(options = {}) {
     [client, currency, locationId, optimisticEnabled]
   );
   const view = useCollectionStore(entry.collection);
+  useEffect(() => {
+    if (client.getLocationId() !== locationId) {
+      client.setLocationId(locationId);
+    }
+  }, [client, locationId]);
   useEffect(() => {
     void ensureInitialized(entry);
   }, [entry]);
@@ -4875,19 +4922,53 @@ function useSearch(options = {}) {
 }
 var quoteCache = /* @__PURE__ */ new Map();
 var quoteInflight = /* @__PURE__ */ new Map();
-function buildQuoteCacheKey(client, locationId, inputSignature) {
-  return [client.getPublicKey(), locationId ?? "", inputSignature].join("|");
+var quoteClientNamespaces = /* @__PURE__ */ new WeakMap();
+var nextQuoteClientNamespace = 0;
+var QUOTE_LOAD_DEBOUNCE_MS = 150;
+var MIN_AUTO_REFRESH_DELAY_MS = 1e3;
+function getQuoteClientNamespace(client) {
+  const existing = quoteClientNamespaces.get(client);
+  if (existing !== void 0) {
+    return existing;
+  }
+  const namespace = nextQuoteClientNamespace++;
+  quoteClientNamespaces.set(client, namespace);
+  return namespace;
+}
+function buildQuoteCacheKey(client, sessionEpoch, locationId, inputSignature) {
+  return JSON.stringify([
+    getQuoteClientNamespace(client),
+    client.getPublicKey(),
+    sessionEpoch,
+    locationId ?? "",
+    inputSignature
+  ]);
+}
+function useClientSessionEpoch(client) {
+  const subscribe = useCallback(
+    (notify) => {
+      const unsubscribe = [
+        client.events.on(AUTH_TOKEN_CHANGED, notify),
+        client.events.on(SESSION_CLAIMED, notify),
+        client.events.on(SESSION_CLEARED, notify)
+      ];
+      return () => {
+        for (const stopListening of unsubscribe) {
+          stopListening();
+        }
+      };
+    },
+    [client]
+  );
+  const getSnapshot = useCallback(() => client.getSessionEpoch(), [client]);
+  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 }
 function serializeQuoteBundleSelections(selections) {
   if (!selections || selections.length === 0) {
     return "";
   }
   return selections.map((selection) => {
-    return [
-      selection.component_id,
-      selection.quantity,
-      selection.variant_id ?? ""
-    ].join(":");
+    return [selection.component_id, selection.quantity, selection.variant_id ?? ""].join(":");
   }).join(";");
 }
 function serializeQuoteCompositeSelections(selections) {
@@ -4917,15 +4998,37 @@ function buildQuoteInputSignature(input) {
     serializeQuoteCompositeSelections(input.compositeSelections)
   ].join("|");
 }
-function isQuoteExpired(quote) {
+function quoteExpiryTimestamp(quote) {
   if (!quote?.expires_at) {
-    return false;
+    return Number.NaN;
   }
   const expiresAt = Date.parse(quote.expires_at);
-  if (!Number.isFinite(expiresAt)) {
-    return false;
+  return Number.isFinite(expiresAt) ? expiresAt : Number.NaN;
+}
+function isQuoteExpired(quote, now = Date.now()) {
+  const expiresAt = quoteExpiryTimestamp(quote);
+  return Number.isFinite(expiresAt) && expiresAt <= now;
+}
+function readUsableCachedQuote(cacheKey2) {
+  const entry = quoteCache.get(cacheKey2);
+  if (!entry) {
+    return null;
   }
-  return expiresAt <= Date.now();
+  if (isQuoteExpired(entry.quote)) {
+    quoteCache.delete(cacheKey2);
+    return null;
+  }
+  return entry.quote;
+}
+function requestState(cacheKey2, quote, isLoading) {
+  return {
+    cacheKey: cacheKey2,
+    quote,
+    isLoading,
+    error: null,
+    isExpired: false,
+    messages: quote?.ui_messages ?? []
+  };
 }
 function normalizeInput(input, fallbackLocationId) {
   const productId = input.productId.trim();
@@ -4942,7 +5045,7 @@ function normalizeInput(input, fallbackLocationId) {
   };
 }
 function useQuote(input, options = {}) {
-  const context = useOptionalCimplifyClient();
+  const context = useOptionalCimplify();
   const client = options.client ?? context?.client;
   if (!client) {
     throw new Error("useQuote must be used within CimplifyProvider or passed { client }.");
@@ -4950,59 +5053,58 @@ function useQuote(input, options = {}) {
   const enabled = options.enabled ?? true;
   const autoRefresh = options.autoRefresh ?? true;
   const refreshBeforeExpiryMs = Math.max(0, options.refreshBeforeExpiryMs ?? 3e4);
-  const locationId = client.getLocationId();
+  const sessionEpoch = useClientSessionEpoch(client);
+  const fallbackLocationId = context?.client === client ? context.currentLocation?.id ?? (context.isReady ? null : client.getLocationId()) : client.getLocationId();
   const requestIdRef = useRef(0);
-  const debounceTimerRef = useRef(null);
   const inputSignature = buildQuoteInputSignature(input);
   const normalizedInput = useMemo(() => {
     if (!input) {
       return null;
     }
-    const normalized = normalizeInput(input, locationId);
+    const normalized = normalizeInput(input, fallbackLocationId);
     return normalized.product_id.length > 0 ? normalized : null;
-  }, [inputSignature, locationId]);
+  }, [inputSignature, fallbackLocationId]);
   const cacheKey2 = useMemo(
-    () => buildQuoteCacheKey(client, locationId, inputSignature),
-    [client, inputSignature, locationId]
+    () => buildQuoteCacheKey(
+      client,
+      sessionEpoch,
+      normalizedInput?.location_id ?? null,
+      inputSignature
+    ),
+    [client, inputSignature, normalizedInput?.location_id, sessionEpoch]
   );
-  const cached = quoteCache.get(cacheKey2);
-  const [quote, setQuote] = useState(cached?.quote ?? null);
-  const [isLoading, setIsLoading] = useState(enabled && normalizedInput !== null && !cached);
-  const [error, setError] = useState(null);
-  const [isExpired, setIsExpired] = useState(isQuoteExpired(cached?.quote ?? null));
-  const [messages, setMessages] = useState(cached?.quote?.ui_messages ?? []);
-  const quoteExpiryTimestamp = useMemo(() => {
-    if (!quote?.expires_at) {
-      return Number.NaN;
-    }
-    const expiresAt = Date.parse(quote.expires_at);
-    return Number.isFinite(expiresAt) ? expiresAt : Number.NaN;
-  }, [quote?.expires_at]);
+  const [state, setState] = useState(() => {
+    const cached = enabled && normalizedInput ? readUsableCachedQuote(cacheKey2) : null;
+    return requestState(cacheKey2, cached, enabled && normalizedInput !== null && !cached);
+  });
+  const stateIsCurrent = state.cacheKey === cacheKey2 && enabled && normalizedInput !== null;
+  const activeQuote = stateIsCurrent ? state.quote : null;
+  const activeQuoteExpired = isQuoteExpired(activeQuote);
+  const quote = activeQuoteExpired ? null : activeQuote;
+  const isLoading = enabled && normalizedInput !== null && (!stateIsCurrent || state.isLoading);
+  const error = stateIsCurrent ? state.error : null;
+  const isExpired = stateIsCurrent ? state.isExpired || activeQuoteExpired : false;
+  const messages = stateIsCurrent ? state.messages : [];
+  const expiresAt = quoteExpiryTimestamp(activeQuote);
   const load = useCallback(
     async (force = false) => {
       if (!enabled || !normalizedInput) {
-        setQuote(null);
-        setMessages([]);
-        setIsExpired(false);
-        setError(null);
-        setIsLoading(false);
+        requestIdRef.current += 1;
+        setState(requestState(cacheKey2, null, false));
         return;
       }
       const nextRequestId = ++requestIdRef.current;
-      setError(null);
       if (!force) {
-        const cacheEntry = quoteCache.get(cacheKey2);
-        if (cacheEntry) {
-          setQuote(cacheEntry.quote);
-          setMessages(cacheEntry.quote?.ui_messages ?? []);
-          setIsExpired(isQuoteExpired(cacheEntry.quote));
-          setIsLoading(false);
+        const cachedQuote = readUsableCachedQuote(cacheKey2);
+        if (cachedQuote) {
+          setState(requestState(cacheKey2, cachedQuote, false));
           return;
         }
       }
-      setIsLoading(true);
-      setQuote(null);
-      setMessages([]);
+      setState((current) => ({
+        ...requestState(cacheKey2, null, true),
+        isExpired: current.cacheKey === cacheKey2 && current.isExpired
+      }));
       try {
         const existing = quoteInflight.get(cacheKey2);
         const promise = existing ?? (async () => {
@@ -5019,55 +5121,58 @@ function useQuote(input, options = {}) {
           }).catch(() => void 0);
         }
         const value = await promise;
-        quoteCache.set(cacheKey2, { quote: value });
-        if (nextRequestId === requestIdRef.current) {
-          setQuote(value);
-          setMessages(value.ui_messages ?? []);
-          setIsExpired(isQuoteExpired(value));
-          setError(null);
+        const expired = isQuoteExpired(value);
+        if (expired) {
+          quoteCache.delete(cacheKey2);
+        } else {
+          quoteCache.set(cacheKey2, { quote: value });
         }
-      } catch (loadError) {
         if (nextRequestId === requestIdRef.current) {
-          setError(loadError);
+          setState({
+            ...requestState(cacheKey2, expired ? null : value, false),
+            isExpired: expired
+          });
         }
-      } finally {
+      } catch (loadError) {
         if (nextRequestId === requestIdRef.current) {
-          setIsLoading(false);
+          setState((current) => ({
+            ...requestState(cacheKey2, null, false),
+            error: loadError,
+            isExpired: current.cacheKey === cacheKey2 && current.isExpired
+          }));
         }
       }
     },
     [cacheKey2, client, enabled, normalizedInput]
   );
   useEffect(() => {
-    if (debounceTimerRef.current) {
-      clearTimeout(debounceTimerRef.current);
-    }
-    const hasCached = quoteCache.has(cacheKey2);
-    if (hasCached || !enabled || !normalizedInput) {
+    if (!enabled || !normalizedInput || readUsableCachedQuote(cacheKey2)) {
       void load(false);
-    } else {
-      debounceTimerRef.current = setTimeout(() => {
-        void load(false);
-      }, 150);
+      return;
     }
+    const timer = setTimeout(() => {
+      void load(false);
+    }, QUOTE_LOAD_DEBOUNCE_MS);
     return () => {
-      if (debounceTimerRef.current) {
-        clearTimeout(debounceTimerRef.current);
-        debounceTimerRef.current = null;
-      }
+      clearTimeout(timer);
     };
   }, [load, cacheKey2, enabled, normalizedInput]);
   const refresh = useCallback(async () => {
     if (!enabled || !normalizedInput) {
       return;
     }
-    if (!quote?.quote_id) {
+    if (!quote?.quote_id || isQuoteExpired(quote)) {
+      quoteCache.delete(cacheKey2);
       await load(true);
       return;
     }
     const nextRequestId = ++requestIdRef.current;
-    setError(null);
-    setIsLoading(true);
+    setState((current) => ({
+      ...current,
+      cacheKey: cacheKey2,
+      isLoading: true,
+      error: null
+    }));
     try {
       const result = await client.catalogue.refreshQuote({
         quote_id: quote.quote_id,
@@ -5077,52 +5182,67 @@ function useQuote(input, options = {}) {
         throw result.error;
       }
       const refreshed = result.value.quote;
-      quoteCache.set(cacheKey2, { quote: refreshed });
-      if (nextRequestId === requestIdRef.current) {
-        setQuote(refreshed);
-        setMessages(refreshed.ui_messages ?? []);
-        setIsExpired(isQuoteExpired(refreshed));
-        setError(null);
+      const expired = isQuoteExpired(refreshed);
+      if (expired) {
+        quoteCache.delete(cacheKey2);
+      } else {
+        quoteCache.set(cacheKey2, { quote: refreshed });
       }
-    } catch (refreshError) {
       if (nextRequestId === requestIdRef.current) {
-        setError(refreshError);
+        setState({
+          ...requestState(cacheKey2, expired ? null : refreshed, false),
+          isExpired: expired
+        });
       }
-    } finally {
+    } catch (refreshError) {
       if (nextRequestId === requestIdRef.current) {
-        setIsLoading(false);
+        setState((current) => ({
+          ...current,
+          cacheKey: cacheKey2,
+          isLoading: false,
+          error: refreshError
+        }));
       }
     }
   }, [cacheKey2, client, enabled, load, normalizedInput, quote]);
   useEffect(() => {
-    if (!Number.isFinite(quoteExpiryTimestamp)) {
-      setIsExpired(false);
+    if (!activeQuote || !Number.isFinite(expiresAt)) {
       return;
     }
-    const now = Date.now();
-    const isCurrentlyExpired = quoteExpiryTimestamp <= now;
-    const timers = [];
-    setIsExpired(isCurrentlyExpired);
-    if (!isCurrentlyExpired) {
-      timers.push(
-        setTimeout(() => {
-          setIsExpired(true);
-        }, Math.max(0, quoteExpiryTimestamp - now))
-      );
-    }
-    if (autoRefresh && enabled && !isCurrentlyExpired) {
-      timers.push(
-        setTimeout(() => {
-          void refresh();
-        }, Math.max(0, quoteExpiryTimestamp - now - refreshBeforeExpiryMs))
-      );
+    const remainingMs = expiresAt - Date.now();
+    if (remainingMs <= 0) {
+      quoteCache.delete(cacheKey2);
+      void load(true);
+      return;
     }
+    const expiryTimer = setTimeout(() => {
+      quoteCache.delete(cacheKey2);
+      setState({
+        ...requestState(cacheKey2, null, true),
+        isExpired: true
+      });
+      void load(true);
+    }, remainingMs);
+    const refreshDelayMs = remainingMs - refreshBeforeExpiryMs;
+    const refreshTimer = autoRefresh && enabled && refreshDelayMs >= MIN_AUTO_REFRESH_DELAY_MS ? setTimeout(() => {
+      void refresh();
+    }, refreshDelayMs) : null;
     return () => {
-      for (const timer of timers) {
-        clearTimeout(timer);
+      clearTimeout(expiryTimer);
+      if (refreshTimer) {
+        clearTimeout(refreshTimer);
       }
     };
-  }, [autoRefresh, enabled, quoteExpiryTimestamp, refresh, refreshBeforeExpiryMs]);
+  }, [
+    activeQuote,
+    autoRefresh,
+    cacheKey2,
+    enabled,
+    expiresAt,
+    load,
+    refresh,
+    refreshBeforeExpiryMs
+  ]);
   return { quote, isLoading, error, refresh, isExpired, messages };
 }
 
@@ -5311,14 +5431,7 @@ function useBundles(options = {}) {
   return { bundles: data ?? [], isLoading, error, refetch };
 }
 function useProductPrice(input) {
-  const {
-    product,
-    quantity = 1,
-    variant,
-    addOnOptions,
-    compositePrice,
-    bundleTotalPrice
-  } = input;
+  const { product, quantity = 1, variant, addOnOptions, compositePrice, bundleTotalPrice } = input;
   return useMemo(() => {
     let unitPrice;
     if (bundleTotalPrice != null) {
@@ -5326,10 +5439,7 @@ function useProductPrice(input) {
     } else if (compositePrice) {
       unitPrice = parsePrice(compositePrice.final_price);
     } else {
-      unitPrice = parsePrice(product.default_price);
-      if (variant?.price_adjustment) {
-        unitPrice += parsePrice(variant.price_adjustment);
-      }
+      unitPrice = getVariantUnitPrice(product, variant);
       if (addOnOptions) {
         for (const option of addOnOptions) {
           if (option.default_price) {
@@ -5345,7 +5455,15 @@ function useProductPrice(input) {
       totalPrice,
       displayTotalPrice: totalPrice
     };
-  }, [product.default_price, quantity, variant?.price_adjustment, addOnOptions, compositePrice, bundleTotalPrice]);
+  }, [
+    product,
+    quantity,
+    variant?.price_adjustment,
+    variant?.price_info,
+    addOnOptions,
+    compositePrice,
+    bundleTotalPrice
+  ]);
 }
 
 // src/react/hooks/use-orders.ts
@@ -9597,7 +9715,18 @@ function DateSlotPicker({
     }
   );
 }
-function ProductCustomizer({
+var REQUIRED_OPTIONS_MESSAGE = "Please select all required options";
+var QUOTE_LOADING_MESSAGE = "Updating price\u2026";
+var QUOTE_UNAVAILABLE_MESSAGE = "Price is unavailable. Please try again.";
+var CUSTOMIZER_VALIDATION_ID = "cimplify-customizer-validation";
+function initialVariantSelection(product) {
+  const variant = product.variants?.find((candidate) => candidate.is_default) ?? product.variants?.[0];
+  return { id: variant?.id, variant };
+}
+function ProductCustomizer(props) {
+  return /* @__PURE__ */ jsx(ProductCustomizerContent, { ...props }, props.product.id);
+}
+function ProductCustomizerContent({
   product,
   onAddToCart,
   onVariantChange,
@@ -9609,8 +9738,11 @@ function ProductCustomizer({
   const [quantity, setQuantity] = useState(product.min_order_quantity ?? 1);
   const [isAdded, setIsAdded] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const [selectedVariantId, setSelectedVariantId] = useState();
-  const [selectedVariant, setSelectedVariant] = useState();
+  const [variantSelection, setVariantSelection] = useState(
+    () => initialVariantSelection(product)
+  );
+  const selectedVariantId = variantSelection.id;
+  const selectedVariant = variantSelection.variant;
   const [selectedAddOnOptionIds, setSelectedAddOnOptionIds] = useState([]);
   const [compositeSelections, setCompositeSelections] = useState([]);
   const [compositePrice, setCompositePrice] = useState(null);
@@ -9625,7 +9757,6 @@ function ProductCustomizer({
   const [selectedStaffId, setSelectedStaffId] = useState(null);
   const [unitsCount, setUnitsCount] = useState(1);
   const cart = useCart();
-  const currency = getProductCurrency(product);
   const productType = product.type || "product";
   const isComposite = productType === "composite";
   const isBundle = productType === "bundle";
@@ -9635,26 +9766,6 @@ function ProductCustomizer({
   const isStandard = !isComposite && !isBundle;
   const hasVariants = isStandard && product.variants && product.variants.length > 0;
   const hasAddOns = isStandard && product.add_ons && product.add_ons.length > 0;
-  useEffect(() => {
-    setQuantity(product.min_order_quantity ?? 1);
-    setIsAdded(false);
-    setIsSubmitting(false);
-    setSelectedVariantId(void 0);
-    setSelectedVariant(void 0);
-    setSelectedAddOnOptionIds([]);
-    setCompositeSelections([]);
-    setCompositePrice(null);
-    setCompositeReady(false);
-    setBundleSelections([]);
-    setBundleTotalPrice(null);
-    setBundleReady(false);
-    setSelectedBillingPlan(null);
-    setCustomerInputValues({});
-    setSpecialInstructions("");
-    setSelectedSlot(null);
-    setSelectedStaffId(null);
-    setUnitsCount(1);
-  }, [product.id, product.min_order_quantity]);
   const slotStaff = useMemo(
     () => (selectedSlot?.available_staff ?? []).map((member) => ({
       id: member.staff_id,
@@ -9677,7 +9788,9 @@ function ProductCustomizer({
   }, [product.add_ons, selectedAddOnOptionIds]);
   const normalizedAddOnOptionIds = useMemo(() => {
     if (selectedAddOnOptionIds.length === 0) return [];
-    return Array.from(new Set(selectedAddOnOptionIds.map((id) => id.trim()).filter(Boolean))).sort();
+    return Array.from(
+      new Set(selectedAddOnOptionIds.map((id) => id.trim()).filter(Boolean))
+    ).sort();
   }, [selectedAddOnOptionIds]);
   const localTotalPrice = useMemo(() => {
     if (isComposite && compositePrice) {
@@ -9686,17 +9799,23 @@ function ProductCustomizer({
     if (isBundle && bundleTotalPrice != null) {
       return bundleTotalPrice * quantity;
     }
-    let price = parsePrice(product.default_price);
-    if (selectedVariant?.price_adjustment) {
-      price += parsePrice(selectedVariant.price_adjustment);
-    }
+    let price = getVariantUnitPrice(product, selectedVariant);
     for (const option of selectedAddOnOptions) {
       if (option.default_price) {
         price += parsePrice(option.default_price);
       }
     }
     return price * quantity;
-  }, [product.default_price, selectedVariant, selectedAddOnOptions, quantity, isComposite, compositePrice, isBundle, bundleTotalPrice]);
+  }, [
+    product.default_price,
+    selectedVariant,
+    selectedAddOnOptions,
+    quantity,
+    isComposite,
+    compositePrice,
+    isBundle,
+    bundleTotalPrice
+  ]);
   const requiredAddOnsSatisfied = useMemo(() => {
     if (!product.add_ons) return true;
     for (const addOn of product.add_ons) {
@@ -9721,7 +9840,16 @@ function ProductCustomizer({
       bundleSelections: isBundle && bundleSelections.length > 0 ? bundleSelections : void 0,
       compositeSelections: isComposite && compositeSelections.length > 0 ? compositeSelections : void 0
     }),
-    [product.id, quantity, selectedVariantId, normalizedAddOnOptionIds, isBundle, bundleSelections, isComposite, compositeSelections]
+    [
+      product.id,
+      quantity,
+      selectedVariantId,
+      normalizedAddOnOptionIds,
+      isBundle,
+      bundleSelections,
+      isComposite,
+      compositeSelections
+    ]
   );
   const requiredInputsSatisfied = useMemo(() => {
     if (!product.input_fields || product.input_fields.length === 0) return true;
@@ -9732,17 +9860,23 @@ function ProductCustomizer({
     });
   }, [product.input_fields, customerInputValues]);
   const quoteEnabled = isComposite ? compositeReady && requiredInputsSatisfied : isBundle ? bundleReady && requiredInputsSatisfied : requiredAddOnsSatisfied && requiredInputsSatisfied;
-  const { quote } = useQuote(quoteInput, {
+  const {
+    quote,
+    isLoading: isQuoteLoading,
+    error: quoteError,
+    isExpired: isQuoteExpired2
+  } = useQuote(quoteInput, {
     enabled: quoteEnabled
   });
+  const currency = quote?.currency ?? getProductCurrency(product);
   const quoteId = quote?.quote_id;
+  const quotedUnitPrice = (quote?.quoted_total_price_info ?? quote?.final_price_info)?.final_price;
   const quotedTotalPrice = useMemo(() => {
-    if (!quote) return void 0;
-    const priceInfo = quote.quoted_total_price_info ?? quote.final_price_info;
-    const perUnit = priceInfo.pre_tax_price;
-    if (perUnit === void 0 || perUnit === null) return void 0;
-    return parsePrice(perUnit) * quantity;
-  }, [quote, quantity]);
+    if (quotedUnitPrice === void 0 || quotedUnitPrice === null) return void 0;
+    return parsePrice(quotedUnitPrice) * quantity;
+  }, [quotedUnitPrice, quantity]);
+  const quoteIsReady = quoteEnabled && quote !== null && !isQuoteLoading && !quoteError && !isQuoteExpired2;
+  const validationMessage = !quoteEnabled ? REQUIRED_OPTIONS_MESSAGE : quoteError ? QUOTE_UNAVAILABLE_MESSAGE : !quoteIsReady ? QUOTE_LOADING_MESSAGE : null;
   const displayTotalPrice = useMemo(() => {
     const total = quotedTotalPrice ?? localTotalPrice;
     const multiplier = serviceBillingMultiplier(product, {
@@ -9756,8 +9890,7 @@ function ProductCustomizer({
   }, [quotedTotalPrice, localTotalPrice, product, quantity, unitsCount, selectedSlot]);
   const handleVariantChange = useCallback(
     (variantId, variant) => {
-      setSelectedVariantId(variantId);
-      setSelectedVariant(variant);
+      setVariantSelection({ id: variantId, variant });
       onVariantChange?.(variantId, variant);
     },
     [onVariantChange]
@@ -9765,12 +9898,21 @@ function ProductCustomizer({
   const addedTimerRef = useRef(void 0);
   useEffect(() => () => clearTimeout(addedTimerRef.current), []);
   const handleAddToCart = useCallback(async () => {
-    if (isSubmitting) return;
+    if (isSubmitting || !quoteIsReady || !quote || quotedUnitPrice === void 0 || quotedUnitPrice === null) {
+      return;
+    }
     setIsSubmitting(true);
     const options = {
+      locationId: quote.location_id ?? void 0,
       variantId: selectedVariantId,
-      variant: selectedVariant ? { id: selectedVariant.id, name: selectedVariant.name || "", price_adjustment: selectedVariant.price_adjustment } : void 0,
+      variant: selectedVariant ? {
+        id: selectedVariant.id,
+        name: selectedVariant.name || "",
+        price_adjustment: selectedVariant.price_adjustment,
+        price_info: selectedVariant.price_info
+      } : void 0,
       quoteId,
+      quotedUnitPrice,
       addOnOptionIds: normalizedAddOnOptionIds.length > 0 ? normalizedAddOnOptionIds : void 0,
       addOnOptions: selectedAddOnOptions.length > 0 ? selectedAddOnOptions.map((opt) => ({
         id: opt.id,
@@ -9807,7 +9949,32 @@ function ProductCustomizer({
     } finally {
       setIsSubmitting(false);
     }
-  }, [product, quantity, selectedVariantId, selectedVariant, quoteId, normalizedAddOnOptionIds, selectedAddOnOptions, isComposite, compositeSelections, isBundle, bundleSelections, selectedBillingPlan, customerInputValues, specialInstructions, isService, selectedSlot, selectedStaffId, unitsCount, isSubmitting, onAddToCart, cart]);
+  }, [
+    product,
+    quantity,
+    selectedVariantId,
+    selectedVariant,
+    quoteId,
+    quotedUnitPrice,
+    normalizedAddOnOptionIds,
+    selectedAddOnOptions,
+    isComposite,
+    compositeSelections,
+    isBundle,
+    bundleSelections,
+    selectedBillingPlan,
+    customerInputValues,
+    specialInstructions,
+    isService,
+    selectedSlot,
+    selectedStaffId,
+    unitsCount,
+    isSubmitting,
+    onAddToCart,
+    cart,
+    quoteIsReady,
+    quote
+  ]);
   return /* @__PURE__ */ jsxs("div", { "data-cimplify-customizer": true, className: cn("space-y-6", className, classNames?.root), children: [
     isComposite && product.groups && product.composite_id && /* @__PURE__ */ jsx(
       CompositeSelector,
@@ -9920,27 +10087,48 @@ function ProductCustomizer({
         currency
       }
     ),
-    product.deposit_type && product.deposit_type !== "none" && product.deposit_amount && /* @__PURE__ */ jsx("div", { "data-cimplify-customizer-deposit": true, className: cn("text-sm text-muted-foreground", classNames?.depositInfo), children: product.deposit_type === "fixed" ? /* @__PURE__ */ jsxs("span", { children: [
-      "Deposit required: ",
-      /* @__PURE__ */ jsx(Price, { amount: product.deposit_amount, currency })
-    ] }) : /* @__PURE__ */ jsxs("span", { children: [
-      "Deposit required: ",
-      parsePrice(product.deposit_amount),
-      "%"
-    ] }) }),
-    product.allergies && product.allergies.length > 0 && /* @__PURE__ */ jsx("div", { "data-cimplify-customizer-allergens": true, className: cn("flex flex-wrap gap-1.5", classNames?.allergens), children: product.allergies.map((allergen) => /* @__PURE__ */ jsx(
-      "span",
+    product.deposit_type && product.deposit_type !== "none" && product.deposit_amount && /* @__PURE__ */ jsx(
+      "div",
       {
-        "data-cimplify-allergen-tag": true,
-        className: "inline-block text-xs px-2 py-0.5 rounded-full bg-muted text-muted-foreground",
-        children: allergen
-      },
-      allergen
-    )) }),
-    isService && product.duration_minutes != null && /* @__PURE__ */ jsxs("div", { "data-cimplify-customizer-duration": true, className: cn("text-sm text-muted-foreground", classNames?.duration), children: [
-      "Duration: ",
-      formatDuration2(product.duration_minutes, product.duration_unit)
-    ] }),
+        "data-cimplify-customizer-deposit": true,
+        className: cn("text-sm text-muted-foreground", classNames?.depositInfo),
+        children: product.deposit_type === "fixed" ? /* @__PURE__ */ jsxs("span", { children: [
+          "Deposit required: ",
+          /* @__PURE__ */ jsx(Price, { amount: product.deposit_amount, currency })
+        ] }) : /* @__PURE__ */ jsxs("span", { children: [
+          "Deposit required: ",
+          parsePrice(product.deposit_amount),
+          "%"
+        ] })
+      }
+    ),
+    product.allergies && product.allergies.length > 0 && /* @__PURE__ */ jsx(
+      "div",
+      {
+        "data-cimplify-customizer-allergens": true,
+        className: cn("flex flex-wrap gap-1.5", classNames?.allergens),
+        children: product.allergies.map((allergen) => /* @__PURE__ */ jsx(
+          "span",
+          {
+            "data-cimplify-allergen-tag": true,
+            className: "inline-block text-xs px-2 py-0.5 rounded-full bg-muted text-muted-foreground",
+            children: allergen
+          },
+          allergen
+        ))
+      }
+    ),
+    isService && product.duration_minutes != null && /* @__PURE__ */ jsxs(
+      "div",
+      {
+        "data-cimplify-customizer-duration": true,
+        className: cn("text-sm text-muted-foreground", classNames?.duration),
+        children: [
+          "Duration: ",
+          formatDuration2(product.duration_minutes, product.duration_unit)
+        ]
+      }
+    ),
     showSpecialInstructions && !isDigital && /* @__PURE__ */ jsx("div", { "data-cimplify-customizer-special-instructions": true, children: /* @__PURE__ */ jsx(
       "textarea",
       {
@@ -9973,13 +10161,17 @@ function ProductCustomizer({
         "data-cimplify-customizer-actions": true,
         className: cn("pt-4 border-t border-border", classNames?.actions),
         children: [
-          !quoteEnabled && /* @__PURE__ */ jsx(
+          validationMessage && /* @__PURE__ */ jsx(
             "p",
             {
-              id: "cimplify-customizer-validation",
+              id: CUSTOMIZER_VALIDATION_ID,
               "data-cimplify-customizer-validation": true,
-              className: cn("text-sm text-destructive mb-3", classNames?.validation),
-              children: "Please select all required options"
+              className: cn(
+                "text-sm mb-3",
+                quoteError ? "text-destructive" : "text-muted-foreground",
+                classNames?.validation
+              ),
+              children: validationMessage
             }
           ),
           /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-4", children: [
@@ -9992,28 +10184,54 @@ function ProductCustomizer({
                   min: product.min_order_quantity ?? 1
                 }
               ),
-              product.min_order_quantity && product.min_order_quantity > 1 && /* @__PURE__ */ jsxs("span", { "data-cimplify-customizer-min-hint": true, className: "text-xs text-muted-foreground text-center", children: [
-                "Min. ",
-                product.min_order_quantity
-              ] })
-            ] }),
-            product.quantity_pricing && product.quantity_pricing.length > 0 && /* @__PURE__ */ jsxs("div", { "data-cimplify-customizer-unit-price": true, className: "text-sm text-muted-foreground text-right shrink-0", children: [
-              /* @__PURE__ */ jsx(Price, { amount: getUnitPriceAtQuantity(product.quantity_pricing, quantity, parsePrice(product.default_price)), currency, className: "font-medium text-foreground" }),
-              " ea."
+              product.min_order_quantity && product.min_order_quantity > 1 && /* @__PURE__ */ jsxs(
+                "span",
+                {
+                  "data-cimplify-customizer-min-hint": true,
+                  className: "text-xs text-muted-foreground text-center",
+                  children: [
+                    "Min. ",
+                    product.min_order_quantity
+                  ]
+                }
+              )
             ] }),
+            product.quantity_pricing && product.quantity_pricing.length > 0 && /* @__PURE__ */ jsxs(
+              "div",
+              {
+                "data-cimplify-customizer-unit-price": true,
+                className: "text-sm text-muted-foreground text-right shrink-0",
+                children: [
+                  /* @__PURE__ */ jsx(
+                    Price,
+                    {
+                      amount: getUnitPriceAtQuantity(
+                        product.quantity_pricing,
+                        quantity,
+                        parsePrice(product.default_price)
+                      ),
+                      currency,
+                      className: "font-medium text-foreground"
+                    }
+                  ),
+                  " ",
+                  "ea."
+                ]
+              }
+            ),
             /* @__PURE__ */ jsx(
               Button$1,
               {
                 onClick: handleAddToCart,
-                disabled: isAdded || isSubmitting || !quoteEnabled,
-                "aria-describedby": !quoteEnabled ? "cimplify-customizer-validation" : void 0,
+                disabled: isAdded || isSubmitting || !quoteIsReady,
+                "aria-describedby": validationMessage ? CUSTOMIZER_VALIDATION_ID : void 0,
                 "data-cimplify-customizer-submit": true,
                 className: cn(
                   "flex-1 h-14 text-base bg-primary text-primary-foreground font-medium hover:bg-primary/90 transition-colors disabled:opacity-50 disabled:cursor-not-allowed rounded-full",
                   isAdded && classNames?.submitButtonAdded,
                   classNames?.submitButton
                 ),
-                children: isAdded ? "Added" : /* @__PURE__ */ jsxs(Fragment, { children: [
+                children: isAdded ? "Added" : !quoteEnabled ? submitLabel ?? "Add to Cart" : !quoteIsReady ? quoteError ? QUOTE_UNAVAILABLE_MESSAGE : QUOTE_LOADING_MESSAGE : /* @__PURE__ */ jsxs(Fragment, { children: [
                   submitLabel ?? "Add to Cart",
                   " \xB7",
                   " ",
@@ -10447,13 +10665,16 @@ function CartLineItemRow({
   item,
   onRemove,
   onQuantityChange,
+  currency,
   classNames
 }) {
-  const { unitPrice } = useProductPrice({
+  const { unitPrice: locallyResolvedUnitPrice } = useProductPrice({
     product: item.product,
     variant: item.variant,
     addOnOptions: item.addOnOptions
   });
+  const pinnedUnitPrice = item._quotedUnitPrice;
+  const unitPrice = pinnedUnitPrice === void 0 ? locallyResolvedUnitPrice : parsePrice(pinnedUnitPrice);
   const hasComposite = item.compositeSelections && item.compositeSelections.length > 0;
   const hasBundle = item.bundleSelections && item.bundleSelections.length > 0;
   const isOptimistic2 = item.isOptimistic === true;
@@ -10476,15 +10697,25 @@ function CartLineItemRow({
           {
             "data-cimplify-cart-item-image": true,
             className: "relative w-20 h-20 shrink-0 rounded-md overflow-hidden bg-muted",
-            children: imageUrl ? /* @__PURE__ */ jsx(
-              "img",
+            children: imageUrl ? /* @__PURE__ */ jsx("img", { src: imageUrl, alt: "", className: "w-full h-full object-cover", loading: "lazy" }) : /* @__PURE__ */ jsx("div", { className: "w-full h-full grid place-items-center text-muted-foreground/40", children: /* @__PURE__ */ jsx(
+              "svg",
               {
-                src: imageUrl,
-                alt: "",
-                className: "w-full h-full object-cover",
-                loading: "lazy"
+                className: "w-6 h-6",
+                fill: "none",
+                stroke: "currentColor",
+                strokeWidth: "1.5",
+                viewBox: "0 0 24 24",
+                "aria-hidden": true,
+                children: /* @__PURE__ */ jsx(
+                  "path",
+                  {
+                    strokeLinecap: "round",
+                    strokeLinejoin: "round",
+                    d: "M2.25 15.75l5.159-5.159a2.25 2.25 0 013.182 0l5.159 5.159m-1.5-1.5l1.409-1.409a2.25 2.25 0 013.182 0l2.909 2.909m-18 3.75h16.5a1.5 1.5 0 001.5-1.5V6a1.5 1.5 0 00-1.5-1.5H3.75A1.5 1.5 0 002.25 6v12a1.5 1.5 0 001.5 1.5zm10.5-11.25h.008v.008h-.008V8.25zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0z"
+                  }
+                )
               }
-            ) : /* @__PURE__ */ jsx("div", { className: "w-full h-full grid place-items-center text-muted-foreground/40", children: /* @__PURE__ */ jsx("svg", { className: "w-6 h-6", fill: "none", stroke: "currentColor", strokeWidth: "1.5", viewBox: "0 0 24 24", "aria-hidden": true, children: /* @__PURE__ */ jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M2.25 15.75l5.159-5.159a2.25 2.25 0 013.182 0l5.159 5.159m-1.5-1.5l1.409-1.409a2.25 2.25 0 013.182 0l2.909 2.909m-18 3.75h16.5a1.5 1.5 0 001.5-1.5V6a1.5 1.5 0 00-1.5-1.5H3.75A1.5 1.5 0 002.25 6v12a1.5 1.5 0 001.5 1.5zm10.5-11.25h.008v.008h-.008V8.25zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0z" }) }) })
+            ) })
           }
         ),
         /* @__PURE__ */ jsxs("div", { "data-cimplify-cart-item-info": true, className: "flex-1 min-w-0 flex flex-col", children: [
@@ -10508,7 +10739,18 @@ function CartLineItemRow({
                   classNames?.removeButton
                 ),
                 "aria-label": `Remove ${item.product.name}`,
-                children: /* @__PURE__ */ jsx("svg", { className: "w-3.5 h-3.5", fill: "none", stroke: "currentColor", strokeWidth: "2", viewBox: "0 0 24 24", "aria-hidden": true, children: /* @__PURE__ */ jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M6 18L18 6M6 6l12 12" }) })
+                children: /* @__PURE__ */ jsx(
+                  "svg",
+                  {
+                    className: "w-3.5 h-3.5",
+                    fill: "none",
+                    stroke: "currentColor",
+                    strokeWidth: "2",
+                    viewBox: "0 0 24 24",
+                    "aria-hidden": true,
+                    children: /* @__PURE__ */ jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M6 18L18 6M6 6l12 12" })
+                  }
+                )
               }
             )
           ] }),
@@ -10554,43 +10796,124 @@ function CartLineItemRow({
               ]
             }
           ),
-          item.customerInputs && item.customerInputs.length > 0 && /* @__PURE__ */ jsx("dl", { "data-cimplify-cart-customer-inputs": true, className: cn("mt-1.5 text-xs space-y-0.5", classNames?.customerInputs), children: item.customerInputs.map((input) => /* @__PURE__ */ jsxs("div", { "data-cimplify-cart-input": true, className: "flex gap-1.5", children: [
-            /* @__PURE__ */ jsxs("dt", { "data-cimplify-cart-input-label": true, className: "text-muted-foreground", children: [
-              input.field_name,
-              ":"
-            ] }),
-            /* @__PURE__ */ jsx("dd", { "data-cimplify-cart-input-value": true, className: "text-foreground m-0 truncate", children: input.field_type === INPUT_FIELD_TYPE.File || input.field_type === INPUT_FIELD_TYPE.Image ? String(input.value).split("/").pop() || "Uploaded file" : String(input.value) })
-          ] }, input.field_id)) }),
-          (item.lineType === "service" || item.product.type === "service") && item.scheduledStart && /* @__PURE__ */ jsxs("div", { "data-cimplify-cart-service-info": true, className: cn("mt-1.5 flex items-center gap-1.5 text-xs text-muted-foreground", classNames?.serviceInfo), children: [
-            /* @__PURE__ */ jsx("svg", { className: "w-3.5 h-3.5 shrink-0", fill: "none", stroke: "currentColor", strokeWidth: "2", viewBox: "0 0 24 24", "aria-hidden": true, children: /* @__PURE__ */ jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" }) }),
-            /* @__PURE__ */ jsxs("span", { children: [
-              new Date(item.scheduledStart).toLocaleDateString(void 0, { month: "short", day: "numeric" }),
-              " at",
-              " ",
-              new Date(item.scheduledStart).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })
-            ] }),
-            item.serviceStatus && /* @__PURE__ */ jsx("span", { "data-status": item.serviceStatus, className: "ml-auto px-1.5 py-0.5 rounded-full bg-muted text-[10px] uppercase tracking-wider", children: item.serviceStatus })
-          ] }),
-          (item.lineType === "digital" || item.product.type === "digital") && /* @__PURE__ */ jsxs("div", { "data-cimplify-cart-digital-info": true, className: cn("mt-1.5 flex items-center gap-1 text-xs text-muted-foreground", classNames?.digitalInfo), children: [
-            /* @__PURE__ */ jsx("svg", { className: "w-3.5 h-3.5 shrink-0", fill: "none", stroke: "currentColor", strokeWidth: "2", viewBox: "0 0 24 24", "aria-hidden": true, children: /* @__PURE__ */ jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M13 10V3L4 14h7v7l9-11h-7z" }) }),
-            /* @__PURE__ */ jsx("span", { children: "Instant digital delivery" })
-          ] }),
+          item.customerInputs && item.customerInputs.length > 0 && /* @__PURE__ */ jsx(
+            "dl",
+            {
+              "data-cimplify-cart-customer-inputs": true,
+              className: cn("mt-1.5 text-xs space-y-0.5", classNames?.customerInputs),
+              children: item.customerInputs.map((input) => /* @__PURE__ */ jsxs("div", { "data-cimplify-cart-input": true, className: "flex gap-1.5", children: [
+                /* @__PURE__ */ jsxs("dt", { "data-cimplify-cart-input-label": true, className: "text-muted-foreground", children: [
+                  input.field_name,
+                  ":"
+                ] }),
+                /* @__PURE__ */ jsx("dd", { "data-cimplify-cart-input-value": true, className: "text-foreground m-0 truncate", children: input.field_type === INPUT_FIELD_TYPE.File || input.field_type === INPUT_FIELD_TYPE.Image ? String(input.value).split("/").pop() || "Uploaded file" : String(input.value) })
+              ] }, input.field_id))
+            }
+          ),
+          (item.lineType === "service" || item.product.type === "service") && item.scheduledStart && /* @__PURE__ */ jsxs(
+            "div",
+            {
+              "data-cimplify-cart-service-info": true,
+              className: cn(
+                "mt-1.5 flex items-center gap-1.5 text-xs text-muted-foreground",
+                classNames?.serviceInfo
+              ),
+              children: [
+                /* @__PURE__ */ jsx(
+                  "svg",
+                  {
+                    className: "w-3.5 h-3.5 shrink-0",
+                    fill: "none",
+                    stroke: "currentColor",
+                    strokeWidth: "2",
+                    viewBox: "0 0 24 24",
+                    "aria-hidden": true,
+                    children: /* @__PURE__ */ jsx(
+                      "path",
+                      {
+                        strokeLinecap: "round",
+                        strokeLinejoin: "round",
+                        d: "M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
+                      }
+                    )
+                  }
+                ),
+                /* @__PURE__ */ jsxs("span", { children: [
+                  new Date(item.scheduledStart).toLocaleDateString(void 0, {
+                    month: "short",
+                    day: "numeric"
+                  }),
+                  " ",
+                  "at",
+                  " ",
+                  new Date(item.scheduledStart).toLocaleTimeString([], {
+                    hour: "2-digit",
+                    minute: "2-digit"
+                  })
+                ] }),
+                item.serviceStatus && /* @__PURE__ */ jsx(
+                  "span",
+                  {
+                    "data-status": item.serviceStatus,
+                    className: "ml-auto px-1.5 py-0.5 rounded-full bg-muted text-[10px] uppercase tracking-wider",
+                    children: item.serviceStatus
+                  }
+                )
+              ]
+            }
+          ),
+          (item.lineType === "digital" || item.product.type === "digital") && /* @__PURE__ */ jsxs(
+            "div",
+            {
+              "data-cimplify-cart-digital-info": true,
+              className: cn(
+                "mt-1.5 flex items-center gap-1 text-xs text-muted-foreground",
+                classNames?.digitalInfo
+              ),
+              children: [
+                /* @__PURE__ */ jsx(
+                  "svg",
+                  {
+                    className: "w-3.5 h-3.5 shrink-0",
+                    fill: "none",
+                    stroke: "currentColor",
+                    strokeWidth: "2",
+                    viewBox: "0 0 24 24",
+                    "aria-hidden": true,
+                    children: /* @__PURE__ */ jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M13 10V3L4 14h7v7l9-11h-7z" })
+                  }
+                ),
+                /* @__PURE__ */ jsx("span", { children: "Instant digital delivery" })
+              ]
+            }
+          ),
           (item.bundleResolved || item.compositeResolved) && /* @__PURE__ */ jsx(
             "ul",
             {
               "data-cimplify-cart-composite-breakdown": item.compositeResolved ? "" : void 0,
               "data-cimplify-cart-bundle-breakdown": item.bundleResolved ? "" : void 0,
-              className: cn("mt-1.5 pl-3 border-l border-border space-y-0.5 text-xs text-muted-foreground", item.compositeResolved ? classNames?.compositeBreakdown : classNames?.bundleBreakdown),
+              className: cn(
+                "mt-1.5 pl-3 border-l border-border space-y-0.5 text-xs text-muted-foreground",
+                item.compositeResolved ? classNames?.compositeBreakdown : classNames?.bundleBreakdown
+              ),
               children: (item.bundleResolved?.selections ?? item.compositeResolved?.selections ?? []).map((sel) => {
                 const name = sel.product_name ?? sel.component_name ?? "";
                 const compId = sel.component_id ?? `${name}-${sel.quantity}`;
-                return /* @__PURE__ */ jsxs("li", { "data-product-type": sel.product_type, className: "flex items-baseline gap-1.5 m-0", children: [
-                  /* @__PURE__ */ jsxs("span", { className: "font-medium text-foreground/80", children: [
-                    sel.quantity,
-                    "\\u00D7"
-                  ] }),
-                  /* @__PURE__ */ jsx("span", { className: "truncate", children: name })
-                ] }, compId);
+                return /* @__PURE__ */ jsxs(
+                  "li",
+                  {
+                    "data-product-type": sel.product_type,
+                    className: "flex items-baseline gap-1.5 m-0",
+                    children: [
+                      /* @__PURE__ */ jsxs("span", { className: "font-medium text-foreground/80", children: [
+                        sel.quantity,
+                        "\\u00D7"
+                      ] }),
+                      /* @__PURE__ */ jsx("span", { className: "truncate", children: name })
+                    ]
+                  },
+                  compId
+                );
               })
             }
           ),
@@ -10599,6 +10922,7 @@ function CartLineItemRow({
               Price,
               {
                 amount: lineTotal,
+                currency,
                 className: cn("text-sm font-semibold tabular-nums", classNames?.itemPrice)
               }
             ),
@@ -10636,9 +10960,11 @@ function CartSummary({
     isEmpty,
     isOptimistic: isOptimistic2,
     pendingOpCount,
+    currency,
     removeItem,
     updateQuantity
   } = useCart();
+  const displayCurrency = serverCart?.currency ?? currencyCode(currency);
   const deliveryFee = serverCart?.delivery_fee;
   const serviceCharge = serverCart?.service_charge;
   const totalDiscounts = serverCart?.total_discounts;
@@ -10670,6 +10996,7 @@ function CartSummary({
             item,
             onRemove: handleRemove,
             onQuantityChange: handleQuantityChange,
+            currency: displayCurrency,
             classNames
           },
           item.id
@@ -10678,38 +11005,115 @@ function CartSummary({
           "div",
           {
             "data-cimplify-cart-totals": true,
-            className: cn("mt-6 pt-4 border-t border-border space-y-2 text-sm", classNames?.totals),
+            className: cn(
+              "mt-6 pt-4 border-t border-border space-y-2 text-sm",
+              classNames?.totals
+            ),
             children: [
-              /* @__PURE__ */ jsxs("div", { "data-cimplify-cart-subtotal": true, className: cn("flex items-baseline justify-between", classNames?.subtotal), children: [
-                /* @__PURE__ */ jsxs("span", { className: "text-muted-foreground", children: [
-                  "Subtotal (",
-                  itemCount,
-                  " ",
-                  itemCount === 1 ? "item" : "items",
-                  ")"
-                ] }),
-                /* @__PURE__ */ jsx(Price, { amount: subtotal, className: "tabular-nums" })
-              ] }),
-              totalDiscounts != null && parsePrice(totalDiscounts) > 0 && /* @__PURE__ */ jsxs("div", { "data-cimplify-cart-discount": true, className: cn("flex items-baseline justify-between", classNames?.discount), children: [
-                /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: "Discount" }),
-                /* @__PURE__ */ jsx(Price, { amount: totalDiscounts, prefix: "-", className: "tabular-nums text-primary" })
-              ] }),
-              deliveryFee != null && /* @__PURE__ */ jsxs("div", { "data-cimplify-cart-delivery-fee": true, className: cn("flex items-baseline justify-between", classNames?.deliveryFee), children: [
-                /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: "Delivery" }),
-                parsePrice(deliveryFee) > 0 ? /* @__PURE__ */ jsx(Price, { amount: deliveryFee, className: "tabular-nums" }) : /* @__PURE__ */ jsx("span", { className: "font-medium text-primary", children: "Free" })
-              ] }),
-              serviceCharge != null && parsePrice(serviceCharge) > 0 && /* @__PURE__ */ jsxs("div", { "data-cimplify-cart-service-charge": true, className: cn("flex items-baseline justify-between", classNames?.serviceCharge), children: [
-                /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: "Service charge" }),
-                /* @__PURE__ */ jsx(Price, { amount: serviceCharge, className: "tabular-nums" })
-              ] }),
-              /* @__PURE__ */ jsxs("div", { "data-cimplify-cart-tax": true, className: cn("flex items-baseline justify-between", classNames?.tax), children: [
-                /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: "Tax" }),
-                /* @__PURE__ */ jsx(Price, { amount: tax, className: "tabular-nums" })
-              ] }),
-              /* @__PURE__ */ jsxs("div", { "data-cimplify-cart-total": true, className: cn("flex items-baseline justify-between pt-3 mt-1 border-t border-border", classNames?.total), children: [
-                /* @__PURE__ */ jsx("span", { className: "font-semibold", children: "Total" }),
-                /* @__PURE__ */ jsx(Price, { amount: total, className: "text-base font-bold tabular-nums" })
-              ] })
+              /* @__PURE__ */ jsxs(
+                "div",
+                {
+                  "data-cimplify-cart-subtotal": true,
+                  className: cn("flex items-baseline justify-between", classNames?.subtotal),
+                  children: [
+                    /* @__PURE__ */ jsxs("span", { className: "text-muted-foreground", children: [
+                      "Subtotal (",
+                      itemCount,
+                      " ",
+                      itemCount === 1 ? "item" : "items",
+                      ")"
+                    ] }),
+                    /* @__PURE__ */ jsx(Price, { amount: subtotal, currency: displayCurrency, className: "tabular-nums" })
+                  ]
+                }
+              ),
+              totalDiscounts != null && parsePrice(totalDiscounts) > 0 && /* @__PURE__ */ jsxs(
+                "div",
+                {
+                  "data-cimplify-cart-discount": true,
+                  className: cn("flex items-baseline justify-between", classNames?.discount),
+                  children: [
+                    /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: "Discount" }),
+                    /* @__PURE__ */ jsx(
+                      Price,
+                      {
+                        amount: totalDiscounts,
+                        currency: displayCurrency,
+                        prefix: "-",
+                        className: "tabular-nums text-primary"
+                      }
+                    )
+                  ]
+                }
+              ),
+              deliveryFee != null && /* @__PURE__ */ jsxs(
+                "div",
+                {
+                  "data-cimplify-cart-delivery-fee": true,
+                  className: cn("flex items-baseline justify-between", classNames?.deliveryFee),
+                  children: [
+                    /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: "Delivery" }),
+                    parsePrice(deliveryFee) > 0 ? /* @__PURE__ */ jsx(
+                      Price,
+                      {
+                        amount: deliveryFee,
+                        currency: displayCurrency,
+                        className: "tabular-nums"
+                      }
+                    ) : /* @__PURE__ */ jsx("span", { className: "font-medium text-primary", children: "Free" })
+                  ]
+                }
+              ),
+              serviceCharge != null && parsePrice(serviceCharge) > 0 && /* @__PURE__ */ jsxs(
+                "div",
+                {
+                  "data-cimplify-cart-service-charge": true,
+                  className: cn("flex items-baseline justify-between", classNames?.serviceCharge),
+                  children: [
+                    /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: "Service charge" }),
+                    /* @__PURE__ */ jsx(
+                      Price,
+                      {
+                        amount: serviceCharge,
+                        currency: displayCurrency,
+                        className: "tabular-nums"
+                      }
+                    )
+                  ]
+                }
+              ),
+              /* @__PURE__ */ jsxs(
+                "div",
+                {
+                  "data-cimplify-cart-tax": true,
+                  className: cn("flex items-baseline justify-between", classNames?.tax),
+                  children: [
+                    /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: "Tax" }),
+                    /* @__PURE__ */ jsx(Price, { amount: tax, currency: displayCurrency, className: "tabular-nums" })
+                  ]
+                }
+              ),
+              /* @__PURE__ */ jsxs(
+                "div",
+                {
+                  "data-cimplify-cart-total": true,
+                  className: cn(
+                    "flex items-baseline justify-between pt-3 mt-1 border-t border-border",
+                    classNames?.total
+                  ),
+                  children: [
+                    /* @__PURE__ */ jsx("span", { className: "font-semibold", children: "Total" }),
+                    /* @__PURE__ */ jsx(
+                      Price,
+                      {
+                        amount: total,
+                        currency: displayCurrency,
+                        className: "text-base font-bold tabular-nums"
+                      }
+                    )
+                  ]
+                }
+              )
             ]
           }
         ),
@@ -10794,12 +11198,14 @@ function SaleBadge({
     return null;
   }
   let percentage = null;
-  if (hasDeal && dealInfo.benefit_type === "percentage") {
+  if (product.sale) {
+    percentage = parsePrice(product.sale.percent_off);
+  } else if (hasDeal && dealInfo.benefit_type === "percentage") {
     percentage = parsePrice(dealInfo.value);
   } else if (onSale) {
     percentage = getDiscountPercentage(product);
   }
-  const badgeText = label ?? dealInfo?.label ?? (percentage != null && percentage > 0 ? `${percentage}% off` : null);
+  const badgeText = label ?? product.sale?.badge_text ?? dealInfo?.label ?? (percentage != null && percentage > 0 ? `${percentage}% off` : null);
   if (!badgeText) {
     return null;
   }