Merge branch '2.2-develop' into 2.2-develop-pr8

Author: serhii-balko

app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js

@@ -25,6 +25,8 @@ define([
         if (countryId) {
             if (addressData.region && addressData.region['region_id']) {
                 regionId = addressData.region['region_id'];
+            } else if (!addressData['region_id']) {
+                regionId = undefined;
             } else if (countryId === window.checkoutConfig.defaultCountryId) {
                 regionId = window.checkoutConfig.defaultRegionId;
             }

app/code/Magento/Downloadable/etc/events.xml

@@ -6,10 +6,10 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-    <event name="sales_order_item_save_commit_after">
+    <event name="sales_order_item_save_after">
         <observer name="downloadable_observer" instance="Magento\Downloadable\Observer\SaveDownloadableOrderItemObserver" />
     </event>
-    <event name="sales_order_save_commit_after">
+    <event name="sales_order_save_after">
         <observer name="downloadable_observer" instance="Magento\Downloadable\Observer\SetLinkStatusObserver" />
     </event>
     <event name="sales_model_service_quote_submit_success">

app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php

@@ -341,7 +341,7 @@ protected function getProductInfo(\Magento\Framework\DataObject $buyRequest, $pr
                 if ($isStrictProcessMode && !$subProduct->getQty()) {
                     return __('Please specify the quantity of product(s).')->render();
                 }
-                $productsInfo[$subProduct->getId()] = (int)$subProduct->getQty();
+                $productsInfo[$subProduct->getId()] = $subProduct->isSalable() ? (float)$subProduct->getQty() : 0;
             }
         }
 

app/code/Magento/PageCache/view/frontend/web/js/page-cache.js

@@ -6,9 +6,10 @@
 define([
     'jquery',
     'domReady',
+    'consoleLogger',
     'jquery/ui',
     'mage/cookies'
-], function ($, domReady) {
+], function ($, domReady, consoleLogger) {
     'use strict';
 
     /**
@@ -41,7 +42,9 @@ define([
          * @param {jQuery} element - Comment holder
          */
         (function lookup(element) {
-            var iframeHostName;
+            var iframeHostName,
+                contents,
+                elementContents;
 
             // prevent cross origin iframe content reading
             if ($(element).prop('tagName') === 'IFRAME') {
@@ -53,7 +56,30 @@ define([
                 }
             }
 
-            $(element).contents().each(function (index, el) {
+            /**
+             * Rewrite jQuery contents method
+             *
+             * @param {Object} el
+             * @returns {Object}
+             * @private
+             */
+            contents = function (el) {
+                return $.map(el, function (elem) {
+                    try {
+                        return $.nodeName(elem, 'iframe') ?
+                               elem.contentDocument || (elem.contentWindow ? elem.contentWindow.document : []) :
+                               $.merge([], elem.childNodes);
+                    } catch (e) {
+                        consoleLogger.error(e);
+
+                        return [];
+                    }
+                });
+            };
+
+            elementContents = contents($(element));
+
+            $.each(elementContents, function (index, el) {
                 switch (el.nodeType) {
                     case 1: // ELEMENT_NODE
                         lookup(el);

app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js

@@ -439,6 +439,9 @@ define([
 
                 activePanel.find('table input')
                     .each(function () {
+                        if ($(this).is(':radio') && !$(this).prop('checked')) {
+                            return;
+                        }
                         swatchValues.push(this.name + '=' + $(this).val());
                     });
 

app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml

@@ -15,11 +15,6 @@
                 </arguments>
             </block>
         </referenceBlock>
-        <block class="Magento\Theme\Block\Html\Header" name="header" as="header">
-            <arguments>
-                <argument name="show_part" xsi:type="string">welcome</argument>
-            </arguments>
-        </block>
         <move element="header" destination="header.links" before="-"/>
         <move element="register-link" destination="header.links"/>
         <move element="top.links" destination="customer"/>

dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL)
+    ->setId(31)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Virtual Product Out')
+    ->setSku('virtual-product-out')
+    ->setPrice(10)
+    ->setTaxClassId(0)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['is_in_stock' => 0])
+    ->save();

dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock_rollback.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+try {
+    $product = $productRepository->get('virtual-product-out', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);