@anker-in/shopify-react 0.1.1-beta.4 → 0.1.1-beta.40

package/dist/index.mjs

@@ -1,9 +1,10 @@
 import { createContext, useMemo, useContext, useRef, useState, useEffect, useCallback } from 'react';
-import { createShopifyClient, getProductsByHandles, createCart, updateCartCodes, addCartLines, updateCartLines, removeCartLines, updateCartAttributes, getProduct, getAllProducts, getCollection, getAllCollections, getCollections, getBlog, getAllBlogs, getArticle, getArticles, getArticlesInBlog, getLocalStorage, getCart, setLocalStorage } from '@anker-in/shopify-sdk';
-export { ShopifyConfig, clearLocalStorage, createShopifyClient, getLocalStorage, removeLocalStorage, setLocalStorage } from '@anker-in/shopify-sdk';
+import { createShopifyClient, getProductsByHandles, createCart, updateCartCodes, addCartLines, updateCartLines, removeCartLines, updateCartAttributes, getLocalStorage, getProduct, getAllProducts, getCollection, getAllCollections, getCollections, getBlog, getAllBlogs, getArticle, getArticles, getArticlesInBlog, getCart, setLocalStorage, updateCartDeliveryOptions } from '@anker-in/shopify-sdk';
+export * from '@anker-in/shopify-sdk';
 import Cookies5 from 'js-cookie';
 import { jsx } from 'react/jsx-runtime';
 import Decimal2 from 'decimal.js';
+import { atobID, btoaID } from '@anker-in/shopify-core';
 import useSWR from 'swr';
 import useSWRMutation from 'swr/mutation';
 import { useRequest } from 'ahooks';
@@ -45,6 +46,20 @@ var browserCartCookieAdapter = {
     Cookies5.remove(getCartCookieName(locale));
   }
 };
