Merge pull request #244 from magento-dragons/develop

[DRAGONS] Sprint 77 - Bugs and MultiLocationInventory

Author: kandy

app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js

@@ -61,15 +61,16 @@ define([
         },
 
         changeUrl: function (paramName, paramValue, defaultValue) {
+            var decode = window.decodeURIComponent;
             var urlPaths = this.options.url.split('?'),
                 baseUrl = urlPaths[0],
                 urlParams = urlPaths[1] ? urlPaths[1].split('&') : [],
                 paramData = {},
                 parameters;
             for (var i = 0; i < urlParams.length; i++) {
                 parameters = urlParams[i].split('=');
-                paramData[parameters[0]] = parameters[1] !== undefined
-                    ? window.decodeURIComponent(parameters[1].replace(/\+/g, '%20'))
+                paramData[decode(parameters[0])] = parameters[1] !== undefined
+                    ? decode(parameters[1].replace(/\+/g, '%20'))
                     : '';
             }
             paramData[paramName] = paramValue;

app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml

@@ -23,7 +23,7 @@
 <?php else: ?>
     <div class="message error">
         <div>
-            <?php /* @escapeNotVerified */ echo __('We can\'t find any items matching these search criteria.');?> <a href="<?php /* @escapeNotVerified */ echo $block->getFormUrl(); ?>"><?php /* @escapeNotVerified */ echo __('Modify your search'); ?></a>
+            <?php /* @escapeNotVerified */ echo __('We can\'t find any items matching these search criteria.');?> <a href="<?php /* @escapeNotVerified */ echo $block->getFormUrl(); ?>"><?php /* @escapeNotVerified */ echo __('Modify your search.'); ?></a>
         </div>
     </div>
 <?php endif; ?>
@@ -44,7 +44,7 @@
     <div class="message notice">
         <div>
             <?php /* @escapeNotVerified */ echo __("Don't see what you're looking for?"); ?>
-            <a href="<?php /* @escapeNotVerified */ echo $block->getFormUrl(); ?>"><?php /* @escapeNotVerified */ echo __('Modify your search'); ?></a>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getFormUrl(); ?>"><?php /* @escapeNotVerified */ echo __('Modify your search.'); ?></a>
         </div>
     </div>
 <?php endif; ?>

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php

@@ -51,7 +51,9 @@ public function afterInitialize(
         $attributes = $this->request->getParam('attributes');
         if ($product->getTypeId() == ConfigurableProduct::TYPE_CODE && !empty($attributes)) {
             $setId = $this->request->getPost('new-variations-attribute-set-id');
-            $product->setAttributeSetId($setId);
+            if ($setId) {
+                $product->setAttributeSetId($setId);
+            }
             $this->productType->setUsedProductAttributeIds($attributes, $product);
 
             $product->setNewVariationsAttributeSetId($setId);

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php

@@ -22,16 +22,16 @@ public function getFinalPrice($qty, $product)
             return $product->getCalculatedFinalPrice();
         }
         if ($product->getCustomOption('simple_product') && $product->getCustomOption('simple_product')->getProduct()) {
-            return parent::getFinalPrice($qty, $product->getCustomOption('simple_product')->getProduct());
+            $finalPrice = parent::getFinalPrice($qty, $product->getCustomOption('simple_product')->getProduct());
         } else {
             $priceInfo = $product->getPriceInfo();
             $finalPrice = $priceInfo->getPrice('final_price')->getAmount()->getValue();
-            $finalPrice = $this->_applyOptionsPrice($product, $qty, $finalPrice);
-            $finalPrice = max(0, $finalPrice);
-            $product->setFinalPrice($finalPrice);
-
-            return $finalPrice;
         }
+        $finalPrice = $this->_applyOptionsPrice($product, $qty, $finalPrice);
+        $finalPrice = max(0, $finalPrice);
+        $product->setFinalPrice($finalPrice);
+
+        return $finalPrice;
     }
 
     /**

app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Filters.php

@@ -43,9 +43,9 @@ public function update(UiComponentInterface $component)
             return;
         }
 
-        $attributeIds = $component->getContext()->getRequestParam('attribute_ids');
-        if ($attributeIds) {
-            foreach ($this->getAttributes($attributeIds) as $attribute) {
+        $attributeCodes = $component->getContext()->getRequestParam('attributes_codes');
+        if ($attributeCodes) {
+            foreach ($this->getAttributes($attributeCodes) as $attribute) {
                 $filter = $this->filterFactory->create($attribute, $component->getContext());
                 $filter->prepare();
                 $component->addComponent($attribute->getAttributeCode(), $filter);
@@ -54,12 +54,12 @@ public function update(UiComponentInterface $component)
     }
 
     /**
-     * @param array $attributeIds
+     * @param array $attributeCodes
      * @return mixed
      */
-    protected function getAttributes($attributeIds)
+    protected function getAttributes($attributeCodes)
     {
         $attributeCollection = $this->attributeCollectionFactory->create();
-        return $attributeCollection->addFieldToFilter('attribute_code', ['in' => $attributeIds]);
+        return $attributeCollection->addFieldToFilter('attribute_code', ['in' => $attributeCodes]);
     }
 }

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/options/price-type-handler.js

@@ -27,9 +27,9 @@ define([
             }
             this.hideWarning();
             $(this.messageSelector).notification('add', {
-                message: $.mage.__('We can\'t save custom-defined options with price type "percent" for ' +
+                message: $.mage.__('Custom options with price type "percent" is not available for ' +
                     'configurable product.'),
-                error: true,
+                error: false,
                 messageContainer: this.messageSelector
             });
         },

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/product-grid.js

@@ -245,7 +245,7 @@ define([
                 }),
                 usedProductIds = _.values(this.variationsComponent().productAttributesMap);
 
-            if (usedProductIds) {
+            if (usedProductIds && usedProductIds.length > 0) {
                 filterModifier['entity_id'] = {
                     'condition_type': 'nin', value: usedProductIds
                 };

app/code/Magento/Search/Model/Query.php

@@ -172,6 +172,12 @@ public function getSuggestCollection()
     public function loadByQuery($text)
     {
         $this->_getResource()->loadByQuery($this, $text);
+
+        $synonymFor = $this->getSynonymFor();
+        if (!empty($synonymFor)) {
+            $this->setQueryText($synonymFor);
+        }
+
         $this->_afterLoad();
         $this->setOrigData();
         return $this;