MAGETWO-33581: Refactor modules to remove usage of Tax module builders

Yu Tang · Yu Tang · commit 0219f14dff82 · 2015-02-04T19:33:16.000-06:00
- Fixed integration test failure
diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
@@ -354,7 +354,6 @@ protected function getAppliedTax($rowTax, $appliedRate)
      */
     protected function getAppliedTaxes($rowTax, $totalTaxRate, $appliedRates)
     {
-        $appliedTaxDataObject = $this->appliedTaxDataObjectFactory->create();
         /** @var \Magento\Tax\Api\Data\AppliedTaxInterface[] $appliedTaxes */
         $appliedTaxes = [];
         $totalAppliedAmount = 0;
@@ -376,6 +375,7 @@ protected function getAppliedTaxes($rowTax, $totalTaxRate, $appliedRates)
             }
             $totalAppliedAmount += $appliedAmount;
 
+            $appliedTaxDataObject = $this->appliedTaxDataObjectFactory->create();
             $appliedTaxDataObject->setAmount($appliedAmount);
             $appliedTaxDataObject->setPercent($appliedRate['percent']);
             $appliedTaxDataObject->setTaxRateKey($appliedRate['id']);

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,6 @@ protected function getAppliedTax($rowTax, $appliedRate)`
`354`	`354`	`*/`
`355`	`355`	`protected function getAppliedTaxes($rowTax, $totalTaxRate, $appliedRates)`
`356`	`356`	`{`
`357`		`- $appliedTaxDataObject = $this->appliedTaxDataObjectFactory->create();`
`358`	`357`	`/** @var \Magento\Tax\Api\Data\AppliedTaxInterface[] $appliedTaxes */`
`359`	`358`	`$appliedTaxes = [];`
`360`	`359`	`$totalAppliedAmount = 0;`
`@@ -376,6 +375,7 @@ protected function getAppliedTaxes($rowTax, $totalTaxRate, $appliedRates)`
`376`	`375`	`}`
`377`	`376`	`$totalAppliedAmount += $appliedAmount;`
`378`	`377`
	`378`	`+ $appliedTaxDataObject = $this->appliedTaxDataObjectFactory->create();`
`379`	`379`	`$appliedTaxDataObject->setAmount($appliedAmount);`
`380`	`380`	`$appliedTaxDataObject->setPercent($appliedRate['percent']);`
`381`	`381`	`$appliedTaxDataObject->setTaxRateKey($appliedRate['id']);`