MAGETWO-44737: Tax applied twice for configurable product on product and catalog pages

Author: Maksym Aposov

app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPriceResolver.php

@@ -6,6 +6,8 @@
 
 namespace Magento\ConfigurableProduct\Pricing\Price;
 
+use Magento\Catalog\Pricing\Price\FinalPrice as CatalogFinalPrice;
+
 class FinalPriceResolver implements PriceResolverInterface
 {
     /**
@@ -14,7 +16,7 @@ class FinalPriceResolver implements PriceResolverInterface
      */
     public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product)
     {
-        return $product->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)
-            ->getAmount()->getValue();
+        return $product->getPriceInfo()->getPrice(CatalogFinalPrice::PRICE_CODE)
+            ->getAmount()->getBaseAmount();
     }
 }

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/Configurable/PriceTest.php

@@ -5,26 +5,66 @@
  */
 namespace Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
+/**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/ConfigurableProduct/_files/tax_rule.php
+ * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+ */
 class PriceTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     *
      */
     public function testGetFinalPrice()
     {
+        $this->validatePrice(10);
+    }
+
+    /**
+     * @magentoConfigFixture current_store tax/display/type 1
+     */
+    public function testGetFinalPriceExcludingTax()
+    {
+        $this->validatePrice(10);
+    }
+
+    /**
+     * @magentoConfigFixture current_store tax/display/type 2
+     */
+    public function testGetFinalPriceIncludingTax()
+    {
+        //lowest price of configurable variation + 10%
+        $this->validatePrice(11);
+    }
+
+    /**
+     * @magentoConfigFixture current_store tax/display/type 3
+     */
+    public function testGetFinalPriceIncludingExcludingTax()
+    {
+        //lowest price of configurable variation + 10%
+        $this->validatePrice(11);
+    }
+
+    /**
+     * Test
+     *
+     * @param $expectedPrice
+     */
+    protected function validatePrice($expectedPrice)
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
         /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Catalog\Model\Product'
-        );
+        $product = $objectManager->create('Magento\Catalog\Model\Product');
         $product->load(1);
-        // fixture
 
         /** @var $model \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price */
-        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $model = $objectManager->create(
             'Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price'
         );
 
         // final price is the lowest price of configurable variations
-        $this->assertEquals(10, $model->getFinalPrice(1, $product));
+        $this->assertEquals(round($expectedPrice, 2), round($model->getFinalPrice(1, $product), 2));
     }
 }

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php

@@ -28,7 +28,7 @@
         ->setWebsiteIds([1])
         ->setName('Configurable Option' . $option->getLabel())
         ->setSku('simple_' . $productId)
-        ->setPrice(10)
+        ->setPrice($productId)
         ->setTestConfigurable($option->getValue())
         ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
         ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
@@ -51,7 +51,6 @@
     ->setWebsiteIds([1])
     ->setName('Configurable Product')
     ->setSku('configurable')
-    ->setPrice(100)
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1])

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/tax_rule.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$customerTaxClass = $objectManager->create('Magento\Tax\Model\ClassModel')->load('Retail Customer', 'class_name');
+$productTaxClass1 = $objectManager->create('Magento\Tax\Model\ClassModel')->load('Taxable Goods', 'class_name');
+
+
+$taxRate = [
+    'tax_country_id' => 'US',
+    'tax_region_id' => '0',
+    'tax_postcode' => '*',
+    'code' => '*',
+    'rate' => '10',
+];
+$rate = $objectManager->create('Magento\Tax\Model\Calculation\Rate')->setData($taxRate)->save();
+
+/** @var Magento\Framework\Registry $registry */
+$registry = $objectManager->get('Magento\Framework\Registry');
+$registry->unregister('_fixture/Magento_Tax_Model_Calculation_Rate');
+$registry->register('_fixture/Magento_Tax_Model_Calculation_Rate', $rate);
+
+$ruleData = [
+    'code' => 'Test Rule',
+    'priority' => '0',
+    'position' => '0',
+    'customer_tax_class_ids' => [$customerTaxClass->getId()],
+    'product_tax_class_ids' => [$productTaxClass1->getId()],
+    'tax_rate_ids' => [$rate->getId()],
+];
+
+$taxRule = $objectManager->create('Magento\Tax\Model\Calculation\Rule')->setData($ruleData)->save();
+
+$registry->unregister('_fixture/Magento_Tax_Model_Calculation_Rule');
+$registry->register('_fixture/Magento_Tax_Model_Calculation_Rule', $taxRule);