foodbot-cart-calculations 1.0.1 → 1.0.2

package/functions/taxCalculation.js

@@ -56,21 +56,21 @@ function calculateTax2(cart, texSettings, taxType) {
         total = +element.item_price;
 
         if (element.isPackage == 1) {
-          let result = await calculatePackageItemTax(cart, itemIndex, element, texSettings, afterDiscount);
+          let result = await calculatePackageItemTax(cart, itemIndex, element, texSettings, afterDiscount,taxType);
           cart = result.cart;
           element = result.element;
         } else {
-          let result = await calculateItemTax(cart, itemIndex, element, texSettings, afterDiscount);
+          let result = await calculateItemTax(cart, itemIndex, element, texSettings, afterDiscount,taxType);
           cart = result.cart;
           element = result.element;
         }
 
         if (element.isPackage == 1) {
-          let result = await calculatePackageModiTax(cart, itemIndex, element, texSettings, afterDiscount);
+          let result = await calculatePackageModiTax(cart, itemIndex, element, texSettings, afterDiscount,taxType);
           cart = result.cart;
           element = result.element;
         } else {
-          let result = await calculateModiTax(cart, itemIndex, element, texSettings, afterDiscount);
+          let result = await calculateModiTax(cart, itemIndex, element, texSettings, afterDiscount,taxType);
           cart = result.cart;
           element = result.element;
         }
@@ -87,11 +87,11 @@ function calculateTax2(cart, texSettings, taxType) {
   });
 }
 
-function calculateItemTax(cart, itemIndex, element, tax_settings, afterDicsount) {
+function calculateItemTax(cart, itemIndex, element, tax_settings, afterDicsount,taxType) {
   return new Promise(async (resolve, reject) => {
     getTaxSettings2(element.tax_id, tax_settings, element.ieps_tax).then(async (itemTaxs) => {
       let lastPrice = afterDicsount
-      getBeforeTaxPriceOfItem(itemTaxs, lastPrice).then((resp) => {
+      getBeforeTaxPriceOfItem(itemTaxs, lastPrice,taxType).then((resp) => {
         lastPrice = +resp.beforeTax;
         let itemTotalTax = 0;
 
@@ -129,7 +129,7 @@ function calculateItemTax(cart, itemIndex, element, tax_settings, afterDicsount)
     })
   })
 }
-function calculatePackageItemTax(cart, itemIndex, element, tax_settings, afterDicsount) {
+function calculatePackageItemTax(cart, itemIndex, element, tax_settings, afterDicsount,taxType) {
   return new Promise(async (resolve, reject) => {
     let itemTotalTax = 0;
     element.package_items.forEach((packageItem, packageItemIndex) => {
@@ -158,7 +158,7 @@ function calculatePackageItemTax(cart, itemIndex, element, tax_settings, afterDi
         let lastPrice = afterDicsountPackage
         let itemtaxAmount = 0;
 
-        await getBeforeTaxPriceOfItem(itemTaxs, lastPrice).then(async (resp) => {
+        await getBeforeTaxPriceOfItem(itemTaxs, lastPrice,taxType).then(async (resp) => {
           lastPrice = +resp.beforeTax;
 
           itemTaxs.forEach(async (itemTaxArray, itemTaxIndex) => {
@@ -208,7 +208,7 @@ function calculatePackageItemTax(cart, itemIndex, element, tax_settings, afterDi
     })
   })
 }
-function calculateModiTax(cart, itemIndex, element, tax_settings, afterDicsount) {
+function calculateModiTax(cart, itemIndex, element, tax_settings, afterDicsount,taxType) {
   return new Promise(async (resolve, reject) => {
     if (element && element.item_modifiers && element.item_modifiers.length > 0) {
       let itemModiTotalTax = 0
@@ -250,7 +250,7 @@ function calculateModiTax(cart, itemIndex, element, tax_settings, afterDicsount)
 
           let lastPrice = afterDicsount
           if (modiItemTaxs.length > 0) {
-            await getBeforeTaxPriceOfItem(modiItemTaxs, lastPrice).then((resp) => {
+            await getBeforeTaxPriceOfItem(modiItemTaxs, lastPrice,taxType).then((resp) => {
               lastPrice = +resp.beforeTax;
 
               modiItemTaxs.forEach(async (modiItemTax, modiTaxItemIndex) => {
@@ -307,7 +307,7 @@ function calculateModiTax(cart, itemIndex, element, tax_settings, afterDicsount)
     }
   })
 }
-function calculatePackageModiTax(cart, itemIndex, element, tax_settings, afterDicsount) {
+function calculatePackageModiTax(cart, itemIndex, element, tax_settings, afterDicsount,taxType) {
   return new Promise(async (resolve, reject) => {
     element.package_items.forEach((packageItem, packageItemIndex) => {
       element.package_items[packageItemIndex].tax_amount_modifier = 0
@@ -351,7 +351,7 @@ function calculatePackageModiTax(cart, itemIndex, element, tax_settings, afterDi
             let lastPrice = afterDicsount
 
             if (modiItemTaxs.length > 0) {
-              await getBeforeTaxPriceOfItem(modiItemTaxs, lastPrice).then((resp) => {
+              await getBeforeTaxPriceOfItem(modiItemTaxs, lastPrice,taxType).then((resp) => {
                 lastPrice = +resp.beforeTax;
                 modiItemTaxs.forEach(async (modiItemTax, modiTaxItemIndex) => {
 
@@ -492,9 +492,8 @@ function isJson(str) {
   return true;
 }
 
-async function getBeforeTaxPriceOfItem(taxes, price) {
+async function getBeforeTaxPriceOfItem(taxes, price,taxType) {
   return new Promise((resolve, reject) => {
-    let taxType = this.taxType;
     let beforeTax = parseFloat(price);
     let taxRate = 0;
     let taxAmount = 0;

package/package.json

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