@anker-in/shopify-react 1.2.2-beta.4 → 1.2.2-beta.6

package/dist/hooks/index.mjs

@@ -807,36 +807,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.variant.price || 0), new Decimal2(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 },
@@ -997,7 +991,7 @@ var initSameLinesAttributes = ({
   line
 }) => {
   const sameLineInCart = cart?.lineItems.find(
-    (lineInCart) => lineInCart.variant.sku === line.variant?.sku && lineInCart.product?.handle === line.variant?.product?.handle
+    (lineInCart) => lineInCart.variant.id === line.variant?.id
   );
   const codeAmountAttribute = sameLineInCart?.customAttributes?.find(
     (attr) => attr.key === CODE_AMOUNT_KEY
@@ -2547,7 +2541,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) {