@artisan-commerce/analytics-web 0.2.0-canary.67 → 0.2.0-canary.69

package/CHANGELOG.md

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

package/dist/bundle.cjs.js

@@ -39,7 +39,7 @@ const getState$2 = () => {
 
 var name = "@artisan-commerce/analytics-web";
 var description = "Artisn commerce analytics web library";
-var version = "0.2.0-canary.66";
+var version = "0.2.0-canary.68";
 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.41",
-	"@artisan-commerce/shopping-cart": "0.12.0-canary.63",
-	"@artisan-commerce/types": "0.14.0-canary.32"
+	"@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"
 };
 var peerDependencies = {
 	"@artisan-commerce/products": "*",
@@ -1614,7 +1614,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;
@@ -1644,14 +1644,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);
@@ -1659,13 +1661,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), {
@@ -1673,8 +1685,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), {