Merge branch 'ACP2E-3513' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-Tier4-VK-2025-01-09

Author: vkolesny

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento\ConfigurableProduct\Model\Product\Type;
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
@@ -1483,7 +1482,8 @@ private function getAttributesForCollection(\Magento\Catalog\Model\Product $prod
             'thumbnail',
             'status',
             'visibility',
-            'media_gallery'
+            'media_gallery',
+            'special_price',
         ];
 
         $usedAttributes = array_map(

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php

@@ -1,17 +1,22 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Pricing\Price\FinalPrice;
 use Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox;
+use Magento\Framework\App\Area;
 use Magento\Framework\Pricing\Render\Amount;
 use Magento\Framework\Pricing\Render\RendererPool;
+use Magento\TestFramework\Fixture\AppArea;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DbIsolation;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -101,6 +106,26 @@ public function testRenderingByDefault()
         );
     }
 
+    #[
+        DataFixture('Magento/ConfigurableProduct/_files/product_configurable.php'),
+        AppArea(Area::AREA_FRONTEND),
+        DbIsolation(false),
+    ]
+    public function testHasSpecialPrice(): void
+    {
+        $productAttributeRepository = Bootstrap::getObjectManager()->get(ProductAttributeRepositoryInterface::class);
+        $specialPrice = $productAttributeRepository->get('special_price');
+        $specialPrice->setUsedInProductListing(false);
+        $productAttributeRepository->save($specialPrice);
+
+        try {
+            self::assertTrue($this->finalPriceBox->hasSpecialPrice());
+        } finally {
+            $specialPrice->setUsedInProductListing(true);
+            $productAttributeRepository->save($specialPrice);
+        }
+    }
+
     /**
      * Test when is_product_list flag is specified
      *