', { class: 'material-icons', text: 'info' }));
$placeholder.append($infoWrapper);
}
},
diff --git a/sources/js/admin/entity-selector/_preview.js b/sources/js/admin/entity-selector/_preview.js
index 44ffaa8..4fdf70a 100644
--- a/sources/js/admin/entity-selector/_preview.js
+++ b/sources/js/admin/entity-selector/_preview.js
@@ -192,23 +192,8 @@
});
}
- // Position popover below badge
- var badgeOffset = $badge.offset();
- var badgeHeight = $badge.outerHeight();
- var badgeWidth = $badge.outerWidth();
- var popoverWidth = $popover.outerWidth();
-
- var leftPos = badgeOffset.left + (badgeWidth / 2) - (popoverWidth / 2);
- var minLeft = 10;
- var maxLeft = $(window).width() - popoverWidth - 10;
- leftPos = Math.max(minLeft, Math.min(leftPos, maxLeft));
-
- $popover.css({
- position: 'absolute',
- top: badgeOffset.top + badgeHeight + 8,
- left: leftPos,
- zIndex: 10000
- });
+ // Position popover relative to badge (handles viewport overflow)
+ this.positionPopover($popover, $badge);
// Show with transition
$popover.addClass('show');
@@ -216,6 +201,61 @@
return $popover;
},
+ /**
+ * Position a popover relative to a trigger element.
+ * Handles horizontal and vertical viewport overflow.
+ * @param {jQuery} $popover - The popover element
+ * @param {jQuery} $trigger - The trigger element to position against
+ * @param {number} [zIndex=10000] - Optional z-index
+ */
+ positionPopover: function($popover, $trigger, zIndex) {
+ var triggerRect = $trigger[0].getBoundingClientRect();
+ var scrollTop = $(window).scrollTop();
+ var scrollLeft = $(window).scrollLeft();
+ var popoverWidth = $popover.outerWidth();
+ var popoverHeight = $popover.outerHeight();
+ var windowWidth = $(window).width();
+ var windowHeight = $(window).height();
+ var gap = 8;
+
+ // Horizontal: center on trigger, then clamp to viewport
+ var left = triggerRect.left + scrollLeft + (triggerRect.width / 2) - (popoverWidth / 2);
+ left = Math.max(10, Math.min(left, windowWidth - popoverWidth - 10));
+
+ // Vertical: prefer below, flip above if it would overflow
+ var top;
+ var positionAbove = false;
+ if (triggerRect.bottom + popoverHeight + gap > windowHeight - 10) {
+ // Position above the trigger
+ top = triggerRect.top + scrollTop - popoverHeight - gap;
+ positionAbove = true;
+ } else {
+ // Position below the trigger
+ top = triggerRect.bottom + scrollTop + gap;
+ }
+
+ $popover.css({
+ position: 'absolute',
+ top: top,
+ left: left,
+ zIndex: zIndex || 10000
+ });
+
+ // Toggle arrow direction class
+ $popover.toggleClass('position-above', positionAbove);
+
+ // Determine horizontal arrow position class
+ var triggerCenter = triggerRect.left + (triggerRect.width / 2);
+ var popoverLeft = left;
+ var popoverCenter = popoverLeft + (popoverWidth / 2);
+ $popover.removeClass('position-left position-right');
+ if (triggerCenter - popoverLeft < popoverWidth * 0.3) {
+ $popover.addClass('position-right');
+ } else if (triggerCenter - popoverLeft > popoverWidth * 0.7) {
+ $popover.addClass('position-left');
+ }
+ },
+
/**
* Update popover after loading more items
*/
@@ -1180,6 +1220,144 @@
});
},
+ // =========================================================================
+ // FILTER VALUE PREVIEW (individual attribute/feature value chip)
+ // =========================================================================
+
+ /**
+ * Show preview popover for a specific filter value (attribute or feature value)
+ * @param {jQuery} $badge - The preview button on the chip
+ * @param {number} valueId - The attribute/feature value ID
+ * @param {string} valueType - 'attribute' or 'feature'
+ * @param {string} valueName - Display name of the value
+ * @param {number} groupId - The parent group ID
+ */
+ showFilterValuePreviewPopover: function($badge, valueId, valueType, valueName, groupId) {
+ var self = this;
+
+ this.hidePreviewPopover();
+
+ $badge.addClass('popover-open loading');
+ this.$activeBadge = $badge;
+
+ $.ajax({
+ url: this.config.ajaxUrl,
+ type: 'POST',
+ dataType: 'json',
+ data: {
+ ajax: 1,
+ action: 'previewFilterValueProducts',
+ trait: 'EntitySelector',
+ value_id: valueId,
+ value_type: valueType,
+ group_id: groupId,
+ limit: 10
+ },
+ success: function(response) {
+ $badge.removeClass('loading');
+
+ if (response.success) {
+ self.createPreviewPopover({
+ $badge: $badge,
+ items: response.items || [],
+ totalCount: response.count || 0,
+ hasMore: response.hasMore || false,
+ entityLabel: 'products',
+ previewType: 'filter-value',
+ context: { valueId: valueId, valueType: valueType, groupId: groupId, valueName: valueName },
+ onLoadMore: function($btn) {
+ self.loadMoreFilterValueItems($btn);
+ },
+ onFilter: function(query) {
+ self.filterFilterValueItems(query);
+ }
+ });
+ } else {
+ $badge.removeClass('popover-open');
+ self.$activeBadge = null;
+ }
+ },
+ error: function() {
+ $badge.removeClass('loading popover-open');
+ self.$activeBadge = null;
+ }
+ });
+ },
+
+ /**
+ * AJAX filter handler for filter value preview
+ */
+ filterFilterValueItems: function(query) {
+ var self = this;
+ var ctx = this.previewContext;
+
+ if (!ctx || !ctx.valueId) {
+ self.showFilterLoading(false);
+ return;
+ }
+
+ $.ajax({
+ url: this.config.ajaxUrl,
+ type: 'POST',
+ dataType: 'json',
+ data: {
+ ajax: 1,
+ action: 'previewFilterValueProducts',
+ trait: 'EntitySelector',
+ value_id: ctx.valueId,
+ value_type: ctx.valueType,
+ group_id: ctx.groupId,
+ filter: query,
+ limit: 20
+ },
+ success: function(response) {
+ self.updatePreviewPopoverFiltered(response);
+ },
+ error: function() {
+ self.showFilterLoading(false);
+ }
+ });
+ },
+
+ loadMoreFilterValueItems: function($btn) {
+ var self = this;
+ var ctx = this.previewContext;
+
+ if (!ctx || !ctx.valueId) return;
+
+ var loadCount = this.previewLoadCount || 20;
+
+ var ajaxData = {
+ ajax: 1,
+ action: 'previewFilterValueProducts',
+ trait: 'EntitySelector',
+ value_id: ctx.valueId,
+ value_type: ctx.valueType,
+ group_id: ctx.groupId,
+ limit: self.previewLoadedCount + loadCount
+ };
+ if (self.previewCurrentFilter) {
+ ajaxData.filter = self.previewCurrentFilter;
+ }
+
+ $.ajax({
+ url: this.config.ajaxUrl,
+ type: 'POST',
+ dataType: 'json',
+ data: ajaxData,
+ success: function(response) {
+ if (response.success) {
+ self.previewTotalCount = response.count;
+ self.updatePreviewPopover(response.items || [], response.hasMore);
+ }
+ },
+ error: function() {
+ $btn.removeClass('loading');
+ $btn.find('i').removeClass('icon-spinner icon-spin').addClass('icon-plus');
+ }
+ });
+ },
+
// =========================================================================
// CATEGORY ITEMS PREVIEW (products/pages in a category)
// =========================================================================
@@ -1517,28 +1695,9 @@
self.switchToBlock(blockType);
});
- // Position popover
+ // Position popover relative to badge (handles viewport overflow)
$('body').append($popover);
- var badgeOffset = $badge.offset();
- var badgeHeight = $badge.outerHeight();
- var popoverWidth = $popover.outerWidth();
-
- $popover.css({
- position: 'absolute',
- top: badgeOffset.top + badgeHeight + 5,
- left: badgeOffset.left - (popoverWidth / 2) + ($badge.outerWidth() / 2),
- zIndex: 10000
- });
-
- // Adjust if off screen
- var windowWidth = $(window).width();
- var popoverRight = $popover.offset().left + popoverWidth;
- if (popoverRight > windowWidth - 10) {
- $popover.css('left', windowWidth - popoverWidth - 10);
- }
- if ($popover.offset().left < 10) {
- $popover.css('left', 10);
- }
+ this.positionPopover($popover, $badge);
$popover.hide().fadeIn(150);
},
diff --git a/sources/js/admin/entity-selector/_search.js b/sources/js/admin/entity-selector/_search.js
index c69b15d..6eb5169 100644
--- a/sources/js/admin/entity-selector/_search.js
+++ b/sources/js/admin/entity-selector/_search.js
@@ -40,6 +40,11 @@
sort_dir: this.currentSort ? this.currentSort.dir : 'ASC'
};
+ // Add product_selection_level if set
+ if (this.config.productSelectionLevel && this.config.productSelectionLevel !== 'product') {
+ requestData.product_selection_level = this.config.productSelectionLevel;
+ }
+
// Add refine query if present
if (this.refineQuery) {
requestData.refine = this.refineQuery;
@@ -367,6 +372,8 @@
var isSelected = selectedIds.indexOf(String(item.id)) !== -1;
var itemClass = 'dropdown-item' + (isSelected ? ' selected' : '');
if (item.type === 'product') itemClass += ' result-item-product';
+ if (item.is_combination) itemClass += ' is-combination';
+ if (item.is_parent) itemClass += ' is-parent-product';
html += ' .target-search-dropdown,
font-weight: $es-font-weight-medium;
}
- // Count with eye icon (like group-count-badge)
.toggle-count {
- display: inline-flex;
- align-items: center;
- gap: 0.125rem;
color: $es-text-muted;
font-size: 0.65rem;
-
- i {
- font-size: 10px;
- color: $es-primary;
- }
-
- // Clickable preview badge
- &.clickable {
- cursor: pointer;
- padding: 0.125rem 0.25rem;
- border-radius: $es-radius-sm;
- transition: all $es-transition-fast;
-
- &:hover {
- background: rgba($es-primary, 0.1);
- color: $es-primary;
-
- i {
- color: $es-primary;
- }
- }
-
- &.popover-open {
- background: $es-primary;
- color: $es-white;
-
- i {
- color: $es-white;
- }
- }
-
- &.loading {
- i {
- animation: spin 0.6s linear infinite;
- }
- }
- }
}
}
@@ -1426,6 +1399,67 @@ body > .target-search-dropdown,
color: rgba(255, 255, 255, 0.8);
}
+ // Filter chip wrapper (chip/toggle + preview button)
+ .filter-chip-wrapper {
+ display: inline-flex;
+ align-items: stretch;
+ border-radius: $es-radius-sm;
+ overflow: hidden;
+
+ // Left element gets left-only border-radius
+ .filter-chip,
+ .filter-group-toggle {
+ border-radius: $es-radius-sm 0 0 $es-radius-sm;
+ }
+
+ // Preview eye button — unified for both value chips and group toggles
+ .chip-preview-btn {
+ @include button-reset;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ padding: 0 0.375rem;
+ font-size: 10px;
+ color: $es-text-muted;
+ background: $es-slate-100;
+ border-left: 1px solid $es-border-color;
+ border-radius: 0 $es-radius-sm $es-radius-sm 0;
+ cursor: pointer;
+ transition: all $es-transition-fast;
+
+ &:hover {
+ background: rgba($es-primary, 0.1);
+ color: $es-primary;
+ }
+
+ &.popover-open {
+ background: $es-primary;
+ color: $es-white;
+ }
+
+ &.loading i {
+ animation: spin 0.6s linear infinite;
+ }
+ }
+
+ // When no preview button, restore full border-radius
+ .filter-chip:last-child,
+ .filter-group-toggle:last-child {
+ border-radius: $es-radius-sm;
+ }
+
+ // Group toggle active/has-selection states propagate to wrapper border
+ .filter-group-toggle.active + .chip-preview-btn {
+ border-left-color: $es-primary;
+ background: rgba($es-primary, 0.05);
+ }
+
+ .filter-group-toggle.has-selection + .chip-preview-btn {
+ border-left-color: $es-success;
+ background: rgba($es-success, 0.03);
+ }
+ }
+
// Dropdown content
.dropdown-content {
max-height: 400px;
diff --git a/sources/scss/components/_entity-selector.scss b/sources/scss/components/_entity-selector.scss
index 9e20591..2b3599e 100644
--- a/sources/scss/components/_entity-selector.scss
+++ b/sources/scss/components/_entity-selector.scss
@@ -368,6 +368,7 @@
// Single mode specific styles
.target-conditions-trait.single-mode,
.entity-selector-trait.single-mode {
+ // Hide tabs in standalone layout (has separate header, 1 tab is redundant)
.target-block-tabs {
display: none;
}
@@ -375,6 +376,11 @@
.target-block-container {
display: block;
}
+
+ // In form-content layout, always show tabs — they serve as the block title
+ .entity-selector-tabs-row .target-block-tabs {
+ display: flex;
+ }
}
// Header action buttons
diff --git a/sources/scss/components/_groups.scss b/sources/scss/components/_groups.scss
index f8cd6b7..ec55e34 100644
--- a/sources/scss/components/_groups.scss
+++ b/sources/scss/components/_groups.scss
@@ -931,6 +931,36 @@
background-size: 1.25em 1.25em;
}
+ // Single mode — strip padding, borders, backgrounds for clean single-selection UI
+ &[data-mode=single],
+ .mode-single {
+ .groups-container {
+ padding: 0;
+ }
+
+ .group-body {
+ padding: 0;
+ }
+
+ .group-include {
+ padding: 0.5rem;
+ margin-bottom: 0;
+ background: transparent;
+ border: none;
+ border-radius: 0;
+ }
+
+ .selection-group {
+ background: transparent;
+ border: none;
+ margin-bottom: 0;
+ }
+
+ .group-header {
+ display: none;
+ }
+ }
+
// Condition match count badge
.condition-match-count {
display: inline-flex;
diff --git a/sources/scss/components/_list-preview.scss b/sources/scss/components/_list-preview.scss
index 8f1873a..dd9af79 100644
--- a/sources/scss/components/_list-preview.scss
+++ b/sources/scss/components/_list-preview.scss
@@ -66,6 +66,23 @@
transform: none;
}
}
+
+ // Positioned above trigger - arrow pointing down
+ &.position-above {
+ &::before {
+ top: auto;
+ bottom: -8px;
+ border-top: 8px solid $es-border-color;
+ border-bottom: 0;
+ }
+
+ &::after {
+ top: auto;
+ bottom: -6px;
+ border-top: 6px solid $es-white;
+ border-bottom: 0;
+ }
+ }
}
// =============================================================================
diff --git a/src/EntitySelector.php b/src/EntitySelector.php
index e262ed6..73d7982 100644
--- a/src/EntitySelector.php
+++ b/src/EntitySelector.php
@@ -156,8 +156,11 @@ trait EntitySelector
}
/**
- * Get base path for target conditions assets from vendor package
- * Assets are loaded directly from the package - no manual copying needed
+ * Get base path for entity selector assets from the vendor package.
+ * Auto-detects the correct path via reflection — no manual copying needed.
+ *
+ * DO NOT override this method. DO NOT copy CSS/JS to views/ directories.
+ * The sync script (sync-entity-selector.sh) enforces single-source assets.
*
* @return string URL path ending with /
*/
@@ -172,8 +175,17 @@ trait EntitySelector
$assetsDir = $packageDir . '/assets/';
// Convert filesystem path to URL path relative to PS root
- $psRoot = _PS_ROOT_DIR_ . '/';
- $relativePath = str_replace($psRoot, '', $assetsDir);
+ // Use realpath() on PS root to handle symlinks consistently
+ $psRoot = realpath(_PS_ROOT_DIR_) . '/';
+ $assetsReal = realpath($packageDir . '/assets');
+ $relativePath = $assetsReal ? str_replace($psRoot, '', $assetsReal . '/') : null;
+
+ // If symlink resolution caused the path to escape PS root, fall back to module URI
+ if (!$relativePath || strpos($relativePath, '/') === 0 || strpos($relativePath, '..') !== false) {
+ // Use module's web-accessible path as base
+ $modulePath = $this->module->getPathUri();
+ return $modulePath . 'vendor/myprestarocks/prestashop-entity-selector/assets/';
+ }
return __PS_BASE_URI__ . $relativePath;
}
@@ -275,6 +287,9 @@ trait EntitySelector
case 'previewFilterGroupProducts':
$this->ajaxPreviewFilterGroupProducts();
return true;
+ case 'previewFilterValueProducts':
+ $this->ajaxPreviewFilterValueProducts();
+ return true;
case 'previewCategoryProducts':
$this->ajaxPreviewCategoryProducts();
return true;
@@ -837,6 +852,114 @@ trait EntitySelector
}
}
+ /**
+ * AJAX: Preview products for a specific attribute/feature value
+ * Used by filter chip eye button
+ */
+ protected function ajaxPreviewFilterValueProducts()
+ {
+ $valueId = (int) Tools::getValue('value_id');
+ $valueType = Tools::getValue('value_type'); // 'attribute' or 'feature'
+ $groupId = (int) Tools::getValue('group_id');
+ $limit = (int) Tools::getValue('limit', 10);
+ $filter = Tools::getValue('filter', '');
+
+ if (!$valueId || !in_array($valueType, ['attribute', 'feature'])) {
+ die(json_encode([
+ 'success' => false,
+ 'error' => 'Invalid parameters'
+ ]));
+ }
+
+ $idLang = (int) Context::getContext()->language->id;
+ $idShop = (int) Context::getContext()->shop->id;
+
+ try {
+ $db = Db::getInstance();
+
+ if ($valueType === 'attribute') {
+ $sql = new DbQuery();
+ $sql->select('DISTINCT p.id_product');
+ $sql->from('product', 'p');
+ $sql->innerJoin('product_shop', 'ps', 'ps.id_product = p.id_product AND ps.id_shop = ' . $idShop);
+ $sql->innerJoin('product_attribute', 'pa', 'pa.id_product = p.id_product');
+ $sql->innerJoin('product_attribute_combination', 'pac', 'pac.id_product_attribute = pa.id_product_attribute');
+ $sql->where('pac.id_attribute = ' . $valueId);
+ $sql->where('ps.active = 1');
+ } else {
+ $sql = new DbQuery();
+ $sql->select('DISTINCT p.id_product');
+ $sql->from('product', 'p');
+ $sql->innerJoin('product_shop', 'ps', 'ps.id_product = p.id_product AND ps.id_shop = ' . $idShop);
+ $sql->innerJoin('feature_product', 'fp', 'fp.id_product = p.id_product');
+ $sql->where('fp.id_feature_value = ' . $valueId);
+ $sql->where('ps.active = 1');
+ }
+
+ $results = $db->executeS($sql);
+ $productIds = array_column($results, 'id_product');
+
+ if (!empty($filter) && !empty($productIds)) {
+ $productIds = $this->getEntityPreviewHandler()->filterProductIdsByQuery($productIds, $filter, $idLang, $idShop);
+ }
+
+ $totalCount = count($productIds);
+ $previewIds = array_slice($productIds, 0, $limit);
+
+ $items = [];
+ if (!empty($previewIds)) {
+ $productSql = new DbQuery();
+ $productSql->select('p.id_product, pl.name, p.reference, i.id_image, m.name as manufacturer');
+ $productSql->from('product', 'p');
+ $productSql->innerJoin('product_lang', 'pl', 'pl.id_product = p.id_product AND pl.id_lang = ' . $idLang . ' AND pl.id_shop = ' . $idShop);
+ $productSql->leftJoin('image', 'i', 'i.id_product = p.id_product AND i.cover = 1');
+ $productSql->leftJoin('manufacturer', 'm', 'm.id_manufacturer = p.id_manufacturer');
+ $productSql->where('p.id_product IN (' . implode(',', array_map('intval', $previewIds)) . ')');
+
+ $products = $db->executeS($productSql);
+
+ $productsById = [];
+ foreach ($products as $product) {
+ $imageUrl = null;
+ if ($product['id_image']) {
+ $imageUrl = Context::getContext()->link->getImageLink(
+ Tools::link_rewrite($product['name']),
+ $product['id_product'] . '-' . $product['id_image'],
+ 'small_default'
+ );
+ }
+
+ $productsById[(int) $product['id_product']] = [
+ 'id' => (int) $product['id_product'],
+ 'name' => $product['name'],
+ 'reference' => $product['reference'],
+ 'manufacturer' => $product['manufacturer'],
+ 'image' => $imageUrl
+ ];
+ }
+
+ foreach ($previewIds as $id) {
+ if (isset($productsById[(int) $id])) {
+ $items[] = $productsById[(int) $id];
+ }
+ }
+ }
+
+ die(json_encode([
+ 'success' => true,
+ 'items' => $items,
+ 'count' => $totalCount,
+ 'hasMore' => $totalCount > count($items)
+ ]));
+
+ } catch (\Exception $e) {
+ die(json_encode([
+ 'success' => false,
+ 'error' => $e->getMessage()
+ ]));
+ }
+ }
+
/**
* AJAX: Preview products in a category
* Used by tree view product count click
@@ -1279,6 +1402,8 @@ trait EntitySelector
// Sorting
'sort_by' => $sortBy,
'sort_dir' => $sortDir,
+ // Product selection level
+ 'product_selection_level' => Tools::getValue('product_selection_level', 'product'),
];
// Delegate to EntitySearchEngine
@@ -1302,6 +1427,7 @@ trait EntitySelector
protected function ajaxGetTargetEntitiesByIds()
{
$entityType = Tools::getValue('entity_type', '');
+ $productSelectionLevel = Tools::getValue('product_selection_level', 'product');
$ids = Tools::getValue('ids', '');
if (is_string($ids)) {
$ids = json_decode($ids, true);
@@ -1311,7 +1437,7 @@ trait EntitySelector
}
// Delegate to EntitySearchEngine
- $entities = $this->getEntitySearchEngine()->getByIds($entityType, $ids);
+ $entities = $this->getEntitySearchEngine()->getByIds($entityType, $ids, $productSelectionLevel);
$this->ajaxDie(json_encode([
'success' => true,
@@ -1327,7 +1453,7 @@ trait EntitySelector
protected function ajaxGetTargetEntitiesByIdsBulk()
{
$entitiesParam = Tools::getValue('entities', '');
- \PrestaShopLogger::addLog('[EntitySelector] ajaxGetTargetEntitiesByIdsBulk called, raw param: ' . substr($entitiesParam, 0, 500), 1);
+ $productSelectionLevel = Tools::getValue('product_selection_level', 'product');
if (is_string($entitiesParam)) {
$entitiesParam = json_decode($entitiesParam, true);
@@ -1336,21 +1462,20 @@ trait EntitySelector
$entitiesParam = [];
}
- \PrestaShopLogger::addLog('[EntitySelector] Parsed entities param: ' . json_encode($entitiesParam), 1);
-
$result = [];
$searchEngine = $this->getEntitySearchEngine();
foreach ($entitiesParam as $entityType => $ids) {
if (!is_array($ids) || empty($ids)) {
- \PrestaShopLogger::addLog('[EntitySelector] Skipping entityType=' . $entityType . ' - empty or not array', 1);
continue;
}
- // Deduplicate and sanitize IDs
- $ids = array_unique(array_map('intval', $ids));
- \PrestaShopLogger::addLog('[EntitySelector] Fetching entityType=' . $entityType . ' ids=' . implode(',', $ids), 1);
- $result[$entityType] = $searchEngine->getByIds($entityType, $ids);
- \PrestaShopLogger::addLog('[EntitySelector] Got ' . count($result[$entityType]) . ' results for ' . $entityType, 1);
+ // For combination-level products, keep string IDs (c:32, p:17); otherwise intval
+ if ($entityType === 'products' && ($productSelectionLevel === 'combination' || $productSelectionLevel === 'both')) {
+ $ids = array_unique(array_map('strval', $ids));
+ } else {
+ $ids = array_unique(array_map('intval', $ids));
+ }
+ $result[$entityType] = $searchEngine->getByIds($entityType, $ids, $productSelectionLevel);
}
$this->ajaxDie(json_encode([
diff --git a/src/EntitySelector/EntityPreviewHandler.php b/src/EntitySelector/EntityPreviewHandler.php
index 042647e..053f5f3 100644
--- a/src/EntitySelector/EntityPreviewHandler.php
+++ b/src/EntitySelector/EntityPreviewHandler.php
@@ -305,6 +305,19 @@ class EntityPreviewHandler
return [];
}
+ // Detect prefixed IDs (c:32, p:17) — route to combination-aware preview
+ $hasPrefixed = false;
+ foreach ($productIds as $id) {
+ if (is_string($id) && (strpos($id, 'c:') === 0 || strpos($id, 'p:') === 0)) {
+ $hasPrefixed = true;
+ break;
+ }
+ }
+
+ if ($hasPrefixed) {
+ return $this->getProductPreviewDataPrefixed($productIds, $idLang, $idShop);
+ }
+
$sql = new DbQuery();
$sql->select('p.id_product, pl.name, p.reference, p.price, p.active');
$sql->select('sa.quantity, m.name AS manufacturer_name');
@@ -353,6 +366,130 @@ class EntityPreviewHandler
return $ordered;
}
+ /**
+ * Get preview data for prefixed IDs (c:32, p:17).
+ * Splits into combination IDs and product IDs, fetches data for each.
+ *
+ * @param array $prefixedIds Prefixed string IDs
+ * @param int $idLang Language ID
+ * @param int $idShop Shop ID
+ * @return array Formatted preview items in original order
+ */
+ protected function getProductPreviewDataPrefixed(array $prefixedIds, $idLang, $idShop)
+ {
+ $comboIds = [];
+ $productIds = [];
+
+ foreach ($prefixedIds as $prefixedId) {
+ $prefixedId = (string) $prefixedId;
+ if (strpos($prefixedId, 'c:') === 0) {
+ $comboIds[] = (int) substr($prefixedId, 2);
+ } elseif (strpos($prefixedId, 'p:') === 0) {
+ $productIds[] = (int) substr($prefixedId, 2);
+ } else {
+ $productIds[] = (int) $prefixedId;
+ }
+ }
+
+ $db = Db::getInstance();
+ $imageType = $this->getProductImageType();
+ $itemsByKey = [];
+
+ // Fetch combination data
+ if (!empty($comboIds)) {
+ $sql = 'SELECT pa.id_product_attribute, pa.id_product, pl.name, p.reference AS product_reference,
+ pa.reference AS combo_reference, p.price, p.active,
+ IFNULL(sa_c.quantity, 0) AS quantity,
+ m.name AS manufacturer_name, cl.name AS category_name,
+ i.id_image, pai.id_image AS combo_id_image,
+ GROUP_CONCAT(CONCAT(agl.name, \': \', al.name) ORDER BY ag.position ASC SEPARATOR \', \') AS attributes
+ FROM ' . _DB_PREFIX_ . 'product_attribute pa
+ INNER JOIN ' . _DB_PREFIX_ . 'product p ON p.id_product = pa.id_product
+ INNER JOIN ' . _DB_PREFIX_ . 'product_attribute_shop pas ON pas.id_product_attribute = pa.id_product_attribute AND pas.id_shop = ' . (int) $idShop . '
+ INNER JOIN ' . _DB_PREFIX_ . 'product_lang pl ON pl.id_product = p.id_product AND pl.id_lang = ' . (int) $idLang . ' AND pl.id_shop = ' . (int) $idShop . '
+ INNER JOIN ' . _DB_PREFIX_ . 'product_attribute_combination pac ON pac.id_product_attribute = pa.id_product_attribute
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute a ON a.id_attribute = pac.id_attribute
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute_lang al ON al.id_attribute = a.id_attribute AND al.id_lang = ' . (int) $idLang . '
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute_group ag ON ag.id_attribute_group = a.id_attribute_group
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute_group_lang agl ON agl.id_attribute_group = a.id_attribute_group AND agl.id_lang = ' . (int) $idLang . '
+ LEFT JOIN ' . _DB_PREFIX_ . 'manufacturer m ON m.id_manufacturer = p.id_manufacturer
+ LEFT JOIN ' . _DB_PREFIX_ . 'category_lang cl ON cl.id_category = p.id_category_default AND cl.id_lang = ' . (int) $idLang . ' AND cl.id_shop = ' . (int) $idShop . '
+ LEFT JOIN ' . _DB_PREFIX_ . 'stock_available sa_c ON sa_c.id_product = pa.id_product AND sa_c.id_product_attribute = pa.id_product_attribute AND sa_c.id_shop = ' . (int) $idShop . '
+ LEFT JOIN ' . _DB_PREFIX_ . 'image i ON i.id_product = p.id_product AND i.cover = 1
+ LEFT JOIN ' . _DB_PREFIX_ . 'product_attribute_image pai ON pai.id_product_attribute = pa.id_product_attribute
+ WHERE pa.id_product_attribute IN (' . implode(',', array_map('intval', $comboIds)) . ')
+ GROUP BY pa.id_product_attribute';
+
+ $rows = $db->executeS($sql);
+ if ($rows) {
+ foreach ($rows as $row) {
+ $key = 'c:' . (int) $row['id_product_attribute'];
+ $imageId = !empty($row['combo_id_image']) ? $row['combo_id_image'] : ($row['id_image'] ?? null);
+ $ref = $row['combo_reference'] ?: $row['product_reference'];
+
+ $itemsByKey[$key] = [
+ 'id' => $key,
+ 'name' => $row['name'] . ', ' . $row['attributes'],
+ 'reference' => $ref,
+ 'price' => (float) $row['price'],
+ 'quantity' => (int) $row['quantity'],
+ 'active' => (bool) $row['active'],
+ 'manufacturer' => $row['manufacturer_name'],
+ 'category' => $row['category_name'],
+ 'image' => $imageId ? $this->getProductImageUrl($row['id_product'], $imageId, $imageType) : null,
+ 'attributes' => $row['attributes'],
+ 'isCombination' => true,
+ ];
+ }
+ }
+ }
+
+ // Fetch plain product data
+ if (!empty($productIds)) {
+ $sql = new DbQuery();
+ $sql->select('p.id_product, pl.name, p.reference, p.price, p.active');
+ $sql->select('sa.quantity, m.name AS manufacturer_name');
+ $sql->select('cl.name AS category_name, i.id_image');
+ $sql->from('product', 'p');
+ $sql->innerJoin('product_shop', 'ps', 'ps.id_product = p.id_product AND ps.id_shop = ' . (int) $idShop);
+ $sql->leftJoin('product_lang', 'pl', 'pl.id_product = p.id_product AND pl.id_lang = ' . (int) $idLang . ' AND pl.id_shop = ' . (int) $idShop);
+ $sql->leftJoin('manufacturer', 'm', 'm.id_manufacturer = p.id_manufacturer');
+ $sql->leftJoin('category_lang', 'cl', 'cl.id_category = p.id_category_default AND cl.id_lang = ' . (int) $idLang . ' AND cl.id_shop = ' . (int) $idShop);
+ $sql->leftJoin('stock_available', 'sa', 'sa.id_product = p.id_product AND sa.id_product_attribute = 0 AND sa.id_shop = ' . (int) $idShop);
+ $sql->leftJoin('image', 'i', 'i.id_product = p.id_product AND i.cover = 1');
+ $sql->where('p.id_product IN (' . implode(',', array_map('intval', $productIds)) . ')');
+
+ $rows = $db->executeS($sql);
+ if ($rows) {
+ foreach ($rows as $row) {
+ $key = 'p:' . (int) $row['id_product'];
+ $itemsByKey[$key] = [
+ 'id' => $key,
+ 'name' => $row['name'],
+ 'reference' => $row['reference'],
+ 'price' => (float) $row['price'],
+ 'quantity' => (int) $row['quantity'],
+ 'active' => (bool) $row['active'],
+ 'manufacturer' => $row['manufacturer_name'],
+ 'category' => $row['category_name'],
+ 'image' => $row['id_image'] ? $this->getProductImageUrl($row['id_product'], $row['id_image'], $imageType) : null,
+ ];
+ }
+ }
+ }
+
+ // Return in original order
+ $ordered = [];
+ foreach ($prefixedIds as $id) {
+ $key = (string) $id;
+ if (isset($itemsByKey[$key])) {
+ $ordered[] = $itemsByKey[$key];
+ }
+ }
+
+ return $ordered;
+ }
+
/**
* Get product image type for thumbnails
*
diff --git a/src/EntitySelector/EntitySearchEngine.php b/src/EntitySelector/EntitySearchEngine.php
index 676f3a6..6dc0ac0 100644
--- a/src/EntitySelector/EntitySearchEngine.php
+++ b/src/EntitySelector/EntitySearchEngine.php
@@ -58,6 +58,12 @@ class EntitySearchEngine
*/
public function search($entityType, $query, $limit = 20, $offset = 0, array $filters = [])
{
+ // product_selection_level: route product searches to combination methods
+ $psl = $filters['product_selection_level'] ?? 'product';
+ if ($entityType === 'products' && ($psl === 'combination' || $psl === 'both')) {
+ return $this->searchProductCombinations($query, $this->idLang, $this->idShop, $limit, $offset, $filters);
+ }
+
$method = 'searchTarget' . $this->camelCase($entityType);
if (method_exists($this, $method)) {
@@ -77,6 +83,11 @@ class EntitySearchEngine
*/
public function count($entityType, $query, array $filters = [])
{
+ $psl = $filters['product_selection_level'] ?? 'product';
+ if ($entityType === 'products' && ($psl === 'combination' || $psl === 'both')) {
+ return $this->countProductCombinations($query, $this->idLang, $this->idShop, $filters);
+ }
+
$method = 'countTarget' . $this->camelCase($entityType);
if (method_exists($this, $method)) {
@@ -93,8 +104,13 @@ class EntitySearchEngine
* @param array $ids Entity IDs
* @return array Entities data
*/
- public function getByIds($entityType, array $ids)
+ public function getByIds($entityType, array $ids, $productSelectionLevel = 'product')
{
+ // If product type with combination-level IDs (prefixed strings), use combination handler
+ if ($entityType === 'products' && ($productSelectionLevel === 'combination' || $productSelectionLevel === 'both')) {
+ return $this->getProductCombinationsByIds($ids, $this->idLang, $this->idShop);
+ }
+
$method = 'getTarget' . $this->camelCase($entityType) . 'ByIds';
if (method_exists($this, $method)) {
@@ -414,6 +430,492 @@ class EntitySearchEngine
return $ordered;
}
+ // =========================================================================
+ // PRODUCT COMBINATIONS (product_selection_level = combination)
+ // =========================================================================
+
+ /**
+ * Search products at combination level.
+ * Products WITH combinations return one result per combination (id = "c:{id_product_attribute}").
+ * Simple products (no combinations) return with id = "p:{id_product}".
+ *
+ * @param string $query Search query
+ * @param int $idLang Language ID
+ * @param int $idShop Shop ID
+ * @param int $limit Results limit
+ * @param int $offset Results offset
+ * @param array $filters Additional filters
+ * @return array Search results
+ */
+ public function searchProductCombinations($query, $idLang, $idShop, $limit = 20, $offset = 0, array $filters = [])
+ {
+ $db = Db::getInstance();
+ $escapedQuery = !empty($query) ? $this->escapePattern($query) : '';
+
+ // Step 1: Find matching products (same query as searchTargetProducts but no limit — we paginate the flat result)
+ $sqlProducts = new DbQuery();
+ $sqlProducts->select('DISTINCT p.id_product, pl.name, p.reference, ps.price AS base_price, ps.active,
+ m.name AS manufacturer_name, cl.name AS category_name, i.id_image,
+ IFNULL(sa.quantity, 0) AS stock_qty');
+ // Sales
+ $sqlProducts->select('(SELECT COALESCE(SUM(od.product_quantity), 0) FROM ' . _DB_PREFIX_ . 'order_detail od
+ INNER JOIN ' . _DB_PREFIX_ . 'orders o ON o.id_order = od.id_order
+ WHERE od.product_id = p.id_product AND o.valid = 1) AS sales_qty');
+ $sqlProducts->from('product', 'p');
+ $sqlProducts->innerJoin('product_shop', 'ps', 'ps.id_product = p.id_product AND ps.id_shop = ' . (int) $idShop);
+ $sqlProducts->leftJoin('product_lang', 'pl', 'pl.id_product = p.id_product AND pl.id_lang = ' . (int) $idLang . ' AND pl.id_shop = ' . (int) $idShop);
+ $sqlProducts->leftJoin('manufacturer', 'm', 'm.id_manufacturer = p.id_manufacturer');
+ $sqlProducts->leftJoin('category_lang', 'cl', 'cl.id_category = p.id_category_default AND cl.id_lang = ' . (int) $idLang . ' AND cl.id_shop = ' . (int) $idShop);
+ $sqlProducts->leftJoin('stock_available', 'sa', 'sa.id_product = p.id_product AND sa.id_product_attribute = 0 AND sa.id_shop = ' . (int) $idShop);
+ $sqlProducts->leftJoin('image', 'i', 'i.id_product = p.id_product AND i.cover = 1');
+
+ if (!empty($escapedQuery)) {
+ $sqlProducts->where('(pl.name LIKE \'%' . $escapedQuery . '%\' OR p.reference LIKE \'%' . $escapedQuery . '%\' OR p.id_product = ' . (int) $query . ')');
+ }
+
+ $this->applyProductFilters($sqlProducts, $filters, $idLang, $idShop);
+ $sqlProducts->orderBy('pl.name ASC');
+
+ $matchingProducts = $db->executeS($sqlProducts);
+ if (!$matchingProducts) {
+ return [];
+ }
+
+ $productIds = array_column($matchingProducts, 'id_product');
+ $productMap = [];
+ foreach ($matchingProducts as $p) {
+ $productMap[(int) $p['id_product']] = $p;
+ }
+
+ // Step 2: Get all combinations with stock, image, attributes
+ $sqlCombos = 'SELECT pa.id_product_attribute, pa.id_product, pa.reference AS combo_reference,
+ pas.price AS combo_price_impact,
+ IFNULL(sa_c.quantity, 0) AS combo_stock,
+ pai.id_image AS combo_id_image,
+ GROUP_CONCAT(CONCAT(agl.name, \': \', al.name) ORDER BY ag.position ASC SEPARATOR \', \') AS attributes
+ FROM ' . _DB_PREFIX_ . 'product_attribute pa
+ INNER JOIN ' . _DB_PREFIX_ . 'product_attribute_shop pas ON pas.id_product_attribute = pa.id_product_attribute AND pas.id_shop = ' . (int) $idShop . '
+ INNER JOIN ' . _DB_PREFIX_ . 'product_attribute_combination pac ON pac.id_product_attribute = pa.id_product_attribute
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute a ON a.id_attribute = pac.id_attribute
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute_lang al ON al.id_attribute = a.id_attribute AND al.id_lang = ' . (int) $idLang . '
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute_group ag ON ag.id_attribute_group = a.id_attribute_group
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute_group_lang agl ON agl.id_attribute_group = a.id_attribute_group AND agl.id_lang = ' . (int) $idLang . '
+ LEFT JOIN ' . _DB_PREFIX_ . 'stock_available sa_c ON sa_c.id_product = pa.id_product AND sa_c.id_product_attribute = pa.id_product_attribute AND sa_c.id_shop = ' . (int) $idShop . '
+ LEFT JOIN ' . _DB_PREFIX_ . 'product_attribute_image pai ON pai.id_product_attribute = pa.id_product_attribute
+ WHERE pa.id_product IN (' . implode(',', array_map('intval', $productIds)) . ')';
+
+ // Filter combinations by selected attribute values
+ $comboAttrIds = $this->extractAttributeFilterIds($filters);
+ if (!empty($comboAttrIds)) {
+ $sqlCombos .= ' AND EXISTS (
+ SELECT 1 FROM ' . _DB_PREFIX_ . 'product_attribute_combination pac_f
+ WHERE pac_f.id_product_attribute = pa.id_product_attribute
+ AND pac_f.id_attribute IN (' . implode(',', $comboAttrIds) . ')
+ )';
+ }
+
+ $sqlCombos .= ' GROUP BY pa.id_product_attribute
+ ORDER BY pa.id_product, pa.id_product_attribute';
+
+ $combinations = $db->executeS($sqlCombos);
+
+ // Group combinations by product
+ $combosByProduct = [];
+ if ($combinations) {
+ foreach ($combinations as $combo) {
+ $combosByProduct[(int) $combo['id_product']][] = $combo;
+ }
+ }
+
+ // Step 3: Build flat result list with full product data
+ $imageType = $this->getProductImageType();
+ $context = Context::getContext();
+ $locale = $context->getCurrentLocale();
+ $currency = $context->currency;
+ $isBothMode = ($filters['product_selection_level'] ?? 'combination') === 'both';
+
+ $allResults = [];
+ foreach ($productIds as $idProduct) {
+ $idProduct = (int) $idProduct;
+ $product = $productMap[$idProduct];
+
+ if (!empty($combosByProduct[$idProduct])) {
+ // In 'both' mode, add the base product entry first
+ if ($isBothMode) {
+ $basePrice = (float) ($product['base_price'] ?? 0);
+ $stockQty = (int) ($product['stock_qty'] ?? 0);
+ $regularPriceFormatted = $locale->formatPrice($basePrice, $currency->iso_code);
+ $finalPrice = \Product::getPriceStatic($idProduct, true, null, 2, null, false, true, 1, false, null, null, null, $dummyNull, true, true, $context);
+ $finalPriceFormatted = $locale->formatPrice($finalPrice, $currency->iso_code);
+ $hasDiscount = ($basePrice > 0 && $finalPrice < $basePrice);
+ $stockStatus = $stockQty <= 0 ? 'out_of_stock' : ($stockQty <= 5 ? 'low_stock' : 'in_stock');
+
+ $allResults[] = [
+ 'id' => 'p:' . $idProduct,
+ 'type' => 'product',
+ 'name' => $product['name'],
+ 'subtitle' => $product['reference'] ? 'Ref: ' . $product['reference'] : null,
+ 'reference' => $product['reference'],
+ 'is_combination' => false,
+ 'is_parent' => true,
+ 'combination_count' => count($combosByProduct[$idProduct]),
+ 'id_product' => $idProduct,
+ 'active' => (bool) $product['active'],
+ 'manufacturer' => $product['manufacturer_name'],
+ 'category' => $product['category_name'],
+ 'image' => $product['id_image'] ? $this->getProductImageUrl($idProduct, $product['id_image'], $imageType) : null,
+ 'regular_price_formatted' => $regularPriceFormatted,
+ 'price_formatted' => $finalPriceFormatted,
+ 'has_discount' => $hasDiscount,
+ 'stock_qty' => $stockQty,
+ 'stock_status' => $stockStatus,
+ 'sales_qty' => (int) ($product['sales_qty'] ?? 0),
+ ];
+ }
+
+ // Product HAS combinations — one entry per combination
+ foreach ($combosByProduct[$idProduct] as $combo) {
+ $idPA = (int) $combo['id_product_attribute'];
+ $comboStock = (int) $combo['combo_stock'];
+
+ // Price: use Product::getPrice with combination ID for accurate price
+ $comboPrice = \Product::getPriceStatic($idProduct, true, $idPA, 2, null, false, true, 1, false, null, null, null, $dummyNull, true, true, $context);
+ $comboPriceFormatted = $locale->formatPrice($comboPrice, $currency->iso_code);
+
+ // Regular price (without reduction)
+ $comboRegularPrice = \Product::getPriceStatic($idProduct, true, $idPA, 2, null, false, false, 1, false, null, null, null, $dummyNull, true, true, $context);
+ $comboRegularPriceFormatted = $locale->formatPrice($comboRegularPrice, $currency->iso_code);
+
+ $hasDiscount = ($comboRegularPrice > $comboPrice);
+
+ // Image: combination image if exists, otherwise product cover
+ $imageId = !empty($combo['combo_id_image']) ? $combo['combo_id_image'] : ($product['id_image'] ?? null);
+
+ // Stock status
+ $stockStatus = 'in_stock';
+ if ($comboStock <= 0) {
+ $stockStatus = 'out_of_stock';
+ } elseif ($comboStock <= 5) {
+ $stockStatus = 'low_stock';
+ }
+
+ // Name includes attributes: "Product name, Attr1: Val1, Attr2: Val2"
+ $fullName = $product['name'] . ', ' . $combo['attributes'];
+ $ref = $combo['combo_reference'] ?: $product['reference'];
+
+ $allResults[] = [
+ 'id' => 'c:' . $idPA,
+ 'type' => 'product',
+ 'name' => $fullName,
+ 'subtitle' => $ref ? 'Ref: ' . $ref : null,
+ 'reference' => $ref,
+ 'attributes' => $combo['attributes'],
+ 'is_combination' => true,
+ 'id_product' => $idProduct,
+ 'id_product_attribute' => $idPA,
+ 'active' => (bool) $product['active'],
+ 'manufacturer' => $product['manufacturer_name'],
+ 'category' => $product['category_name'],
+ 'image' => $imageId ? $this->getProductImageUrl($idProduct, $imageId, $imageType) : null,
+ 'regular_price_formatted' => $comboRegularPriceFormatted,
+ 'price_formatted' => $comboPriceFormatted,
+ 'has_discount' => $hasDiscount,
+ 'stock_qty' => $comboStock,
+ 'stock_status' => $stockStatus,
+ 'sales_qty' => (int) ($product['sales_qty'] ?? 0),
+ ];
+ }
+ } else {
+ // Simple product — no combinations
+ // Skip simple products when attribute filter is active (they can't match)
+ if (!empty($comboAttrIds)) {
+ continue;
+ }
+ $basePrice = (float) ($product['base_price'] ?? 0);
+ $stockQty = (int) ($product['stock_qty'] ?? 0);
+ $salesQty = (int) ($product['sales_qty'] ?? 0);
+
+ $regularPriceFormatted = $locale->formatPrice($basePrice, $currency->iso_code);
+ $finalPrice = \Product::getPriceStatic($idProduct, true, null, 2, null, false, true, 1, false, null, null, null, $dummyNull, true, true, $context);
+ $finalPriceFormatted = $locale->formatPrice($finalPrice, $currency->iso_code);
+ $hasDiscount = ($basePrice > 0 && $finalPrice < $basePrice);
+
+ $stockStatus = 'in_stock';
+ if ($stockQty <= 0) {
+ $stockStatus = 'out_of_stock';
+ } elseif ($stockQty <= 5) {
+ $stockStatus = 'low_stock';
+ }
+
+ $allResults[] = [
+ 'id' => 'p:' . $idProduct,
+ 'type' => 'product',
+ 'name' => $product['name'],
+ 'subtitle' => $product['reference'] ? 'Ref: ' . $product['reference'] : null,
+ 'reference' => $product['reference'],
+ 'is_combination' => false,
+ 'id_product' => $idProduct,
+ 'active' => (bool) $product['active'],
+ 'manufacturer' => $product['manufacturer_name'],
+ 'category' => $product['category_name'],
+ 'image' => $product['id_image'] ? $this->getProductImageUrl($idProduct, $product['id_image'], $imageType) : null,
+ 'regular_price_formatted' => $regularPriceFormatted,
+ 'price_formatted' => $finalPriceFormatted,
+ 'has_discount' => $hasDiscount,
+ 'stock_qty' => $stockQty,
+ 'stock_status' => $stockStatus,
+ 'sales_qty' => $salesQty,
+ ];
+ }
+ }
+
+ // Apply offset/limit to the flat list
+ return array_slice($allResults, (int) $offset, (int) $limit);
+ }
+
+ /**
+ * Count products at combination level.
+ * Each combination counts as 1. Simple products count as 1.
+ *
+ * @param string $query Search query
+ * @param int $idLang Language ID
+ * @param int $idShop Shop ID
+ * @param array $filters Additional filters
+ * @return int Total count
+ */
+ public function countProductCombinations($query, $idLang, $idShop, array $filters = [])
+ {
+ $db = Db::getInstance();
+ $escapedQuery = !empty($query) ? $this->escapePattern($query) : '';
+
+ // Get matching product IDs
+ $sqlProducts = new DbQuery();
+ $sqlProducts->select('DISTINCT p.id_product');
+ $sqlProducts->from('product', 'p');
+ $sqlProducts->innerJoin('product_shop', 'ps', 'ps.id_product = p.id_product AND ps.id_shop = ' . (int) $idShop);
+ $sqlProducts->leftJoin('product_lang', 'pl', 'pl.id_product = p.id_product AND pl.id_lang = ' . (int) $idLang . ' AND pl.id_shop = ' . (int) $idShop);
+
+ if (!empty($escapedQuery)) {
+ $sqlProducts->where('(pl.name LIKE \'%' . $escapedQuery . '%\' OR p.reference LIKE \'%' . $escapedQuery . '%\' OR p.id_product = ' . (int) $query . ')');
+ }
+
+ $this->applyProductFilters($sqlProducts, $filters, $idLang, $idShop);
+
+ $matchingProducts = $db->executeS($sqlProducts);
+ if (!$matchingProducts) {
+ return 0;
+ }
+
+ $productIds = array_column($matchingProducts, 'id_product');
+
+ // Count combinations for these products
+ $sqlComboCount = 'SELECT COUNT(*) FROM ' . _DB_PREFIX_ . 'product_attribute pa
+ INNER JOIN ' . _DB_PREFIX_ . 'product_attribute_shop pas ON pas.id_product_attribute = pa.id_product_attribute AND pas.id_shop = ' . (int) $idShop . '
+ WHERE pa.id_product IN (' . implode(',', array_map('intval', $productIds)) . ')';
+
+ // Filter combination count by selected attribute values
+ $comboAttrIds = $this->extractAttributeFilterIds($filters);
+ if (!empty($comboAttrIds)) {
+ $sqlComboCount .= ' AND EXISTS (
+ SELECT 1 FROM ' . _DB_PREFIX_ . 'product_attribute_combination pac_f
+ WHERE pac_f.id_product_attribute = pa.id_product_attribute
+ AND pac_f.id_attribute IN (' . implode(',', $comboAttrIds) . ')
+ )';
+ }
+
+ $comboCount = (int) $db->getValue($sqlComboCount);
+
+ // Count simple products (those with no combinations)
+ // Simple products only included when no attribute filter is active
+ // (simple products have no combinations, so they can't match attribute filters)
+ $simpleCount = 0;
+ if (empty($comboAttrIds)) {
+ $sqlSimpleCount = 'SELECT COUNT(*) FROM (' . $sqlProducts->build() . ') AS matched_products
+ WHERE matched_products.id_product NOT IN (
+ SELECT DISTINCT pa2.id_product FROM ' . _DB_PREFIX_ . 'product_attribute pa2
+ INNER JOIN ' . _DB_PREFIX_ . 'product_attribute_shop pas2 ON pas2.id_product_attribute = pa2.id_product_attribute AND pas2.id_shop = ' . (int) $idShop . '
+ )';
+ $simpleCount = (int) $db->getValue($sqlSimpleCount);
+ }
+
+ // In 'both' mode, also count parent products (products that have combinations)
+ $isBothMode = ($filters['product_selection_level'] ?? 'combination') === 'both';
+ $parentCount = 0;
+ if ($isBothMode) {
+ $sqlParentCount = 'SELECT COUNT(DISTINCT pa3.id_product) FROM ' . _DB_PREFIX_ . 'product_attribute pa3
+ INNER JOIN ' . _DB_PREFIX_ . 'product_attribute_shop pas3 ON pas3.id_product_attribute = pa3.id_product_attribute AND pas3.id_shop = ' . (int) $idShop . '
+ WHERE pa3.id_product IN (' . implode(',', array_map('intval', $productIds)) . ')';
+ $parentCount = (int) $db->getValue($sqlParentCount);
+ }
+
+ return $comboCount + $simpleCount + $parentCount;
+ }
+
+ /**
+ * Get product combinations by prefixed IDs.
+ * Handles "c:{id_product_attribute}" and "p:{id_product}" formats.
+ *
+ * @param array $ids Prefixed string IDs
+ * @param int $idLang Language ID
+ * @param int $idShop Shop ID
+ * @return array Entities data
+ */
+ public function getProductCombinationsByIds(array $ids, $idLang, $idShop = null)
+ {
+ if (empty($ids)) {
+ return [];
+ }
+
+ $idShop = $idShop ?: $this->idShop;
+ $db = Db::getInstance();
+
+ // Parse prefixed IDs
+ $comboIds = [];
+ $productIds = [];
+ foreach ($ids as $prefixedId) {
+ $prefixedId = (string) $prefixedId;
+ if (strpos($prefixedId, 'c:') === 0) {
+ $comboIds[] = (int) substr($prefixedId, 2);
+ } elseif (strpos($prefixedId, 'p:') === 0) {
+ $productIds[] = (int) substr($prefixedId, 2);
+ } else {
+ // Fallback: treat as product ID
+ $productIds[] = (int) $prefixedId;
+ }
+ }
+
+ $imageType = $this->getProductImageType();
+ $context = Context::getContext();
+ $locale = $context->getCurrentLocale();
+ $currency = $context->currency;
+
+ $results = [];
+
+ // Fetch combinations with full data
+ if (!empty($comboIds)) {
+ $sqlCombos = 'SELECT pa.id_product_attribute, pa.id_product, pa.reference AS combo_reference,
+ pl.name, p.reference AS product_reference, i.id_image,
+ IFNULL(sa_c.quantity, 0) AS combo_stock,
+ pai.id_image AS combo_id_image,
+ GROUP_CONCAT(CONCAT(agl.name, \': \', al.name) ORDER BY ag.position ASC SEPARATOR \', \') AS attributes
+ FROM ' . _DB_PREFIX_ . 'product_attribute pa
+ INNER JOIN ' . _DB_PREFIX_ . 'product p ON p.id_product = pa.id_product
+ INNER JOIN ' . _DB_PREFIX_ . 'product_attribute_shop pas ON pas.id_product_attribute = pa.id_product_attribute AND pas.id_shop = ' . (int) $idShop . '
+ INNER JOIN ' . _DB_PREFIX_ . 'product_lang pl ON pl.id_product = p.id_product AND pl.id_lang = ' . (int) $idLang . ' AND pl.id_shop = ' . (int) $idShop . '
+ INNER JOIN ' . _DB_PREFIX_ . 'product_attribute_combination pac ON pac.id_product_attribute = pa.id_product_attribute
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute a ON a.id_attribute = pac.id_attribute
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute_lang al ON al.id_attribute = a.id_attribute AND al.id_lang = ' . (int) $idLang . '
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute_group ag ON ag.id_attribute_group = a.id_attribute_group
+ INNER JOIN ' . _DB_PREFIX_ . 'attribute_group_lang agl ON agl.id_attribute_group = a.id_attribute_group AND agl.id_lang = ' . (int) $idLang . '
+ LEFT JOIN ' . _DB_PREFIX_ . 'stock_available sa_c ON sa_c.id_product = pa.id_product AND sa_c.id_product_attribute = pa.id_product_attribute AND sa_c.id_shop = ' . (int) $idShop . '
+ LEFT JOIN ' . _DB_PREFIX_ . 'product_attribute_image pai ON pai.id_product_attribute = pa.id_product_attribute
+ LEFT JOIN ' . _DB_PREFIX_ . 'image i ON i.id_product = p.id_product AND i.cover = 1
+ WHERE pa.id_product_attribute IN (' . implode(',', array_map('intval', $comboIds)) . ')
+ GROUP BY pa.id_product_attribute';
+
+ $comboRows = $db->executeS($sqlCombos);
+ if ($comboRows) {
+ foreach ($comboRows as $row) {
+ $idPA = (int) $row['id_product_attribute'];
+ $idProduct = (int) $row['id_product'];
+ $key = 'c:' . $idPA;
+
+ // Price
+ $comboPrice = \Product::getPriceStatic($idProduct, true, $idPA, 2, null, false, true, 1, false, null, null, null, $dummyNull, true, true, $context);
+ $comboRegularPrice = \Product::getPriceStatic($idProduct, true, $idPA, 2, null, false, false, 1, false, null, null, null, $dummyNull, true, true, $context);
+ $hasDiscount = ($comboRegularPrice > $comboPrice);
+
+ // Image: combination image if exists, otherwise product cover
+ $imageId = !empty($row['combo_id_image']) ? $row['combo_id_image'] : ($row['id_image'] ?? null);
+
+ // Stock
+ $comboStock = (int) $row['combo_stock'];
+ $stockStatus = $comboStock <= 0 ? 'out_of_stock' : ($comboStock <= 5 ? 'low_stock' : 'in_stock');
+
+ $ref = $row['combo_reference'] ?: $row['product_reference'];
+
+ $results[$key] = [
+ 'id' => $key,
+ 'type' => 'product',
+ 'name' => $row['name'] . ', ' . $row['attributes'],
+ 'subtitle' => $ref ? 'Ref: ' . $ref : null,
+ 'reference' => $ref,
+ 'attributes' => $row['attributes'],
+ 'is_combination' => true,
+ 'id_product' => $idProduct,
+ 'id_product_attribute' => $idPA,
+ 'image' => $imageId ? $this->getProductImageUrl($idProduct, $imageId, $imageType) : null,
+ 'regular_price_formatted' => $locale->formatPrice($comboRegularPrice, $currency->iso_code),
+ 'price_formatted' => $locale->formatPrice($comboPrice, $currency->iso_code),
+ 'has_discount' => $hasDiscount,
+ 'stock_qty' => $comboStock,
+ 'stock_status' => $stockStatus,
+ ];
+ }
+ }
+ }
+
+ // Fetch simple products with full data
+ if (!empty($productIds)) {
+ $sqlProducts = new DbQuery();
+ $sqlProducts->select('p.id_product, pl.name, p.reference, ps.price AS base_price,
+ IFNULL(sa.quantity, 0) AS stock_qty, i.id_image');
+ $sqlProducts->from('product', 'p');
+ $sqlProducts->innerJoin('product_shop', 'ps', 'ps.id_product = p.id_product AND ps.id_shop = ' . (int) $idShop);
+ $sqlProducts->leftJoin('product_lang', 'pl', 'pl.id_product = p.id_product AND pl.id_lang = ' . (int) $idLang . ' AND pl.id_shop = ' . (int) $idShop);
+ $sqlProducts->leftJoin('stock_available', 'sa', 'sa.id_product = p.id_product AND sa.id_product_attribute = 0 AND sa.id_shop = ' . (int) $idShop);
+ $sqlProducts->leftJoin('image', 'i', 'i.id_product = p.id_product AND i.cover = 1');
+ $sqlProducts->where('p.id_product IN (' . implode(',', array_map('intval', $productIds)) . ')');
+
+ $productRows = $db->executeS($sqlProducts);
+ if ($productRows) {
+ foreach ($productRows as $row) {
+ $idProduct = (int) $row['id_product'];
+ $key = 'p:' . $idProduct;
+ $stockQty = (int) $row['stock_qty'];
+
+ $finalPrice = \Product::getPriceStatic($idProduct, true, null, 2, null, false, true, 1, false, null, null, null, $dummyNull, true, true, $context);
+ $regularPrice = (float) $row['base_price'];
+ $hasDiscount = ($regularPrice > 0 && $finalPrice < $regularPrice);
+
+ $stockStatus = $stockQty <= 0 ? 'out_of_stock' : ($stockQty <= 5 ? 'low_stock' : 'in_stock');
+
+ $results[$key] = [
+ 'id' => $key,
+ 'type' => 'product',
+ 'name' => $row['name'],
+ 'subtitle' => $row['reference'] ? 'Ref: ' . $row['reference'] : null,
+ 'reference' => $row['reference'],
+ 'is_combination' => false,
+ 'id_product' => $idProduct,
+ 'image' => $row['id_image'] ? $this->getProductImageUrl($idProduct, $row['id_image'], $imageType) : null,
+ 'regular_price_formatted' => $locale->formatPrice($regularPrice, $currency->iso_code),
+ 'price_formatted' => $locale->formatPrice($finalPrice, $currency->iso_code),
+ 'has_discount' => $hasDiscount,
+ 'stock_qty' => $stockQty,
+ 'stock_status' => $stockStatus,
+ ];
+ }
+ }
+ }
+
+ // Return in original order
+ $ordered = [];
+ foreach ($ids as $originalId) {
+ $key = (string) $originalId;
+ if (isset($results[$key])) {
+ $ordered[] = $results[$key];
+ } elseif (isset($results['p:' . $key])) {
+ // Plain integer ID → stored as "p:{id}" (simple product fallback)
+ $ordered[] = $results['p:' . $key];
+ } elseif (isset($results['c:' . $key])) {
+ $ordered[] = $results['c:' . $key];
+ }
+ }
+
+ return $ordered;
+ }
+
/**
* Apply product-specific filters to query
*
@@ -451,23 +953,40 @@ class EntitySearchEngine
$sql->where('ps.active = 1');
}
- // Attribute filter
+ // Attribute filter — supports flat array [id1, id2] or grouped [{id_attribute_group, values}]
if (!empty($filters['attributes'])) {
- foreach ($filters['attributes'] as $attrFilter) {
- if (!empty($attrFilter['values'])) {
- $attrIds = array_map('intval', $attrFilter['values']);
- $sql->innerJoin('product_attribute_combination', 'pac_' . (int) $attrFilter['id_attribute_group'], 'pac_' . (int) $attrFilter['id_attribute_group'] . '.id_attribute IN (' . implode(',', $attrIds) . ')');
- $sql->innerJoin('product_attribute', 'pa_' . (int) $attrFilter['id_attribute_group'], 'pa_' . (int) $attrFilter['id_attribute_group'] . '.id_product_attribute = pac_' . (int) $attrFilter['id_attribute_group'] . '.id_product_attribute AND pa_' . (int) $attrFilter['id_attribute_group'] . '.id_product = p.id_product');
+ $first = reset($filters['attributes']);
+ if (is_numeric($first)) {
+ // Flat array of attribute value IDs (from filter chips)
+ $attrIds = array_map('intval', $filters['attributes']);
+ $sql->innerJoin('product_attribute_combination', 'pac_filter', 'pac_filter.id_attribute IN (' . implode(',', $attrIds) . ')');
+ $sql->innerJoin('product_attribute', 'pa_filter', 'pa_filter.id_product_attribute = pac_filter.id_product_attribute AND pa_filter.id_product = p.id_product');
+ } else {
+ // Grouped format: [{id_attribute_group: X, values: [1,2,3]}, ...]
+ foreach ($filters['attributes'] as $attrFilter) {
+ if (!empty($attrFilter['values'])) {
+ $attrIds = array_map('intval', $attrFilter['values']);
+ $sql->innerJoin('product_attribute_combination', 'pac_' . (int) $attrFilter['id_attribute_group'], 'pac_' . (int) $attrFilter['id_attribute_group'] . '.id_attribute IN (' . implode(',', $attrIds) . ')');
+ $sql->innerJoin('product_attribute', 'pa_' . (int) $attrFilter['id_attribute_group'], 'pa_' . (int) $attrFilter['id_attribute_group'] . '.id_product_attribute = pac_' . (int) $attrFilter['id_attribute_group'] . '.id_product_attribute AND pa_' . (int) $attrFilter['id_attribute_group'] . '.id_product = p.id_product');
+ }
}
}
}
- // Feature filter
+ // Feature filter — supports flat array [id1, id2] or grouped [{id_feature, values}]
if (!empty($filters['features'])) {
- foreach ($filters['features'] as $featFilter) {
- if (!empty($featFilter['values'])) {
- $featIds = array_map('intval', $featFilter['values']);
- $sql->innerJoin('feature_product', 'fp_' . (int) $featFilter['id_feature'], 'fp_' . (int) $featFilter['id_feature'] . '.id_product = p.id_product AND fp_' . (int) $featFilter['id_feature'] . '.id_feature_value IN (' . implode(',', $featIds) . ')');
+ $first = reset($filters['features']);
+ if (is_numeric($first)) {
+ // Flat array of feature value IDs (from filter chips)
+ $featIds = array_map('intval', $filters['features']);
+ $sql->innerJoin('feature_product', 'fp_filter', 'fp_filter.id_product = p.id_product AND fp_filter.id_feature_value IN (' . implode(',', $featIds) . ')');
+ } else {
+ // Grouped format: [{id_feature: X, values: [1,2,3]}, ...]
+ foreach ($filters['features'] as $featFilter) {
+ if (!empty($featFilter['values'])) {
+ $featIds = array_map('intval', $featFilter['values']);
+ $sql->innerJoin('feature_product', 'fp_' . (int) $featFilter['id_feature'], 'fp_' . (int) $featFilter['id_feature'] . '.id_product = p.id_product AND fp_' . (int) $featFilter['id_feature'] . '.id_feature_value IN (' . implode(',', $featIds) . ')');
+ }
}
}
}
@@ -481,6 +1000,33 @@ class EntitySearchEngine
}
}
+ /**
+ * Extract flat array of attribute value IDs from filters.
+ * Handles both flat [id1, id2] and grouped [{id_attribute_group, values}] formats.
+ *
+ * @param array $filters
+ * @return array Integer attribute IDs
+ */
+ protected function extractAttributeFilterIds(array $filters)
+ {
+ if (empty($filters['attributes'])) {
+ return [];
+ }
+
+ $first = reset($filters['attributes']);
+ if (is_numeric($first)) {
+ return array_map('intval', $filters['attributes']);
+ }
+
+ $ids = [];
+ foreach ($filters['attributes'] as $attrFilter) {
+ if (!empty($attrFilter['values'])) {
+ $ids = array_merge($ids, array_map('intval', $attrFilter['values']));
+ }
+ }
+ return $ids;
+ }
+
/**
* Get product image type for thumbnails
*
@@ -3469,6 +4015,130 @@ class EntitySearchEngine
return $ordered;
}
+ // =========================================================================
+ // MPR MATERIALS (module-specific entity type)
+ // =========================================================================
+
+ /**
+ * Search materials
+ */
+ public function searchTargetMprMaterials($query, $idLang, $idShop, $limit = 20, $offset = 0, array $filters = [])
+ {
+ $db = Db::getInstance();
+ $escapedQuery = $this->escapePattern($query);
+
+ $sql = new DbQuery();
+ $sql->select('m.id_material, m.reference, m.unit, m.unit_cost, m.active,
+ ml.name, ml.description,
+ IFNULL(SUM(ms.quantity), 0) AS stock_qty');
+ $sql->from('mprwarehouserevolution_material', 'm');
+ $sql->leftJoin('mprwarehouserevolution_material_lang', 'ml', 'ml.id_material = m.id_material AND ml.id_lang = ' . (int) $idLang);
+ $sql->leftJoin('mprwarehouserevolution_material_stock', 'ms', 'ms.id_material = m.id_material');
+
+ if ($query !== '') {
+ $sql->where('(ml.name LIKE \'%' . $escapedQuery . '%\' OR m.reference LIKE \'%' . $escapedQuery . '%\' OR m.barcode LIKE \'%' . $escapedQuery . '%\')');
+ }
+
+ $sql->groupBy('m.id_material');
+ $sql->orderBy('ml.name ASC');
+ $sql->limit($limit, $offset);
+
+ $rows = $db->executeS($sql);
+ if (!$rows) {
+ return [];
+ }
+
+ $results = [];
+ foreach ($rows as $row) {
+ $stockQty = (int) $row['stock_qty'];
+ $stockStatus = $stockQty <= 0 ? 'out_of_stock' : ($stockQty <= (int) ($row['min_stock'] ?? 5) ? 'low_stock' : 'in_stock');
+
+ $results[] = [
+ 'id' => (int) $row['id_material'],
+ 'type' => 'mpr_material',
+ 'name' => $row['name'],
+ 'subtitle' => $row['reference'] ? 'Ref: ' . $row['reference'] : null,
+ 'reference' => $row['reference'],
+ 'stock_qty' => $stockQty,
+ 'stock_status' => $stockStatus,
+ 'active' => (bool) $row['active'],
+ ];
+ }
+
+ return $results;
+ }
+
+ /**
+ * Count materials matching query
+ */
+ public function countTargetMprMaterials($query, $idLang, $idShop, array $filters = [])
+ {
+ $escapedQuery = $this->escapePattern($query);
+
+ $sql = new DbQuery();
+ $sql->select('COUNT(DISTINCT m.id_material)');
+ $sql->from('mprwarehouserevolution_material', 'm');
+ $sql->leftJoin('mprwarehouserevolution_material_lang', 'ml', 'ml.id_material = m.id_material AND ml.id_lang = ' . (int) $idLang);
+
+ if ($query !== '') {
+ $sql->where('(ml.name LIKE \'%' . $escapedQuery . '%\' OR m.reference LIKE \'%' . $escapedQuery . '%\' OR m.barcode LIKE \'%' . $escapedQuery . '%\')');
+ }
+
+ return (int) Db::getInstance()->getValue($sql);
+ }
+
+ /**
+ * Get materials by IDs
+ */
+ public function getTargetMprMaterialsByIds(array $ids, $idLang, $idShop = null)
+ {
+ if (empty($ids)) {
+ return [];
+ }
+
+ $db = Db::getInstance();
+
+ $sql = new DbQuery();
+ $sql->select('m.id_material, m.reference, m.unit, m.unit_cost, m.active,
+ ml.name, ml.description,
+ IFNULL(SUM(ms.quantity), 0) AS stock_qty');
+ $sql->from('mprwarehouserevolution_material', 'm');
+ $sql->leftJoin('mprwarehouserevolution_material_lang', 'ml', 'ml.id_material = m.id_material AND ml.id_lang = ' . (int) ($idLang ?: $this->idLang));
+ $sql->leftJoin('mprwarehouserevolution_material_stock', 'ms', 'ms.id_material = m.id_material');
+ $sql->where('m.id_material IN (' . implode(',', array_map('intval', $ids)) . ')');
+ $sql->groupBy('m.id_material');
+
+ $rows = $db->executeS($sql);
+ if (!$rows) {
+ return [];
+ }
+
+ $materials = [];
+ foreach ($rows as $row) {
+ $stockQty = (int) $row['stock_qty'];
+ $materials[(int) $row['id_material']] = [
+ 'id' => (int) $row['id_material'],
+ 'type' => 'mpr_material',
+ 'name' => $row['name'],
+ 'subtitle' => $row['reference'] ? 'Ref: ' . $row['reference'] : null,
+ 'reference' => $row['reference'],
+ 'stock_qty' => $stockQty,
+ 'stock_status' => $stockQty <= 0 ? 'out_of_stock' : 'in_stock',
+ 'active' => (bool) $row['active'],
+ ];
+ }
+
+ // Return in original order
+ $ordered = [];
+ foreach ($ids as $id) {
+ if (isset($materials[(int) $id])) {
+ $ordered[] = $materials[(int) $id];
+ }
+ }
+
+ return $ordered;
+ }
+
// =========================================================================
// FILTERABLE DATA (for UI dropdowns)
// =========================================================================
diff --git a/src/EntitySelector/EntitySelectorRenderer.php b/src/EntitySelector/EntitySelectorRenderer.php
index d822a07..1408f32 100644
--- a/src/EntitySelector/EntitySelectorRenderer.php
+++ b/src/EntitySelector/EntitySelectorRenderer.php
@@ -121,6 +121,7 @@ class EntitySelectorRenderer
'show_cms' => true,
'show_cms_categories' => true,
'combination_mode' => 'products',
+ 'product_selection_level' => 'product',
'mode' => 'multi',
'blocks' => [],
'customBlocks' => [],
@@ -139,6 +140,9 @@ class EntitySelectorRenderer
if (is_string($savedData)) {
$savedData = json_decode($savedData, true) ?: [];
}
+ if (!is_array($savedData)) {
+ $savedData = [];
+ }
// Determine which block is active
$enabledBlocks = [];
@@ -1542,6 +1546,7 @@ class EntitySelectorRenderer
],
'methodHelp' => $this->getAllMethodHelpContent(),
'combinationMode' => $config['combination_mode'] ?? 'products',
+ 'productSelectionLevel' => $config['product_selection_level'] ?? 'product',
'emptyMeansAll' => $config['empty_means_all'] ?? true,
];
}
diff --git a/src/EntitySelector/ProductConditionResolver.php b/src/EntitySelector/ProductConditionResolver.php
index 8c46886..ded01b9 100644
--- a/src/EntitySelector/ProductConditionResolver.php
+++ b/src/EntitySelector/ProductConditionResolver.php
@@ -176,7 +176,18 @@ class ProductConditionResolver
return $this->getAllActiveProductIds();
case 'specific':
- return is_array($values) ? array_map('intval', $values) : [];
+ if (!is_array($values)) {
+ return [];
+ }
+ // Support prefixed string IDs (c:32, p:17) — return as-is
+ $hasPrefixed = false;
+ foreach ($values as $v) {
+ if (is_string($v) && (strpos($v, 'c:') === 0 || strpos($v, 'p:') === 0)) {
+ $hasPrefixed = true;
+ break;
+ }
+ }
+ return $hasPrefixed ? array_map('strval', $values) : array_map('intval', $values);
case 'by_category':
return $this->getProductIdsByCategories($values);
@@ -2049,4 +2060,62 @@ class ProductConditionResolver
'combinations' => $allCombinations,
];
}
+
+ /**
+ * Expand product IDs to combination-level prefixed IDs.
+ * Products WITH combinations → "c:{id_product_attribute}" per combination.
+ * Products WITHOUT combinations (simple) → "p:{id_product}".
+ *
+ * @param array $productIds Plain integer product IDs
+ * @param string $mode 'combination' (only combos + simple) or 'both' (parent + combos + simple)
+ * @return array Prefixed string IDs
+ */
+ public function expandToCombinations(array $productIds, $mode = 'combination')
+ {
+ if (empty($productIds)) {
+ return [];
+ }
+
+ $db = Db::getInstance();
+ $idShop = $this->idShop;
+
+ // Get all combinations for these products
+ $sql = 'SELECT pa.id_product_attribute, pa.id_product
+ FROM ' . _DB_PREFIX_ . 'product_attribute pa
+ INNER JOIN ' . _DB_PREFIX_ . 'product_attribute_shop pas
+ ON pas.id_product_attribute = pa.id_product_attribute AND pas.id_shop = ' . (int) $idShop . '
+ WHERE pa.id_product IN (' . implode(',', array_map('intval', $productIds)) . ')
+ ORDER BY pa.id_product, pa.id_product_attribute';
+
+ $rows = $db->executeS($sql);
+
+ // Group combinations by product
+ $combosByProduct = [];
+ if ($rows) {
+ foreach ($rows as $row) {
+ $combosByProduct[(int) $row['id_product']][] = (int) $row['id_product_attribute'];
+ }
+ }
+
+ $result = [];
+ foreach ($productIds as $idProduct) {
+ $idProduct = (int) $idProduct;
+
+ if (!empty($combosByProduct[$idProduct])) {
+ // Product has combinations
+ if ($mode === 'both') {
+ // Include parent product entry
+ $result[] = 'p:' . $idProduct;
+ }
+ foreach ($combosByProduct[$idProduct] as $idPA) {
+ $result[] = 'c:' . $idPA;
+ }
+ } else {
+ // Simple product — no combinations
+ $result[] = 'p:' . $idProduct;
+ }
+ }
+
+ return $result;
+ }
}