foodbot-cart-calculations 1.0.54 → 1.0.56

package/functions/promotionCalculation.js

@@ -1081,10 +1081,17 @@ 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.quantity * v.price));
+                                if(item.quantity > 1){
+                                    itemTotal += (v.quantity * v.price);
+                                }else{
+                                    itemTotal += (item.quantity  * (v.quantity * v.price));
+                                }
                             })
                             let packagePrice = item.quantity * item.item_price;
+                            // console.log(packagePrice);
                             let totalDiscount = (packagePrice < itemTotal) ? (parseFloat(itemTotal) - parseFloat(packagePrice)).toFixed(2) : 0;
+                            // console.log(itemTotal);
+                            // console.log(totalDiscount);
                             await distributeDiscount(item.package_items, totalDiscount, itemTotal, item.quantity).then(ele => {
                                 item.package_items = ele;
                                 if (index == cart.item_details.length - 1) {
@@ -1125,7 +1132,6 @@ function distributeDiscount(packageItems, totalDiscount, itemTotal, quantity) {
                 totalApplied = (parseFloat(totalApplied) + parseFloat(discountPerItem)).toFixed(2);
                 item.default_combo_discount = parseFloat(discountPerItem).toFixed(2);
                 if (index == packageItems.length - 1) {
-
                     let remaningOfferAmount = (parseFloat(totalDiscount) - parseFloat(totalApplied)).toFixed(2);
                     for (const updateItem of packageItems) {
                         let updateDisc = (parseFloat(updateItem.default_combo_discount) + parseFloat(remaningOfferAmount)).toFixed(2);

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 * (packageItem.quantity * element.quantity) - promoDiscountPackage
+      let afterDicsountPackage = packageItem.price * packageItem.quantity - promoDiscountPackage
 
       afterDicsountPackage = parseFloat(afterDicsountPackage).toFixed(2)
       afterDicsountPackage = afterDicsountPackage - pointsDisouuntPackage
@@ -201,7 +201,7 @@ function calculatePackageItemTax(cart, itemIndex, element, tax_settings, afterDi
 
         let lastPrice = afterDicsountPackage
         let itemtaxAmount = 0;
-        await getBeforeTaxPriceOfItem(itemTaxs, lastPrice, taxType, (packageItem.quantity * element.quantity)).then(async (resp) => {
+        await getBeforeTaxPriceOfItem(itemTaxs, lastPrice, taxType, packageItem.quantity).then(async (resp) => {
           lastPrice = resp.beforeTax;
           let lastPriceIeps = +resp.beforeTaxIeps;
           let iepsTaxRate = +resp.iepsTaxRate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foodbot-cart-calculations",
-  "version": "1.0.54",
+  "version": "1.0.56",
   "description": "Package for cart calculations in which it performs discount distribution and tax distribution on order",
   "main": "index.js",
   "scripts": {