@anker-in/shopify-react 0.1.1-beta.35 → 0.1.1-beta.37

package/dist/index.mjs

@@ -477,54 +477,28 @@ 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 currentCurrency = effectiveCart?.currency?.code || "";
-    console.log("currentCurrency useCalcAutoFreeGift", effectiveCart, currentCurrency);
+    const currentCurrency2 = effectiveCart?.currency?.code || "";
+    console.log("currentCurrency useCalcAutoFreeGift", effectiveCart, currentCurrency2);
     const getThresholdAmount = (tier) => {
-      if (tier.spend_sum_money_multi_markets?.[currentCurrency]?.value) {
-        return Number(tier.spend_sum_money_multi_markets[currentCurrency].value);
+      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);
     };
-    const qualifyingTier = [...giftTiers].sort((a, b) => getThresholdAmount(b) - getThresholdAmount(a)).find((tier) => subtotal >= getThresholdAmount(tier));
+    const qualifyingTier2 = [...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) => {
-        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: actualThreshold,
-                // 使用实际的门槛金额（多币种支持）
-                currency_code: currentCurrency
-                // 记录当前币种
-              })
-            }
-          ]
-        };
-      }).filter((item) => item !== null)
+    const actualThreshold2 = qualifyingTier2 ? getThresholdAmount(qualifyingTier2) : 0;
+    return {
+      qualifyingTier: qualifyingTier2,
+      nextTierGoal: nextGoal || null,
+      actualThreshold: actualThreshold2,
+      currentCurrency: currentCurrency2
     };
-    return { qualifyingGift: formattedGift, nextTierGoal: nextGoal || null };
   }, [activeCampaign, subtotal, effectiveCart]);
   const giftHandles = useMemo(() => {
     const giftVariant = autoFreeGiftConfig.map(
@@ -565,6 +539,58 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
     }
     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,
@@ -2531,15 +2557,27 @@ 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);
@@ -2549,12 +2587,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";
@@ -2581,40 +2617,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;
@@ -2668,7 +2698,10 @@ function useShippingMethods(options) {
     freeShippingMethods,
     paymentShippingMethods,
     nddOverweight,
-    tddOverweight
+    tddOverweight,
+    nddCoupon,
+    tddCoupon,
+    isLoadingCoupon: isLoading
   };
 }
 function useShippingMethodAvailableCheck() {
@@ -2958,9 +2991,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(
@@ -2976,7 +3009,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,
@@ -3437,6 +3474,6 @@ function useCartContext(options) {
   return context;
 }
 
-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, 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 };
+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