Skip to content

fix-configurable-sorting-child-match-39929 #39935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
Open

fix-configurable-sorting-child-match-39929 #39935

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 28 additions & 27 deletions ...ode/Magento/ConfigurableProduct/Plugin/CatalogWidget/Block/Product/ProductsListPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,15 @@
namespace Magento\ConfigurableProduct\Plugin\CatalogWidget\Block\Product;

use Magento\Catalog\Model\Product;
use Magento\Catalog\Model\Product\Visibility;
use Magento\Catalog\Model\ResourceModel\Product\Collection;
use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
use Magento\CatalogWidget\Block\Product\ProductsList;
use Magento\Framework\App\ResourceConnection;
use Magento\Framework\DB\Select;
use Magento\Framework\EntityManager\MetadataPool;
use Magento\Framework\Exception\LocalizedException;

class ProductsListPlugin
{
/**
* @var CollectionFactory
*/
private CollectionFactory $productCollectionFactory;

/**
* @var Visibility
*/
private Visibility $catalogProductVisibility;

/**
* @var ResourceConnection
*/
Expand All @@ -39,19 +28,13 @@ class ProductsListPlugin
private MetadataPool $metadataPool;

/**
* @param CollectionFactory $productCollectionFactory
* @param Visibility $catalogProductVisibility
* @param ResourceConnection $resource
* @param MetadataPool $metadataPool
*/
public function __construct(
CollectionFactory $productCollectionFactory,
Visibility $catalogProductVisibility,
ResourceConnection $resource,
MetadataPool $metadataPool
) {
$this->productCollectionFactory = $productCollectionFactory;
$this->catalogProductVisibility = $catalogProductVisibility;
$this->resource = $resource;
$this->metadataPool = $metadataPool;
}
Expand Down Expand Up @@ -95,18 +78,36 @@ public function afterCreateCollection(ProductsList $subject, Collection $result)
->where('link_table.product_id IN (?)', $searchProducts)
);

$configurableProductCollection = $this->productCollectionFactory->create();
$configurableProductCollection->setVisibility($this->catalogProductVisibility->getVisibleInCatalogIds());
$configurableProductCollection->addIdFilter($productIds);

/** @var Product $item */
foreach ($configurableProductCollection->getItems() as $item) {
if (false === in_array($item->getId(), $currentIds)) {
$result->addItem($item->load($item->getId()));
}
if (empty($productIds)) {
return $result;
}
$this->addParentProductsToSelect($result, $productIds);
}

return $result;
}

/**
* @param Collection $result The product collection
* @param array $productIds Array of parent product IDs to include
* @return void
*/
protected function addParentProductsToSelect(Collection $result, array $productIds): void
{
$connection = $this->resource->getConnection();
$select = $result->getSelect();
$originalWhere = $select->getPart(Select::WHERE);
if (!empty($originalWhere)) {
$originalWhere = array_filter($originalWhere, 'strlen');
}
$parentCondition = $connection->quoteInto('e.entity_id IN (?)', $productIds);

$newWhere = [];
if (!empty($originalWhere)) {
$newWhere[] = '(' . implode(' ', $originalWhere) . ')';
}
$newWhere[] = $parentCondition;
$select->reset(Select::WHERE);
$select->where(new \Zend_Db_Expr(implode(' OR ', $newWhere)));
}
}