Merge branch 'FearlessKiwis-MAGETWO-47440-Github2471-Incorrect-prices-on-configurable-product' into develop

Yu Tang · Yu Tang · commit 64ef009a2088 · 2016-01-12T15:44:22.000-06:00
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPriceResolver.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPriceResolver.php
@@ -16,7 +16,6 @@ class FinalPriceResolver implements PriceResolverInterface
      */
     public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product)
     {
-        return $product->getPriceInfo()->getPrice(CatalogFinalPrice::PRICE_CODE)
-            ->getAmount()->getBaseAmount();
+        return $product->getPriceInfo()->getPrice(CatalogFinalPrice::PRICE_CODE)->getValue();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ class FinalPriceResolver implements PriceResolverInterface`
`16`	`16`	`*/`
`17`	`17`	`public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product)`
`18`	`18`	`{`
`19`		`- return $product->getPriceInfo()->getPrice(CatalogFinalPrice::PRICE_CODE)`
`20`		`- ->getAmount()->getBaseAmount();`
	`19`	`+ return $product->getPriceInfo()->getPrice(CatalogFinalPrice::PRICE_CODE)->getValue();`
`21`	`20`	`}`
`22`	`21`	`}`