From 25ea6caf9f64c9ad55e951c54bbb633b84f3dcc2 Mon Sep 17 00:00:00 2001
From: Andre Flitsch <andre@pixelperfect.at>
Date: Mon, 3 Aug 2020 13:39:58 +0200
Subject: [PATCH] Fix bug where free shipping

Calculation was not based on correct value
https://github.com/magento/magento2/issues/28472
---
 .../Tax/Model/Sales/Total/Quote/CommonTaxCollector.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
index c7cc4ded1bf07..cc37cba69ffe1 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -596,8 +596,8 @@ protected function processProductItems(
         $address = $shippingAssignment->getShipping()->getAddress();
         $address->setBaseTaxAmount($baseTax);
         $address->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
-        $address->setSubtotal($total->getSubtotal());
-        $address->setBaseSubtotal($total->getBaseSubtotal());
+        //$address->setSubtotal($total->getSubtotal());
+        //$address->setBaseSubtotal($total->getBaseSubtotal());
 
         return $this;
     }