@artisan-commerce/analytics-rn 0.3.0-canary.69 → 0.3.0-canary.70

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 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.70](https://bitbucket.org/tradesystem/artisn_sdk/compare/@artisan-commerce/analytics-rn@0.3.0-canary.69...@artisan-commerce/analytics-rn@0.3.0-canary.70) (2022-04-05)
+
+**Note:** Version bump only for package @artisan-commerce/analytics-rn
+
+
+
+
+
 ## [0.3.0-canary.69](https://bitbucket.org/tradesystem/artisn_sdk/compare/@artisan-commerce/analytics-rn@0.3.0-canary.68...@artisan-commerce/analytics-rn@0.3.0-canary.69) (2022-03-07)
 
 **Note:** Version bump only for package @artisan-commerce/analytics-rn

package/dist/bundle.cjs.js

@@ -49,7 +49,7 @@ const getState$2 = () => {
 
 var name = "@artisan-commerce/analytics-rn";
 var description = "Artisn commerce analytics react native library";
-var version = "0.3.0-canary.69";
+var version = "0.3.0-canary.70";
 var main = "./dist/bundle.esm.js";
 var module$1 = "./dist/bundle.esm.js";
 var types = "./dist/bundle.d.ts";
@@ -91,9 +91,9 @@ var dependencies = {
 	"snake-case": "^3.0.4"
 };
 var devDependencies = {
-	"@artisan-commerce/products": "0.9.0-canary.42",
-	"@artisan-commerce/shopping-cart": "0.12.0-canary.65",
-	"@artisan-commerce/types": "0.14.0-canary.33",
+	"@artisan-commerce/products": "0.9.0-canary.43",
+	"@artisan-commerce/shopping-cart": "0.12.0-canary.66",
+	"@artisan-commerce/types": "0.14.0-canary.34",
 	"@babel/core": "^7.13.15",
 	"@babel/preset-env": "^7.10.4",
 	"@babel/preset-react": "^7.10.4",
@@ -112,7 +112,7 @@ var peerDependencies = {
 	react: ">=16.8.6",
 	"react-native-fbsdk-next": "*"
 };
-var gitHead = "0f7d112c16f14207b4ac0c92606736e8bf6618a8";
+var gitHead = "bd05f9bb540ac313d058fb96936fa3810f7cc103";
 var packageJSON = {
 	name: name,
 	description: description,
@@ -1482,7 +1482,7 @@ const getShoppingCartTotal = (shoppingCart, config = {}) => {
       total: acc.total + normal
     };
   }, initialValue);
-  const totalsWithBenefits = applyBenefits(shoppingCart == null ? void 0 : shoppingCart.additional_info, shoppingCart == null ? void 0 : shoppingCart.benefits, totals);
+  const totalsWithBenefits = applyBenefits(shoppingCart, totals);
   const { shippingCost = shoppingCart.shippingCost } = config;
   if (!shippingCost) {
     return totalsWithBenefits;
@@ -1512,14 +1512,16 @@ const getShoppingCartProducts = (shoppingCart, storeId) => {
     return [...acc, ...products];
   }, []);
 };
-const applyBenefits = (additionalInfo, benefits, shoppingCartTotals) => {
+const applyBenefits = (shoppingCart, shoppingCartTotals) => {
+  const additionalInfo = shoppingCart["additional_info"];
+  const benefits = shoppingCart["benefits"];
   if (!benefits) {
     return shoppingCartTotals;
   }
   const benefitsValues = Object.values(benefits);
   return benefitsValues.reduce((acc, benefit) => {
     if (benefit.type === "DISCOUNT_PERCENTAGE" && benefit.discountPercentage) {
-      return applyBenefitByDiscountPercentage(benefit, acc, additionalInfo);
+      return applyBenefitByDiscountPercentage(benefit, acc, shoppingCart);
     }
     if (benefit.type === "DISCOUNT_FIXED" && benefit.discountFixed) {
       return applyBenefitByDiscountFixed(benefit, acc, additionalInfo);
@@ -1527,13 +1529,23 @@ const applyBenefits = (additionalInfo, benefits, shoppingCartTotals) => {
     return acc;
   }, shoppingCartTotals);
 };
-const applyBenefitByDiscountPercentage = (benefit, shoppingCartTotals, additionalInfo) => {
+const applyBenefitByDiscountPercentage = (benefit, shoppingCartTotals, shoppingCart) => {
+  let taxValue = 0;
+  const additionalInfo = shoppingCart["additional_info"];
+  const { billTotal } = shoppingCart;
+  const { NORMAL } = billTotal;
+  const { discounts } = NORMAL != null ? NORMAL : {};
+  discounts == null ? void 0 : discounts.forEach((discount) => {
+    if (discount.taxValue) {
+      taxValue += discount.taxValue;
+    }
+  });
   const { subtotal, total: prevTotal } = shoppingCartTotals;
   const { totalDiscounts: prevTotalDiscounts } = shoppingCartTotals;
   const discountPercentage = benefit.discountPercentage * 0.01;
   if (typeof (additionalInfo == null ? void 0 : additionalInfo.copayment) !== "undefined") {
     const copayment = additionalInfo == null ? void 0 : additionalInfo.copayment;
-    const totalDiscount2 = copayment * discountPercentage;
+    const totalDiscount2 = copayment * discountPercentage + taxValue;
     const newTotalDiscounts2 = prevTotalDiscounts !== null ? prevTotalDiscounts + totalDiscount2 : totalDiscount2;
     const newTotal2 = (copayment - totalDiscount2).toFixed(4);
     return __spreadProps$c$1(__spreadValues$g$1({}, shoppingCartTotals), {
@@ -1541,8 +1553,7 @@ const applyBenefitByDiscountPercentage = (benefit, shoppingCartTotals, additiona
       total: Number(newTotal2)
     });
   }
-  const newSubtotal = subtotal * discountPercentage;
-  const totalDiscount = newSubtotal;
+  const totalDiscount = subtotal * discountPercentage + taxValue;
   const newTotalDiscounts = prevTotalDiscounts !== null ? prevTotalDiscounts + totalDiscount : totalDiscount;
   const newTotal = prevTotal - totalDiscount;
   return __spreadProps$c$1(__spreadValues$g$1({}, shoppingCartTotals), {