Set correct discount package value for tablerate

basvanpoppel · basvanpoppel · commit 5ce73ab1f2b0 · 2020-09-23T14:51:14.000+02:00
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
@@ -140,10 +140,9 @@ public function collectRates(RateRequest $request)
                     $freePackageValue += $item->getBaseRowTotal();
                 }
             }
-            $oldValue = $request->getPackageValue();
-            $newPackageValue = $oldValue - $freePackageValue;
-            $request->setPackageValue($newPackageValue);
-            $request->setPackageValueWithDiscount($newPackageValue);
+            
+            $request->setPackageValue($request->getPackageValue() - $freePackageValue);
+            $request->setPackageValueWithDiscount($request->getPackageValueWithDiscount() - $freePackageValue);
         }
 
         if (!$request->getConditionName()) {

Original file line number	Diff line number	Diff line change
`@@ -140,10 +140,9 @@ public function collectRates(RateRequest $request)`
`140`	`140`	`$freePackageValue += $item->getBaseRowTotal();`
`141`	`141`	`}`
`142`	`142`	`}`
`143`		`- $oldValue = $request->getPackageValue();`
`144`		`- $newPackageValue = $oldValue - $freePackageValue;`
`145`		`- $request->setPackageValue($newPackageValue);`
`146`		`- $request->setPackageValueWithDiscount($newPackageValue);`
	`143`	`+`
	`144`	`+ $request->setPackageValue($request->getPackageValue() - $freePackageValue);`
	`145`	`+ $request->setPackageValueWithDiscount($request->getPackageValueWithDiscount() - $freePackageValue);`
`147`	`146`	`}`
`148`	`147`
`149`	`148`	`if (!$request->getConditionName()) {`