Merge pull request #72 from algolia/develop

Develop

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 1.0.1
+
+- Fixed issue with merging JS files - added new line at the end of [algoliaBundle.min.js](https://github.com/algolia/algoliasearch-magento-2/blob/master/view/frontend/web/internals/algoliaBundle.min.js)
+- Fixed page indexing when some excluded pages were set
+- Fixed data types of `enabled` variables in `algoliaConfig`
+- Fixed few typos
+
 ## 1.0.0
 
 - Release
@@ -16,7 +23,7 @@
     - Layout's XML files were rewritten and optimized
     - Extension's assets were removed and replaced by SVGs
 - Fixed CSS of autocomplete menu's footer (#55, #58)
-- Instatnsearch.js library was updated to it's latest version (#56)
+- Instantsearch.js library was updated to it's latest version (#56)
 - The extension officially supports only 2.0.X versions of Magento, however it's still possible and encouraged to use it on 2.1.0 (#53)
 - Fixed some annotations in code (#52, #51)
 

Helper/AlgoliaHelper.php

@@ -194,7 +194,7 @@ private function checkClient($methodName)
         $this->resetCredentialsFromConfig();
 
         if (!isset($this->client)) {
-            throw new AlgoliaException('Operation "' . $methodName . ' could not be performed because Algolia credetials were not provided.');
+            throw new AlgoliaException('Operation "' . $methodName . ' could not be performed because Algolia credentials were not provided.');
         }
     }
 }

Helper/ConfigHelper.php

@@ -158,7 +158,7 @@ public function showSuggestionsOnNoResultsPage($storeId = null)
 
     public function isEnabledFrontEnd($storeId = null)
     {
-        // Frontend = Backend + Frontent
+        // Frontend = Backend + Frontend
         return (bool) $this->configInterface->getValue(self::ENABLE_BACKEND, ScopeInterface::SCOPE_STORE, $storeId) && (bool) $this->configInterface->getValue(self::ENABLE_FRONTEND, ScopeInterface::SCOPE_STORE, $storeId);
     }
 

Helper/Data.php

@@ -164,9 +164,9 @@ public function rebuildStoreAdditionalSectionsIndex($storeId)
             return;
         }
 
-        $additionnal_sections = $this->configHelper->getAutocompleteSections();
+        $additional_sections = $this->configHelper->getAutocompleteSections();
 
-        foreach ($additionnal_sections as $section) {
+        foreach ($additional_sections as $section) {
             if ($section['name'] === 'products' || $section['name'] === 'categories' || $section['name'] === 'pages' || $section['name'] === 'suggestions') {
                 continue;
             }

Helper/Entity/CategoryHelper.php

@@ -172,10 +172,10 @@ public function getObject(Category $category)
         foreach ($this->config->getCategoryAdditionalAttributes($storeId) as $attribute) {
             $value = $category->getData($attribute['attribute']);
 
-            $attribute_ressource = $category->getResource()->getAttribute($attribute['attribute']);
+            $attribute_resource = $category->getResource()->getAttribute($attribute['attribute']);
 
-            if ($attribute_ressource) {
-                $value = $attribute_ressource->getFrontend()->getValue($category);
+            if ($attribute_resource) {
+                $value = $attribute_resource->getFrontend()->getValue($category);
             }
 
             if (isset($data[$attribute['attribute']])) {

Helper/Entity/PageHelper.php

@@ -28,7 +28,7 @@ public function getPages($storeId)
         $excluded_pages = array_values($this->config->getExcludedPages());
 
         foreach ($excluded_pages as &$excluded_page) {
-            $excluded_page = $excluded_page['pages'];
+            $excluded_page = $excluded_page['attribute'];
         }
 
         $pages = [];

Helper/Entity/ProductHelper.php

@@ -291,7 +291,7 @@ public function setSettings($storeId, $saveToTmpIndicesToo = false)
                 $synonymsToSet[] = [
                     'objectID' => $objectID,
                     'type' => 'synonym',
-                    'synonyms' => $this->explodeSynomyms($synonym['synonyms']),
+                    'synonyms' => $this->explodeSynonyms($synonym['synonyms']),
                 ];
             }
 
@@ -301,7 +301,7 @@ public function setSettings($storeId, $saveToTmpIndicesToo = false)
                     'objectID' => $objectID,
                     'type' => 'oneWaySynonym',
                     'input' => $onewaySynonym['input'],
-                    'synonyms' => $this->explodeSynomyms($onewaySynonym['synonyms']),
+                    'synonyms' => $this->explodeSynonyms($onewaySynonym['synonyms']),
                 ];
             }
         }
@@ -800,7 +800,7 @@ public function getObject(Product $product)
         return $customData;
     }
 
-    private function explodeSynomyms($synonyms)
+    private function explodeSynonyms($synonyms)
     {
         return array_map('trim', explode(',', $synonyms));
     }

Model/Source/CustomPages.php

