Merge remote-tracking branch 'l3/ACP2E-313' into PR_L3_05_04_2022

Author: veloraven

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

@@ -210,13 +210,13 @@ private function getConfigTaxDisplayType(): int
     protected function filterTierPrices(array $priceList)
     {
         $qtyCache = [];
+        $minPrice = $this->priceInfo->getPrice(FinalPrice::PRICE_CODE)->getValue();
         $allCustomersGroupId = $this->groupManagement->getAllCustomersGroup()->getId();
         foreach ($priceList as $priceKey => &$price) {
-            if ($price['price'] >= $this->priceInfo->getPrice(FinalPrice::PRICE_CODE)->getValue()) {
+            if ($price['price'] >= $minPrice) {
                 unset($priceList[$priceKey]);
                 continue;
             }
-
             if (isset($price['price_qty']) && $price['price_qty'] == 1) {
                 unset($priceList[$priceKey]);
                 continue;
@@ -239,6 +239,7 @@ protected function filterTierPrices(array $priceList)
             } else {
                 $qtyCache[$price['price_qty']] = $priceKey;
             }
+            $minPrice = $price['price'];
         }
         return array_values($priceList);
     }

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml

@@ -86,11 +86,8 @@
             <expectedResult type="string">Buy {{tierPriceOnDefault.qty_0}} for ${{tierPriceOnDefault.price_0}} each and save 100%</expectedResult>
             <actualResult type="variable">firstTierPriceText</actualResult>
         </assertEquals>
-        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', tierPriceOnDefault.qty_1)}}" stepKey="secondTierPriceText"/>
-        <assertEquals stepKey="assertTierPriceTextOnProductPage2">
-            <expectedResult type="string">Buy {{tierPriceOnDefault.qty_1}} for ${{tierPriceOnDefault.price_1}} each and save 100%</expectedResult>
-            <actualResult type="variable">secondTierPriceText</actualResult>
-        </assertEquals>
+        <dontSeeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', tierPriceOnDefault.qty_1)}}" stepKey="secondTierPriceText"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertTierPriceTextOnProductPage2"/>
 
         <!--  Verify customer see product out of stock status on product page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>

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

@@ -22,6 +22,7 @@
 use Magento\Framework\Pricing\Price\PriceInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Pricing\PriceInfo\Base;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -84,6 +85,11 @@ class TierPriceTest extends TestCase
      */
     private $customerGroupRetriever;
 
+    /**
+     * @var MockObject
+     */
+    private $scopeConfigMock;
+
     /**
      * Initialize base dependencies
      */
@@ -108,6 +114,7 @@ protected function setUp(): void
         $this->groupManagement = $this->getMockForAbstractClass(GroupManagementInterface::class);
 
         $this->priceCurrencyMock = $this->getMockForAbstractClass(PriceCurrencyInterface::class);
+        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
 
         $this->model = new TierPrice(
             $this->product,
@@ -116,7 +123,8 @@ protected function setUp(): void
             $this->priceCurrencyMock,
             $this->session,
             $this->groupManagement,
-            $this->customerGroupRetriever
+            $this->customerGroupRetriever,
+            $this->scopeConfigMock
         );
     }
 
@@ -242,7 +250,8 @@ public function testGetterStoredTierPrices()
             $this->priceCurrencyMock,
             $this->session,
             $this->groupManagement,
-            $this->customerGroupRetriever
+            $this->customerGroupRetriever,
+            $this->scopeConfigMock
         );
         $group = $this->createMock(\Magento\Customer\Model\Data\Group::class);
         $group->expects($this->once())->method('getId')->willReturn(GroupManagement::CUST_GROUP_ALL);
@@ -305,21 +314,21 @@ public function providerForGetterTierPriceList()
                 'tierPrices' => [
                     // will be ignored due to customer group
                     [
-                        'price'         => '1.3',
-                        'website_price' => '1.3',
+                        'price'         => '21.3',
+                        'website_price' => '21.3',
                         'price_qty'     => '1.3',
                         'cust_group'    => $this->customerGroup + 1
                     ],
                     [
-                        'price'         => '25.4',
-                        'website_price' => '25.4',
+                        'price'         => '20.4',
+                        'website_price' => '20.4',
                         'price_qty'     => '5.',
                         'cust_group'    => Group::CUST_GROUP_ALL
                     ],
                     // cases to calculate save percent
                     [
-                        'price'         => '15.1',
-                        'website_price' => '15.1',
+                        'price'         => '20.1',
+                        'website_price' => '20.1',
                         'price_qty'     => '5.',
                         'cust_group'    => Group::CUST_GROUP_ALL
                     ],
@@ -339,8 +348,8 @@ public function providerForGetterTierPriceList()
                 'basePrice' => 20.,
                 'expectedResult' => [
                     [
-                        'price'          => '7.55',
-                        'website_price'  => '7.55',
+                        'price'          => '10.05',
+                        'website_price'  => '10.05',
                         'price_qty'      => '5.',
                         'cust_group'     => Group::CUST_GROUP_ALL,
                     ],
@@ -418,7 +427,8 @@ public function testGetQuantity($quantity, $expectedValue)
             $this->priceCurrencyMock,
             $this->session,
             $this->groupManagement,
-            $this->customerGroupRetriever
+            $this->customerGroupRetriever,
+            $this->scopeConfigMock
         );
 
         $this->assertEquals($expectedValue, $tierPrice->getQuantity());