Merge pull request #10161 from magento-gl/spartans_pr_29102025

[Spartans] BugFixes Delivery

Author: glo71317

app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php

@@ -17,6 +17,7 @@
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Registry;
 
@@ -42,6 +43,11 @@ class Product extends Extended
      */
     private $visibility;
 
+    /**
+     * @var ProductCollectionFactory|mixed
+     */
+    private ProductCollectionFactory $productCollectionFactory;
+
     /**
      * @param Context $context
      * @param Data $backendHelper
@@ -50,6 +56,7 @@ class Product extends Extended
      * @param array $data
      * @param Visibility|null $visibility
      * @param Status|null $status
+     * @param ProductCollectionFactory|null $productCollectionFactory
      */
     public function __construct(
         Context $context,
@@ -58,12 +65,16 @@ public function __construct(
         Registry $coreRegistry,
         array $data = [],
         ?Visibility $visibility = null,
-        ?Status $status = null
+        ?Status $status = null,
+        ?ProductCollectionFactory $productCollectionFactory = null
     ) {
         $this->_productFactory = $productFactory;
         $this->_coreRegistry = $coreRegistry;
         $this->visibility = $visibility ?: ObjectManager::getInstance()->get(Visibility::class);
         $this->status = $status ?: ObjectManager::getInstance()->get(Status::class);
+        $this->productCollectionFactory = $productCollectionFactory ?: ObjectManager::getInstance()->get(
+            ProductCollectionFactory::class
+        );
         parent::__construct($context, $backendHelper, $data);
     }
 
@@ -125,31 +136,30 @@ protected function _prepareCollection()
         if ($this->getCategory()->getId()) {
             $this->setDefaultFilter(['in_category' => 1]);
         }
-
-        $collection = $this->_productFactory->create()->getCollection()->addAttributeToSelect(
-            'name'
-        )->addAttributeToSelect(
-            'sku'
-        )->addAttributeToSelect(
-            'visibility'
-        )->addAttributeToSelect(
-            'status'
-        )->addAttributeToSelect(
-            'price'
-        )->joinField(
+        $collection = $this->productCollectionFactory->create();
+        $storeId = (int)$this->getRequest()->getParam('store', 0);
+        if ($storeId > 0) {
+            $collection->addStoreFilter($storeId);
+        }
+        $collection->addAttributeToSelect(
+            [
+                'name',
+                'sku',
+                'visibility',
+                'status',
+                'price'
+            ],
+            'left'
+        );
+        $collection->joinField(
             'position',
             'catalog_category_product',
             'position',
             'product_id=entity_id',
             'category_id=' . (int)$this->getRequest()->getParam('id', 0),
             'left'
         );
-        $storeId = (int)$this->getRequest()->getParam('store', 0);
-        $collection->setStoreId($storeId);
-        if ($storeId > 0) {
-            $collection->addStoreFilter($storeId);
-        }
-
+        $collection->getSelect()->group('e.entity_id');
         $this->setCollection($collection);
 
         if ($this->getCategory()->getProductsReadonly()) {

app/code/Magento/Catalog/Plugin/Model/ConfigPlugin.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Plugin\Model;
+
+use Magento\Catalog\Model\Config as Subject;
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\Config as EavConfig;
+
+/**
+ * Plugin to ensure special_price attribute is always loaded in product listings even when used_in_product_listing = 0
+ */
+class ConfigPlugin
+{
+    private const SPECIAL_PRICE_ATTR_CODE = 'special_price';
+
+    /**
+     * @param EavConfig $eavConfig
+     */
+    public function __construct(
+        private readonly EavConfig $eavConfig
+    ) {
+    }
+
+    /**
+     * Add special_price attribute to the list of attributes used in product listing
+     *
+     * @param Subject $subject
+     * @param array $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetAttributesUsedInProductListing(Subject $subject, array $result): array
+    {
+        // Check if special_price is already in the result
+        if (!isset($result[self::SPECIAL_PRICE_ATTR_CODE])) {
+            // Get the special_price attribute
+            $specialPriceAttribute = $this->eavConfig->getAttribute(
+                Product::ENTITY,
+                self::SPECIAL_PRICE_ATTR_CODE
+            );
+
+            if ($specialPriceAttribute && $specialPriceAttribute->getId()) {
+                // Add it to the result
+                $result[self::SPECIAL_PRICE_ATTR_CODE] = $specialPriceAttribute;
+            }
+        }
+        return $result;
+    }
+}