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

package/dist/provider/index.js

@@ -430,54 +430,28 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
     }
     return { activeCampaign: null, subtotal: 0 };
   }, [autoFreeGiftConfig, effectiveCart, tags, dealsType]);
-  const { qualifyingGift, nextTierGoal } = react.useMemo(() => {
+  const { qualifyingTier, nextTierGoal, actualThreshold, currentCurrency } = react.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: shopifyCore.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 = react.useMemo(() => {
     const giftVariant = autoFreeGiftConfig.map(
@@ -518,6 +492,58 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
     }
     return giftProductsResult;
   }, [giftProductsResult, shouldFetch]);
+  const qualifyingGift = react.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: shopifyCore.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,