@artisan-commerce/analytics-rn 0.3.0-canary.57 → 0.3.0-canary.58

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.3.0-canary.58](https://bitbucket.org/tradesystem/artisn_sdk/compare/@artisan-commerce/analytics-rn@0.3.0-canary.57...@artisan-commerce/analytics-rn@0.3.0-canary.58) (2021-12-16)
+
+
+### Bug Fixes
+
+* **artisn:** fix ShoppingCartTotals ([412b147](https://bitbucket.org/tradesystem/artisn_sdk/commit/412b147e7e402aef26eb24c4ca7d987e7be9473b))
+
+
+
 ## [0.3.0-canary.57](https://bitbucket.org/tradesystem/artisn_sdk/compare/@artisan-commerce/analytics-rn@0.3.0-canary.56...@artisan-commerce/analytics-rn@0.3.0-canary.57) (2021-12-15)
 
 **Note:** Version bump only for package @artisan-commerce/analytics-rn

package/dist/bundle.cjs.js

@@ -49,7 +49,7 @@ const getState$1 = () => {
 
 var name = "@artisan-commerce/analytics-rn";
 var description = "Artisn commerce analytics react native library";
-var version = "0.3.0-canary.57";
+var version = "0.3.0-canary.58";
 var main = "./dist/bundle.esm.js";
 var module$1 = "./dist/bundle.esm.js";
 var types = "./dist/bundle.d.ts";
@@ -91,8 +91,8 @@ var dependencies = {
 	"snake-case": "^3.0.4"
 };
 var devDependencies = {
-	"@artisan-commerce/products": "0.9.0-canary.36",
-	"@artisan-commerce/shopping-cart": "0.12.0-canary.53",
+	"@artisan-commerce/products": "0.9.0-canary.37",
+	"@artisan-commerce/shopping-cart": "0.12.0-canary.54",
 	"@artisan-commerce/types": "0.14.0-canary.28",
 	"@babel/core": "^7.13.15",
 	"@babel/preset-env": "^7.10.4",
@@ -112,7 +112,7 @@ var peerDependencies = {
 	react: ">=16.8.6",
 	"react-native-fbsdk-next": "*"
 };
-var gitHead = "41494d0ea43f17af10489d8ef47f4d4ad014a951";
+var gitHead = "0427e4882a041437b9020e86646d0dff83dbda9e";
 var packageJSON = {
 	name: name,
 	description: description,
@@ -1336,6 +1336,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) => {
@@ -1346,7 +1349,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;
@@ -1355,7 +1358,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);
@@ -1380,6 +1383,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);
@@ -1407,12 +1413,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;
@@ -1423,9 +1432,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);
@@ -1437,8 +1447,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
@@ -1478,7 +1488,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,
@@ -1487,7 +1497,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,
@@ -1677,6 +1687,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) => {
@@ -1687,7 +1700,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;
@@ -1696,7 +1709,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);
@@ -1721,6 +1734,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);
@@ -4164,7 +4180,7 @@ const initiateCheckout$2 = (provider, params) => {
   analytics__default$1["default"]().logEvent("begin_checkout", __spreadValues$33(__spreadValues$33({
     items: mapProductsToGoogleItems(shoppingCart, selectedCurrency),
     value: total,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -4214,11 +4230,11 @@ const initiateCheckout$1 = (provider, params) => {
   const { total, totalTaxes, shippingCost, totalPoints } = getShoppingCartTotal(shoppingCart);
   analytics__default["default"].track("Initiate Checkout", __spreadValues$32(__spreadValues$32({
     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));
 };
 
@@ -4268,7 +4284,7 @@ const initiateCheckout = (provider, params) => {
     fb_num_items: productsIds.length,
     fb_currency: selectedCurrency,
     fb_content_type: contentType,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -9831,7 +9847,7 @@ const purchaseAttempt$2 = (provider, params) => {
   analytics__default$1["default"]().logEvent("purchase_attempt", __spreadValues$18(__spreadValues$18({
     products: transformArrayParam(productContents),
     value: total,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -9881,11 +9897,11 @@ const purchaseAttempt$1 = (provider, params) => {
   const { total, totalTaxes, shippingCost, totalPoints } = getShoppingCartTotal(shoppingCart);
   analytics__default["default"].track("Purchase Attempt", __spreadValues$17(__spreadValues$17({
     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));
 };
 
@@ -9935,7 +9951,7 @@ const purchaseAttempt = (provider, params) => {
     fb_num_items: productsIds.length,
     fb_content_type: contentType,
     fb_currency: selectedCurrency,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -9996,7 +10012,7 @@ const purchaseFail$2 = (provider, params) => {
   analytics__default$1["default"]().logEvent("purchase_fail", __spreadValues$15(__spreadValues$15({
     products: transformArrayParam(productContents),
     value: total,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -10046,11 +10062,11 @@ const purchaseFail$1 = (provider, params) => {
   const { total, totalTaxes, shippingCost, totalPoints } = getShoppingCartTotal(shoppingCart);
   analytics__default["default"].track("Purchase Fail", __spreadValues$14(__spreadValues$14({
     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));
 };
 
@@ -10100,7 +10116,7 @@ const purchaseFail = (provider, params) => {
     fb_num_items: productsIds.length,
     fb_content_type: contentType,
     fb_currency: selectedCurrency,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };
 
@@ -10160,10 +10176,10 @@ const purchaseSuccess$2 = (provider, params) => {
   analytics__default$1["default"]().logEvent("purchase", __spreadValues$12(__spreadValues$12({
     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));
 };
 
@@ -10213,11 +10229,11 @@ const purchaseSuccess$1 = (provider, params) => {
   const { total, totalTaxes, shippingCost, totalPoints } = getShoppingCartTotal(shoppingCart);
   analytics__default["default"].track("Order Completed", __spreadValues$11(__spreadValues$11({
     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));
 };
 
@@ -10267,7 +10283,7 @@ const purchaseSuccess = (provider, params) => {
     fb_contents: transformArrayParam(productContents),
     fb_num_items: productsIds.length,
     fb_content_type: contentType,
-    points: totalPoints
+    points: totalPoints != null ? totalPoints : 0
   }, transformedParams), transformedMeta));
 };