@@ -13,7 +13,7 @@ protected function getTableData()
 
         return [
             'attribute' => [
-                'label'  => 'Attribute',
+                'label'  => 'Page',
                 'values' => function () use ($pageCollection) {
                     $options = [];
                     $magento_pages = $pageCollection->addFieldToFilter('is_active', 1);

Model/Source/Sections.php

@@ -10,7 +10,7 @@ protected function getTableData()
 
         return [
             'name' => [
-                'label'  => 'Attribute',
+                'label'  => 'Section',
                 'values' => function () use ($config) {
                     $options = [];
 

README.md

@@ -7,7 +7,7 @@ This extension replaces the default search of Magento with a typo-tolerant, fast
 
 See features and benefits of [Algolia Search Extension for Magento](https://community.algolia.com/magento).
 
-![Latest version](https://img.shields.io/badge/latest-1.0.0-green.svg)
+![Latest version](https://img.shields.io/badge/latest-1.0.1-green.svg)
 ![Magento 2.0.X](https://img.shields.io/badge/Magento-2.0.X-blue.svg)
 ![PHP >= 5.5.22](https://img.shields.io/badge/PHP-%3E=5.5.22-green.svg)
 

Setup/UpgradeSchema.php

@@ -23,7 +23,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
             $table->addColumn('method', $table::TYPE_TEXT, 50, ['nullable' => false]);
             $table->addColumn('data', $table::TYPE_TEXT, 5000, ['nullable' => false]);
             $table->addColumn('max_retries', $table::TYPE_INTEGER, 11, ['nullable' => false, 'default' => 3]);
-            $table->addColumn('retries', $table::TYPE_INTEGER, 11, ['nullable' => false, 'defualt' => 0]);
+            $table->addColumn('retries', $table::TYPE_INTEGER, 11, ['nullable' => false, 'default' => 0]);
             $table->addColumn('error_log', $table::TYPE_TEXT, null, ['nullable' => false]);
             $table->addColumn('data_size', $table::TYPE_INTEGER, 11, ['nullable' => true, 'default' => null]);
 

composer.json

@@ -2,7 +2,7 @@
   "name": "algolia/algoliasearch-magento-2",
   "description": "Algolia Search integration for Magento 2",
   "type": "magento2-module",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "license": ["MIT"],
   "require": {
     "php": "~5.5.0|~5.6.0|~7.0.0",

etc/module.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Algolia_AlgoliaSearch" setup_version="1.0.0">
+    <module name="Algolia_AlgoliaSearch" setup_version="1.0.1">
     </module>
 </config>

i18n/en_US.csv

@@ -493,7 +493,7 @@ Synonyms,Synonyms
                         <br>
                         <br>
                         Algolia offers more synonymys’ types - placeholders and alternative corrections. These types can be managed directly from your <a href=""https://www.algolia.com/dashboard"" target=""_blank"">Algolia’s dashboard</a>.
-                        Any changes you will make to placeholders and alternative corrections in Algolia’s dashboard won’t be overriden.
+                        Any changes you will make to placeholders and alternative corrections in Algolia’s dashboard won’t be overridden.
 
                     ","
 

view/frontend/templates/internals/configuration.phtml

@@ -91,12 +91,12 @@ if ($config->isInstantEnabled() && $isSearchPage) {
 
 $algoliaJsConfig = [
     'instant' => [
-        'enabled' => $config->isInstantEnabled(),
+        'enabled' => (bool) $config->isInstantEnabled(),
         'selector' => $config->getInstantSelector(),
         'isAddToCartEnabled' => $config->isAddToCartEnable(),
     ],
     'autocomplete' => [
-        'enabled' => $config->isAutoCompleteEnabled(),
+        'enabled' => (bool) $config->isAutoCompleteEnabled(),
         'selector' => $config->getAutocompleteSelector(),
         'sections' => $config->getAutocompleteSections(),
         'nbOfProductsSuggestions' => $config->getNumberOfProductsSuggestions(),

view/frontend/web/autocomplete.js

@@ -16,7 +16,7 @@ requirejs(['algoliaBundle'], function(algoliaBundle) {
 			products: algoliaBundle.Hogan.compile($('#autocomplete_products_template').html()),
 			categories: algoliaBundle.Hogan.compile($('#autocomplete_categories_template').html()),
 			pages: algoliaBundle.Hogan.compile($('#autocomplete_pages_template').html()),
-			additionnalSection: algoliaBundle.Hogan.compile($('#autocomplete_extra_template').html())
+			additionalSection: algoliaBundle.Hogan.compile($('#autocomplete_extra_template').html())
 		};
 
 		/**

view/frontend/web/instantsearch.js

@@ -292,7 +292,7 @@ requirejs(['algoliaBundle'], function(algoliaBundle) {
 			}
 		};
 
-		/** Add all facet widgets to instatnsearch object **/
+		/** Add all facet widgets to instantsearch object **/
 
 		window.getFacetWidget = function (facet, templates) {
 

view/frontend/web/internals/common.js

@@ -190,7 +190,7 @@ requirejs(['algoliaBundle'], function(algoliaBundle) {
 					templates: {
 						suggestion: function (hit) {
 							hit.url = algoliaConfig.baseUrl + '/catalogsearch/result/?q=' + hit.value + '&refinement_key=' + section.name;
-							return algoliaConfig.autocomplete.templates.additionnalSection.render(hit);
+							return algoliaConfig.autocomplete.templates.additionalSection.render(hit);
 						}
 					}
 				};