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

Author: monkeysee

app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml

@@ -50,6 +50,7 @@ require([
             showTime: false,
             showHour: false,
             showMinute: false,
+            serverTimezoneSeconds: <?php echo (int) $block->getStoreTimestamp(); ?>,
             yearRange: '<?php /* @escapeNotVerified */ echo $block->getYearRange() ?>'
         }
     });

app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml

@@ -74,7 +74,7 @@
                 </field>
                 <field name="theme">
                     <argument name="data" xsi:type="array">
-                        <item name="options" xsi:type="object">Magento\Framework\View\Design\Theme\Label</item>
+                        <item name="options" xsi:type="object">Magento\Theme\Model\Design\Theme\Label</item>
                         <item name="config" xsi:type="array">
                             <item name="formElement" xsi:type="string">select</item>
                             <item name="dataType" xsi:type="string">text</item>

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/Catalog/view/adminhtml/web/js/bundle-proxy-button.js

@@ -54,6 +54,19 @@ define([
             return this;
         },
 
+        /**
+         * Calls 'destroy' of parent and
+         * clear listing provider source
+         *
+         * @returns {Object} Chainable.
+         */
+        destroy: function () {
+            this._super();
+            this.source.set(this.listingDataProvider, []);
+
+            return this;
+        },
+
         /**
          * Call parent "action" method
          * and set new data to record and listing.

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>