Merge remote-tracking branch 'mainline/develop' into bugs

Author: Oleksii Korshenko

app/code/Magento/Bundle/Model/Product/Price.php

@@ -183,8 +183,9 @@ public function getFinalPrice($qty, $product)
         $finalPrice = $this->_applyOptionsPrice($product, $qty, $finalPrice);
         $finalPrice += $this->getTotalBundleItemsPrice($product, $qty);
 
+        $finalPrice = max(0, $finalPrice);
         $product->setFinalPrice($finalPrice);
-        return max(0, $product->getData('final_price'));
+        return $finalPrice;
     }
 
     /**

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php

@@ -70,11 +70,11 @@ protected function _prepareForm()
         }
         $this->_coreRegistry->register('attribute_type_hidden_fields', $_hiddenFields);
 
-        $this->_eventManager->dispatch('product_attribute_form_build_main_tab', ['form' => $form]);
-
         $frontendInputValues = array_merge($frontendInputElm->getValues(), $additionalTypes);
         $frontendInputElm->setValues($frontendInputValues);
 
+        $this->_eventManager->dispatch('product_attribute_form_build_main_tab', ['form' => $form]);
+
         return $this;
     }
 

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php

@@ -88,7 +88,7 @@ protected function createActionPage($title = null)
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         if ($this->getRequest()->getParam('popup')) {
-            if ($this->getRequest()->getParam('product_tab') == 'variations') {
+            if ($this->getRequest()->getParam('product_tab') === 'variations') {
                 $resultPage->addHandle(['popup', 'catalog_product_attribute_edit_product_tab_variations_popup']);
             } else {
                 $resultPage->addHandle(['popup', 'catalog_product_attribute_edit_popup']);

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/StockDataFilter.php

@@ -16,7 +16,7 @@ class StockDataFilter
     /**
      * The greatest value which could be stored in CatalogInventory Qty field
      */
-    const MAX_QTY_VALUE = 99999999.9999;
+    const MAX_QTY_VALUE = 99999999;
 
     /**
      * @var ScopeConfigInterface

app/code/Magento/Catalog/Model/Product.php

@@ -142,11 +142,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $optionInstance;
 
-    /**
-     * @var bool
-     */
-    protected $optionsInitialized = false;
-
     /**
      * @var array
      */
@@ -1901,6 +1896,7 @@ public function addOption(Product\Option $option)
     {
         $options = (array)$this->getData('options');
         $options[] = $option;
+        $option->setProduct($this);
         $this->setData('options', $options);
         return $this;
     }

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogInventory\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
@@ -213,6 +214,7 @@ private function prepareMeta()
                 'validation' => [
                     'validate-number' => true,
                     'validate-digits' => true,
+                    'less-than-equals-to' => StockDataFilter::MAX_QTY_VALUE,
                 ],
                 'imports' => [
                     'handleChanges' => '${$.provider}:data.product.stock_data.is_qty_decimal',

app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

@@ -96,6 +96,7 @@
                         <item name="validation" xsi:type="array">
                             <item name="validate-number" xsi:type="boolean">true</item>
                             <item name="validate-digits" xsi:type="boolean">true</item>
+                            <item name="less-than-equals-to" xsi:type="number">99999999</item>
                         </item>
                         <item name="sortOrder" xsi:type="number">200</item>
                         <item name="scopeLabel" xsi:type="string">[GLOBAL]</item>

app/code/Magento/CatalogInventory/view/adminhtml/web/js/components/qty-validator-changer.js

@@ -21,6 +21,7 @@ define([
 
             this.validation['validate-number'] = !isDigits;
             this.validation['validate-digits'] = isDigits;
+            this.validation['less-than-equals-to'] = isDigits ? 99999999 : 99999999.9999;
             this.validate();
         }
     });

app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php

@@ -84,6 +84,12 @@ protected function _getItemsData()
             ->getProductCollection();
         $optionsFacetedData = $productCollection->getFacetedData($attribute->getAttributeCode());
 
+        if (count($optionsFacetedData) === 0
+            && $this->getAttributeIsFilterable($attribute) !== static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS
+        ) {
+            return $this->itemDataBuilder->build();
+        }
+
         $productSize = $productCollection->getSize();
 
         $options = $attribute->getFrontend()
@@ -100,9 +106,8 @@ protected function _getItemsData()
                 : 0;
             // Check filter type
             if (
-                $count === 0
-                && $this->getAttributeIsFilterable($attribute) === static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS
-                && !$this->isOptionReducesResults($count, $productSize)
+                $this->getAttributeIsFilterable($attribute) === static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS
+                && (!$this->isOptionReducesResults($count, $productSize) || $count === 0)
             ) {
                 continue;
             }

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext;
 
+use Magento\CatalogSearch\Model\Search\RequestGenerator;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
@@ -398,14 +399,17 @@ public function getFacetedData($field)
         $this->_renderFilters();
         $result = [];
         $aggregations = $this->searchResult->getAggregations();
-        $bucket = $aggregations->getBucket($field . '_bucket');
-        if ($bucket) {
-            foreach ($bucket->getValues() as $value) {
-                $metrics = $value->getMetrics();
-                $result[$metrics['value']] = $metrics;
+        // This behavior is for case with empty object when we got EmptyRequestDataException
+        if (null !== $aggregations) {
+            $bucket = $aggregations->getBucket($field . RequestGenerator::BUCKET_SUFFIX);
+            if ($bucket) {
+                foreach ($bucket->getValues() as $value) {
+                    $metrics = $value->getMetrics();
+                    $result[$metrics['value']] = $metrics;
+                }
+            } else {
+                throw new StateException(__('Bucket does not exist'));
             }
-        } else {
-            throw new StateException(__('Bucket do not exists'));
         }
         return $result;
     }