Added tax calculation with product_tax_id and user group id

Author: ResuBaka

config/default.json

@@ -72,7 +72,9 @@
         "deprecatedPriceFieldsSupport": true,
         "calculateServerSide": true,
         "sourcePriceIncludesTax": false,
-		    "finalPriceIncludesTax": true        
+        "finalPriceIncludesTax": true,
+        "userGroupId": null,
+        "useOnlyDefaultUserGroupId": false
       },
       "i18n": {
         "fullCountryName": "Germany",
@@ -104,7 +106,9 @@
         "calculateServerSide": true,
         "sourcePriceIncludesTax": false,
         "deprecatedPriceFieldsSupport": true,
-        "finalPriceIncludesTax": true
+        "finalPriceIncludesTax": true,
+        "userGroupId": null,
+        "useOnlyDefaultUserGroupId": false
       },
       "i18n": {
         "fullCountryName": "Italy",
@@ -132,7 +136,9 @@
     "setConfigurableProductOptions": true,
     "sourcePriceIncludesTax": false,
     "deprecatedPriceFieldsSupport": true,
-    "finalPriceIncludesTax": true
+    "finalPriceIncludesTax": true,
+    "userGroupId": null,
+    "useOnlyDefaultUserGroupId": false
   },
   "bodyLimit": "100kb",
   "corsHeaders": [

src/api/catalog.js

@@ -68,22 +68,21 @@ export default ({config, db}) => function (req, res, body) {
 		url = config.elasticsearch.protocol + '://' + url
 	}
 
-	// Check price tiers
-	if (config.usePriceTiers) {
-		const userToken = requestBody.groupToken
-
-		// Decode token and get group id
-        if (userToken && userToken.length > 10) {
-		// if (userToken && userToken.length > 10) {
-			const decodeToken = jwt.decode(userToken, config.authHashSecret ? config.authHashSecret : config.objHashSecret)
-			groupId = decodeToken.group_id || groupId
-		}
+  const userToken = requestBody.groupToken
+
+  // Decode token and get group id
+  if (userToken && userToken.length > 10) {
+    const decodeToken = jwt.decode(userToken, config.authHashSecret ? config.authHashSecret : config.objHashSecret)
+    groupId = decodeToken.group_id || groupId
+  } else if (requestBody.groupId) {
+    groupId = requestBody.groupId || groupId
+  }
+
+  delete requestBody.groupToken
+  delete requestBody.groupId
 
-		delete requestBody.groupToken
-	}
-  
   let auth = null;
-  
+
   // Only pass auth if configured
   if(config.elasticsearch.user || config.elasticsearch.password) {
     auth = {

src/api/user.js

@@ -11,15 +11,13 @@ function addUserGroupToken(config, result) {
   /**
    * Add group id to token
    */
-  if (config.usePriceTiers) {
-    const data = {
-      group_id : result.group_id,
-      id: result.id,
-      user: result.email,
-    }
-
-    result.groupToken = jwt.encode(data, config.authHashSecret ? config.authHashSecret : config.objHashSecret)
+  const data = {
+    group_id : result.group_id,
+    id: result.id,
+    user: result.email,
   }
+
+  result.groupToken = jwt.encode(data, config.authHashSecret ? config.authHashSecret : config.objHashSecret)
 }
 
 export default ({config, db}) => {

src/lib/taxcalc.js

@@ -206,10 +206,19 @@ export function updateProductPrices (product, rate, sourcePriceInclTax = false,
   }
 }
 
-export function calculateProductTax (product, taxClasses, taxCountry = 'PL', taxRegion = '', sourcePriceInclTax = false, deprecatedPriceFieldsSupport = false, finalPriceInclTax = true) {
+export function calculateProductTax (product, taxClasses, taxCountry = 'PL', taxRegion = '', sourcePriceInclTax = false, deprecatedPriceFieldsSupport = false, finalPriceInclTax = true, userGroupId = null, _storeConfigTax) {
   let rateFound = false
   if (product.tax_class_id > 0) {
-    let taxClass = taxClasses.find((el) => el.product_tax_class_ids.indexOf(parseInt(product.tax_class_id) >= 0))
+    let taxClass
+    if (checkIfTaxWithUserGroupIsActive(_storeConfigTax) && typeof userGroupId === "number") {
+      taxClass = taxClasses.find((el) =>
+        el.product_tax_class_ids.indexOf(parseInt(product.tax_class_id)) >= 0 &&
+          el.customer_tax_class_ids.indexOf(userGroupId) >= 0
+      )
+    } else {
+      taxClass = taxClasses.find((el) => el.product_tax_class_ids.indexOf(parseInt(product.tax_class_id) >= 0))
+    }
+
     if (taxClass) {
       for (let rate of taxClass.rates) { // TODO: add check for zip code ranges (!)
         if (rate.tax_country_id === taxCountry && (rate.region_name === taxRegion || rate.tax_region_id === 0 || !rate.region_name)) {
@@ -256,3 +265,19 @@ export function calculateProductTax (product, taxClasses, taxCountry = 'PL', tax
     }
   }
 }
+
+export function checkIfTaxWithUserGroupIsActive(configTax) {
+  if (typeof configTax.userGroupId === "number") {
+    return true
+  }
+
+  return false
+}
+
+export function getUserGroupIdToUse(userGroupId, configTax) {
+  if (configTax.useOnlyDefaultUserGroupId) {
+    return configTax.userGroupId
+  }
+
+  return userGroupId
+}

src/platform/magento1/tax.js

@@ -1,5 +1,5 @@
 import AbstractTaxProxy from '../abstract/tax'
-import { calculateProductTax } from '../../lib/taxcalc'
+import { calculateProductTax, checkIfTaxWithUserGroupIsActive, getUserGroupIdToUse } from "../../lib/taxcalc";
 const es = require('elasticsearch')
 const bodybuilder = require('bodybuilder')
 import TierHelper from '../../helpers/priceTiers'
@@ -11,6 +11,8 @@ class TaxProxy extends AbstractTaxProxy {
     this._indexName = indexName
     this._sourcePriceInclTax = sourcePriceInclTax
     this._finalPriceInclTax = finalPriceInclTax
+    this._userGroupId = this._config.tax.userGroupId
+    this._storeConfigTax = this._config.tax
 
     if (this._config.storeViews && this._config.storeViews.multistore) {
       for (let storeCode in this._config.storeViews){
@@ -23,6 +25,7 @@ class TaxProxy extends AbstractTaxProxy {
               taxCountry = store.tax.defaultCountry
               sourcePriceInclTax = store.tax.sourcePriceIncludesTax
               finalPriceInclTax = store.tax.finalPriceIncludesTax
+              this._storeConfigTax = store.tax
               break;
             }
           }
@@ -51,8 +54,8 @@ class TaxProxy extends AbstractTaxProxy {
     this.taxFor = this.taxFor.bind(this)
   }
 
-  taxFor (product) {
-    return calculateProductTax(product, this._taxClasses, this._taxCountry, this._taxRegion, this._sourcePriceInclTax, this._deprecatedPriceFieldsSupport, this._finalPriceInclTax)
+  taxFor (product, groupId) {
+    return calculateProductTax(product, this._taxClasses, this._taxCountry, this._taxRegion, this._sourcePriceInclTax, this._deprecatedPriceFieldsSupport, this._finalPriceInclTax, groupId, this._storeConfigTax)
   }
 
   applyTierPrices (productList, groupId) {
@@ -82,7 +85,7 @@ class TaxProxy extends AbstractTaxProxy {
         if (this._config.elasticsearch.user) {
           esConfig.httpAuth = this._config.elasticsearch.user + ':' + this._config.elasticsearch.password
         }
-        
+
         const client = new es.Client(esConfig)
         const esQuery = {
           index: this._indexName,
@@ -92,7 +95,14 @@ class TaxProxy extends AbstractTaxProxy {
         client.search(esQuery).then(function (taxClasses) { // we're always trying to populate cache - when online
           inst._taxClasses = taxClasses.hits.hits.map(el => { return el._source })
           for (let item of productList) {
-            inst.taxFor(item._source)
+            const isActive = checkIfTaxWithUserGroupIsActive(inst._storeConfigTax)
+            if (isActive) {
+              groupId = getUserGroupIdToUse(inst._userGroupId, inst._storeConfigTax)
+            } else {
+              groupId = null
+            }
+
+            inst.taxFor(item._source, groupId)
           }
 
           resolve(productList)

src/platform/magento2/tax.js

@@ -1,5 +1,5 @@
 import AbstractTaxProxy from '../abstract/tax'
-import { calculateProductTax } from '../../lib/taxcalc'
+import { calculateProductTax, checkIfTaxWithUserGroupIsActive, getUserGroupIdToUse } from "../../lib/taxcalc";
 const es = require('elasticsearch')
 const bodybuilder = require('bodybuilder')
 import TierHelper from '../../helpers/priceTiers'
@@ -11,6 +11,8 @@ class TaxProxy extends AbstractTaxProxy {
     this._indexName = indexName
     this._sourcePriceInclTax = sourcePriceInclTax
     this._finalPriceInclTax = finalPriceInclTax
+    this._userGroupId = this._config.tax.userGroupId
+    this._storeConfigTax = this._config.tax
 
     if (this._config.storeViews && this._config.storeViews.multistore) {
       for (let storeCode in this._config.storeViews){
@@ -22,6 +24,7 @@ class TaxProxy extends AbstractTaxProxy {
               taxCountry = store.tax.defaultCountry
               sourcePriceInclTax = store.tax.sourcePriceIncludesTax
               finalPriceInclTax = store.tax.finalPriceIncludesTax
+              this._storeConfigTax = store.tax
               break;
             }
           }
@@ -50,8 +53,8 @@ class TaxProxy extends AbstractTaxProxy {
     this.taxFor = this.taxFor.bind(this)
   }
 
-  taxFor (product) {
-    return calculateProductTax(product, this._taxClasses, this._taxCountry, this._taxRegion, this._sourcePriceInclTax, this._deprecatedPriceFieldsSupport, this._finalPriceInclTax)
+  taxFor (product, groupId) {
+    return calculateProductTax(product, this._taxClasses, this._taxCountry, this._taxRegion, this._sourcePriceInclTax, this._deprecatedPriceFieldsSupport, this._finalPriceInclTax, groupId, this._storeConfigTax)
   }
 
   applyTierPrices (productList, groupId) {
@@ -81,7 +84,7 @@ class TaxProxy extends AbstractTaxProxy {
         if (this._config.elasticsearch.user) {
           esConfig.httpAuth = this._config.elasticsearch.user + ':' + this._config.elasticsearch.password
         }
-        
+
         let client = new es.Client(esConfig)
         const esQuery = {
           index: this._indexName,
@@ -91,7 +94,14 @@ class TaxProxy extends AbstractTaxProxy {
         client.search(esQuery).then(function (taxClasses) { // we're always trying to populate cache - when online
           inst._taxClasses = taxClasses.hits.hits.map(el => { return el._source })
           for (let item of productList) {
-            inst.taxFor(item._source)
+            const isActive = checkIfTaxWithUserGroupIsActive(inst._storeConfigTax)
+            if (isActive) {
+              groupId = getUserGroupIdToUse(inst._userGroupId, inst._storeConfigTax)
+            } else {
+              groupId = null
+            }
+
+            inst.taxFor(item._source, groupId)
           }
 
           resolve(productList)