@anker-in/shopify-react 0.1.1-beta.3 → 0.1.1-beta.30

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';
@@ -101,9 +102,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 ? Number(variant.finalPrice.amount) : originalPrice;
+    const subtotalAmount = originalPrice * quantity;
+    const totalAmount = finalPrice * quantity;
     return {
       id: `temp-line-${index}-${variant.id}`,
       // Temporary ID for pre-cart lines
@@ -117,7 +119,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 +150,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 +190,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) => {
@@ -403,6 +396,7 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
   const effectiveCart = useMemo(() => {
     return cart;
   }, [lines, cart]);
+  console.log("effectiveCart useCalcAutoFreeGift", effectiveCart);
   const { activeCampaign, subtotal } = useMemo(() => {
     for (const campaign of autoFreeGiftConfig) {
       const { rule_conditions = [], rule_result } = campaign;
@@ -418,6 +412,7 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
             all_store_variant: spend_get_reward.main_product?.all_store_variant || false
           }
         );
+        console.log("matchedSubtotal useCalcAutoFreeGift", matchedSubtotal);
         if (matchedSubtotal > 0) {
           return { activeCampaign: campaign, subtotal: matchedSubtotal };
         }
@@ -430,11 +425,20 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
       return { qualifyingGift: null, nextTierGoal: null };
     }
     const giftTiers = activeCampaign.rule_result.spend_get_reward.gift_product;
-    const qualifyingTier = [...giftTiers].reverse().find((tier) => subtotal >= Number(tier.spend_sum_money));
-    const nextGoal = giftTiers.find((tier) => subtotal < Number(tier.spend_sum_money));
+    const currentCurrency = effectiveCart?.currency?.code || "";
+    console.log("currentCurrency useCalcAutoFreeGift", effectiveCart, currentCurrency);
+    const getThresholdAmount = (tier) => {
+      if (tier.spend_sum_money_multi_markets?.[currentCurrency]?.value) {
+        return Number(tier.spend_sum_money_multi_markets[currentCurrency].value);
+      }
+      return Number(tier.spend_sum_money || 0);
+    };
+    const qualifyingTier = [...giftTiers].sort((a, b) => getThresholdAmount(b) - getThresholdAmount(a)).find((tier) => subtotal >= getThresholdAmount(tier));
+    const nextGoal = giftTiers.find((tier) => subtotal < getThresholdAmount(tier));
     if (!qualifyingTier) {
       return { qualifyingGift: null, nextTierGoal: nextGoal || null };
     }
+    const actualThreshold = getThresholdAmount(qualifyingTier);
     const formattedGift = {
       tier: qualifyingTier,
       itemsToAdd: qualifyingTier.reward_list?.map((reward) => {
@@ -453,7 +457,10 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
               value: JSON.stringify({
                 is_gift: true,
                 rule_id: activeCampaign.rule_id,
-                spend_sum_money: qualifyingTier.spend_sum_money
+                spend_sum_money: actualThreshold,
+                // 使用实际的门槛金额（多币种支持）
+                currency_code: currentCurrency
+                // 记录当前币种
               })
             }
           ]
@@ -461,7 +468,7 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
       }).filter((item) => item !== null)
     };
     return { qualifyingGift: formattedGift, nextTierGoal: nextGoal || null };
-  }, [activeCampaign, subtotal]);
+  }, [activeCampaign, subtotal, effectiveCart]);
   const giftHandles = useMemo(() => {
     const giftVariant = autoFreeGiftConfig.map(
       (item) => item.rule_result?.spend_get_reward?.gift_product?.map(
@@ -477,18 +484,24 @@ 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;
@@ -541,12 +554,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 +626,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;
@@ -704,12 +725,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("invite_code") || Cookies5.get("invite_code");
+  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 : "" },
@@ -733,8 +752,6 @@ var useCartAttributes = ({
     memberSetting,
     cart
   });
-  console.log("memberSetting", memberSetting);
-  console.log("hasPlusMember", hasPlusMember);
   useEffect(() => {
     setCurrentUrl(window.location.href);
   }, []);
@@ -760,7 +777,7 @@ var useCartAttributes = ({
     return "new_user_login";
   }, [customer]);
   const memberAttributes = useMemo(() => {
-    return [
+    const attributes = [
       {
         key: "_token",
         value: profile?.token
@@ -781,17 +798,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 [
@@ -823,18 +851,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 useUpdateLineCodeAmountAttributes = ({
@@ -863,7 +923,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({
@@ -902,29 +962,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]
   );
@@ -1050,8 +1103,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
@@ -1155,8 +1213,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,
@@ -1184,6 +1248,7 @@ function CartProvider({
     }),
     [
       cart,
+      totalQuantity,
       isCartLoading,
       fetchCart,
       mutateCart,