+
+// src/adapters/browser-performance.ts
+var BrowserPerformanceAdapter = class {
+  /**
+   * Start tracking a performance event
+   */
+  addToCartStart() {
+  }
+  /**
+   * End tracking a performance event
+   */
+  addToCartEnd() {
+  }
+};
 function ShopifyProvider({
   config,
   locale,
@@ -53,7 +68,8 @@ function ShopifyProvider({
   cartCookieAdapter = browserCartCookieAdapter,
   routerAdapter,
   userAdapter,
-  children
+  children,
+  performanceAdapter
 }) {
   const client = useMemo(() => {
     return createShopifyClient(config, locale);
@@ -67,7 +83,8 @@ function ShopifyProvider({
       cookieAdapter,
       cartCookieAdapter,
       routerAdapter,
-      userAdapter
+      userAdapter,
+      performanceAdapter
     };
   }, [
     client,
@@ -77,6 +94,7 @@ function ShopifyProvider({
     cookieAdapter,
     cartCookieAdapter,
     routerAdapter,
+    performanceAdapter,
     userAdapter
   ]);
   return /* @__PURE__ */ jsx(ShopifyContext.Provider, { value, children });
@@ -140,9 +158,10 @@ function normalizeAddToCartLines(lines) {
     const variant = line.variant;
     const product = variant.product;
     const quantity = line.quantity || 1;
-    const price = variant.finalPrice?.amount ? Number(variant.finalPrice.amount) : variant.compareAtPrice?.amount ? Number(variant.compareAtPrice.amount) : variant.price?.amount ? Number(variant.price.amount) : 0;
-    const subtotalAmount = price * quantity;
-    const totalAmount = subtotalAmount;
+    const originalPrice = variant.price?.amount ? Number(variant.price.amount) : 0;
+    const finalPrice = variant.finalPrice?.amount === void 0 ? originalPrice : Number(variant.finalPrice?.amount);
+    const subtotalAmount = originalPrice * quantity;
+    const totalAmount = finalPrice * quantity;
     return {
       id: `temp-line-${index}-${variant.id}`,
       // Temporary ID for pre-cart lines
@@ -156,7 +175,7 @@ function normalizeAddToCartLines(lines) {
       customAttributes: line.attributes || [],
       variant: {
         id: variant.id,
-        price,
+        price: finalPrice,
         listPrice: variant.compareAtPrice?.amount ? Number(variant.compareAtPrice.amount) : 0,
         sku: variant.sku || "",
         name: variant.title || "",
@@ -187,15 +206,16 @@ function createMockCartFromLines(lines, existingCart) {
   const normalizedLines = normalizeAddToCartLines(lines);
   const subtotalPrice = normalizedLines.reduce((sum, line) => sum + line.subtotalAmount, 0);
   const totalPrice = normalizedLines.reduce((sum, line) => sum + line.totalAmount, 0);
+  const currency = lines[0]?.variant?.price?.currencyCode;
   return {
     id: existingCart?.id || "temp-cart-id",
     customerId: existingCart?.customerId,
     email: existingCart?.email,
     createdAt: existingCart?.createdAt || (/* @__PURE__ */ new Date()).toISOString(),
-    currency: existingCart?.currency || { code: "USD" },
+    currency: existingCart?.currency || { code: currency },
     taxesIncluded: existingCart?.taxesIncluded,
     lineItems: normalizedLines,
-    totallineItemsDiscount: 0,
+    totalLineItemsDiscount: 0,
     orderDiscounts: 0,
     lineItemsSubtotalPrice: subtotalPrice,
     subtotalPrice,
@@ -226,16 +246,6 @@ var getQuery = () => {
   }
   return theRequest;
 };
-function atobID(id) {
-  if (id && typeof id === "string" && id.includes("/")) {
-    return id.split("/").pop()?.split("?")?.shift();
-  } else {
-    return id;
-  }
-}
-function btoaID(id, type = "ProductVariant") {
-  return `gid://shopify/${type}/${id}`;
-}
 var getMatchedMainProductSubTotal = (cartData, variant_list, main_product) => {
   const isAllStoreVariant = main_product?.all_store_variant ?? false;
   const matchedList = cartData?.lineItems?.filter((line) => {
@@ -467,43 +477,29 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
     }
     return { activeCampaign: null, subtotal: 0 };
   }, [autoFreeGiftConfig, effectiveCart, tags, dealsType]);
-  const { qualifyingGift, nextTierGoal } = useMemo(() => {
+  const { qualifyingTier, nextTierGoal, actualThreshold, currentCurrency } = useMemo(() => {
     if (!activeCampaign || !activeCampaign.rule_result?.spend_get_reward?.gift_product) {
-      return { qualifyingGift: null, nextTierGoal: null };
+      return { qualifyingTier: null, nextTierGoal: null, actualThreshold: 0, currentCurrency: "" };
     }
     const giftTiers = activeCampaign.rule_result.spend_get_reward.gift_product;
-    const qualifyingTier = [...giftTiers].sort((a, b) => Number(b.spend_sum_money) - Number(a.spend_sum_money)).find((tier) => subtotal >= Number(tier.spend_sum_money));
-    const nextGoal = giftTiers.find((tier) => subtotal < Number(tier.spend_sum_money));
-    if (!qualifyingTier) {
-      return { qualifyingGift: null, nextTierGoal: nextGoal || null };
-    }
-    const formattedGift = {
-      tier: qualifyingTier,
-      itemsToAdd: qualifyingTier.reward_list?.map((reward) => {
-        const giftProduct = reward?.variant_list?.[0];
-        if (!giftProduct) return null;
-        return {
-          variant: {
-            id: btoaID(giftProduct.variant_id),
-            handle: giftProduct.handle,
-            sku: giftProduct.sku
-          },
-          quantity: reward?.get_unit || 1,
-          attributes: [
-            {
-              key: CUSTOMER_ATTRIBUTE_KEY,
-              value: JSON.stringify({
-                is_gift: true,
-                rule_id: activeCampaign.rule_id,
-                spend_sum_money: qualifyingTier.spend_sum_money
-              })
-            }
-          ]
-        };
-      }).filter((item) => item !== null)
+    const currentCurrency2 = effectiveCart?.currency?.code || "";
+    console.log("currentCurrency useCalcAutoFreeGift", effectiveCart, currentCurrency2);
+    const getThresholdAmount = (tier) => {
+      if (tier.spend_sum_money_multi_markets?.[currentCurrency2]?.value) {
+        return Number(tier.spend_sum_money_multi_markets[currentCurrency2].value);
+      }
+      return Number(tier.spend_sum_money || 0);
     };
-    return { qualifyingGift: formattedGift, nextTierGoal: nextGoal || null };
-  }, [activeCampaign, subtotal]);
+    const qualifyingTier2 = [...giftTiers].sort((a, b) => getThresholdAmount(b) - getThresholdAmount(a)).find((tier) => subtotal >= getThresholdAmount(tier));
+    const nextGoal = giftTiers.find((tier) => subtotal < getThresholdAmount(tier));
+    const actualThreshold2 = qualifyingTier2 ? getThresholdAmount(qualifyingTier2) : 0;
+    return {
+      qualifyingTier: qualifyingTier2,
+      nextTierGoal: nextGoal || null,
+      actualThreshold: actualThreshold2,
+      currentCurrency: currentCurrency2
+    };
+  }, [activeCampaign, subtotal, effectiveCart]);
   const giftHandles = useMemo(() => {
     const giftVariant = autoFreeGiftConfig.map(
       (item) => item.rule_result?.spend_get_reward?.gift_product?.map(
@@ -519,24 +515,82 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
     }
     return true;
   }, [giftHandles]);
-  const { data: giftProductsResult } = useSWR(shouldFetch ? giftHandles : null, async () => {
-    const res = await getProductsByHandles(client, {
-      handles: giftHandles,
-      locale
-    });
-    const result = Array.isArray(res) ? res : [];
-    giftProductsCache.current = {
-      data: result,
-      giftHandles: [...giftHandles]
-    };
-    return result;
-  });
+  const { data: giftProductsResult } = useSWR(
+    shouldFetch ? giftHandles : null,
+    async () => {
+      const res = await getProductsByHandles(client, {
+        handles: giftHandles,
+        locale
+      });
+      const result = Array.isArray(res) ? res : [];
+      giftProductsCache.current = {
+        data: result,
+        giftHandles: [...giftHandles]
+      };
+      return result;
+    },
+    {
+      revalidateOnFocus: false
+    }
+  );
   const finalGiftProductsResult = useMemo(() => {
     if (giftProductsCache.current && !shouldFetch) {
       return giftProductsCache.current.data || void 0;
     }
     return giftProductsResult;
   }, [giftProductsResult, shouldFetch]);
+  const qualifyingGift = useMemo(() => {
+    if (!qualifyingTier || !activeCampaign) {
+      return null;
+    }
+    const itemsToAdd = qualifyingTier.reward_list?.map((reward) => {
+      if (!reward.variant_list || reward.variant_list.length === 0) {
+        return null;
+      }
+      let selectedGiftProduct = null;
+      for (const giftVariant of reward.variant_list) {
+        const productInfo = finalGiftProductsResult?.find(
+          (p) => p.handle === giftVariant.handle
+        );
+        if (productInfo) {
+          const variantInfo = productInfo.variants?.find((v) => v.sku === giftVariant.sku);
+          if (variantInfo?.availableForSale) {
+            selectedGiftProduct = giftVariant;
+            break;
+          }
+        }
+      }
+      if (!selectedGiftProduct) {
+        selectedGiftProduct = reward.variant_list[0];
+      }
+      return {
+        variant: {
+          id: btoaID(selectedGiftProduct.variant_id),
+          handle: selectedGiftProduct.handle,
+          sku: selectedGiftProduct.sku
+        },
+        quantity: reward?.get_unit || 1,
+        attributes: [
+          {
+            key: CUSTOMER_ATTRIBUTE_KEY,
+            value: JSON.stringify({
+              is_gift: true,
+              rule_id: activeCampaign.rule_id,
+              spend_sum_money: actualThreshold,
+              // 使用实际的门槛金额（多币种支持）
+              currency_code: currentCurrency
+              // 记录当前币种
+            })
+          }
+        ]
+      };
+    }).filter((item) => item !== null);
+    const formattedGift = {
+      tier: qualifyingTier,
+      itemsToAdd
+    };
+    return formattedGift;
+  }, [qualifyingTier, activeCampaign, finalGiftProductsResult, actualThreshold, currentCurrency]);
   return {
     qualifyingGift,
     nextTierGoal,
@@ -583,12 +637,14 @@ var useScriptAutoFreeGift = ({
       upgrade_multiple2 = 1.2;
       upgrade_value2 = 40;
     }
-    effectiveCart?.lineItems?.forEach(({ customAttributes }) => {
-      customAttributes?.forEach(({ key, value }) => {
-        if (key === "_amount_upgrade_multiple") upgrade_multiple2 = Number(value) || 1;
-        if (key === "_amount_upgrade_value") upgrade_value2 = Number(value) || 0;
-      });
-    });
+    effectiveCart?.lineItems?.forEach(
+      ({ customAttributes }) => {
+        customAttributes?.forEach(({ key, value }) => {
+          if (key === "_amount_upgrade_multiple") upgrade_multiple2 = Number(value) || 1;
+          if (key === "_amount_upgrade_value") upgrade_value2 = Number(value) || 0;
+        });
+      }
+    );
     return [upgrade_multiple2, upgrade_value2];
   }, [effectiveCart?.lineItems, points_subscribe]);
   const breakpoints = useMemo(() => {
@@ -653,18 +709,24 @@ var useScriptAutoFreeGift = ({
     const nextLevel = levelIndex > 0 ? sortedLevels[levelIndex - 1] ?? null : null;
     return [currentLevel, nextLevel];
   }, [breakpoints, involvedSubTotal, involvedLines.length]);
-  const { data: giftProductsResult } = useSWR(shouldFetch ? giftHandles : null, async () => {
-    const res = await getProductsByHandles(client, {
-      handles: giftHandles,
-      locale
-    });
-    const result = Array.isArray(res) ? res : [];
-    giftProductsCache.current = {
-      data: result,
-      giftHandles: [...giftHandles]
-    };
-    return result;
-  });
+  const { data: giftProductsResult } = useSWR(
+    shouldFetch ? giftHandles : null,
+    async () => {
+      const res = await getProductsByHandles(client, {
+        handles: giftHandles,
+        locale
+      });
+      const result = Array.isArray(res) ? res : [];
+      giftProductsCache.current = {
+        data: result,
+        giftHandles: [...giftHandles]
+      };
+      return result;
+    },
+    {
+      revalidateOnFocus: false
+    }
+  );
   const finalGiftProductsResult = useMemo(() => {
     if (giftProductsCache.current && !shouldFetch) {
       return giftProductsCache.current.data || void 0;
@@ -731,11 +793,23 @@ function useAddCartLines(options) {
   const { mutateCart, metafieldIdentifiers } = useCartContext();
   const addLines = useCallback(
     async (_key, { arg }) => {
-      let updatedCart = await addCartLines(client, {
-        ...arg,
-        metafieldIdentifiers,
-        cookieAdapter: cartCookieAdapter
-      });
+      const { cartId, lines } = arg;
+      const id = cartId || cartCookieAdapter?.getCartId(locale);
+      let updatedCart;
+      if (!id) {
+        updatedCart = await createCart(client, {
+          lines,
+          metafieldIdentifiers,
+          cookieAdapter: cartCookieAdapter
+        });
+      } else {
+        updatedCart = await addCartLines(client, {
+          cartId: id,
+          lines,
+          metafieldIdentifiers,
+          cookieAdapter: cartCookieAdapter
+        });
+      }
       if (updatedCart) {
         const unApplicableCodes = updatedCart.discountCodes.filter((item) => !item.applicable).map((item) => item.code);
         if (unApplicableCodes.length > 0) {
@@ -782,7 +856,7 @@ var trackAddToCartGA = ({
   const currencyCode = variant.product?.price?.currencyCode;
   const totalPrice = lineItems?.reduce(
     (prev, { variant: variant2 }) => prev.plus(
-      variant2?.finalPrice?.amount ?? variant2?.compareAtPrice?.amount ?? variant2?.price?.amount ?? 0
+      variant2?.finalPrice?.amount === void 0 ? Number(variant2?.price?.amount) || 0 : Number(variant2?.finalPrice?.amount) || 0
     ),
     new Decimal2(0)
   ).toNumber();
@@ -817,7 +891,7 @@ var trackBeginCheckoutGA = ({
   }
   const totalPrice = lineItems?.reduce(
     (prev, { variant }) => prev.plus(
-      variant?.finalPrice?.amount ?? variant?.compareAtPrice?.amount ?? variant?.price?.amount ?? 0
+      variant?.finalPrice?.amount === void 0 ? Number(variant?.price?.amount) || 0 : Number(variant?.finalPrice?.amount) || 0
     ),
     new Decimal2(0)
   ).toNumber();
@@ -850,10 +924,10 @@ var trackBuyNowGA = ({
     return;
   }
   const { variant } = lineItems[0];
-  const currencyCode = variant.price?.currencyCode;
+  const currencyCode = variant.product?.price?.currencyCode || variant.price?.currencyCode;
   const totalPrice = lineItems?.reduce(
     (prev, { variant: variant2 }) => prev.plus(
-      variant2?.finalPrice?.amount ?? variant2?.compareAtPrice?.amount ?? (variant2?.price?.amount || 0)
+      variant2?.finalPrice?.amount === void 0 ? Number(variant2?.price?.amount) || 0 : Number(variant2?.finalPrice?.amount) || 0
     ),
     new Decimal2(0)
   ).toNumber();
@@ -927,7 +1001,7 @@ function useApplyCartCodes(options) {
       if (!discountCodes?.length) {
         throw new Error("Invalid input used for this operation: Miss discountCode");
       }
-      const cartId = providedCartId ? void 0 : providedCartId || cart?.id;
+      const cartId = providedCartId || cart?.id;
       if (!cartId) {
         return void 0;
       }
@@ -940,12 +1014,18 @@ function useApplyCartCodes(options) {
         cookieAdapter: cartCookieAdapter,
         metafieldIdentifiers
       });
+      const unApplicableCodes = discountCodes.filter(
+        (code) => updatedCart?.discountCodes?.find((item) => item.code === code && !item.applicable)
+      );
+      if (unApplicableCodes.length) {
+        throw new Error(`${unApplicableCodes.join(", ")} is not applicable to the cart`);
+      }
       if (updatedCart) {
         mutateCart(updatedCart);
       }
       return updatedCart;
     },
-    [client, locale, cartCookieAdapter, mutateCart, cart]
+    [client, locale, cartCookieAdapter, mutateCart, cart, metafieldIdentifiers]
   );
   return useSWRMutation("apply-codes", applyCodes, options);
 }
@@ -955,7 +1035,7 @@ function useRemoveCartCodes(options) {
   const removeCodes = useCallback(
     async (_key, { arg }) => {
       const { cartId: providedCartId, discountCodes } = arg;
-      const cartId = providedCartId ? void 0 : providedCartId || cart?.id;
+      const cartId = providedCartId || cart?.id;
       const codes = cart?.discountCodes?.filter((code) => !!code.applicable) || [];
       const leftCodes = codes.filter((code) => discountCodes?.length ? !discountCodes.includes(code.code) : code.code).map((code) => code.code);
       const updatedCart = await updateCartCodes(client, {
@@ -969,18 +1049,74 @@ function useRemoveCartCodes(options) {
       }
       return updatedCart;
     },
-    [client, locale, cartCookieAdapter, mutateCart, cart]
+    [client, locale, cartCookieAdapter, mutateCart, cart, metafieldIdentifiers]
   );
   return useSWRMutation("remove-codes", removeCodes, options);
 }
 
+// src/hooks/cart/utils/add-to-cart.ts
+var getLinesWithAttributes = ({
+  cart,
+  lineItems
+}) => {
+  return lineItems.map((line) => {
+    const sameLineInCart = cart?.lineItems.find(
+      (lineInCart) => lineInCart.variant.sku === line.variant?.sku && lineInCart.product?.handle === line.variant?.product?.handle
+    );
+    const codeAmountAttribute = sameLineInCart?.customAttributes?.find(
+      (attr) => attr.key === CODE_AMOUNT_KEY
+    );
+    const scriptCodeAmountAttribute = sameLineInCart?.customAttributes?.find(
+      (attr) => attr.key === SCRIPT_CODE_AMOUNT_KEY
+    );
+    let functionAttribute = null;
+    try {
+      functionAttribute = sameLineInCart?.customAttributes?.find(
+        (attr) => attr.key === CUSTOMER_ATTRIBUTE_KEY && JSON.parse(attr.value)?.discounted_amount
+      );
+    } catch (error) {
+    }
+    if (codeAmountAttribute || functionAttribute || scriptCodeAmountAttribute) {
+      return {
+        ...line,
+        attributes: [
+          ...line.attributes || [],
+          codeAmountAttribute,
+          functionAttribute,
+          scriptCodeAmountAttribute
+        ].filter(Boolean)
+      };
+    }
+    return line;
+  });
+};
+var getLinesWithFunctionAttributes = (lineItems) => {
+  return lineItems.map((line) => {
+    let itemAttributes = line.attributes || [];
+    const functionEnvAttribute = itemAttributes.find((attr) => attr.key === CUSTOMER_ATTRIBUTE_KEY);
+    if (!functionEnvAttribute) {
+      itemAttributes = itemAttributes.concat([
+        {
+          key: CUSTOMER_ATTRIBUTE_KEY,
+          value: JSON.stringify({
+            is_gift: false,
+            discounted_amount: line.variant?.finalPrice?.amount === void 0 ? Number(line.variant?.price?.amount) * (line.quantity || 1) : Number(line.variant?.finalPrice?.amount) * (line.quantity || 1)
+          })
+        }
+      ]);
+    }
+    return { ...line, attributes: itemAttributes };
+  });
+};
+
 // src/hooks/cart/use-add-to-cart.ts
 function useAddToCart({ withTrack = true } = {}, swrOptions) {
-  const { client, config, locale, cartCookieAdapter, userAdapter } = useShopify();
-  const { cart } = useCartContext();
+  const { client, config, locale, cartCookieAdapter, userAdapter, performanceAdapter } = useShopify();
+  const { cart, addCustomAttributes } = useCartContext();
   const { trigger: applyCartCodes } = useApplyCartCodes();
   const { trigger: removeInvalidCodes } = useRemoveCartCodes();
   const { trigger: addCartLines2 } = useAddCartLines();
+  const { trigger: createCart4 } = useCreateCart();
   const addToCart = useCallback(
     async (_key, { arg }) => {
       const {
@@ -991,12 +1127,19 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
         buyerIdentity,
         needCreateCart = false,
         onCodesInvalid,
-        replaceExistingCodes
+        replaceExistingCodes,
+        customAttributes
       } = arg;
       if (!lineItems || lineItems.length === 0) {
         return;
       }
-      const lines = lineItems.map((item) => ({
+      performanceAdapter?.addToCartStart();
+      const linesWithAttributes = getLinesWithAttributes({
+        cart,
+        lineItems
+      });
+      const linesWithFunctionAttributes = getLinesWithFunctionAttributes(linesWithAttributes);
+      const lines = linesWithFunctionAttributes.map((item) => ({
         merchandiseId: item.variant?.id || "",
         quantity: item.quantity || 1,
         attributes: item.attributes,
@@ -1005,36 +1148,45 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
       if (lines.length === 0) {
         return;
       }
-      const cartId = needCreateCart ? void 0 : providedCartId || cart?.id;
-      let resultCart = await addCartLines2({
-        cartId,
-        lines,
-        buyerIdentity
-      });
-      if (!resultCart) {
-        return void 0;
-      }
-      console.log("npm addCartLines resultCart", resultCart);
-      if (resultCart.discountCodes && resultCart.discountCodes.length > 0) {
-        const unapplicableCodes = resultCart.discountCodes.filter((item) => !item.applicable).map((item) => item.code);
-        if (unapplicableCodes.length > 0) {
-          if (onCodesInvalid) {
-            const handledCart = await onCodesInvalid(resultCart, unapplicableCodes);
-            if (handledCart) {
-              resultCart = handledCart;
+      let cartId = needCreateCart ? void 0 : providedCartId || cart?.id;
+      let resultCart = null;
+      if (!cartId) {
+        resultCart = await createCart4({
+          lines,
+          buyerIdentity,
+          discountCodes,
+          customAttributes
+        });
+      } else {
+        resultCart = await addCartLines2({
+          cartId,
+          lines
+        });
+        console.log("npm addCartLines resultCart", resultCart);
+        if (resultCart && resultCart.discountCodes && resultCart.discountCodes.length > 0) {
+          const unapplicableCodes = resultCart.discountCodes.filter((item) => !item.applicable).map((item) => item.code);
+          if (unapplicableCodes.length > 0) {
+            if (onCodesInvalid) {
+              const handledCart = await onCodesInvalid(resultCart, unapplicableCodes);
+              if (handledCart) {
+                resultCart = handledCart;
+              }
+            } else {
+              await removeInvalidCodes({
+                discountCodes: unapplicableCodes
+              });
             }
-          } else {
-            await removeInvalidCodes({
-              discountCodes: unapplicableCodes
-            });
           }
         }
-      }
-      if (discountCodes && discountCodes.length > 0) {
-        applyCartCodes({
-          replaceExistingCodes,
-          discountCodes
-        });
+        if (resultCart && discountCodes && discountCodes.length > 0) {
+          applyCartCodes({
+            replaceExistingCodes,
+            discountCodes
+          });
+        }
+        if (customAttributes && customAttributes.length > 0) {
+          addCustomAttributes(customAttributes);
+        }
       }
       if (withTrack) {
         trackAddToCartGA({
@@ -1043,9 +1195,24 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
         });
         trackAddToCartFBQ({ lineItems });
       }
+      performanceAdapter?.addToCartEnd();
       return resultCart;
     },
-    [client, locale, cartCookieAdapter, userAdapter, cart, withTrack]
+    [
+      client,
+      locale,
+      cartCookieAdapter,
+      userAdapter,
+      cart,
+      withTrack,
+      performanceAdapter,
+      createCart4,
+      addCartLines2,
+      applyCartCodes,
+      removeInvalidCodes,
+      addCustomAttributes,
+      config
+    ]
   );
   return useSWRMutation("add-to-cart", addToCart, swrOptions);
 }
@@ -1062,9 +1229,10 @@ function useUpdateCartLines(options) {
       if (updatedCart) {
         mutateCart(updatedCart);
       }
+      console.log("use-update-cart-lines updatedCart", metafieldIdentifiers, updatedCart);
       return updatedCart;
     },
-    [client, locale, cartCookieAdapter, mutateCart]
+    [client, locale, cartCookieAdapter, mutateCart, metafieldIdentifiers]
   );
   return useSWRMutation("update-cart-lines", updateLines, options);
 }
@@ -1103,7 +1271,7 @@ function useRemoveCartLines(options) {
       }
       return updatedCart;
     },
-    [client, locale, cartCookieAdapter, mutateCart]
+    [client, locale, cartCookieAdapter, mutateCart, metafieldIdentifiers]
   );
   return useSWRMutation("remove-cart-lines", removeLines, options);
 }
@@ -1122,7 +1290,7 @@ function useUpdateCartAttributes(mutate, metafieldIdentifiers, options) {
       }
       return updatedCart;
     },
-    [client, locale, cartCookieAdapter, mutate]
+    [client, locale, cartCookieAdapter, mutate, metafieldIdentifiers]
   );
   return useSWRMutation("update-cart-attributes", updateAttributes, options);
 }
@@ -1144,7 +1312,8 @@ function useBuyNow({ withTrack = true } = {}, swrOptions) {
       if (!lineItems || lineItems.length === 0) {
         return;
       }
-      const lines = lineItems.map((item) => ({
+      const linesWithFunctionAttributes = getLinesWithFunctionAttributes(lineItems);
+      const lines = linesWithFunctionAttributes.map((item) => ({
         merchandiseId: item.variant?.id || "",
         quantity: item.quantity || 1,
         attributes: item.attributes,
@@ -1262,7 +1431,7 @@ var useCalcOrderDiscount = (cart, orderDiscountConfig, customer) => {
   const isCustomerLoading = useMemo(() => !customer ? true : false, [customer]);
   const dealsType = "";
   const { activeCampaign, subtotal } = useMemo(() => {
-    for (const campaign of orderDiscountConfig) {
+    for (const campaign of orderDiscountConfig || []) {
       const { rule_conditions = [], result_detail } = campaign;
       const { main_product, order_discount_conf } = result_detail || {};
       const isPreCheckPassed = preCheck(rule_conditions, tags, []);
@@ -1292,9 +1461,12 @@ var useCalcOrderDiscount = (cart, orderDiscountConfig, customer) => {
         discountAmount: 0
       };
     }
-    const tieredDiscounts = activeCampaign.result_detail.order_discount_conf.tiered_discounts;
-    const qualifyingTier = [...tieredDiscounts].reverse().find((tier) => subtotal >= Number(tier.amount));
-    const nextGoal = tieredDiscounts.find((tier) => subtotal < Number(tier.amount));
+    const currentCurrency = cart?.currency?.code || "";
+    console.log("currentCurrency", cart, currentCurrency);
+    const orderDiscountConf = activeCampaign.result_detail.order_discount_conf;
+    const tieredDiscounts = orderDiscountConf.tiered_discounts_markets?.[currentCurrency] || orderDiscountConf.tiered_discounts;
+    const qualifyingTier = [...tieredDiscounts].sort((a, b) => Number(b.amount) - Number(a.amount)).find((tier) => subtotal >= Number(tier.amount));
+    const nextGoal = [...tieredDiscounts].sort((a, b) => Number(a.amount) - Number(b.amount)).find((tier) => subtotal < Number(tier.amount));
     if (!qualifyingTier) {
       return {
         qualifyingDiscount: null,
@@ -1362,12 +1534,10 @@ function useHasPlusMemberInCart({
     };
   }, [cart?.lineItems, plus_monthly_product, plus_annual_product]);
 }
-
-// src/hooks/cart/feature/use-cart-attributes.ts
 var getReferralAttributes = () => {
-  const inviteCode = Cookies5.get("invite_code");
-  const playModeId = Cookies5.get("playModeId");
-  const popup = Cookies5.get("_popup");
+  const inviteCode = getLocalStorage("inviteCode") || Cookies5.get("inviteCode");
+  const playModeId = getLocalStorage("playModeId") || Cookies5.get("playModeId");
+  const popup = getLocalStorage("_popup") || Cookies5.get("_popup");
   if (inviteCode && playModeId) {
     return popup ? [
       { key: "_invite_code", value: inviteCode ? inviteCode : "" },
@@ -1391,8 +1561,6 @@ var useCartAttributes = ({
     memberSetting,
     cart
   });
-  console.log("memberSetting", memberSetting);
-  console.log("hasPlusMember", hasPlusMember);
   useEffect(() => {
     setCurrentUrl(window.location.href);
   }, []);
@@ -1418,7 +1586,7 @@ var useCartAttributes = ({
     return "new_user_login";
   }, [customer]);
   const memberAttributes = useMemo(() => {
-    return [
+    const attributes = [
       {
         key: "_token",
         value: profile?.token
@@ -1439,17 +1607,28 @@ var useCartAttributes = ({
         value: profile?.token ? "true" : "false"
       }
     ];
+    if (profile?.token) {
+      attributes.push({
+        key: "_login_user",
+        value: "1"
+      });
+    }
+    return attributes;
   }, [profile?.memberType, profile?.token, userType, hasPlusMember]);
   const functionAttributes = useMemo(() => {
-    return [
-      cart?.discountCodes && {
+    const hasFunctionEnvAttribute = cart?.lineItems.some(
+      (item) => item.customAttributes?.some((attr) => attr.key === CUSTOMER_ATTRIBUTE_KEY)
+    );
+    const discountCodes = cart?.discountCodes.map((item) => item.code).filter((code) => code) || [];
+    return hasFunctionEnvAttribute ? [
+      {
         key: "_discounts_function_env",
         value: JSON.stringify({
-          discount_code: cart?.discountCodes.map((item) => item.code),
+          discount_code: discountCodes,
           user_tags: customer?.tags || []
         })
       }
-    ];
+    ] : [];
   }, [cart]);
   const presellAttributes = useMemo(() => {
     return [
@@ -1481,18 +1660,50 @@ var useCartAttributes = ({
       }
     ];
   }, [currentUrl]);
+  const commonAttributes = useMemo(
+    () => [
+      ...memberAttributes,
+      ...functionAttributes,
+      ...presellAttributes,
+      ...weightAttributes,
+      ...trackingAttributes,
+      ...getReferralAttributes()
+    ].filter((item) => item?.value),
+    [memberAttributes, functionAttributes, presellAttributes, weightAttributes, trackingAttributes]
+  );
+  const extraAttributesInCart = useMemo(() => {
+    const commonAttributeKeys = [
+      // member attributes
+      "_token",
+      "_member_type",
+      "_user_type",
+      "_is_login",
+      "_login_user",
+      // function attributes
+      "_discounts_function_env",
+      // presell attributes
+      "_presale",
+      // weight attributes
+      "_weight",
+      "_app_source_name",
+      // tracking attributes
+      "utm_params",
+      // referral attributes
+      "_invite_code",
+      "_play_mode_id",
+      "_popup"
+    ];
+    return cart?.customAttributes?.filter(
+      (item) => !commonAttributeKeys.includes(item.key)
+    ) || [];
+  }, [cart]);
   return useMemo(
     () => ({
-      attributes: [
-        ...memberAttributes,
-        ...functionAttributes,
-        ...presellAttributes,
-        ...weightAttributes,
-        ...trackingAttributes,
-        ...getReferralAttributes()
-      ].filter((item) => item?.value)
+      attributes: [...commonAttributes, ...extraAttributesInCart].filter(
+        (item) => item?.value
+      )
     }),
-    [memberAttributes, functionAttributes, presellAttributes, weightAttributes, trackingAttributes]
+    [commonAttributes, extraAttributesInCart]
   );
 };
 var DEFAULT_MIN = 1;
@@ -1555,7 +1766,7 @@ var useUpdateLineCodeAmountAttributes = ({
       );
       const functionEnvValue = getDiscountEnvAttributeValue(line.customAttributes);
       const hasSameFunctionEnvAttribute = Number(functionEnvValue.discounted_amount) === Number(line.totalAmount);
-      if (!hasSameFunctionEnvAttribute && hasFunctionEnvAttribute) {
+      if (!hasSameFunctionEnvAttribute && hasFunctionEnvAttribute && !functionEnvValue.is_gift) {
         attrNeedUpdate.push({
           key: CUSTOMER_ATTRIBUTE_KEY,
           value: JSON.stringify({
@@ -1594,29 +1805,22 @@ var useUpdateLineCodeAmountAttributes = ({
     }).filter(
       ({ attrNeedUpdate, attrNeedDelete }) => attrNeedUpdate.length || attrNeedDelete.length
     ).map(({ line, attrNeedUpdate, attrNeedDelete }) => {
+      let lineId = line.id;
+      let attributes = line.customAttributes || [];
+      if (attrNeedDelete.length) {
+        attributes = attributes.filter(
+          (attr) => !attrNeedDelete.includes(attr.key)
+        );
+      }
       if (attrNeedUpdate.length) {
-        return {
-          id: line.id,
-          attributes: [
-            ...line.customAttributes?.filter(
-              (attr) => !attrNeedUpdate.some((updateAttr) => updateAttr.key === attr.key)
-            ) || [],
-            ...attrNeedUpdate
-          ]
-        };
-      } else if (attrNeedDelete.length) {
-        return {
-          id: line.id,
-          attributes: line.customAttributes?.filter(
-            (attr) => !attrNeedDelete.includes(attr.key)
-          ) || []
-        };
-      } else {
-        return {
-          id: line.id,
-          attributes: line.customAttributes || []
-        };
+        attributes = attributes.filter(
+          (attr) => !attrNeedUpdate.some((updateAttr) => updateAttr.key === attr.key)
+        ).concat(attrNeedUpdate);
       }
+      return {
+        id: lineId,
+        attributes
+      };
     }),
     [cart?.lineItems, mainProductDiscountCodes]
   );
@@ -1709,8 +1913,9 @@ function useProductsByHandles(options = {}) {
         metafieldIdentifiers
       });
     },
-    swrOptions || {
-      revalidateOnFocus: false
+    {
+      revalidateOnFocus: false,
+      ...swrOptions
     }
   );
 }
@@ -2339,7 +2544,10 @@ var createInitialValue = () => ({
     freeShippingMethods: [],
     paymentShippingMethods: [],
     nddOverweight: false,
-    tddOverweight: false
+    tddOverweight: false,
+    nddCoupon: void 0,
+    tddCoupon: void 0,
+    isLoadingCoupon: false
   },
   selectedPlusMemberProduct: null,
   plusMemberProducts: [],
@@ -2384,15 +2592,29 @@ function usePlusAnnualProductVariant() {
   }, [plusMemberProducts, plusAnnual]);
   return plusAnnualProductVariant;
 }
-function useShippingMethods(options) {
-  const {
-    variant,
-    plusMemberMetafields,
-    selectedPlusMemberMode,
-    isPlus = false,
+var useAvailableDeliveryCoupon = ({
+  profile
+}) => {
+  const { data: availableDeliveryCoupon, isLoading } = useSWR(
+    profile?.email ? ["/api/multipass/subsrv/v1/prime/delivery_coupons/current/available", profile?.email] : void 0,
+    async ([apiPath]) => {
+      return fetch(apiPath).then((res) => res.json());
+    }
+  );
+  console.log("availableDeliveryCoupon", availableDeliveryCoupon);
+  const { ndd_coupon: nddCoupon, tdd_coupon: tddCoupon } = availableDeliveryCoupon?.data?.data || {};
+  return {
     nddCoupon,
-    tddCoupon
-  } = options;
+    tddCoupon,
+    isLoading
+  };
+};
+
+// src/hooks/member/plus/use-shipping-methods.ts
+function useShippingMethods(options) {
+  const { variant, plusMemberMetafields, selectedPlusMemberMode, isPlus = false, profile } = options;
+  const { nddCoupon, tddCoupon, isLoading } = useAvailableDeliveryCoupon({ profile });
+  console.log("nddCoupon", nddCoupon);
   const { plus_shipping, shippingMethod } = plusMemberMetafields || {};
   const nddOverweight = useMemo(() => {
     return (variant?.weight || 0) > (shippingMethod?.overWeight_ndd || Infinity);
@@ -2402,12 +2624,10 @@ function useShippingMethods(options) {
   }, [shippingMethod?.overWeight_tdd, variant?.weight]);
   const paymentShippingMethods = useMemo(() => {
     const weight = variant?.weight || 0;
-    const methods = plus_shipping?.shipping_methods?.filter(
-      ({ weight_low, weight_high, __mode, __plus }) => {
-        const fitWeight = (!weight_low || weight >= weight_low) && (!weight_high || weight <= weight_high);
-        return __mode !== "free" /* FREE */ && !__plus && fitWeight;
-      }
-    ) || [];
+    const methods = plus_shipping?.shipping_methods?.filter(({ weight_low, weight_high, __mode, __plus }) => {
+      const fitWeight = (!weight_low || weight >= weight_low) && (!weight_high || weight <= weight_high);
+      return __mode !== "free" /* FREE */ && !__plus && fitWeight;
+    }) || [];
     return methods.map((method) => {
       let disabled = false;
       const selectedFreeMember = selectedPlusMemberMode === "free";
@@ -2434,40 +2654,34 @@ function useShippingMethods(options) {
   ]);
   const nddPrice = useMemo(() => {
     const weight = variant?.weight || 0;
-    const nddMethod = paymentShippingMethods.find(
-      ({ __mode, weight_high, weight_low }) => {
-        const fitWeight = (!weight_low || weight >= weight_low) && (!weight_high || weight <= weight_high);
-        return __mode === "ndd" && fitWeight;
-      }
-    );
+    const nddMethod = paymentShippingMethods.find(({ __mode, weight_high, weight_low }) => {
+      const fitWeight = (!weight_low || weight >= weight_low) && (!weight_high || weight <= weight_high);
+      return __mode === "ndd" && fitWeight;
+    });
     return nddMethod?.price || 0;
   }, [variant?.weight, paymentShippingMethods]);
   const tddPrice = useMemo(() => {
     const weight = variant?.weight || 0;
-    const tddMethod = paymentShippingMethods.find(
-      ({ __mode, weight_high, weight_low }) => {
-        const fitWeight = (!weight_low || weight >= weight_low) && (!weight_high || weight <= weight_high);
-        return __mode === "tdd" && fitWeight;
-      }
-    );
+    const tddMethod = paymentShippingMethods.find(({ __mode, weight_high, weight_low }) => {
+      const fitWeight = (!weight_low || weight >= weight_low) && (!weight_high || weight <= weight_high);
+      return __mode === "tdd" && fitWeight;
+    });
     return tddMethod?.price || 0;
   }, [variant?.weight, paymentShippingMethods]);
   const freeShippingMethods = useMemo(() => {
     const weight = variant?.weight || 0;
-    let methods = plus_shipping?.shipping_methods?.filter(
-      ({ __mode, __plus, weight_low, weight_high }) => {
-        if (__mode === "free" /* FREE */) {
-          return true;
-        }
-        if (isPlus) {
-          const hasCoupon = isPlus && __mode === "ndd" /* NDD */ && nddCoupon || isPlus && __mode === "tdd" /* TDD */ && (tddCoupon || nddCoupon);
-          const fitWeight = (!weight_low || weight >= weight_low) && (!weight_high || weight <= weight_high);
-          return hasCoupon && fitWeight && !__plus;
-        } else {
-          return __plus;
-        }
+    let methods = plus_shipping?.shipping_methods?.filter(({ __mode, __plus, weight_low, weight_high }) => {
+      if (__mode === "free" /* FREE */) {
+        return true;
       }
-    ) || [];
+      if (isPlus) {
+        const hasCoupon = isPlus && __mode === "ndd" /* NDD */ && nddCoupon || isPlus && __mode === "tdd" /* TDD */ && (tddCoupon || nddCoupon);
+        const fitWeight = (!weight_low || weight >= weight_low) && (!weight_high || weight <= weight_high);
+        return hasCoupon && fitWeight && !__plus;
+      } else {
+        return __plus;
+      }
+    }) || [];
     if (isPlus) {
       methods = methods.sort((a, b) => {
         if (b.__mode === "free" /* FREE */) return -1;
@@ -2521,7 +2735,10 @@ function useShippingMethods(options) {
     freeShippingMethods,
     paymentShippingMethods,
     nddOverweight,
-    tddOverweight
+    tddOverweight,
+    nddCoupon,
+    tddCoupon,
+    isLoadingCoupon: isLoading
   };
 }
 function useShippingMethodAvailableCheck() {
@@ -2626,6 +2843,73 @@ var usePlusMemberDeliveryCodes = ({
     [deliveryData]
   );
 };
+function useUpdateCartDeliveryOptions(mutate, metafieldIdentifiers, options) {
+  const { client, locale, cartCookieAdapter } = useShopify();
+  const updateDeliveryOptions = useCallback(
+    async (_key, { arg }) => {
+      const updatedCart = await updateCartDeliveryOptions(client, {
+        ...arg,
+        metafieldIdentifiers,
+        cookieAdapter: cartCookieAdapter
+      });
+      console.log("useUpdateCartDeliveryOptions updatedCart", updatedCart);
+      if (updatedCart) {
+        mutate(updatedCart);
+      }
+      return updatedCart;
+    },
+    [client, locale, cartCookieAdapter, mutate, metafieldIdentifiers]
+  );
+  return useSWRMutation("update-cart-delivery-options", updateDeliveryOptions, options);
+}
+
+// src/hooks/member/plus/use-update-plus-member-delivery-options.ts
+var useUpdatePlusMemberDeliveryOptions = ({
+  options
+} = {}) => {
+  const { cart: cartContextData, mutateCart, metafieldIdentifiers } = useCartContext();
+  const { trigger: updateCartDeliveryOptions2 } = useUpdateCartDeliveryOptions(
+    mutateCart,
+    metafieldIdentifiers
+  );
+  const handler = useCallback(
+    async (_, { arg }) => {
+      const currentCart = arg?.cart || cartContextData;
+      const { deliveryData } = arg;
+      const firstDeliveryGroup = currentCart?.deliveryGroups?.[0];
+      const deliveryGroupId = firstDeliveryGroup?.id;
+      const selectedOptionCode = deliveryData?.deliveryCustomData?.selected_delivery_option?.code;
+      if (!deliveryGroupId || !selectedOptionCode || selectedOptionCode === firstDeliveryGroup?.selectedDeliveryOption?.code) {
+        return null;
+      }
+      const deliveryGroup = currentCart?.deliveryGroups?.find(
+        (group) => group?.id === deliveryGroupId
+      );
+      const matchedOption = deliveryGroup?.deliveryOptions?.find(
+        (option) => option?.code === selectedOptionCode
+      );
+      if (!matchedOption?.handle) {
+        return null;
+      }
+      const deliveryOptions = [
+        {
+          deliveryGroupId,
+          deliveryOptionHandle: matchedOption.handle
+        }
+      ];
+      const updatedCart = await updateCartDeliveryOptions2({
+        selectedDeliveryOptions: deliveryOptions,
+        cartId: currentCart?.id
+      });
+      if (updatedCart && mutateCart) {
+        mutateCart(updatedCart);
+      }
+      return updatedCart;
+    },
+    [cartContextData, updateCartDeliveryOptions2, mutateCart]
+  );
+  return useSWRMutation("update-cart-delivery-options", handler, options);
+};
 var usePlusMemberItemCustomAttributes = ({
   deliveryData
 }) => {
@@ -2645,48 +2929,18 @@ var usePlusMemberCheckoutCustomAttributes = ({
   deliveryData,
   product,
   variant,
-  customer,
   isShowShippingBenefits
 }) => {
   const { deliveryCustomData } = deliveryData || {};
   const { profile } = usePlusMemberContext();
-  const userType = useMemo(() => {
-    const customerInfo = customer;
-    if (!customerInfo) {
-      return "new_user_unlogin";
-    }
-    if (customer) {
-      const { orders = {} } = customer;
-      const edgesLength = orders?.edges?.length;
-      if (edgesLength === 1) {
-        return "old_user_orders_once";
-      } else if (edgesLength && edgesLength > 1) {
-        return "old_user_orders_twice";
-      }
-    }
-    return "new_user_login";
-  }, [customer]);
   return useMemo(() => {
     const checkoutCustomAttributes = [
-      {
-        key: "_token",
-        value: profile?.token || ""
-      },
+      // _last_url: 付费会员结算完成之后 checkout 有一个继续购买的按钮, 用于跳转到继续购买的页面
       {
         key: "_last_url",
         value: typeof window !== "undefined" ? window.location.origin + window.location.pathname : ""
-      },
-      {
-        key: "_user_type",
-        value: userType
       }
     ];
-    if (profile) {
-      checkoutCustomAttributes.push({
-        key: "_login_user",
-        value: "1"
-      });
-    }
     if (deliveryCustomData) {
       checkoutCustomAttributes.push({
         key: "_checkout_delivery_custom",
@@ -2696,12 +2950,6 @@ var usePlusMemberCheckoutCustomAttributes = ({
         })
       });
     }
-    if (variant?.metafields?.presell) {
-      checkoutCustomAttributes.push({
-        key: "_presale",
-        value: "true"
-      });
-    }
     if (isShowShippingBenefits && !isShowShippingBenefits({ variant, product, setting: {} })) {
       checkoutCustomAttributes.push({
         key: "_hide_shipping",
@@ -2709,18 +2957,17 @@ var usePlusMemberCheckoutCustomAttributes = ({
       });
     }
     return checkoutCustomAttributes;
-  }, [deliveryCustomData, product, profile, userType, variant, isShowShippingBenefits]);
+  }, [deliveryCustomData, product, profile, variant, isShowShippingBenefits]);
 };
 function useAutoRemovePlusMemberInCart({
-  metafields,
-  isMonthlyPlus,
-  isAnnualPlus
+  cart,
+  profile,
+  memberSetting
 }) {
-  const { plus_monthly_product, plus_annual_product } = metafields || {};
-  const { cart } = useCartContext();
+  const { plus_monthly_product, plus_annual_product } = memberSetting || {};
   const { trigger: removeCartLines2 } = useRemoveCartLines();
   useEffect(() => {
-    if (!cart) return;
+    if (!cart || !plus_monthly_product || !plus_annual_product) return;
     const removePlusProduct = async (productType) => {
       if (!productType) return;
       const product = cart.lineItems?.find(
@@ -2732,33 +2979,25 @@ function useAutoRemovePlusMemberInCart({
         });
       }
     };
-    if (isMonthlyPlus) {
+    if (profile?.isMonthlyPlus) {
       removePlusProduct(plus_monthly_product);
     }
-    if (isAnnualPlus) {
+    if (profile?.isAnnualPlus) {
       removePlusProduct(plus_annual_product);
     }
-  }, [
-    cart,
-    plus_annual_product,
-    plus_monthly_product,
-    isAnnualPlus,
-    isMonthlyPlus,
-    removeCartLines2
-  ]);
+  }, [cart, plus_annual_product, plus_monthly_product, profile, removeCartLines2]);
 }
-function useAddPlusMemberProductsToCart({
+function usePlusMemberNeedAddToCart({
   cart,
-  memberSetting,
-  selectedPlusMemberMode,
-  selectedPlusMemberProduct
+  profile
 }) {
+  const { selectedPlusMemberMode, selectedPlusMemberProduct, plusMemberMetafields } = usePlusMemberContext();
   const { hasMonthlyPlus, hasAnnualPlus } = useHasPlusMemberInCart({
-    cart,
-    memberSetting
+    memberSetting: plusMemberMetafields,
+    cart
   });
   const plusMemberProduct = useMemo(() => {
-    if (selectedPlusMemberMode === "free" /* FREE */) {
+    if (!selectedPlusMemberProduct || selectedPlusMemberMode === "free" /* FREE */) {
       return void 0;
     }
     if (selectedPlusMemberMode === "monthly" /* MONTHLY */ && hasMonthlyPlus) {
@@ -2767,7 +3006,10 @@ function useAddPlusMemberProductsToCart({
     if (selectedPlusMemberMode === "annual" /* ANNUAL */ && hasAnnualPlus) {
       return void 0;
     }
-    if (!selectedPlusMemberProduct) {
+    if (profile?.isMonthlyPlus && selectedPlusMemberMode === "monthly" /* MONTHLY */) {
+      return void 0;
+    }
+    if (profile?.isAnnualPlus && selectedPlusMemberMode === "annual" /* ANNUAL */) {
       return void 0;
     }
     return selectedPlusMemberProduct;
@@ -2786,9 +3028,9 @@ var PlusMemberProvider = ({
   memberSetting,
   initialSelectedPlusMemberMode = "free",
   profile,
-  locale,
   children
 }) => {
+  const { locale } = useShopify();
   const [zipCode, setZipCode] = useState("");
   const [showTip, setShowTip] = useState(false);
   const [selectedPlusMemberMode, setSelectedPlusMemberMode] = useState(
@@ -2804,7 +3046,11 @@ var PlusMemberProvider = ({
   const shippingMethodsContext = useShippingMethods({
     variant,
     plusMemberMetafields: memberSetting,
-    selectedPlusMemberMode});
+    selectedPlusMemberMode,
+    profile,
+    isPlus: profile?.isPlus || false
+  });
+  console.log("shippingMethodsContext", shippingMethodsContext);
   const plusMemberHandles = useMemo(() => {
     return [
       memberSetting?.plus_monthly_product?.handle,
@@ -3086,8 +3332,13 @@ function CartProvider({
   const { attributes } = useCartAttributes({ profile, customer, cart, memberSetting });
   useRequest(
     () => {
-      const newAttributes = [...attributes, ...customAttributes];
-      const needUpdate = cart && !checkAttributesUpdateNeeded(
+      const newAttributes = [...attributes];
+      customAttributes.forEach((item) => {
+        if (item.value && !newAttributes.some((attr) => attr.key === item.key)) {
+          newAttributes.push(item);
+        }
+      });
+      const needUpdate = cart && checkAttributesUpdateNeeded(
         cart.customAttributes,
         newAttributes,
         customAttributesNeedDelete
@@ -3110,7 +3361,8 @@ function CartProvider({
     cart,
     mutateCart,
     isCartLoading: isCartLoading || isCodeChanging,
-    setLoadingState
+    setLoadingState,
+    metafieldIdentifiers
   });
   const removeCustomAttributes = useCallback(
     (attributes2) => {
@@ -3191,8 +3443,14 @@ function CartProvider({
     );
     return result;
   }, [cart?.lineItems, scriptAutoFreeGift, functionAutoFreeGift]);
+  const totalQuantity = useMemo(() => {
+    const cartLinesCount = cart?.lineItems.reduce((acc, item) => acc + item.quantity, 0) || 0;
+    const giftLinesCount = giftNeedAddToCartLines?.reduce((acc, item) => acc + (item.quantity || 1), 0) || 0;
+    return cartLinesCount + giftLinesCount;
+  }, [cart?.lineItems, giftNeedAddToCartLines]);
   const value = useMemo(
     () => ({
+      totalQuantity,
       cart,
       isCartLoading,
       triggerFetch: fetchCart,
@@ -3220,6 +3478,7 @@ function CartProvider({
     }),
     [
       cart,
+      totalQuantity,
       isCartLoading,
       fetchCart,
       mutateCart,
@@ -3244,14 +3503,14 @@ function CartProvider({
   );
   return /* @__PURE__ */ jsx(CartContext.Provider, { value, children });
 }
-function useCartContext() {
+function useCartContext(options) {
   const context = useContext(CartContext);
-  if (!context) {
+  if (!context && !options?.optional) {
     throw new Error("useCartContext must be used within a CartProvider");
   }
   return context;
 }
 
-export { BuyRuleType, CODE_AMOUNT_KEY, CUSTOMER_ATTRIBUTE_KEY, CUSTOMER_SCRIPT_GIFT_KEY, CartProvider, DeliveryPlusType, MAIN_PRODUCT_CODE, OrderBasePriceType, OrderDiscountType, PLUS_MEMBER_TYPE, PlusMemberContext, PlusMemberMode, PlusMemberProvider, PriceBasePriceType, PriceDiscountType, RuleType, SCRIPT_CODE_AMOUNT_KEY, ShippingMethodMode, ShopifyContext, ShopifyProvider, SpendMoneyType, atobID, browserCartCookieAdapter, browserCookieAdapter, btoaID, checkAttributesUpdateNeeded, clearGeoLocationCache, createMockCartFromLines, currencyCodeMapping, defaultSWRMutationConfiguration, formatFunctionAutoFreeGift, formatScriptAutoFreeGift, gaTrack, getCachedGeoLocation, getDiscountEnvAttributeValue, getMatchedMainProductSubTotal, getQuery, getReferralAttributes, normalizeAddToCartLines, preCheck, safeParse, trackAddToCartFBQ, trackAddToCartGA, trackBeginCheckoutGA, trackBuyNowFBQ, trackBuyNowGA, useAddCartLines, useAddPlusMemberProductsToCart, useAddToCart, useAllBlogs, useAllCollections, useAllProducts, useApplyCartCodes, useArticle, useArticles, useArticlesInBlog, useAutoRemovePlusMemberInCart, useBlog, useBuyNow, useCalcAutoFreeGift, useCalcGiftsFromLines, useCalcOrderDiscount, useCartAttributes, useCartContext, useCartItemQuantityLimit, useCollection, useCollections, useCreateCart, useExposure, useGeoLocation, useHasPlusMemberInCart, useIntersection, usePlusAnnualProductVariant, usePlusMemberCheckoutCustomAttributes, usePlusMemberContext, usePlusMemberDeliveryCodes, usePlusMemberItemCustomAttributes, usePlusMonthlyProductVariant, usePrice, useProduct, useProductUrl, useProductsByHandles, useRemoveCartCodes, useRemoveCartLines, useReplaceCartPlusMember, useScriptAutoFreeGift, useSearch, useSelectedOptions, useShippingMethodAvailableCheck, useShippingMethods, useShopify, useSite, useUpdateCartAttributes, useUpdateCartLines, useUpdateLineCodeAmountAttributes, useUpdateVariantQuery, useVariant, useVariantMedia };
+export { BrowserPerformanceAdapter, BuyRuleType, CODE_AMOUNT_KEY, CUSTOMER_ATTRIBUTE_KEY, CUSTOMER_SCRIPT_GIFT_KEY, CartProvider, DeliveryPlusType, MAIN_PRODUCT_CODE, OrderBasePriceType, OrderDiscountType, PLUS_MEMBER_TYPE, PlusMemberContext, PlusMemberMode, PlusMemberProvider, PriceBasePriceType, PriceDiscountType, RuleType, SCRIPT_CODE_AMOUNT_KEY, ShippingMethodMode, ShopifyContext, ShopifyProvider, SpendMoneyType, browserCartCookieAdapter, browserCookieAdapter, checkAttributesUpdateNeeded, clearGeoLocationCache, createMockCartFromLines, currencyCodeMapping, defaultSWRMutationConfiguration, formatFunctionAutoFreeGift, formatScriptAutoFreeGift, gaTrack, getCachedGeoLocation, getDiscountEnvAttributeValue, getMatchedMainProductSubTotal, getQuery, getReferralAttributes, normalizeAddToCartLines, preCheck, safeParse, trackAddToCartFBQ, trackAddToCartGA, trackBeginCheckoutGA, trackBuyNowFBQ, trackBuyNowGA, useAddCartLines, useAddToCart, useAllBlogs, useAllCollections, useAllProducts, useApplyCartCodes, useArticle, useArticles, useArticlesInBlog, useAutoRemovePlusMemberInCart, useAvailableDeliveryCoupon, useBlog, useBuyNow, useCalcAutoFreeGift, useCalcGiftsFromLines, useCalcOrderDiscount, useCartAttributes, useCartContext, useCartItemQuantityLimit, useCollection, useCollections, useCreateCart, useExposure, useGeoLocation, useHasPlusMemberInCart, useIntersection, usePlusAnnualProductVariant, usePlusMemberCheckoutCustomAttributes, usePlusMemberContext, usePlusMemberDeliveryCodes, usePlusMemberItemCustomAttributes, usePlusMemberNeedAddToCart, usePlusMonthlyProductVariant, usePrice, useProduct, useProductUrl, useProductsByHandles, useRemoveCartCodes, useRemoveCartLines, useReplaceCartPlusMember, useScriptAutoFreeGift, useSearch, useSelectedOptions, useShippingMethodAvailableCheck, useShippingMethods, useShopify, useSite, useUpdateCartAttributes, useUpdateCartLines, useUpdateLineCodeAmountAttributes, useUpdatePlusMemberDeliveryOptions, useUpdateVariantQuery, useVariant, useVariantMedia };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map