@anker-in/shopify-react 0.1.1-beta.5 → 0.1.1-beta.50

package/dist/provider/index.mjs

@@ -1,8 +1,9 @@
 import { createContext, useMemo, useContext, useState, useCallback, useEffect, useRef } from 'react';
-import { createShopifyClient, getCart, updateCartAttributes, updateCartLines, getProductsByHandles } from '@anker-in/shopify-sdk';
+import { createShopifyClient, getCart, updateCartAttributes, updateCartLines, getProductsByHandles, getLocalStorage } from '@anker-in/shopify-sdk';
 import Cookies5 from 'js-cookie';
 import { jsx } from 'react/jsx-runtime';
 import Decimal2 from 'decimal.js';
+import { btoaID, atobID } from '@anker-in/shopify-core';
 import useSWR from 'swr';
 import useSWRMutation8 from 'swr/mutation';
 import { useRequest } from 'ahooks';
@@ -52,7 +53,8 @@ function ShopifyProvider({
   cartCookieAdapter = browserCartCookieAdapter,
   routerAdapter,
   userAdapter,
-  children
+  children,
+  performanceAdapter
 }) {
   const client = useMemo(() => {
     return createShopifyClient(config, locale);
@@ -66,7 +68,8 @@ function ShopifyProvider({
       cookieAdapter,
       cartCookieAdapter,
       routerAdapter,
-      userAdapter
+      userAdapter,
+      performanceAdapter
     };
   }, [
     client,
@@ -76,6 +79,7 @@ function ShopifyProvider({
     cookieAdapter,
     cartCookieAdapter,
     routerAdapter,
+    performanceAdapter,
     userAdapter
   ]);
   return /* @__PURE__ */ jsx(ShopifyContext.Provider, { value, children });
@@ -101,9 +105,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
@@ -117,7 +122,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 || "",
@@ -148,15 +153,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,
@@ -187,16 +193,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) => {
@@ -220,14 +216,6 @@ var getDiscountEnvAttributeValue = (attributes = []) => {
   const attr = attributes.find((attr2) => attr2.key === CUSTOMER_ATTRIBUTE_KEY);
   return safeParse(attr?.value ?? "") ?? {};
 };
-var checkAttributesUpdateNeeded = (oldAttributes, newAttributes, customAttributesNeedRemove) => {
-  return oldAttributes.some((attr) => {
-    const newAttr = newAttributes.find((newAttr2) => newAttr2.key === attr.key);
-    return newAttr ? newAttr.value !== attr.value : true;
-  }) || newAttributes.some((attr) => !oldAttributes.some((oldAttr) => oldAttr.key === attr.key)) || customAttributesNeedRemove.some(
-    (removeAttr) => oldAttributes.some((oldAttr) => oldAttr.key === removeAttr.key)
-  );
-};
 var containsAll = (source, requiredItems = []) => {
   if (!requiredItems?.length) return true;
   const sourceSet = new Set(source);
@@ -425,43 +413,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(
@@ -477,24 +451,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,
@@ -508,7 +540,8 @@ var useScriptAutoFreeGift = ({
   _giveaway,
   cart,
   locale: providedLocale,
-  lines
+  lines,
+  profile
 }) => {
   const { client, locale: contextLocale } = useShopify();
   const locale = providedLocale || contextLocale;
@@ -532,8 +565,9 @@ var useScriptAutoFreeGift = ({
     const utmCampaign = Cookies5.get("utm_campaign") || query?.utm_campaign;
     if (campaign.activityAvailableQuery && !utmCampaign?.includes(campaign.activityAvailableQuery))
       return false;
+    if (campaign.requireLogin && !profile?.email) return false;
     return true;
-  }, [campaign]);
+  }, [campaign, profile]);
   const [upgrade_multiple, upgrade_value] = useMemo(() => {
     let upgrade_multiple2 = 1;
     let upgrade_value2 = 0;
@@ -541,12 +575,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(() => {
@@ -611,18 +647,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;
@@ -654,62 +696,20 @@ var useScriptAutoFreeGift = ({
     giftProductsResult: finalGiftProductsResult
   };
 };
-function useUpdateCartAttributes(mutate, metafieldIdentifiers, options) {
-  const { client, locale, cartCookieAdapter } = useShopify();
-  const updateAttributes = useCallback(
-    async (_key, { arg }) => {
-      const updatedCart = await updateCartAttributes(client, {
-        ...arg,
-        metafieldIdentifiers,
-        cookieAdapter: cartCookieAdapter
-      });
-      console.log("useUpdateCartAttributes updatedCart", updatedCart);
-      if (updatedCart) {
-        mutate(updatedCart);
-      }
-      return updatedCart;
-    },
-    [client, locale, cartCookieAdapter, mutate]
-  );
-  return useSWRMutation8("update-cart-attributes", updateAttributes, options);
-}
-function useHasPlusMemberInCart({
-  memberSetting,
-  cart
-}) {
-  const { plus_monthly_product, plus_annual_product } = memberSetting || {};
-  return useMemo(() => {
-    if (!cart?.lineItems) {
-      return {
-        hasPlusMember: false,
-        hasMonthlyPlus: false,
-        hasAnnualPlus: false
-      };
-    }
-    const monthlyPlusItem = cart.lineItems.find(
-      (item) => item.product?.handle === plus_monthly_product?.handle && item.variant?.sku === plus_monthly_product?.sku
-    );
-    const annualPlusItem = cart.lineItems.find(
-      (item) => item.product?.handle === plus_annual_product?.handle && item.variant?.sku === plus_annual_product?.sku
-    );
-    const hasMonthlyPlus = !!monthlyPlusItem;
-    const hasAnnualPlus = !!annualPlusItem;
-    const hasPlusMember = hasMonthlyPlus || hasAnnualPlus;
-    return {
-      hasPlusMember,
-      hasMonthlyPlus,
-      hasAnnualPlus,
-      monthlyPlusItem,
-      annualPlusItem
-    };
-  }, [cart?.lineItems, plus_monthly_product, plus_annual_product]);
-}
 
-// src/hooks/cart/feature/use-cart-attributes.ts
+// src/hooks/cart/utils/cart-attributes.ts
+var checkAttributesUpdateNeeded = (oldAttributes, newAttributes, customAttributesNeedRemove) => {
+  return newAttributes.some((attr) => !oldAttributes.some((oldAttr) => oldAttr.key === attr.key)) || oldAttributes.some((attr) => {
+    const newAttr = newAttributes.find((newAttr2) => newAttr2.key === attr.key);
+    return newAttr ? newAttr.value !== attr.value : true;
+  }) || customAttributesNeedRemove.some(
+    (removeAttr) => oldAttributes.some((oldAttr) => oldAttr.key === removeAttr.key)
+  );
+};
 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 : "" },
@@ -722,117 +722,130 @@ var getReferralAttributes = () => {
   }
   return [];
 };
+var getUserType = (customer) => {
+  let userInfo = Cookies5.get("userInfo");
+  if (userInfo) {
+    userInfo = JSON.parse(userInfo);
+    let arr = typeof userInfo?.id == "string" && userInfo?.id.split("/");
+    userInfo.setId = arr[arr.length - 1];
+  }
+  const customerInfo = userInfo || customer;
+  if (!customerInfo) {
+    return "new_user_unlogin";
+  }
+  if (customer) {
+    const { orders = {} } = customer;
+    if (orders?.edges?.length === 1) {
+      return "old_user_orders_once";
+    } else if (orders?.edges?.length > 1) {
+      return "old_user_orders_twice";
+    }
+  }
+  return "new_user_login";
+};
+function getCartAttributes({
+  profile,
+  customer,
+  cart,
+  memberType,
+  currentUrl = ""
+}) {
+  const userType = getUserType(customer);
+  const memberAttributes = [
+    {
+      key: "_token",
+      value: profile?.token
+    },
+    {
+      key: "_member_type",
+      value: memberType ?? String(profile?.memberType)
+    },
+    {
+      key: "_user_type",
+      value: userType
+    },
+    {
+      key: "_is_login",
+      value: profile?.token ? "true" : "false"
+    }
+  ];
+  if (profile?.token) {
+    memberAttributes.push({
+      key: "_login_user",
+      value: "1"
+    });
+  }
+  const discountCodes = cart?.discountCodes.map((item) => item.code).filter((code) => code) || [];
+  const functionAttributes = [
+    {
+      key: CUSTOMER_ATTRIBUTE_KEY,
+      value: JSON.stringify({
+        discount_code: discountCodes,
+        user_tags: customer?.tags || []
+      })
+    }
+  ];
+  const presellAttributes = [
+    {
+      key: "_presale",
+      value: cart?.lineItems.some((item) => item?.variant?.metafields?.presell === "presell")
+    }
+  ];
+  const weightAttributes = [
+    {
+      key: "_weight",
+      value: cart?.lineItems.reduce((acc, item) => {
+        return new Decimal2(acc).plus(item.variant.weight ?? 0).toNumber();
+      }, 0).toString()
+    },
+    {
+      key: "_app_source_name",
+      value: "dtc"
+    }
+  ];
+  const trackingAttributes = [
+    {
+      key: "utm_params",
+      value: currentUrl
+    }
+  ];
+  const commonAttributes = [
+    ...memberAttributes,
+    ...functionAttributes,
+    ...presellAttributes,
+    ...weightAttributes,
+    ...trackingAttributes,
+    ...getReferralAttributes()
+  ].filter((item) => item?.value);
+  const extraAttributesInCart = cart?.customAttributes?.filter(
+    (item) => !commonAttributes.some((attr) => attr.key === item.key)
+  ) || [];
+  return [...commonAttributes, ...extraAttributesInCart].filter((item) => item?.value);
+}
 var useCartAttributes = ({
   profile,
   customer,
   cart,
-  memberSetting
+  memberType
 }) => {
   const [currentUrl, setCurrentUrl] = useState("");
-  const { hasPlusMember } = useHasPlusMemberInCart({
-    memberSetting,
-    cart
-  });
   useEffect(() => {
     setCurrentUrl(window.location.href);
   }, []);
-  const userType = useMemo(() => {
-    let userInfo = Cookies5.get("userInfo");
-    if (userInfo) {
-      userInfo = JSON.parse(userInfo);
-      let arr = typeof userInfo?.id == "string" && userInfo?.id.split("/");
-      userInfo.setId = arr[arr.length - 1];
-    }
-    const customerInfo = userInfo || customer;
-    if (!customerInfo) {
-      return "new_user_unlogin";
-    }
-    if (customer) {
-      const { orders = {} } = customer;
-      if (orders?.edges?.length === 1) {
-        return "old_user_orders_once";
-      } else if (orders?.edges?.length > 1) {
-        return "old_user_orders_twice";
-      }
-    }
-    return "new_user_login";
-  }, [customer]);
-  const memberAttributes = useMemo(() => {
-    return [
-      {
-        key: "_token",
-        value: profile?.token
-        //是否登录
-      },
-      {
-        key: "_member_type",
-        value: hasPlusMember ? "2" : profile?.memberType
-        //：0(游客)，1(普通会员)，2(付费会员)
-      },
-      {
-        key: "_user_type",
-        value: userType
-        // n
-      },
-      {
-        key: "_is_login",
-        value: profile?.token ? "true" : "false"
-      }
-    ];
-  }, [profile?.memberType, profile?.token, userType, hasPlusMember]);
-  const functionAttributes = useMemo(() => {
-    return [
-      cart?.discountCodes && {
-        key: "_discounts_function_env",
-        value: JSON.stringify({
-          discount_code: cart?.discountCodes.map((item) => item.code),
-          user_tags: customer?.tags || []
-        })
-      }
-    ];
-  }, [cart]);
-  const presellAttributes = useMemo(() => {
-    return [
-      {
-        key: "_presale",
-        value: cart?.lineItems.some((item) => item?.variant?.metafields?.presell === "presell")
-      }
-    ];
-  }, [cart]);
-  const weightAttributes = useMemo(() => {
-    return [
-      {
-        key: "_weight",
-        value: cart?.lineItems.reduce((acc, item) => {
-          return new Decimal2(acc).plus(item.variant.weight ?? 0).toNumber();
-        }, 0).toString()
-      },
-      {
-        key: "_app_source_name",
-        value: "dtc"
-      }
-    ];
-  }, [cart]);
-  const trackingAttributes = useMemo(() => {
-    return [
-      {
-        key: "utm_params",
-        value: currentUrl
-      }
-    ];
-  }, [currentUrl]);
+  const attributes = useMemo(() => {
+    return getCartAttributes({
+      profile,
+      customer,
+      cart,
+      memberType,
+      currentUrl
+    });
+  }, [profile, customer, cart, memberType, currentUrl]);
   return useMemo(
     () => ({
-      attributes: [
-        ...memberAttributes,
-        ...functionAttributes,
-        ...presellAttributes,
-        ...weightAttributes,
-        ...trackingAttributes,
-        ...getReferralAttributes()
-      ].filter((item) => item?.value)
+      attributes
     }),
-    [memberAttributes, functionAttributes, presellAttributes, weightAttributes, trackingAttributes]
+    [attributes]
   );
 };
 var useUpdateLineCodeAmountAttributes = ({
@@ -861,7 +874,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({
@@ -900,29 +913,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]
   );
@@ -957,28 +963,13 @@ var useUpdateLineCodeAmountAttributes = ({
   }, [loading, setLoadingState]);
 };
 var createInitialValue = () => ({
-  zipCode: "",
   plusMemberMetafields: {},
-  setZipCode: () => {
-  },
-  allowNextDayDelivery: false,
-  setAllowNextDayDelivery: () => {
-  },
-  allowThirdDayDelivery: false,
-  setAllowThirdDayDelivery: () => {
-  },
   selectedPlusMemberMode: "free",
   setSelectedPlusMemberMode: () => {
   },
-  showAreaCheckModal: false,
-  setShowAreaCheckModal: () => {
-  },
   selectedShippingMethod: void 0,
   setSelectedShippingMethod: () => {
   },
-  showTip: false,
-  setShowTip: () => {
-  },
   showMoreShippingMethod: false,
   setShowMoreShippingMethod: () => {
   },
@@ -988,20 +979,85 @@ var createInitialValue = () => ({
     freeShippingMethods: [],
     paymentShippingMethods: [],
     nddOverweight: false,
-    tddOverweight: false
+    tddOverweight: false,
+    nddCoupon: void 0,
+    tddCoupon: void 0,
+    isLoadingCoupon: false
   },
-  selectedPlusMemberProduct: null,
-  plusMemberProducts: [],
+  selectedPlusMemberVariant: void 0,
   showPlusMemberBenefit: false,
   setShowPlusMemberBenefit: () => {
   },
-  deleteMarginBottom: false,
-  setDeleteMarginBottom: () => {
-  },
-  profile: void 0,
-  locale: void 0
+  profile: void 0
 });
 createContext(createInitialValue());
+function hasPlusMemberInCart({
+  memberSetting,
+  cart
+}) {
+  const { plus_monthly_product, plus_annual_product } = memberSetting || {};
+  if (!cart?.lineItems) {
+    return {
+      hasPlusMember: false,
+      hasMonthlyPlus: false,
+      hasAnnualPlus: false
+    };
+  }
+  const monthlyPlusItem = cart.lineItems.find(
+    (item) => item.product?.handle === plus_monthly_product?.handle && item.variant?.sku === plus_monthly_product?.sku
+  );
+  const annualPlusItem = cart.lineItems.find(
+    (item) => item.product?.handle === plus_annual_product?.handle && item.variant?.sku === plus_annual_product?.sku
+  );
+  const hasMonthlyPlus = !!monthlyPlusItem;
+  const hasAnnualPlus = !!annualPlusItem;
+  const hasPlusMember = hasMonthlyPlus || hasAnnualPlus;
+  return {
+    hasPlusMember,
+    hasMonthlyPlus,
+    hasAnnualPlus,
+    monthlyPlusItem,
+    annualPlusItem
+  };
+}
+function useHasPlusMemberInCart({
+  memberSetting,
+  cart
+}) {
+  return useMemo(
+    () => hasPlusMemberInCart({
+      memberSetting,
+      cart
+    }),
+    [memberSetting, cart]
+  );
+}
+function useUpdateCartAttributes({
+  mutate,
+  metafieldIdentifiers,
+  disabled = false,
+  swrOptions
+}) {
+  const { client, locale, cartCookieAdapter } = useShopify();
+  const updateAttributes = useCallback(
+    async (_key, { arg }) => {
+      if (disabled) {
+        return void 0;
+      }
+      const updatedCart = await updateCartAttributes(client, {
+        ...arg,
+        metafieldIdentifiers,
+        cookieAdapter: cartCookieAdapter
+      });
+      if (updatedCart) {
+        mutate(updatedCart);
+      }
+      return updatedCart;
+    },
+    [client, locale, cartCookieAdapter, mutate, metafieldIdentifiers, disabled]
+  );
+  return useSWRMutation8("update-cart-attributes", updateAttributes, swrOptions);
+}
 var CartContext = createContext(null);
 function CartProvider({
   children,
@@ -1016,7 +1072,7 @@ function CartProvider({
 }) {
   const { client, cartCookieAdapter } = useShopify();
   const [customAttributes, setCustomAttributes] = useState([]);
-  const [customAttributesNeedDelete, setCustomAttributesNeedDelete] = useState(
+  const [customAttributesNeedRemove, setCustomAttributesNeedRemove] = useState(
     []
   );
   const [isCodeChanging, setIsCodeChanging] = useState(false);
@@ -1044,15 +1100,34 @@ function CartProvider({
       refreshDeps: [locale]
     }
   );
-  const { trigger: updateAttributes } = useUpdateCartAttributes(mutateCart, metafieldIdentifiers);
-  const { attributes } = useCartAttributes({ profile, customer, cart, memberSetting });
+  const { trigger: updateAttributes } = useUpdateCartAttributes({
+    mutate: mutateCart,
+    metafieldIdentifiers,
+    disabled: isCartLoading
+  });
+  const { hasPlusMember } = useHasPlusMemberInCart({
+    memberSetting,
+    cart
+  });
+  const { attributes: commonAttributes } = useCartAttributes({
+    profile,
+    customer,
+    cart,
+    memberType: hasPlusMember ? "2" : profile?.memberType
+  });
   useRequest(
     () => {
-      const newAttributes = [...attributes, ...customAttributes];
-      const needUpdate = cart && !checkAttributesUpdateNeeded(
+      const filteredSameCommonAttributes = commonAttributes.filter(
+        (attr) => !customAttributes.some((a) => a.key === attr.key)
+      );
+      const newAttributes = [
+        ...filteredSameCommonAttributes,
+        ...customAttributes
+      ];
+      const needUpdate = cart && checkAttributesUpdateNeeded(
         cart.customAttributes,
         newAttributes,
-        customAttributesNeedDelete
+        customAttributesNeedRemove
       );
       if (needUpdate) {
         return updateAttributes({ attributes: newAttributes });
@@ -1065,44 +1140,39 @@ function CartProvider({
       // 1 秒内只触发最后一次更新
       throttleTrailing: true,
       throttleLeading: false,
-      refreshDeps: [attributes, customAttributes]
+      refreshDeps: [commonAttributes, customAttributes, customAttributesNeedRemove]
     }
   );
   useUpdateLineCodeAmountAttributes({
     cart,
     mutateCart,
     isCartLoading: isCartLoading || isCodeChanging,
-    setLoadingState
+    setLoadingState,
+    metafieldIdentifiers
   });
   const removeCustomAttributes = useCallback(
-    (attributes2) => {
-      setCustomAttributesNeedDelete(attributes2);
+    (attributes) => {
+      setCustomAttributesNeedRemove(attributes);
     },
-    [setCustomAttributesNeedDelete]
+    [setCustomAttributesNeedRemove]
   );
   const addCustomAttributes = useCallback(
-    (attributes2) => {
-      const sameAttributes = attributes2.filter(
-        (attr) => customAttributes.some((a) => a.key === attr.key)
-      );
-      if (sameAttributes.length) {
-        setCustomAttributes((prev) => {
-          const removedAttributes = prev.filter(
-            (attr) => !sameAttributes.some((a) => a.key === attr.key)
-          );
-          return [...removedAttributes, ...attributes2];
-        });
-      } else {
-        setCustomAttributes((prev) => [...prev, ...attributes2]);
-      }
+    (attributes) => {
+      setCustomAttributes((oldCustomAttributes) => {
+        const filteredSameAttributes = oldCustomAttributes.filter(
+          (attr) => !attributes.some((a) => a.key === attr.key)
+        );
+        return [...filteredSameAttributes, ...attributes];
+      });
     },
-    [customAttributes]
+    [setCustomAttributes]
   );
   const functionAutoFreeGiftResult = useCalcAutoFreeGift(cart, autoFreeGiftConfig || [], customer);
   const scriptAutoFreeGiftResult = useScriptAutoFreeGift({
     campaign: gradientGiftsConfig || null,
     _giveaway: CUSTOMER_SCRIPT_GIFT_KEY,
-    cart
+    cart,
+    profile
   });
   const formattedScriptGifts = useMemo(() => {
     return formatScriptAutoFreeGift({
@@ -1153,16 +1223,23 @@ 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,
       mutateCart,
       addCustomAttributes,
       removeCustomAttributes,
-      setCustomAttributes,
       locale,
+      profile,
+      customer,
       isCodeChanging,
       setIsCodeChanging,
       autoFreeGiftConfig,
@@ -1178,10 +1255,12 @@ function CartProvider({
       scriptAutoFreeGiftResult,
       setScriptAutoFreeGift,
       giftNeedAddToCartLines,
-      metafieldIdentifiers
+      metafieldIdentifiers,
+      memberSetting
     }),
     [
       cart,
+      totalQuantity,
       isCartLoading,
       fetchCart,
       mutateCart,
@@ -1201,14 +1280,17 @@ function CartProvider({
       scriptAutoFreeGiftResult,
       setScriptAutoFreeGift,
       giftNeedAddToCartLines,
-      metafieldIdentifiers
+      metafieldIdentifiers,
+      customer,
+      profile,
+      memberSetting
     ]
   );
   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;