Merge remote-tracking branch 'tango/MAGETWO-50605' into MAGETWO-51859

Author: Bohdan Korablov

app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php

@@ -162,14 +162,8 @@ public function providerForGetterTierPriceList()
                 'basePrice' => 20.,
                 'expectedResult' => [
                     [
-                        'price'         => '50.',
-                        'website_price' => '50.',
-                        'price_qty'     => '2.',
-                        'cust_group'    => Group::CUST_GROUP_ALL,
-                    ],
-                    [
-                        'price'         => '30.',
-                        'website_price' => '30.',
+                        'price'         => '15.',
+                        'website_price' => '15.',
                         'price_qty'     => '5.',
                         'cust_group'    => Group::CUST_GROUP_ALL
                     ],

app/code/Magento/Catalog/Pricing/Price/TierPrice.php

@@ -162,6 +162,11 @@ protected function filterTierPrices(array $priceList)
         $qtyCache = [];
         $allCustomersGroupId = $this->groupManagement->getAllCustomersGroup()->getId();
         foreach ($priceList as $priceKey => &$price) {
+            if ($price['price'] >= $this->priceInfo->getPrice(FinalPrice::PRICE_CODE)->getValue()) {
+                unset($priceList[$priceKey]);
+                continue;
+            }
+
             if (isset($price['price_qty']) && $price['price_qty'] == 1) {
                 unset($priceList[$priceKey]);
                 continue;
@@ -204,7 +209,7 @@ protected function getBasePrice()
     public function getSavePercent(AmountInterface $amount)
     {
         return ceil(
-            100 - ((100 / $this->priceInfo->getPrice(RegularPrice::PRICE_CODE)->getAmount()->getBaseAmount())
+            100 - ((100 / $this->priceInfo->getPrice(FinalPrice::PRICE_CODE)->getValue())
                 * $amount->getBaseAmount())
         );
     }

app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php

@@ -8,9 +8,8 @@
 
 namespace Magento\Catalog\Test\Unit\Pricing\Price;
 
-use \Magento\Catalog\Pricing\Price\TierPrice;
-use \Magento\Catalog\Pricing\Price\RegularPrice;
-
+use Magento\Catalog\Pricing\Price\TierPrice;
+use Magento\Catalog\Pricing\Price\FinalPrice;
 use Magento\Customer\Model\Group;
 use Magento\Customer\Model\GroupManagement;
 
@@ -271,6 +270,10 @@ public function testGetterTierPriceList($tierPrices, $basePrice, $expectedResult
         $this->calculator->expects($this->atLeastOnce())->method('getAmount')
             ->will($this->returnArgument(0));
 
+        $this->priceInfo->expects(static::atLeastOnce())
+            ->method('getPrice')
+            ->with(FinalPrice::PRICE_CODE)
+            ->willReturn($price);
         $this->priceCurrencyMock->expects($this->any())
             ->method('convertAndRound')
             ->will($this->returnCallback(
@@ -365,20 +368,15 @@ public function providerForGetterTierPriceList()
      */
     public function testGetSavePercent($basePrice, $tierPrice, $savedPercent)
     {
-        $priceAmount = $this->getMockForAbstractClass('Magento\Framework\Pricing\Amount\AmountInterface');
-        $priceAmount->expects($this->once())
-            ->method('getBaseAmount')
-            ->will($this->returnValue($basePrice));
-
         $price = $this->getMock('Magento\Framework\Pricing\Price\PriceInterface');
-        $price->expects($this->any())
-            ->method('getAmount')
-            ->will($this->returnValue($priceAmount));
 
-        $this->priceInfo->expects($this->atLeastOnce())
+        $this->priceInfo->expects(static::atLeastOnce())
             ->method('getPrice')
-            ->will($this->returnValue($price))
-            ->with(RegularPrice::PRICE_CODE);
+            ->with(FinalPrice::PRICE_CODE)
+            ->willReturn($price);
+        $price->expects(static::atLeastOnce())
+            ->method('getValue')
+            ->willReturn($basePrice);
 
         $amount = $this->getMockForAbstractClass('Magento\Framework\Pricing\Amount\AmountInterface');
         $amount->expects($this->atLeastOnce())