foodbot-cart-calculations 1.0.66 → 1.0.67

package/calculations.js

@@ -61,7 +61,7 @@ function applyDistribution(body) {
                             // let message = i18n.__("kiosk_point_message_redeemed").replace(/{totalAmount}/g, currency + "" + totalStoreValue).replace(/{paidPoints}/g, currency + "" + final.store_value)
                             // final.points_redeem_message = message
                         }
-                        taxCalculation.calculateTax2(final, taxSettings, taxType).then(taxData => {
+                        taxCalculation.calculateTax2(final, taxSettings, taxType, body.isSplit).then(taxData => {
                             taxData.sub_total = taxData.cartTotal;
                             mainCart.final_amount = parseFloat(taxData.cartTotal);
                             mainCart.cash_expected = parseFloat(taxData.cartTotal) ;

package/functions/taxCalculation.js

@@ -1,6 +1,8 @@
-function calculateTax2(cart, texSettings, taxType) {
+var toFix = 2;
+function calculateTax2(cart, texSettings, taxType, isSplit = false) {
   return new Promise(function (resolve, reject) {
     try {
+      toFix = isSplit ? 6 : 2;
       cart.cartTotal = 0;
       cart.tax_amount = 0;
       cart.item_details.forEach(function (v) {
@@ -44,15 +46,15 @@ function calculateTax2(cart, texSettings, taxType) {
         }
         promoDiscount = (promoDiscount > element.item_price * element.quantity) ? element.item_price * element.quantity : promoDiscount;
         element.promotion_discount = JSON.parse(JSON.stringify(promoDiscount));
-        promoDiscount = parseFloat(promoDiscount).toFixed(6);
+        promoDiscount = parseFloat(promoDiscount).toFixed(toFix);
 
         let afterDiscount = element.item_price * element.quantity - promoDiscount;
-        afterDiscount = parseFloat(afterDiscount).toFixed(6);
+        afterDiscount = parseFloat(afterDiscount).toFixed(toFix);
         afterDiscount = afterDiscount - pointsDiscount;
-        afterDiscount = parseFloat(afterDiscount).toFixed(6);
+        afterDiscount = parseFloat(afterDiscount).toFixed(toFix);
         afterDiscount = (afterDiscount < 0) ? 0 : afterDiscount;
         cart.cartTotal = parseFloat(cart.cartTotal) + parseFloat(afterDiscount);
-        cart.cartTotal = parseFloat(cart.cartTotal).toFixed(6);
+        cart.cartTotal = parseFloat(cart.cartTotal).toFixed(toFix);
         total = +element.item_price;
         if (element.isPackage == 1) {
           let result = await calculatePackageItemTax(cart, itemIndex, element, texSettings, afterDiscount, taxType);
@@ -75,7 +77,7 @@ function calculateTax2(cart, texSettings, taxType) {
         }
         if (itemIndex == cart.item_details.length - 1) {
           cart.cart_total_with_tax = parseFloat(cart.cartTotal) + parseFloat(cart.tax_amount);
-          cart.cart_total_with_tax = parseFloat(cart.cart_total_with_tax).toFixed(6);
+          cart.cart_total_with_tax = parseFloat(cart.cart_total_with_tax).toFixed(toFix);
 
           //delay
           await new Promise((resolve) => {
@@ -113,6 +115,7 @@ function calculateItemTax(cart, itemIndex, element, tax_settings, afterDicsount,
         let iepsTaxRateQuantity = +resp.iepsTaxRateQuantity;
         let itemTotalTax = 0;
         let tax_array = []
+        console.log("isSplit", toFix)
         if (itemTaxs && itemTaxs.length > 0) {
           itemTaxs.forEach(async (itemTaxArray, itemTaxIndex) => {
             // let startItemTax = JSON.parse(JSON.stringify(itemTaxArray))
@@ -125,13 +128,13 @@ function calculateItemTax(cart, itemIndex, element, tax_settings, afterDicsount,
             // } else {
             //   taxAmount = (lastPrice * startItemTax.tax_rate) / 100;
             // }
-            // taxAmount = parseFloat(taxAmount).toFixed(6)
-            // itemTotalTax = (parseFloat(itemTotalTax) + parseFloat(taxAmount)).toFixed(6)
+            // taxAmount = parseFloat(taxAmount).toFixed(toFix)
+            // itemTotalTax = (parseFloat(itemTotalTax) + parseFloat(taxAmount)).toFixed(toFix)
 
             // cart.tax_amount = parseFloat(cart.tax_amount) + parseFloat(taxAmount)
-            // cart.tax_amount = parseFloat(cart.tax_amount).toFixed(6)
-            // startItemTax.base_price = parseFloat(lastPrice).toFixed(6)
-            // startItemTax.tax_amount = parseFloat(taxAmount).toFixed(6)
+            // cart.tax_amount = parseFloat(cart.tax_amount).toFixed(toFix)
+            // startItemTax.base_price = parseFloat(lastPrice).toFixed(toFix)
+            // startItemTax.tax_amount = parseFloat(taxAmount).toFixed(toFix)
             // element.tax_array.push(JSON.parse(JSON.stringify(startItemTax)))
 
 
@@ -186,13 +189,13 @@ function calculatePackageItemTax(cart, itemIndex, element, tax_settings, afterDi
       let defaultComboDiscount = packageItem.default_combo_discount ? packageItem.default_combo_discount : 0
       let afterDicsountPackage = packageItem.price * packageItem.quantity - promoDiscountPackage
 
-      afterDicsountPackage = parseFloat(afterDicsountPackage).toFixed(6)
+      afterDicsountPackage = parseFloat(afterDicsountPackage).toFixed(toFix)
       afterDicsountPackage = afterDicsountPackage - pointsDisouuntPackage
 
-      afterDicsountPackage = parseFloat(afterDicsountPackage).toFixed(6)
+      afterDicsountPackage = parseFloat(afterDicsountPackage).toFixed(toFix)
       afterDicsountPackage = afterDicsountPackage - defaultComboDiscount
 
-      afterDicsountPackage = parseFloat(afterDicsountPackage).toFixed(6)
+      afterDicsountPackage = parseFloat(afterDicsountPackage).toFixed(toFix)
 
       getTaxSettings2(packageItem.tax_id, tax_settings, packageItem.ieps_tax).then(async (itemTaxs) => {
 
@@ -292,15 +295,15 @@ function calculateModiTax(cart, itemIndex, element, tax_settings, afterDicsount,
         modi.tax_id = taxId
         let promoDiscount = (modi.promotion_discount) ? modi.promotion_discount : 0
         let pointsDisouunt = (modi.points_discount) ? modi.points_discount : 0
-        promoDiscount = parseFloat(promoDiscount).toFixed(6)
+        promoDiscount = parseFloat(promoDiscount).toFixed(toFix)
         let afterDicsount = (modi.modifier_item_price * modi.quantity) * element.quantity - promoDiscount
         afterDicsount = afterDicsount - pointsDisouunt
-        afterDicsount = parseFloat(afterDicsount).toFixed(6)
+        afterDicsount = parseFloat(afterDicsount).toFixed(toFix)
 
         afterDicsount = (afterDicsount < 0) ? 0 : afterDicsount
 
         cart.cartTotal = parseFloat(cart.cartTotal) + parseFloat(afterDicsount)
-        cart.cartTotal = parseFloat(cart.cartTotal).toFixed(6)
+        cart.cartTotal = parseFloat(cart.cartTotal).toFixed(toFix)
 
         getTaxSettings2(taxId, tax_settings, iepsTax).then(async (modiItemTaxs) => {
 
@@ -412,12 +415,12 @@ function calculatePackageModiTax(cart, itemIndex, element, tax_settings, afterDi
           let pointsDisouunt = (modi.points_discount) ? modi.points_discount : 0
           let afterDicsount = (modi.modifier_item_price * modi.quantity) * element.quantity - promoDiscount
           afterDicsount = afterDicsount - pointsDisouunt
-          afterDicsount = parseFloat(afterDicsount).toFixed(6)
+          afterDicsount = parseFloat(afterDicsount).toFixed(toFix)
 
           afterDicsount = (afterDicsount < 0) ? 0 : afterDicsount
 
           cart.cartTotal = parseFloat(cart.cartTotal) + parseFloat(afterDicsount)
-          cart.cartTotal = parseFloat(cart.cartTotal).toFixed(6)
+          cart.cartTotal = parseFloat(cart.cartTotal).toFixed(toFix)
 
           getTaxSettings2(taxId, tax_settings, iepsTax).then(async (modiItemTaxs) => {
 
@@ -457,7 +460,7 @@ function calculatePackageModiTax(cart, itemIndex, element, tax_settings, afterDi
                   cart.tax_amount = parseFloat(cart.tax_amount).toFixed(6)
 
 
-                  // modiItemTax.base_price = that.taxType == 1 ? parseFloat(afterDicsount).toFixed(6) : (parseFloat(afterDicsount) - parseFloat(taxAmount)).toFixed(6)
+                  // modiItemTax.base_price = that.taxType == 1 ? parseFloat(afterDicsount).toFixed(toFix) : (parseFloat(afterDicsount) - parseFloat(taxAmount)).toFixed(toFix)
                   modiItemTaxArray.tax_amount = parseFloat(taxAmount).toFixed(6);
                   modiItemTaxArray.base_price = modiItemTaxArray.ieps_type ? lastPriceIeps : lastPrice;
                   modiItemTaxArray.tax_rate = modiItemTaxArray.ieps_type ? iepsTaxRate : modiItemTaxArray.tax_rate;
@@ -627,7 +630,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(6);
+      beforeTax = (beforeTax / (1 + totalTax / 100)).toFixed(toFix);
     }
 
     // ieps tax type = 1 precentage 2 absoulte 
@@ -636,20 +639,20 @@ async function getBeforeTaxPriceOfItem(taxes, price, taxType, quantity) {
         // Adjust beforeTax based on tax type
         if (beforeTax >= tax.tax_rate) {
           beforeTaxIeps = taxType == 1 ? beforeTax : beforeTax - tax.tax_rate * quantity;
-          beforeTaxIeps = parseFloat(beforeTaxIeps).toFixed(6)
+          beforeTaxIeps = parseFloat(beforeTaxIeps).toFixed(toFix)
           iepsTaxRate = tax.tax_rate * quantity / beforeTaxIeps
           iepsTaxRateQuantity = tax.tax_rate * quantity
           iepsTaxRate = parseFloat(iepsTaxRate)
-          iepsTaxAmount = (tax.tax_rate * quantity).toFixed(6);
+          iepsTaxAmount = (tax.tax_rate * quantity).toFixed(toFix);
         }
       }
       else if (tax.ieps_type && tax.ieps_type == 1) {
         beforeTaxIeps = beforeTax;
         iepsTaxRate = tax.tax_rate
-        iepsTaxAmount = (firstAmount - beforeTax - taxAmount).toFixed(6);
+        iepsTaxAmount = (firstAmount - beforeTax - taxAmount).toFixed(toFix);
       }
       else {
-        taxAmount = ((beforeTax * tax.tax_rate) / 100).toFixed(6);
+        taxAmount = ((beforeTax * tax.tax_rate) / 100).toFixed(toFix);
       }
     });
     resolve({ beforeTax, taxAmount, beforeTaxIeps, iepsTaxRate, iepsTaxAmount, iepsTaxRateQuantity });
@@ -787,9 +790,9 @@ async function calculateItemWiseSplit(cart, itemWiseItems) {
               }));
 
               // FINAL VALUES
-              p.tax = totalTax.toFixed(6);
-              p.amount = subtotal.toFixed(6);
-              p.due = subtotal.toFixed(6);
+              p.tax = totalTax.toFixed(toFix);
+              p.amount = subtotal.toFixed(toFix);
+              p.due = subtotal.toFixed(toFix);
           }
       });
       resolve(cart);
@@ -956,17 +959,17 @@ async function calculateHalfSplit(cart, options = {}) {
             const remainingTax = (unpaidTotalTax - accumulatedTax);
             const remainingAmount = (unpaidTotalAmount - accumulatedAmount);
 
-            p.tax = Number(remainingTax).toFixed(6);
-            p.amount = Number(remainingAmount).toFixed(6);
+            p.tax = Number(remainingTax).toFixed(toFix);
+            p.amount = Number(remainingAmount).toFixed(toFix);
             p.due = p.amount;
           } else {
             // Non-last unpaid: assign precomputed per-person values (rounded to 2 decimals)
-            const taxAmount = Number(Number(halfSplitTaxPerPerson).toFixed(6));
-            const dueAmount = Number(Number(halfSplitTotalPerPerson).toFixed(6));
+            const taxAmount = Number(Number(halfSplitTaxPerPerson).toFixed(toFix));
+            const dueAmount = Number(Number(halfSplitTotalPerPerson).toFixed(toFix));
 
-            p.tax = taxAmount.toFixed(6);
-            p.amount = dueAmount.toFixed(6);
-            p.due = dueAmount.toFixed(6);
+            p.tax = taxAmount.toFixed(toFix);
+            p.amount = dueAmount.toFixed(toFix);
+            p.due = dueAmount.toFixed(toFix);
 
             accumulatedTax += taxAmount;
             accumulatedAmount += dueAmount;

package/package.json

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