@artisan-commerce/analytics-web 0.2.0-canary.55 → 0.2.0-canary.56

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.0-canary.56](https://bitbucket.org/tradesystem/artisn_sdk/compare/@artisan-commerce/analytics-web@0.2.0-canary.55...@artisan-commerce/analytics-web@0.2.0-canary.56) (2021-12-16)
+
+
+### Bug Fixes
+
+* **artisn:** fix ShoppingCartTotals ([412b147](https://bitbucket.org/tradesystem/artisn_sdk/commit/412b147e7e402aef26eb24c4ca7d987e7be9473b))
+
+
+
 ## [0.2.0-canary.55](https://bitbucket.org/tradesystem/artisn_sdk/compare/@artisan-commerce/analytics-web@0.2.0-canary.54...@artisan-commerce/analytics-web@0.2.0-canary.55) (2021-12-15)
 
 **Note:** Version bump only for package @artisan-commerce/analytics-web

package/dist/bundle.cjs.js

@@ -39,7 +39,7 @@ const getState$1 = () => {
 
 var name = "@artisan-commerce/analytics-web";
 var description = "Artisn commerce analytics web library";
-var version = "0.2.0-canary.54";
+var version = "0.2.0-canary.55";
 var main = "./dist/bundle.cjs.js";
 var module$1 = "./dist/bundle.esm.js";
 var types = "./dist/bundle.d.ts";
@@ -80,9 +80,9 @@ var dependencies = {
 	"snake-case": "^3.0.4"
 };
 var devDependencies = {
-	"@artisan-commerce/products": "0.9.0-canary.35",
-	"@artisan-commerce/shopping-cart": "0.12.0-canary.52",
-	"@artisan-commerce/types": "0.14.0-canary.27"
+	"@artisan-commerce/products": "0.9.0-canary.36",
+	"@artisan-commerce/shopping-cart": "0.12.0-canary.53",
+	"@artisan-commerce/types": "0.14.0-canary.28"
 };
 var peerDependencies = {
 	"@artisan-commerce/products": "*",
@@ -1467,6 +1467,9 @@ const getProductTotalTaxes$1 = (product, setAmount) => {
   const { taxes, grossPrice } = prices[priceCategory];
   const taxTotal = getTaxTotal$1(taxes, grossPrice);
   const questionsSum = getModifiersTotalTaxes$1(cartProduct, setAmount);
+  if (taxTotal === null || questionsSum === null) {
+    return null;
+  }
   return questionsSum + taxTotal * amount;
 };
 const getModifiersTotalTaxes$1 = (product, setAmount) => {
@@ -1477,7 +1480,7 @@ const getModifiersTotalTaxes$1 = (product, setAmount) => {
       const { taxes, grossPrice } = prices[priceCategory];
       const taxTotal = getTaxTotal$1(taxes, grossPrice);
       const childrenTotal = getModifiersTotalTaxes$1(answer, setAmount);
-      return acc2 + amount * (taxTotal + childrenTotal);
+      return acc2 + amount * (Number(taxTotal) + childrenTotal);
     }, 0);
     return acc + answersSum * setAmount;
   }, 0)) != null ? _b : 0;
@@ -1486,7 +1489,7 @@ const getProductGrossPrice$1 = (product, setAmount) => {
   return getProductFieldPrice$1(product, "grossPrice", setAmount);
 };
 const getProductTotalDiscounts$1 = (product, setAmount) => {
-  return 0;
+  return null;
 };
 const getProductNetPrice$1 = (product, setAmount) => {
   return getProductFieldPrice$1(product, "netPrice", setAmount);
@@ -1511,6 +1514,9 @@ const getModifiersFieldTotal$1 = (product, field) => {
   }, 0)) != null ? _b : 0;
 };
 const getTaxTotal$1 = (taxes, grossPrice) => {
+  if (!taxes.length) {
+    return null;
+  }
   return taxes.reduce((acc, tax) => {
     return acc + tax.percentage / 100 * grossPrice;
   }, 0);
@@ -1538,12 +1544,15 @@ const { toCartProduct: toCartProduct$4 } = transformers_utils;
 const getShoppingCartTotal = (shoppingCart, config = {}) => {
   const initialValue = {
     subtotal: 0,
-    totalDiscounts: 0,
-    totalTaxes: 0,
-    totalPoints: 0,
+    totalDiscounts: null,
+    shippingCost: null,
+    totalTaxes: null,
+    totalPoints: null,
     total: 0
   };
   const products = getShoppingCartProducts(shoppingCart);
+  if (!products.length)
+    return initialValue;
   const totals = products.reduce((acc, product) => {
     const cartProduct = toCartProduct$4(product);
     const { priceCategory } = cartProduct;
@@ -1554,9 +1563,10 @@ const getShoppingCartTotal = (shoppingCart, config = {}) => {
     const subtotalNormal = !isPoints ? productTotal.grossPrice : 0;
     return {
       subtotal: acc.subtotal + subtotalNormal,
-      totalDiscounts: acc.totalDiscounts + productTotal.totalDiscounts,
-      totalTaxes: acc.totalTaxes + productTotal.totalTaxes,
-      totalPoints: acc.totalPoints + points,
+      totalDiscounts: productTotal.totalDiscounts !== null ? Number(acc.totalDiscounts) + productTotal.totalDiscounts : null,
+      totalTaxes: productTotal.totalTaxes !== null ? Number(acc.totalTaxes) + productTotal.totalTaxes : null,
+      shippingCost: null,
+      totalPoints: points !== null ? Number(acc.totalPoints) + points : null,
       total: acc.total + normal
     };
   }, initialValue);
@@ -1568,8 +1578,8 @@ const getShoppingCartTotal = (shoppingCart, config = {}) => {
   const { grossPrice, netPrice, taxTotal, discountTotal } = shippingCost;
   const totalsWithShippingCost = {
     subtotal: totalsWithBenefits.subtotal + grossPrice,
-    totalDiscounts: totalsWithBenefits.totalDiscounts + discountTotal,
-    totalTaxes: totalsWithBenefits.totalTaxes + taxTotal,
+    totalDiscounts: totalsWithBenefits.totalDiscounts !== null ? totalsWithBenefits.totalDiscounts + discountTotal : discountTotal,
+    totalTaxes: totalsWithBenefits.totalTaxes !== null ? totalsWithBenefits.totalTaxes + taxTotal : taxTotal,
     shippingCost: netPrice,
     totalPoints: totalsWithBenefits.totalPoints,
     total: totalsWithBenefits.total + netPrice
@@ -1609,7 +1619,7 @@ const applyBenefitByDiscount = (benefit, shoppingCartTotals, additionalInfo) =>
   if (typeof (additionalInfo == null ? void 0 : additionalInfo.copayment) !== "undefined") {
     const copayment = additionalInfo == null ? void 0 : additionalInfo.copayment;
     const totalDiscount2 = copayment * discountPercentage;
-    const newTotalDiscounts2 = prevTotalDiscounts + totalDiscount2;
+    const newTotalDiscounts2 = prevTotalDiscounts !== null ? prevTotalDiscounts + totalDiscount2 : totalDiscount2;
     const newTotal2 = (copayment - totalDiscount2).toFixed(4);
     return __spreadProps$c$1(__spreadValues$g$1({}, shoppingCartTotals), {
       totalDiscounts: newTotalDiscounts2,
@@ -1618,7 +1628,7 @@ const applyBenefitByDiscount = (benefit, shoppingCartTotals, additionalInfo) =>
   }
   const newSubtotal = subtotal * discountPercentage;
   const totalDiscount = newSubtotal;
-  const newTotalDiscounts = prevTotalDiscounts + totalDiscount;
+  const newTotalDiscounts = prevTotalDiscounts !== null ? prevTotalDiscounts + totalDiscount : totalDiscount;
   const newTotal = prevTotal - totalDiscount;
   return __spreadProps$c$1(__spreadValues$g$1({}, shoppingCartTotals), {
     totalDiscounts: newTotalDiscounts,
@@ -1808,6 +1818,9 @@ const getProductTotalTaxes = (product, setAmount) => {
   const { taxes, grossPrice } = prices[priceCategory];
   const taxTotal = getTaxTotal(taxes, grossPrice);
   const questionsSum = getModifiersTotalTaxes(cartProduct, setAmount);
+  if (taxTotal === null || questionsSum === null) {
+    return null;
+  }
   return questionsSum + taxTotal * amount;
 };
 const getModifiersTotalTaxes = (product, setAmount) => {
@@ -1818,7 +1831,7 @@ const getModifiersTotalTaxes = (product, setAmount) => {
       const { taxes, grossPrice } = prices[priceCategory];
       const taxTotal = getTaxTotal(taxes, grossPrice);
       const childrenTotal = getModifiersTotalTaxes(answer, setAmount);
-      return acc2 + amount * (taxTotal + childrenTotal);
+      return acc2 + amount * (Number(taxTotal) + childrenTotal);
     }, 0);
     return acc + answersSum * setAmount;
   }, 0)) != null ? _b : 0;
@@ -1827,7 +1840,7 @@ const getProductGrossPrice = (product, setAmount) => {
   return getProductFieldPrice(product, "grossPrice", setAmount);
 };
 const getProductTotalDiscounts = (product, setAmount) => {
-  return 0;
+  return null;
 };
 const getProductNetPrice = (product, setAmount) => {
   return getProductFieldPrice(product, "netPrice", setAmount);
@@ -1852,6 +1865,9 @@ const getModifiersFieldTotal = (product, field) => {
   }, 0)) != null ? _b : 0;
 };
 const getTaxTotal = (taxes, grossPrice) => {
+  if (!taxes.length) {
+    return null;
+  }
   return taxes.reduce((acc, tax) => {
     return acc + tax.percentage / 100 * grossPrice;
   }, 0);
@@ -4390,7 +4406,7 @@ const initiateCheckout$2 = (provider, params) => {
     event_callback: callback,
     items: mapProductsToGoogleItems(shoppingCart, selectedCurrency),
     value: total,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -4444,7 +4460,7 @@ const initiateCheckout$1 = (provider, params) => {
     contents: getProductContentFromShoppingCart(shoppingCart),
     num_items: productsIds.length,
     value: total,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -4494,11 +4510,11 @@ const initiateCheckout = (provider, params) => {
   const { total, totalTaxes, shippingCost, totalPoints } = getShoppingCartTotal(shoppingCart);
   analytics.track("Initiate Checkout", __spreadValues$31(__spreadValues$31({
     total,
-    revenue: total - totalTaxes - (shippingCost != null ? shippingCost : 0),
-    shipping: shippingCost,
-    tax: totalTaxes,
+    revenue: total - (totalTaxes != null ? totalTaxes : 0) - (shippingCost != null ? shippingCost : 0),
+    shipping: shippingCost != null ? shippingCost : 0,
+    tax: totalTaxes != null ? totalTaxes : 0,
     products: mapProductsToSegmentProducts(products),
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -10209,7 +10225,7 @@ const purchaseAttempt$2 = (provider, params) => {
     event_callback: callback,
     items: mapProductsToGoogleItems(shoppingCart, selectedCurrency),
     value: total,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -10263,7 +10279,7 @@ const purchaseAttempt$1 = (provider, params) => {
     contents: getProductContentFromShoppingCart(shoppingCart),
     num_items: productsIds.length,
     value: total,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -10313,11 +10329,11 @@ const purchaseAttempt = (provider, params) => {
   const { total, totalTaxes, shippingCost, totalPoints } = getShoppingCartTotal(shoppingCart);
   analytics.track("Purchase Attempt", __spreadValues$16(__spreadValues$16({
     total,
-    revenue: total - totalTaxes - (shippingCost != null ? shippingCost : 0),
-    shipping: shippingCost,
-    tax: totalTaxes,
+    revenue: total - (totalTaxes != null ? totalTaxes : 0) - (shippingCost != null ? shippingCost : 0),
+    shipping: shippingCost != null ? shippingCost : 0,
+    tax: totalTaxes != null ? totalTaxes : 0,
     products: mapProductsToSegmentProducts(products),
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -10379,7 +10395,7 @@ const purchaseFail$2 = (provider, params) => {
     event_callback: callback,
     items: mapProductsToGoogleItems(shoppingCart, selectedCurrency),
     value: total,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -10433,7 +10449,7 @@ const purchaseFail$1 = (provider, params) => {
     contents: getProductContentFromShoppingCart(shoppingCart),
     num_items: productsIds.length,
     value: total,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -10483,11 +10499,11 @@ const purchaseFail = (provider, params) => {
   const { total, totalTaxes, shippingCost, totalPoints } = getShoppingCartTotal(shoppingCart);
   analytics.track("Purchase Fail", __spreadValues$13(__spreadValues$13({
     total,
-    revenue: total - totalTaxes - (shippingCost != null ? shippingCost : 0),
-    shipping: shippingCost,
-    tax: totalTaxes,
+    revenue: total - (totalTaxes != null ? totalTaxes : 0) - (shippingCost != null ? shippingCost : 0),
+    shipping: shippingCost != null ? shippingCost : 0,
+    tax: totalTaxes != null ? totalTaxes : 0,
     products: mapProductsToSegmentProducts(products),
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -10549,10 +10565,10 @@ const purchaseSuccess$2 = (provider, params) => {
     event_callback: callback,
     items: mapProductsToGoogleItems(shoppingCart, selectedCurrency),
     value: total,
-    points: totalPoints,
+    points: totalPoints != null ? totalPoints : 0,
     transaction_id: orderId,
-    shipping: shippingCost,
-    tax: totalTaxes
+    shipping: shippingCost != null ? shippingCost : 0,
+    tax: totalTaxes != null ? totalTaxes : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -10606,7 +10622,7 @@ const purchaseSuccess$1 = (provider, params) => {
     contents: getProductContentFromShoppingCart(shoppingCart),
     num_items: productsIds.length,
     value: total,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -10656,11 +10672,11 @@ const purchaseSuccess = (provider, params) => {
   const { total, totalTaxes, shippingCost, totalPoints } = getShoppingCartTotal(shoppingCart);
   analytics.track("Order Completed", __spreadValues$10(__spreadValues$10({
     total,
-    revenue: total - totalTaxes - (shippingCost != null ? shippingCost : 0),
-    shipping: shippingCost,
-    tax: totalTaxes,
+    revenue: total - (totalTaxes != null ? totalTaxes : 0) - (shippingCost != null ? shippingCost : 0),
+    shipping: shippingCost != null ? shippingCost : 0,
+    tax: totalTaxes != null ? totalTaxes : 0,
     products: mapProductsToSegmentProducts(products),
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };