bellord/ixrs.catalog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Bellord
2026-07-08 13:28:49 +03:00
parent 01d61b89fe
commit c2b1e4c143
4 changed files with 2729 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.module.json
+2 -2
View File
@@ -3,7 +3,7 @@
"prefix": "ixrs_catalog", "prefix": "ixrs_catalog",
"namespace": "Ixrs\\Catalog", "namespace": "Ixrs\\Catalog",
"gitUrl": "https://bitbucket.org/bellord13/ixrs.catalog/", "gitUrl": "https://bitbucket.org/bellord13/ixrs.catalog/",
"version": "1.0.0", "version": "1.0.1",
"date": "2026-07-07 00:00:00", "date": "2026-07-08 00:00:00",
"deps": ["wt.core"] "deps": ["wt.core"]
} }
components/catalog.smart.filter/class.php
+1283
View File
File diff suppressed because it is too large Load Diff
components/catalog.smart.filter/component.php
+1440
View File
File diff suppressed because it is too large Load Diff
lib/Support/ElementList.php
+4 -5
View File
@@ -7,7 +7,6 @@ class ElementList
public static function getGlobalFilter($iBlockId, $globalFilter) public static function getGlobalFilter($iBlockId, $globalFilter)
{ {
$pFilter = []; $pFilter = [];
$af = app()->factory()->iBlock()->getEntityById($iBlockId); $af = app()->factory()->iBlock()->getEntityById($iBlockId);
$iBlockFactory = app()->factory()->main()->getIBlockFactory(); $iBlockFactory = app()->factory()->main()->getIBlockFactory();
@@ -78,16 +77,16 @@ class ElementList
} }
} }
if($pFilter[$propertyId]['E'][$key] || $pFilter[$propertyId]['O'][$oKey]){ //if($pFilter[$propertyId]['E'][$key] || $pFilter[$propertyId]['O'][$oKey]){
if($globalFilter[$key]){ if($globalFilter[$key]){
$pFilter[$propertyId]['E'][$key] = array_merge($pFilter[$propertyId]['E'][$key], $globalFilter[$key]); $pFilter[$propertyId]['E'][$key] = array_merge((array)$pFilter[$propertyId]['E'][$key], $globalFilter[$key]);
unset($globalFilter[$key]); unset($globalFilter[$key]);
} }
if($globalFilter['OFFERS'][$oKey]){ if($globalFilter['OFFERS'][$oKey]){
$pFilter[$propertyId]['O'][$oKey] = array_merge($pFilter[$propertyId]['O'][$oKey], $globalFilter['OFFERS'][$oKey]); $pFilter[$propertyId]['O'][$oKey] = array_merge((array)$pFilter[$propertyId]['O'][$oKey], $globalFilter['OFFERS'][$oKey]);
unset($globalFilter['OFFERS'][$oKey]); unset($globalFilter['OFFERS'][$oKey]);
} }
} //}
if(!$globalFilter[$key]){ if(!$globalFilter[$key]){
unset($globalFilter[$key]); unset($globalFilter[$key]);