foodbot-cart-calculations 1.0.51 → 1.0.53

package/functions/pointsCalculation.js

@@ -247,7 +247,8 @@ function getPointsDiscount(cartObject, points, userDetails, deliveryCost = 0, se
                                     let basePrice = parseFloat(item.item_price) * item.quantity;
                                     let baseDiscount = ((basePrice - promoDiscount) * parseFloat(singlePriceDiscount));
                                     baseDiscount = parseFloat(baseDiscount).toFixed(2);
-
+                                    console.log("singlePriceDiscount -->", singlePriceDiscount);
+                                    console.log("baseDiscount -->", baseDiscount);
                                     // cap base discount
                                     if (parseFloat(baseDiscount) > basePrice) {
                                         baseDiscount = basePrice.toFixed(2);
@@ -266,6 +267,7 @@ function getPointsDiscount(cartObject, points, userDetails, deliveryCost = 0, se
                                             let modiBase = parseFloat(modi.modifier_item_price) * modi.quantity * item.quantity;
                                             let modiDiscount = ((modiBase - modiPromoDiscount) * parseFloat(singlePriceDiscount));
                                             modiDiscount = parseFloat(modiDiscount).toFixed(2);
+                                            console.log("modiDiscount -->", modiDiscount);
 
                                             // cap modifier
                                             if (parseFloat(modiDiscount) > modiBase) {
@@ -298,6 +300,17 @@ function getPointsDiscount(cartObject, points, userDetails, deliveryCost = 0, se
                             }
                         });
 
+                        if ((Number(itemTotalDicount) < Number(pointsAmount) || Number(itemTotalDicount) > Number(pointsAmount)) && pointsAmount > 0 && itemTotalDicount > 0) {
+                            let difference = Number(pointsAmount) - Number(itemTotalDicount);
+                            difference = parseFloat(difference).toFixed(2);
+                            if (indexes.length > 0 && difference) {
+                                carts[indexes[0]].points_discount = (difference > 0) ? parseFloat(carts[indexes[0]].points_discount) + parseFloat(difference) : parseFloat(carts[indexes[0]].points_discount) - Math.abs(difference);
+                                carts[indexes[0]].points_discount = parseFloat(carts[indexes[0]].points_discount).toFixed(2);
+                                itemTotalDicount = (difference < 0) ? itemTotalDicount + difference : itemTotalDicount - Math.abs(difference);
+                                itemTotalDicount = parseFloat(itemTotalDicount).toFixed(2);
+                            }
+                        }
+
                         cartObject.item_details = carts
                         cartObject.store_value = pointsAmount
                         cartObject.point_discount_amount = pointsAmount

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) {