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

package/dist/index.mjs

@@ -150,6 +150,7 @@ var CUSTOMER_ATTRIBUTE_KEY = "_discounts_function_env";
 var CUSTOMER_SCRIPT_GIFT_KEY = "_giveaway_gradient_gifts";
 var CODE_AMOUNT_KEY = "_sku_code_money";
 var SCRIPT_CODE_AMOUNT_KEY = "_code_money";
+var MEMBER_PRICE_ATTRIBUTE_KEY = "_member_price";
 var MAIN_PRODUCT_CODE = ["WS24", "WSTD", "WS7D", "WSCP", "WSPE", "WSPD"];
 
 // src/hooks/cart/utils/normalize-add-to-cart-lines.ts
@@ -1053,59 +1054,90 @@ function useRemoveCartCodes(options) {
   );
   return useSWRMutation("remove-codes", removeCodes, options);
 }
-
-// src/hooks/cart/utils/add-to-cart.ts
-var getLinesWithAttributes = ({
+var initSameLinesAttributes = ({
   cart,
-  lineItems
+  line
 }) => {
-  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
+  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
     );
-    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;
-  });
+  } catch (error) {
+  }
+  if (codeAmountAttribute || functionAttribute || scriptCodeAmountAttribute) {
+    return {
+      ...line,
+      attributes: [
+        ...line.attributes || [],
+        codeAmountAttribute,
+        functionAttribute,
+        scriptCodeAmountAttribute
+      ].filter(Boolean)
+    };
+  }
+  return line;
+};
+var initDiscountAttributes = ({ 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)
+        })
+      }
+    ]);
+  }
+  const memberPriceAttribute = itemAttributes.find(
+    (attr) => attr.key === MEMBER_PRICE_ATTRIBUTE_KEY
+  );
+  const coupon = line.coupon;
+  if (!memberPriceAttribute && coupon) {
+    itemAttributes = itemAttributes.concat([
+      {
+        key: MEMBER_PRICE_ATTRIBUTE_KEY,
+        value: JSON.stringify({ code: coupon.code })
+      }
+    ]);
+  }
+  const couponDiscountAttribute = itemAttributes.find(
+    (attr) => attr.key === CODE_AMOUNT_KEY || attr.key === SCRIPT_CODE_AMOUNT_KEY
+  );
+  if (!couponDiscountAttribute && coupon && Number(coupon?.amount) > 0) {
+    itemAttributes = itemAttributes.concat([
+      {
+        key: CODE_AMOUNT_KEY,
+        value: new Decimal2(coupon.amount).times(line.quantity || 1).toString()
+      },
+      {
+        key: SCRIPT_CODE_AMOUNT_KEY,
+        value: new Decimal2(coupon.amount).times(line.quantity || 1).toString()
+      }
+    ]);
+  }
+  return { ...line, attributes: itemAttributes };
 };
-var getLinesWithFunctionAttributes = (lineItems) => {
+var getLinesWithAttributes = ({
+  cart,
+  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 };
+    const sameLine = initSameLinesAttributes({ cart, line });
+    const functionLine = initDiscountAttributes({ line: sameLine });
+    return functionLine;
   });
 };
 
@@ -1134,11 +1166,7 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
         return;
       }
       performanceAdapter?.addToCartStart();
-      const linesWithAttributes = getLinesWithAttributes({
-        cart,
-        lineItems
-      });
-      const linesWithFunctionAttributes = getLinesWithFunctionAttributes(linesWithAttributes);
+      const linesWithFunctionAttributes = getLinesWithAttributes({ cart, lineItems });
       const lines = linesWithFunctionAttributes.map((item) => ({
         merchandiseId: item.variant?.id || "",
         quantity: item.quantity || 1,
@@ -1312,13 +1340,15 @@ function useBuyNow({ withTrack = true } = {}, swrOptions) {
       if (!lineItems || lineItems.length === 0) {
         return;
       }
-      const linesWithFunctionAttributes = getLinesWithFunctionAttributes(lineItems);
+      const linesWithFunctionAttributes = getLinesWithAttributes({
+        lineItems
+      });
       const lines = linesWithFunctionAttributes.map((item) => ({
         merchandiseId: item.variant?.id || "",
         quantity: item.quantity || 1,
         attributes: item.attributes,
         sellingPlanId: item.sellingPlanId
-      })).filter((item) => item.merchandiseId && item.quantity);
+      })).filter((item) => item.merchandiseId);
       if (lines.length === 0) {
         return;
       }
@@ -1373,17 +1403,41 @@ function useCalcGiftsFromLines({
     lines
   });
   const allGiftLines = useMemo(() => {
-    const functionGiftLines = functionGift.qualifyingGift?.itemsToAdd || [];
-    const scriptGiftLines = scriptGift.freeGiftLevel ? scriptGift.freeGiftLevel.giveawayProducts.map((product) => {
-      const giftProduct = scriptGift.giftProductsResult?.find(
-        (p) => p.handle === product.handle
+    const functionGiftLines = (functionGift.qualifyingGift?.itemsToAdd || []).map((item) => {
+      const product = functionGift.giftProductsResult?.find(
+        (product2) => product2.handle === item.variant.handle
       );
-      const variant = giftProduct?.variants?.[0];
+      const variants = product?.variants;
+      const variant = Array.isArray(variants) ? variants.find((v) => v.sku === item.variant.sku) : void 0;
+      if (!variant) {
+        console.warn(
+          `Function gift: Variant not found for handle=${item.variant.handle}, sku=${item.variant.sku}`
+        );
+        return null;
+      }
+      return {
+        variant: {
+          ...variant,
+          product
+        },
+        quantity: item.quantity ?? 1,
+        attributes: item.attributes
+      };
+    }).filter((item) => item !== null);
+    const scriptGiftLines = scriptGift.freeGiftLevel ? scriptGift.freeGiftLevel.giveawayProducts.map((item) => {
+      const product = scriptGift.giftProductsResult?.find(
+        (product2) => product2.handle === item.handle
+      );
+      const variants = product?.variants;
+      const variant = Array.isArray(variants) ? variants.find((v) => v.sku === item.sku) : void 0;
+      if (!variant) {
+        console.warn(`Script gift: Variant not found for handle=${item.handle}, sku=${item.sku}`);
+        return null;
+      }
       return {
         variant: {
-          id: variant?.id || "",
-          handle: product.handle,
-          sku: product.sku
+          ...variant,
+          product
         },
         quantity: 1,
         attributes: [
@@ -1393,10 +1447,11 @@ function useCalcGiftsFromLines({
           }
         ]
       };
-    }).filter((item) => item.variant.id) : [];
+    }).filter((item) => item !== null) : [];
     return [...functionGiftLines, ...scriptGiftLines];
   }, [
     functionGift.qualifyingGift,
+    functionGift.giftProductsResult,
     scriptGift.freeGiftLevel,
     scriptGift.giftProductsResult,
     scriptGiveawayKey
@@ -3511,6 +3566,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, 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 };
+export { BrowserPerformanceAdapter, BuyRuleType, CODE_AMOUNT_KEY, CUSTOMER_ATTRIBUTE_KEY, CUSTOMER_SCRIPT_GIFT_KEY, CartProvider, DeliveryPlusType, MAIN_PRODUCT_CODE, MEMBER_PRICE_ATTRIBUTE_KEY, 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