@anker-in/shopify-react 1.2.2-beta.5 → 1.2.2-beta.7

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { createShopifyClient, getProductsByHandles, createCart, updateCartCodes,
 export * from '@anker-in/shopify-sdk';
 import Cookies5 from 'js-cookie';
 import { jsx } from 'react/jsx-runtime';
-import Decimal2 from 'decimal.js';
+import Decimal3 from 'decimal.js';
 import { atobID, btoaID } from '@anker-in/shopify-core';
 import useSWR from 'swr';
 import useSWRMutation from 'swr/mutation';
@@ -152,8 +152,6 @@ 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
 function normalizeAddToCartLines(lines) {
   return lines.filter((line) => line.variant?.id).map((line, index) => {
     const variant = line.variant;
@@ -161,8 +159,8 @@ function normalizeAddToCartLines(lines) {
     const quantity = line.quantity || 1;
     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;
+    const subtotalAmount = new Decimal3(originalPrice).times(quantity).toNumber();
+    const totalAmount = new Decimal3(finalPrice).times(quantity).toNumber();
     return {
       id: `temp-line-${index}-${variant.id}`,
       // Temporary ID for pre-cart lines
@@ -170,6 +168,7 @@ function normalizeAddToCartLines(lines) {
       quantity,
       variantId: variant.id,
       productId: product?.id || variant.id.split("/").slice(0, -2).join("/"),
+      amountPerQuantity: finalPrice,
       totalAmount,
       subtotalAmount,
       discountAllocations: [],
@@ -354,7 +353,7 @@ var formatScriptAutoFreeGift = ({
       path: product?.handle || "",
       variant,
       totalAmount: 0,
-      subtotalAmount: new Decimal2(
+      subtotalAmount: new Decimal3(
         typeof variant?.price === "object" ? variant?.price?.amount || 0 : variant?.price || 0
       ).toNumber(),
       options: [],
@@ -414,7 +413,7 @@ var formatFunctionAutoFreeGift = ({
       path: product?.handle || "",
       variant,
       totalAmount: 0,
-      subtotalAmount: new Decimal2(
+      subtotalAmount: new Decimal3(
         typeof variant?.price === "object" ? variant?.price?.amount || 0 : variant?.price || 0
       ).toNumber(),
       options: [],
@@ -644,7 +643,7 @@ var useScriptAutoFreeGift = ({
   const breakpoints = useMemo(() => {
     if (!isActivityAvailable) return [];
     return (campaign?.breakpoints || []).map((item) => ({
-      breakpoint: new Decimal2(item.breakpoint).minus(new Decimal2(upgrade_value)).dividedBy(new Decimal2(upgrade_multiple)).toFixed(2, Decimal2.ROUND_DOWN),
+      breakpoint: new Decimal3(item.breakpoint).minus(new Decimal3(upgrade_value)).dividedBy(new Decimal3(upgrade_multiple)).toFixed(2, Decimal3.ROUND_DOWN),
       giveawayProducts: item.giveawayProducts || []
     }));
   }, [campaign, upgrade_multiple, upgrade_value]);
@@ -679,11 +678,11 @@ var useScriptAutoFreeGift = ({
     });
   }, [effectiveCart?.lineItems, isActivityAvailable, _giveaway]);
   const involvedSubTotal = useMemo(() => {
-    if (!isActivityAvailable) return new Decimal2(0);
+    if (!isActivityAvailable) return new Decimal3(0);
     return involvedLines.reduce((prev, item) => {
       const amount = campaign?.useTotalAmount ? item.totalAmount : item.subtotalAmount;
-      return new Decimal2(prev).plus(new Decimal2(amount || 0));
-    }, new Decimal2(0));
+      return new Decimal3(prev).plus(new Decimal3(amount || 0));
+    }, new Decimal3(0));
   }, [involvedLines, isActivityAvailable]);
   const [freeGiftLevel, nextFreeGiftLevel] = useMemo(() => {
     if (!isActivityAvailable) return [null, null];
@@ -691,7 +690,7 @@ var useScriptAutoFreeGift = ({
       (a, b) => Number(b.breakpoint) - Number(a.breakpoint)
     );
     const levelIndex = sortedLevels.findIndex(
-      (level) => involvedSubTotal.gte(new Decimal2(level.breakpoint)) && involvedLines.length > 0
+      (level) => involvedSubTotal.gte(new Decimal3(level.breakpoint)) && involvedLines.length > 0
     );
     if (levelIndex === -1) {
       return [
@@ -862,7 +861,7 @@ var trackAddToCartGA = ({
     return;
   }
   const currencyCode = lineItems[0].product?.price?.currencyCode;
-  const totalPrice = lineItems.reduce((prev, item) => prev.plus(item.variant.price || 0), new Decimal2(0)).toNumber();
+  const totalPrice = lineItems.reduce((prev, item) => prev.plus(item.totalAmount || 0), new Decimal3(0)).toNumber();
   gaTrack({
     event: "ga4Event",
     event_name: "add_to_cart",
@@ -904,7 +903,7 @@ var trackBeginCheckoutGA = ({
     (prev, { variant }) => prev.plus(
       variant?.finalPrice?.amount === void 0 ? Number(variant?.price?.amount) || 0 : Number(variant?.finalPrice?.amount) || 0
     ),
-    new Decimal2(0)
+    new Decimal3(0)
   ).toNumber();
   gaTrack({
     event: "ga4Event",
@@ -939,36 +938,30 @@ var trackBuyNowGA = ({
   lineItems = [],
   gtmParams = {}
 }) => {
-  if (!lineItems.length || !lineItems[0]?.variant) {
+  if (!lineItems.length) {
     return;
   }
-  const { variant } = lineItems[0];
-  const currencyCode = variant.product?.price?.currencyCode || variant.price?.currencyCode;
-  const totalPrice = lineItems?.reduce(
-    (prev, { variant: variant2 }) => prev.plus(
-      variant2?.finalPrice?.amount === void 0 ? Number(variant2?.price?.amount) || 0 : Number(variant2?.finalPrice?.amount) || 0
-    ),
-    new Decimal2(0)
-  ).toNumber();
+  const currencyCode = lineItems[0].product?.price?.currencyCode;
+  const totalPrice = lineItems.reduce((prev, item) => prev.plus(item.totalAmount || 0), new Decimal3(0)).toNumber();
   gaTrack({
     event: "ga4Event",
     event_name: "begin_checkout",
     event_parameters: {
       page_group: gtmParams?.pageGroup,
-      position: gtmParams?.position,
+      position: gtmParams?.position || "",
       currency: currencyCode,
       value: totalPrice,
       items: lineItems.map((item) => {
-        const imageUrl = item.variant?.image?.url || item.variant?.product?.images?.[0]?.url;
+        const imageUrl = item.variant.image?.url || item.product?.images?.[0]?.url;
         const itemCategoryId = item.gtmParams?.item_category_id;
-        const itemVariantId = item.variant?.id ? atobID(item.variant.id) : void 0;
+        const itemVariantId = item.variant.id ? atobID(item.variant.id) : void 0;
         return {
-          item_id: item.variant?.sku,
-          item_name: item.variant?.product?.title || item.variant?.title,
+          item_id: item.variant.sku,
+          item_name: item.product?.title,
           item_brand: gtmParams?.brand || "",
-          item_category: item.variant?.product?.productType || "",
-          item_variant: item.variant?.title,
-          price: item.variant?.compareAtPrice?.amount ?? item.variant?.price?.amount,
+          item_category: item.product?.productType || "",
+          item_variant: item.variant.name,
+          price: item.variant.listPrice ?? item.variant.price,
           quantity: item.quantity || 1,
           ...imageUrl && { image_url: imageUrl },
           ...itemCategoryId !== void 0 && { item_category_id: itemCategoryId },
@@ -1205,7 +1198,7 @@ var initDiscountAttributes = ({ line }) => {
         key: CUSTOMER_ATTRIBUTE_KEY,
         value: JSON.stringify({
           is_gift: false,
-          discounted_amount: new Decimal2(priceAmount).times(line.quantity || 1).toNumber()
+          discounted_amount: new Decimal3(priceAmount).times(line.quantity || 1).toNumber()
         })
       }
     ]);
@@ -1229,11 +1222,11 @@ var initDiscountAttributes = ({ line }) => {
     itemAttributes = itemAttributes.concat([
       {
         key: CODE_AMOUNT_KEY,
-        value: new Decimal2(coupon.amount).times(line.quantity || 1).toString()
+        value: new Decimal3(coupon.amount).times(line.quantity || 1).toString()
       },
       {
         key: SCRIPT_CODE_AMOUNT_KEY,
-        value: new Decimal2(coupon.amount).times(line.quantity || 1).toString()
+        value: new Decimal3(coupon.amount).times(line.quantity || 1).toString()
       }
     ]);
   }
@@ -1691,8 +1684,8 @@ function getCartBasicAttributes({
     {
       key: "_weight",
       value: cart?.lineItems?.reduce((acc, item) => {
-        const itemWeight = new Decimal2(item.variant.weight ?? 0).times(item.quantity);
-        return new Decimal2(acc).plus(itemWeight).toNumber();
+        const itemWeight = new Decimal3(item.variant.weight ?? 0).times(item.quantity);
+        return new Decimal3(acc).plus(itemWeight).toNumber();
       }, 0).toString()
     }
   ];
@@ -2717,7 +2710,16 @@ function useBuyNow({ withTrack = true } = {}, swrOptions) {
       }
       if (withTrack && resultCart.lineItems) {
         trackBuyNowGA({
-          lineItems,
+          lineItems: lineItems.map((item) => {
+            const cartLine = resultCart.lineItems.find((line) => line.variant.id === item.variant?.id);
+            if (!cartLine) {
+              return null;
+            }
+            return {
+              ...cartLine,
+              quantity: item.quantity
+            };
+          }).filter(Boolean),
           gtmParams: { ...gtmParams, brand: config.getBrand() }
         });
         if (fbqTrackConfig) {