ACP2E-316: Some product are missed from layered navigation with manually configured price ranges

Author: dhorytskyi

app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php

@@ -18,7 +18,7 @@
 class Price extends AbstractFilter
 {
     /** Price delta for filter  */
-    public const PRICE_DELTA = 0.01;
+    const PRICE_DELTA = 0.001;
 
     /**
      * @var \Magento\Catalog\Model\Layer\Filter\DataProvider\Price
@@ -142,7 +142,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
 
         $this->getLayer()->getProductCollection()->addFieldToFilter(
             'price',
-            ['from' => $from, 'to' =>  $to]
+            ['from' => $from, 'to' =>  empty($to) || $from == $to ? $to : $to - self::PRICE_DELTA]
         );
 
         $this->getLayer()->getState()->addFilter(
@@ -190,6 +190,10 @@ protected function _renderRangeLabel($fromPrice, $toPrice, $isLast = false)
         } elseif ($fromPrice == $toPrice && $this->dataProvider->getOnePriceIntervalValue()) {
             return $formattedFromPrice;
         } else {
+            if ($fromPrice != $toPrice) {
+                $toPrice -= .01;
+            }
+
             return __('%1 - %2', $formattedFromPrice, $this->priceCurrency->format($toPrice));
         }
     }
@@ -270,9 +274,6 @@ protected function getFrom($from)
     private function prepareData($key, $count, $isLast = false)
     {
         [$from, $to] = explode('_', $key);
-        if (!$isLast && !empty($to) && $to != $from) {
-            $to -= self::PRICE_DELTA;
-        }
         $label = $this->_renderRangeLabel($from, $to, $isLast);
         $value = $from . '-' . $to . $this->dataProvider->getAdditionalRequestData();
 

app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php

@@ -81,8 +81,9 @@ private function prepareData(array $data, array $stats): array
     {
         $resultData = [];
         foreach ($data as $key => $value) {
-            if (!isset($data[$key+1]) && isset($stats['max'])) {
-                $value['to'] = $stats['max'];
+            if (!isset($data[$key+1])) {
+                $value['to'] = !isset($stats['max']) ? $value['to'] : $stats['max'];
+                $value['to'] += 0.01;
             }
             $rangeName = "{$value['from']}_{$value['to']}";
             $value['value'] = $rangeName;