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

package/dist/provider/index.js

@@ -128,7 +128,7 @@ function normalizeAddToCartLines(lines) {
       customAttributes: line.attributes || [],
       variant: {
         id: variant.id,
-        price: variant.price?.amount ? Number(variant.price.amount) : 0,
+        price: finalPrice,
         listPrice: variant.compareAtPrice?.amount ? Number(variant.compareAtPrice.amount) : 0,
         sku: variant.sku || "",
         name: variant.title || "",
@@ -159,7 +159,7 @@ function createMockCartFromLines(lines, existingCart) {
   const normalizedLines = normalizeAddToCartLines(lines);
   const subtotalPrice = normalizedLines.reduce((sum, line) => sum + line.subtotalAmount, 0);
   const totalPrice = normalizedLines.reduce((sum, line) => sum + line.totalAmount, 0);
-  console.log("lines createMockCartFromLines", lines);
+  console.log("lines createMockCartFromLines4444", normalizedLines, lines);
   const currency = lines[0]?.variant?.price?.currencyCode;
   return {
     id: existingCart?.id || "temp-cart-id",
@@ -406,6 +406,7 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
   const effectiveCart = react.useMemo(() => {
     return cart;
   }, [lines, cart]);
+  console.log("effectiveCart useCalcAutoFreeGift", effectiveCart);
   const { activeCampaign, subtotal } = react.useMemo(() => {
     for (const campaign of autoFreeGiftConfig) {
       const { rule_conditions = [], rule_result } = campaign;
@@ -421,6 +422,7 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
             all_store_variant: spend_get_reward.main_product?.all_store_variant || false
           }
         );
+        console.log("matchedSubtotal useCalcAutoFreeGift", matchedSubtotal);
         if (matchedSubtotal > 0) {
           return { activeCampaign: campaign, subtotal: matchedSubtotal };
         }
@@ -970,29 +972,22 @@ var useUpdateLineCodeAmountAttributes = ({
     }).filter(
       ({ attrNeedUpdate, attrNeedDelete }) => attrNeedUpdate.length || attrNeedDelete.length
     ).map(({ line, attrNeedUpdate, attrNeedDelete }) => {
+      let lineId = line.id;
+      let attributes = line.customAttributes || [];
+      if (attrNeedDelete.length) {
+        attributes = attributes.filter(
+          (attr) => !attrNeedDelete.includes(attr.key)
+        );
+      }
       if (attrNeedUpdate.length) {
-        return {
-          id: line.id,
-          attributes: [
-            ...line.customAttributes?.filter(
-              (attr) => !attrNeedUpdate.some((updateAttr) => updateAttr.key === attr.key)
-            ) || [],
-            ...attrNeedUpdate
-          ]
-        };
-      } else if (attrNeedDelete.length) {
-        return {
-          id: line.id,
-          attributes: line.customAttributes?.filter(
-            (attr) => !attrNeedDelete.includes(attr.key)
-          ) || []
-        };
-      } else {
-        return {
-          id: line.id,
-          attributes: line.customAttributes || []
-        };
+        attributes = attributes.filter(
+          (attr) => !attrNeedUpdate.some((updateAttr) => updateAttr.key === attr.key)
+        ).concat(attrNeedUpdate);
       }
+      return {
+        id: lineId,
+        attributes
+      };
     }),
     [cart?.lineItems, mainProductDiscountCodes]
   );