Merge pull request #15 from integer-net/fix-autosuggest-url

Adjust autosuggest URL to include current store id

Author: avstudnitz

main/src/Plugin/SearchHelperPlugin.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * integer_net Magento Module
+ *
+ * @copyright  Copyright (c) 2017 integer_net GmbH (http://www.integer-net.de/)
+ * @author     Andreas von Studnitz <[email protected]>
+ */
+
+namespace IntegerNet\Solr\Plugin;
+
+use Magento\Search\Helper\Data as Subject;
+use Magento\Store\Model\StoreManagerInterface;
+
+class SearchHelperPlugin
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    public function __construct(StoreManagerInterface $storeManager)
+    {
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * @return string
+     */
+    public function aroundGetSuggestUrl()
+    {
+        /** @var \Magento\Store\Model\Store $store */
+        $store = $this->storeManager->getStore();
+        return $store->getBaseUrl() . 'autosuggest.php?store_id=' . $store->getId();
+    }
+}

main/src/etc/frontend/di.xml

@@ -3,4 +3,7 @@
     <type name="Magento\Framework\View\Result\Layout">
         <plugin name="updateLayout" type="IntegerNet\Solr\Model\Plugin\LayoutPlugin" />
     </type>
+    <type name="Magento\Search\Helper\Data">
+        <plugin name="integernetSolrSearchHelper" type="IntegerNet\Solr\Plugin\SearchHelperPlugin" />
+    </type>
 </config>

main/src/etc/module.xml

@@ -3,6 +3,8 @@
     <module name="IntegerNet_Solr" setup_version="1.1.1">
         <sequence>
             <module name="Magento_Search"/>
+            <module name="Magento_CatalogSearch"/>
+            <module name="Magento_LayeredNavigation"/>
         </sequence>
     </module>
 </config>

main/src/view/frontend/templates/form.mini.phtml

@@ -15,7 +15,7 @@ $helper = $this->helper('Magento\Search\Helper\Data');
                     <input id="search"
                            data-mage-init='{"quickSearch":{
                                 "formSelector":"#search_mini_form",
-                                "url":"<?php /* @escapeNotVerified */ /*echo $helper->getSuggestUrl();*/  ?>/autosuggest.php?store_id=1",
+                                "url":"<?php /* @escapeNotVerified */ echo $helper->getSuggestUrl();  ?>",
                                 "destinationSelector":"#search_autocomplete"}
                            }'
                            type="text"