Correction for double tax calculation when working with multiple tax …

…calculation plugins
LOVAT-compliance · Feb 7, 2025 · 681e9f8 · 681e9f8
1 parent 8efae94
commit 681e9f8
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 11 deletions.
diff --git a/Api/Data/OrdersDataContainerInterface.php b/Api/Data/OrdersDataContainerInterface.php
diff --git a/Api/Data/OrdersDataInterface.php b/Api/Data/OrdersDataInterface.php
diff --git a/Api/OrdersRepositoryInterface.php b/Api/OrdersRepositoryInterface.php
diff --git a/Helper/Data.php b/Helper/Data.php
diff --git a/Model/Orders.php b/Model/Orders.php
diff --git a/Model/OrdersData.php b/Model/OrdersData.php
diff --git a/Model/OrdersDataContainer.php b/Model/OrdersDataContainer.php
diff --git a/Model/OrdersRepository.php b/Model/OrdersRepository.php
diff --git a/Model/ResourceModel/Orders.php b/Model/ResourceModel/Orders.php
diff --git a/Model/ResourceModel/Orders/Collection.php b/Model/ResourceModel/Orders/Collection.php
diff --git a/Observer/ChangeTaxTotal.php b/Observer/ChangeTaxTotal.php
@@ -191,27 +191,55 @@ private function applyTaxDataToQuote($quote, $vatData, $observer)
         $tax = 0;
         $items = $quote->getItemsCollection();
 
+        $appliedItemsTaxAmount = 0; // tax amount for all qty
+        $appliedItemsBaseTaxAmount = 0; // tax amount for all qty
+
         foreach ($vatData as $data) {
             foreach ($items as $item) {
                 if ($item->getProductId() == $data->transaction_id) {
-                    $item->setTaxAmount($data->tax_amount);
+
+                    $appliedItemTaxAmount = ((float)$item->getTaxPercent() / 100) * $item->getPrice(); // tax amount per 1 item
+                    $appliedItemBaseTaxAmount = ((float)$item->getTaxPercent() / 100) * $item->getBasePrice(); // tax amount per 1 item
+
                     $item->setTaxPercent($data->tax_rate);
+                    $item->setTaxAmount($data->tax_amount);
+                    $item->setBaseTaxAmount($data->tax_amount);
+                    $item->setPriceInclTax($item->getPriceInclTax() - $appliedItemTaxAmount + $data->tax_amount / $item->getQty());
+                    $item->setBasePriceInclTax($item->getBasePriceInclTax() - $appliedItemBaseTaxAmount  + $data->tax_amount / $item->getQty());
+                    $item->setRowTotalInclTax($item->getPriceInclTax() * $item->getQty());
+                    $item->setBaseRowTotalInclTax($item->getBasePriceInclTax() * $item->getQty());
+                    $item->setAppliedTaxes([]);
+
+                    $appliedItemsTaxAmount += $appliedItemTaxAmount;
+                    $appliedItemsBaseTaxAmount += $appliedItemBaseTaxAmount;
+
                     break;
                 }
             }
             $tax += $data->tax_amount;
         }
 
-        $quote->setTaxAmount($tax);
-        $quote->setBaseTaxAmount($tax);
-        $quote->setGrandTotal($quote->getGrandTotal() + $tax);
-        $quote->setBaseGrandTotal($quote->getBaseGrandTotal() + $tax);
+        $quote->setGrandTotal($quote->getGrandTotal() - $appliedItemsTaxAmount + $tax);
+        $quote->setBaseGrandTotal($quote->getBaseGrandTotal() - $appliedItemsBaseTaxAmount + $tax);
         $quote->setTotalsCollectedFlag(false);
 
+
+        /* totals */
         $total = $observer->getTotal();
-        $total->addTotalAmount('tax', $tax);
-        $total->addBaseTotalAmount('tax', $tax);
-        $total->setGrandTotal((float)$total->getGrandTotal() + $tax);
-        $total->setBaseGrandTotal((float)$total->getBaseGrandTotal() + $tax);
+
+        // get previously applied Tax
+        $appliedTotalTaxAmount = (float)$total->getTaxAmount();
+        $appliedTotalBaseTaxAmount = (float)$total->getBaseTaxAmount();
+
+        $total->setAppliedTaxes([]);
+        $total->setItemsAppliedTaxes([]);
+        $total->setTaxAmount($tax);
+        $total->setBaseTaxAmount($tax);
+
+        $total->setSubtotalInclTax($total->getSubtotalInclTax() - $appliedTotalTaxAmount + $tax);
+        $total->setBaseSubtotalTotalInclTax($total->getBaseSubtotalTotalInclTax() - $appliedTotalBaseTaxAmount + $tax);
+        $total->setBaseSubtotalInclTax($total->getBaseSubtotalInclTax() - $appliedTotalBaseTaxAmount + $tax);
+        $total->setGrandTotal($total->getGrandTotal() - $appliedTotalTaxAmount + $tax);
+        $total->setBaseGrandTotal($total->getBaseGrandTotal() - $appliedTotalBaseTaxAmount + $tax);
     }
 }
diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "vatcompliance/module-vatcompliance",
     "description": "Lovat Api Sales Module for Magento 2",
     "type": "magento2-module",
-    "version": "1.0.14",
+    "version": "1.1.0",
     "license": "OSL-3.0",
     "require": {
         "php": ">=7.2",

diff --git a/etc/acl.xml b/etc/acl.xml
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
diff --git a/etc/di.xml b/etc/di.xml
diff --git a/etc/module.xml b/etc/module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Lovat_Api" setup_version="1.0.14"/>
+    <module name="Lovat_Api" setup_version="1.1.0"/>
 </config>
diff --git a/etc/webapi.xml b/etc/webapi.xml
diff --git a/registration.php b/registration.php