7455/price slider

main/src/Model/Bridge/AttributeRepository.php

@@ -8,6 +8,7 @@
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute as AttributeResource;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 
 class AttributeRepository implements AttributeRepositoryInterface
 {
@@ -28,18 +29,20 @@ class AttributeRepository implements AttributeRepositoryInterface
      * @var AttributeSearchCriteriaBuilder
      */
     protected $searchCriteriaBuilder;
-
     /**
-     * AttributeRepository constructor.
-     * @param ProductAttributeRepositoryInterface $attributeRepository
-     * @param AttributeSearchCriteriaBuilder $searchCriteriaBuilder
+     * @var StoreManagerInterface
      */
-    public function __construct(ProductAttributeRepositoryInterface $attributeRepository,
-                                AttributeSearchCriteriaBuilder $searchCriteriaBuilder)
-    {
+    private $storeManager;
+
+    public function __construct(
+        ProductAttributeRepositoryInterface $attributeRepository,
+        AttributeSearchCriteriaBuilder $searchCriteriaBuilder,
+        StoreManagerInterface $storeManager
+    ) {
         $this->attributeRepository = $attributeRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder->except(['status']);
         $this->attributeStorage = new \SplObjectStorage;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -124,6 +127,9 @@ public function getAttributeCodesToIndex()
      */
     public function getAttributeByCode($attributeCode, $storeId)
     {
+        if ($storeId === null) {
+            $storeId = $this->storeManager->getStore()->getId();
+        }
         try {
             $magentoAttribute = $this->attributeRepository->get($attributeCode);
         } catch (NoSuchEntityException $e) {

main/src/Model/Plugin/CatalogsearchFilterDecimalPlugin.php

@@ -0,0 +1,137 @@
+<?php
+/**
+ * integer_net Magento Module
+ *
+ * @category   IntegerNet
+ * @package    IntegerNet
+ * @copyright  Copyright (c) 2016 integer_net GmbH (http://www.integer-net.de/)
+ * @author     Fabian Schmengler <[email protected]>
+ */
+
+namespace IntegerNet\Solr\Model\Plugin;
+
+use Magento\Catalog\Model\Layer\Filter\ItemFactory as FilterItemFactory;
+use Magento\CatalogSearch\Model\Layer\Filter\Decimal as Subject;
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Plugin to display multiple filters for same attribute in state block
+ */
+class CatalogsearchFilterDecimalPlugin
+{
+    /**
+     * @var FilterItemFactory
+     */
+    private $filterItemFactory;
+    /**
+     * @var \Magento\Framework\Pricing\PriceCurrencyInterface
+     */
+    private $priceCurrency;
+    /**
+     * @var \Magento\Catalog\Model\Layer\Filter\DataProvider\PriceFactory
+     */
+    private $dataProviderFactory;
+
+    public function __construct(
+        FilterItemFactory $filterItemFactory,
+        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
+        \Magento\Catalog\Model\Layer\Filter\DataProvider\PriceFactory $dataProviderFactory
+    ) {
+        $this->filterItemFactory = $filterItemFactory;
+        $this->priceCurrency = $priceCurrency;
+        $this->dataProviderFactory = $dataProviderFactory;
+    }
+
+    public function aroundApply(Subject $subject, \Closure $proceed, RequestInterface $request)
+    {
+        $attributeCode = $subject->getRequestVar();
+        $attributeValue = $request->getParam($attributeCode);
+
+        if ((!$attributeValue) || !is_array($attributeValue)) {
+            return $proceed($request);
+        }
+
+        $fromParts = [];
+        $toParts = [];
+        foreach ($attributeValue as $attributeValueArrayPart) {
+            $filterParams = explode(',', $attributeValueArrayPart);
+            $dataProvider = $this->getDataProvider($subject);
+            $filter = $dataProvider->validateFilter($filterParams[0]);
+            if (!$filter) {
+                continue;
+            }
+
+            $dataProvider->setInterval($filter);
+            $priorFilters = $dataProvider->getPriorFilters($filterParams);
+            if ($priorFilters) {
+                $dataProvider->setPriorIntervals($priorFilters);
+            }
+
+            list($from, $to) = $filter;
+
+            $fromParts[] = $from;
+            $toParts[] = $to;
+
+            $subject->getLayer()->getState()->addFilter(
+                $this->_createItem($subject, $this->_renderRangeLabel($subject, empty($from) ? 0 : $from, $to), $filter)
+            );
+        }
+
+        /** @var \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection $productCollection */
+        $productCollection = $subject->getLayer()
+            ->getProductCollection();
+        $productCollection->addFieldToFilter(
+            $attributeCode,
+            ['from' => $fromParts, 'to' =>  $toParts]
+        );
+
+
+        return $subject;
+    }
+
+    /**
+     * Create filter item object
+     *
+     * @param   Subject $subject
+     * @param   string $label
+     * @param   mixed $value
+     * @param   int $count
+     * @return  \Magento\Catalog\Model\Layer\Filter\Item
+     */
+    protected function _createItem(Subject $subject, $label, $value, $count = 0)
+    {
+        return $this->filterItemFactory->create()
+            ->setFilter($subject)
+            ->setLabel($label)
+            ->setValue($value)
+            ->setCount($count);
+    }
+
+    /**
+     * Prepare text of range label
+     *
+     * @param Subject $subject
+     * @param float|string $fromValue
+     * @param float|string $toValue
+     * @return float|\Magento\Framework\Phrase
+     */
+    protected function _renderRangeLabel(Subject $subject, $fromValue, $toValue)
+    {
+        if ($toValue === '') {
+            return __('%1 and above', $fromValue);
+        } elseif ($fromValue == $toValue && $this->getDataProvider($subject)->getOnePriceIntervalValue()) {
+            return $fromValue;
+        } else {
+            return __('%1 - %2', $fromValue, $toValue);
+        }
+    }
+
+    /**
+     * @param Subject $subject
+     * @return \Magento\Catalog\Model\Layer\Filter\DataProvider\Price
+     */
+    private function getDataProvider(Subject $subject)
+    {
+        return $this->dataProviderFactory->create(['layer' => $subject->getLayer()]);
+    }
+}

main/src/Model/Plugin/CatalogsearchFilterPricePlugin.php

@@ -81,7 +81,7 @@ public function aroundApply(Subject $subject, \Closure $proceed, RequestInterfac
         $productCollection = $subject->getLayer()
             ->getProductCollection();
         $productCollection->addFieldToFilter(
-            'price',
+            $attributeCode,
             ['from' => $fromParts, 'to' =>  $toParts]
         );
 

main/src/Model/Search/Adapter/DecimalFilter.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * integer_net Magento Module
+ *
+ * @category   IntegerNet
+ * @package    IntegerNet_Solr
+ * @copyright  Copyright (c) 2017 integer_net GmbH (http://www.integer-net.de/)
+ * @author     Andreas von Studnitz <[email protected]>
+ */
+
+namespace IntegerNet\Solr\Model\Search\Adapter;
+
+class DecimalFilter extends \Magento\CatalogSearch\Model\Layer\Filter\Decimal
+{
+
+    /**
+     * Checks whether the option reduces the number of results
+     *
+     * @param int $optionCount Count of search results with this option
+     * @param int $totalSize Current search results count
+     * @return bool
+     */
+    protected function isOptionReducesResults($optionCount, $totalSize)
+    {
+        return true;
+    }
+}

main/src/Model/Search/Adapter/FilterConverter.php

@@ -11,6 +11,8 @@
 namespace IntegerNet\Solr\Model\Search\Adapter;
 
 use IntegerNet\Solr\Implementor\AttributeRepository;
+use IntegerNet\Solr\Indexer\IndexField;
+use IntegerNet\Solr\Model\Bridge\EventDispatcher;
 use IntegerNet\Solr\Query\Params\FilterQueryBuilder;
 use Magento\Framework\Search\Request as MagentoRequest;
 use Psr\Log\LoggerInterface;
@@ -30,11 +32,19 @@ class FilterConverter
      * @var LoggerInterface
      */
     private $logger;
+    /**
+     * @var EventDispatcher
+     */
+    private $eventDispatcher;
 
-    public function __construct(AttributeRepository $attributeRepository, LoggerInterface $logger)
-    {
+    public function __construct(
+        AttributeRepository $attributeRepository,
+        LoggerInterface $logger,
+        EventDispatcher $eventDispatcher
+    ) {
         $this->attributeRepository = $attributeRepository;
         $this->logger = $logger;
+        $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
@@ -49,7 +59,7 @@ public function configure(FilterQueryBuilder $fqBuilder, MagentoRequest\Query\Fi
         if ($reference instanceof MagentoRequest\Filter\Term) {
             $this->configureTermFilter($fqBuilder, $reference, $storeId);
         } elseif ($reference instanceof MagentoRequest\Filter\Range) {
-            $this->configureRangeFilter($fqBuilder, $reference);
+            $this->configureRangeFilter($fqBuilder, $reference, $storeId);
         } else {
             $this->log(sprintf('Unknown filter reference %s (type: %s)', get_class($reference), $filter->getReferenceType()));
         }
@@ -71,15 +81,23 @@ private function configureTermFilter(FilterQueryBuilder $fqBuilder, MagentoReque
             );
         }
     }
-    private function configureRangeFilter(FilterQueryBuilder $fqBuilder, MagentoRequest\Filter\Range $range)
+    private function configureRangeFilter(FilterQueryBuilder $fqBuilder, MagentoRequest\Filter\Range $range, $storeId)
     {
         if ($range->getField() === 'price') {
             $fqBuilder->addPriceRangeFilterByMinMax(
                 $range->getFrom(),
                 $range->getTo()
             );
         } else {
-            $this->log(sprintf('Unknown range field %s', $range->getField()));
+            $indexField = new IndexField(
+                $this->attributeRepository->getAttributeByCode($range->getField(), $storeId),
+                $this->eventDispatcher
+            );
+            $fqBuilder->addRangeFilterByMinMax(
+                $indexField->getFieldName(),
+                $range->getFrom(),
+                $range->getTo()
+            );
         }
     }