ACP2E-313: Tiered Pricing display on PDP

Author: Anna Bukatar

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

@@ -217,7 +217,6 @@ protected function filterTierPrices(array $priceList)
                 unset($priceList[$priceKey]);
                 continue;
             }
-            $minPrice = $price['price'];
             if (isset($price['price_qty']) && $price['price_qty'] == 1) {
                 unset($priceList[$priceKey]);
                 continue;
@@ -240,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

@@ -84,11 +84,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;
 
@@ -113,7 +114,7 @@ protected function setUp(): void
         $this->groupManagement = $this->getMockForAbstractClass(GroupManagementInterface::class);
 
         $this->priceCurrencyMock = $this->getMockForAbstractClass(PriceCurrencyInterface::class);
-        $this->scopeConfigMock = $this->getMockForAbstractClass(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
 
         $this->model = new TierPrice(
             $this->product,