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

package/dist/hooks/index.js

@@ -6,6 +6,7 @@ var shopifySdk = require('@anker-in/shopify-sdk');
 var Cookies5 = require('js-cookie');
 var jsxRuntime = require('react/jsx-runtime');
 var Decimal2 = require('decimal.js');
+var shopifyCore = require('@anker-in/shopify-core');
 var useSWR = require('swr');
 var ahooks = require('ahooks');
 
@@ -77,9 +78,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
@@ -93,7 +95,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 || "",
@@ -170,7 +172,7 @@ var getMatchedMainProductSubTotal = (cartData, variant_list, main_product) => {
   const matchedList = cartData?.lineItems?.filter((line) => {
     const { is_gift } = getDiscountEnvAttributeValue(line.customAttributes);
     return isAllStoreVariant ? !is_gift : variant_list?.find((item) => {
-      return !is_gift && shopifySdk.atobID(line.variantId) === item;
+      return !is_gift && shopifyCore.atobID(line.variantId) === item;
     });
   });
   return matchedList?.reduce((acc, line) => {
@@ -422,7 +424,7 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
         if (!giftProduct) return null;
         return {
           variant: {
-            id: shopifySdk.btoaID(giftProduct.variant_id),
+            id: shopifyCore.btoaID(giftProduct.variant_id),
             handle: giftProduct.handle,
             sku: giftProduct.sku
           },