foodbot-cart-calculations 1.0.52 → 1.0.54

package/functions/promotionCalculation.js

@@ -1081,7 +1081,7 @@ function setPackageDefaultDiscount(cart) {
                             item.package_items.forEach(function (v) {
                                 //this commemted code is sceniore when user can also increas item quantity i think which is wrong
                                 // itemTotal += ((item.quantity * v.quantity) * v.price);
-                                itemTotal += (item.quantity  * v.price);
+                                itemTotal += (item.quantity  * (v.quantity * v.price));
                             })
                             let packagePrice = item.quantity * item.item_price;
                             let totalDiscount = (packagePrice < itemTotal) ? (parseFloat(itemTotal) - parseFloat(packagePrice)).toFixed(2) : 0;
@@ -1121,7 +1121,7 @@ function distributeDiscount(packageItems, totalDiscount, itemTotal, quantity) {
             for (const [index, item] of packageItems.entries()) {
                 //this commemted code is sceniore when user can also increas item quantity i think which is wrong
                 // let discountPerItem = (parseFloat(singleUnit) * (parseInt(item.quantity) * parseFloat(item.price))).toFixed(2);
-                let discountPerItem = (parseFloat(singleUnit) * parseFloat(item.price)).toFixed(2);
+                let discountPerItem = (parseFloat(singleUnit) * parseFloat(item.price * item.quantity)).toFixed(2);
                 totalApplied = (parseFloat(totalApplied) + parseFloat(discountPerItem)).toFixed(2);
                 item.default_combo_discount = parseFloat(discountPerItem).toFixed(2);
                 if (index == packageItems.length - 1) {

package/functions/taxCalculation.js

@@ -182,7 +182,7 @@ function calculatePackageItemTax(cart, itemIndex, element, tax_settings, afterDi
       let pointsDisouuntPackage = (packageItem.points_discount) ? packageItem.points_discount : 0
 
       let defaultComboDiscount = packageItem.default_combo_discount ? packageItem.default_combo_discount : 0
-      let afterDicsountPackage = packageItem.price * element.quantity - promoDiscountPackage
+      let afterDicsountPackage = packageItem.price * (packageItem.quantity * element.quantity) - promoDiscountPackage
 
       afterDicsountPackage = parseFloat(afterDicsountPackage).toFixed(2)
       afterDicsountPackage = afterDicsountPackage - pointsDisouuntPackage
@@ -201,8 +201,7 @@ function calculatePackageItemTax(cart, itemIndex, element, tax_settings, afterDi
 
         let lastPrice = afterDicsountPackage
         let itemtaxAmount = 0;
-
-        await getBeforeTaxPriceOfItem(itemTaxs, lastPrice, taxType, packageItem.quantity).then(async (resp) => {
+        await getBeforeTaxPriceOfItem(itemTaxs, lastPrice, taxType, (packageItem.quantity * element.quantity)).then(async (resp) => {
           lastPrice = resp.beforeTax;
           let lastPriceIeps = +resp.beforeTaxIeps;
           let iepsTaxRate = +resp.iepsTaxRate;
@@ -624,7 +623,7 @@ async function getBeforeTaxPriceOfItem(taxes, price, taxType, quantity) {
     // Calculate taxAmount based on tax type 1 = exclusive and 2 = inclusive
     if (taxType == 2) {
         beforeTax = (beforeTax / (1 + totalTax / 100)).toFixed(2);
-      }
+    }
 
     // ieps tax type = 1 precentage 2 absoulte 
     taxes.forEach((tax) => {
@@ -638,19 +637,20 @@ async function getBeforeTaxPriceOfItem(taxes, price, taxType, quantity) {
               iepsTaxRate = parseFloat(iepsTaxRate)
               iepsTaxAmount = (tax.tax_rate * quantity).toFixed(2);
             }
-          }
-          else if (tax.ieps_type && tax.ieps_type == 1) {
-            beforeTaxIeps = beforeTax ;
-            iepsTaxRate = tax.tax_rate
-            iepsTaxAmount = (firstAmount - beforeTax - taxAmount).toFixed(2);
-          }
-          else{
-            taxAmount = ((beforeTax * tax.tax_rate) / 100).toFixed(2);
-          }
+        }
+        else if (tax.ieps_type && tax.ieps_type == 1) {
+          beforeTaxIeps = beforeTax ;
+          iepsTaxRate = tax.tax_rate
+          iepsTaxAmount = (firstAmount - beforeTax - taxAmount).toFixed(2);
+        }
+        else{
+          taxAmount = ((beforeTax * tax.tax_rate) / 100).toFixed(2);
+        }
     });  
     resolve({ beforeTax, taxAmount, beforeTaxIeps, iepsTaxRate,iepsTaxAmount,iepsTaxRateQuantity });
-});
+  });
 }
+
 function setTaxes(cart, ele) {
   let index = -1;
   if (ele.ieps_type) {