Merge remote-tracking branch 'fearless-kiwis/FearlessKiwis-MAGETWO-44960-catalog-rule-not-applied-on-product-page' into PR-1

Natalia Momotenko · Natalia Momotenko · commit bf49cb3058b2 · 2015-11-04T13:48:57.000+02:00
diff --git a/app/code/Magento/Tax/Pricing/Render/Adjustment.php b/app/code/Magento/Tax/Pricing/Render/Adjustment.php
@@ -54,7 +54,7 @@ protected function apply()
             $this->amountRender->setDisplayValue(
                 $this->amountRender->getAmount()->getValue($this->getAdjustmentCode())
             );
-            if ($this->taxHelper->priceIncludesTax()) {
+            if ($this->taxHelper->priceIncludesTax() && $this->amountRender->getPriceType() == 'finalPrice') {
                 // for dynamic calculations of prices with any options, use the base price amount
                 $this->amountRender->setPriceType('basePrice');
             }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ protected function apply()`
`54`	`54`	`$this->amountRender->setDisplayValue(`
`55`	`55`	`$this->amountRender->getAmount()->getValue($this->getAdjustmentCode())`
`56`	`56`	`);`
`57`		`- if ($this->taxHelper->priceIncludesTax()) {`
	`57`	`+ if ($this->taxHelper->priceIncludesTax() && $this->amountRender->getPriceType() == 'finalPrice') {`
`58`	`58`	`// for dynamic calculations of prices with any options, use the base price amount`
`59`	`59`	`$this->amountRender->setPriceType('basePrice');`
`60`	`60`	`}`