Merge pull request #1394 from pkarw/develop

Fixed configurable filter setCurrent issue

Author: pkarw

core/components/blocks/SearchPanel/SearchPanel.js

@@ -38,6 +38,8 @@ export default {
 
       query = query.andQuery('bool', b => b.orQuery('match', 'name', { query: queryText, boost: 3 })
         .orQuery('match', 'category.name', { query: queryText, boost: 1 })
+        .orQuery('match', 'sku', { query: queryText, boost: 1 })
+        .orQuery('match', 'configurable_children.sku', { query: queryText, boost: 1 })
         .orQuery('match', 'short_description', { query: queryText, boost: 2 })
         .orQuery('match', 'description', { query: queryText, boost: 1 }))
       query = query.build()

core/store/modules/product/helpers.js

@@ -10,15 +10,13 @@ import union from 'lodash-es/union'
 import { optionLabel } from '../attribute/helpers'
 import i18n from '../../lib/i18n'
 import { currentStoreView } from '../../lib/multistore'
-import * as types from '../../mutation-types'
 
 function _filterRootProductByStockitem (context, stockItem, product, errorCallback) {
   if (stockItem) {
     product.stock = stockItem
     if (stockItem.is_in_stock === false) {
       product.errors.variants = i18n.t('No available product variants')
       context.state.current.errors = product.errors
-      context.commit(types.CATALOG_SET_PRODUCT_CURRENT, product) // just override the reference to not miss changes in the configurable_children
       EventBus.$emit('product-after-removevariant', { product: product })
       if (config.products.listOutOfStockProducts === false) {
         errorCallback(new Error('Product query returned empty result'))
@@ -64,11 +62,7 @@ function _filterChildrenByStockitem (context, stockItems, product, diffLog) {
           context.state.current_options[optionKey] = optionsAvailable
         }
       }
-      if (removedOptions > 0) {
-        configureProductAsync(context, { product, configuration: context.state.current_configuration, selectDefaultVariant: true, fallbackToDefaultWhenNoAvailable: true })
-      } else {
-        context.commit(types.CATALOG_SET_PRODUCT_CURRENT, product) // just override the reference to not miss changes in the configurable_children
-      }
+      configureProductAsync(context, { product, configuration: context.state.current_configuration, selectDefaultVariant: true, fallbackToDefaultWhenNoAvailable: true })
       if (totalOptions === 0) {
         product.errors.variants = i18n.t('No available product variants')
         context.state.current.errors = product.errors