MAGETWO-44639: Incorrect prices in shopping cart when MAP is enabled and catalog prices is including tax

Author: Yu Tang

app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php

@@ -104,6 +104,7 @@ protected function _initItem($address, $item)
             }
         }
 
+        $quoteItem->setConvertedPrice(null);
         $originalPrice = $product->getPrice();
         if ($quoteItem->getParentItem() && $quoteItem->isChildrenCalculated()) {
             $finalPrice = $quoteItem->getParentItem()->getProduct()->getPriceModel()->getChildFinalPrice(

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php

@@ -78,6 +78,7 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
         $this->stockRegistry->expects($this->any())->method('getStockItem')->willReturn($this->stockItemMock);
 
         $priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
+        $convertedPrice = 1231313;
         // @TODO this is a wrong test and it does not check methods. Any digital value will be correct
         $priceCurrency->expects($this->any())->method('convert')->willReturn(1231313);
 
@@ -114,14 +115,16 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
         $product->expects($this->any())->method('isVisibleInCatalog')->will($this->returnValue(true));
 
         $quote->expects($this->any())->method('getStore')->will($this->returnValue($store));
-        $quoteItem->setProduct($product)->setQuote($quote)->setOriginalCustomPrice($price);
+        $quoteItem->setProduct($product)->setQuote($quote);
 
         $parentQuoteItem = false;
         if ($itemHasParent) {
             $parentQuoteItem = $this->getMock('Magento\Quote\Model\Quote\Item', [], [], '', false);
             $parentQuoteItem->expects($this->any())->method('getProduct')->will($this->returnValue($product));
         }
         $quoteItem->setParentItem($parentQuoteItem);
+        //This value will be overwritten
+        $quoteItem->setConvertedPrice(10);
 
         $priceModel = $this->getMock('\Magento\Catalog\Model\Product\Type\Price', [], [], '', false);
         $priceModel->expects($this->any())->method('getChildFinalPrice')->willReturn($price);
@@ -149,6 +152,8 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
 
         $this->assertEquals($expectedPrice, $quoteItem->getPrice());
         $this->assertEquals($expectedOriginalPrice, $quoteItem->getBaseOriginalPrice());
+        $this->assertEquals($convertedPrice, $quoteItem->getCalculationPrice());
+        $this->assertEquals($convertedPrice, $quoteItem->getConvertedPrice());
     }
 
     public function testFetch()