@anker-in/shopify-react 0.1.1-beta.21 → 0.1.1-beta.23

package/dist/index.mjs

@@ -1,9 +1,10 @@
 import { createContext, useMemo, useContext, useRef, useState, useEffect, useCallback } from 'react';
-import { createShopifyClient, atobID, btoaID, getProductsByHandles, createCart, updateCartCodes, addCartLines, updateCartLines, removeCartLines, updateCartAttributes, getLocalStorage, getProduct, getAllProducts, getCollection, getAllCollections, getCollections, getBlog, getAllBlogs, getArticle, getArticles, getArticlesInBlog, getCart, setLocalStorage, updateCartDeliveryOptions } from '@anker-in/shopify-sdk';
+import { createShopifyClient, getProductsByHandles, createCart, updateCartCodes, addCartLines, updateCartLines, removeCartLines, updateCartAttributes, getLocalStorage, getProduct, getAllProducts, getCollection, getAllCollections, getCollections, getBlog, getAllBlogs, getArticle, getArticles, getArticlesInBlog, getCart, setLocalStorage, updateCartDeliveryOptions } from '@anker-in/shopify-sdk';
 export * from '@anker-in/shopify-sdk';
 import Cookies5 from 'js-cookie';
 import { jsx } from 'react/jsx-runtime';
 import Decimal2 from 'decimal.js';
+import { atobID, btoaID } from '@anker-in/shopify-core';
 import useSWR from 'swr';
 import useSWRMutation from 'swr/mutation';
 import { useRequest } from 'ahooks';
@@ -140,9 +141,10 @@ function normalizeAddToCartLines(lines) {
     const variant = line.variant;
     const product = variant.product;
     const quantity = line.quantity || 1;
-    const price = variant.finalPrice?.amount ? Number(variant.finalPrice.amount) : variant.compareAtPrice?.amount ? Number(variant.compareAtPrice.amount) : variant.price?.amount ? Number(variant.price.amount) : 0;
-    const subtotalAmount = price * quantity;
-    const totalAmount = subtotalAmount;
+    const originalPrice = variant.compareAtPrice?.amount ? Number(variant.compareAtPrice.amount) : variant.price?.amount ? Number(variant.price.amount) : 0;
+    const finalPrice = variant.finalPrice?.amount ? Number(variant.finalPrice.amount) : originalPrice;
+    const subtotalAmount = originalPrice * quantity;
+    const totalAmount = finalPrice * quantity;
     return {
       id: `temp-line-${index}-${variant.id}`,
       // Temporary ID for pre-cart lines
@@ -156,7 +158,7 @@ function normalizeAddToCartLines(lines) {
       customAttributes: line.attributes || [],
       variant: {
         id: variant.id,
-        price,
+        price: variant.price?.amount ? Number(variant.price.amount) : 0,
         listPrice: variant.compareAtPrice?.amount ? Number(variant.compareAtPrice.amount) : 0,
         sku: variant.sku || "",
         name: variant.title || "",
@@ -998,6 +1000,61 @@ function useRemoveCartCodes(options) {
   return useSWRMutation("remove-codes", removeCodes, options);
 }
 
+// src/hooks/cart/utils/add-to-cart.ts
+var getLinesWithAttributes = ({
+  cart,
+  lineItems
+}) => {
+  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
+    );
+    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;
+  });
+};
+var getLinesWithFunctionAttributes = (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: Number(line.variant?.finalPrice?.amount || line.variant?.price?.amount) * (line.quantity || 1)
+          })
+        }
+      ]);
+    }
+    return { ...line, attributes: itemAttributes };
+  });
+};
+
 // src/hooks/cart/use-add-to-cart.ts
 function useAddToCart({ withTrack = true } = {}, swrOptions) {
   const { client, config, locale, cartCookieAdapter, userAdapter } = useShopify();
@@ -1021,7 +1078,12 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
       if (!lineItems || lineItems.length === 0) {
         return;
       }
-      const lines = lineItems.map((item) => ({
+      const linesWithAttributes = getLinesWithAttributes({
+        cart,
+        lineItems
+      });
+      const linesWithFunctionAttributes = getLinesWithFunctionAttributes(linesWithAttributes);
+      const lines = linesWithFunctionAttributes.map((item) => ({
         merchandiseId: item.variant?.id || "",
         quantity: item.quantity || 1,
         attributes: item.attributes,
@@ -1172,7 +1234,8 @@ function useBuyNow({ withTrack = true } = {}, swrOptions) {
       if (!lineItems || lineItems.length === 0) {
         return;
       }
-      const lines = lineItems.map((item) => ({
+      const linesWithFunctionAttributes = getLinesWithFunctionAttributes(lineItems);
+      const lines = linesWithFunctionAttributes.map((item) => ({
         merchandiseId: item.variant?.id || "",
         quantity: item.quantity || 1,
         attributes: item.attributes,
@@ -1625,7 +1688,7 @@ var useUpdateLineCodeAmountAttributes = ({
       );
       const functionEnvValue = getDiscountEnvAttributeValue(line.customAttributes);
       const hasSameFunctionEnvAttribute = Number(functionEnvValue.discounted_amount) === Number(line.totalAmount);
-      if (!hasSameFunctionEnvAttribute && hasFunctionEnvAttribute) {
+      if (!hasSameFunctionEnvAttribute && hasFunctionEnvAttribute && !functionEnvValue.is_gift) {
         attrNeedUpdate.push({
           key: CUSTOMER_ATTRIBUTE_KEY,
           value: JSON.stringify({