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

package/dist/bundle.umd.js

@@ -41,7 +41,7 @@
 
   var name = "@artisan-commerce/analytics-web";
   var description = "Artisn commerce analytics web library";
-  var version = "0.2.0-canary.67";
+  var version = "0.2.0-canary.68";
   var main = "./dist/bundle.cjs.js";
   var module = "./dist/bundle.esm.js";
   var types = "./dist/bundle.d.ts";
@@ -82,9 +82,9 @@
   	"snake-case": "^3.0.4"
   };
   var devDependencies = {
-  	"@artisan-commerce/products": "0.9.0-canary.41",
-  	"@artisan-commerce/shopping-cart": "0.12.0-canary.64",
-  	"@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": "*",
@@ -1616,7 +1616,7 @@ ${key}: ${value}`;
         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;
@@ -1646,14 +1646,16 @@ ${key}: ${value}`;
       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);
@@ -1661,13 +1663,23 @@ ${key}: ${value}`;
       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), {
@@ -1675,8 +1687,7 @@ ${key}: ${value}`;
         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), {