Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr121

Author: zakdma

app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js

@@ -309,6 +309,7 @@ define([
 
             self.hostedFieldsInstance.tokenize(function (err, payload) {
                 if (err) {
+                    $('body').trigger('processStop');
                     self.error($t('Some payment input fields are invalid.'));
 
                     return false;

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -8,8 +8,9 @@ define([
     'mage/translate',
     'underscore',
     'Magento_Catalog/js/product/view/product-ids-resolver',
+    'Magento_Catalog/js/product/view/product-info-resolver',
     'jquery-ui-modules/widget'
-], function ($, $t, _, idsResolver) {
+], function ($, $t, _, idsResolver, productInfoResolver) {
     'use strict';
 
     $.widget('mage.catalogAddToCart', {
@@ -24,7 +25,8 @@ define([
             addToCartButtonDisabledClass: 'disabled',
             addToCartButtonTextWhileAdding: '',
             addToCartButtonTextAdded: '',
-            addToCartButtonTextDefault: ''
+            addToCartButtonTextDefault: '',
+            productInfoResolver: productInfoResolver
         },
 
         /** @inheritdoc */
@@ -90,6 +92,7 @@ define([
         ajaxSubmit: function (form) {
             var self = this,
                 productIds = idsResolver(form),
+                productInfo = self.options.productInfoResolver(form),
                 formData;
 
             $(self.options.minicartSelector).trigger('contentLoading');
@@ -119,6 +122,7 @@ define([
                     $(document).trigger('ajax:addToCart', {
                         'sku': form.data().productSku,
                         'productIds': productIds,
+                        'productInfo': productInfo,
                         'form': form,
                         'response': res
                     });
@@ -172,6 +176,7 @@ define([
                     $(document).trigger('ajax:addToCart:error', {
                         'sku': form.data().productSku,
                         'productIds': productIds,
+                        'productInfo': productInfo,
                         'form': form,
                         'response': res
                     });

app/code/Magento/Catalog/view/frontend/web/js/product/view/product-info-resolver.js

@@ -0,0 +1,35 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'underscore',
+    'Magento_Catalog/js/product/view/product-info'
+], function (_, productInfo) {
+    'use strict';
+
+    /**
+     * Returns info about products in form.
+     *
+     * @param {jQuery} $form
+     * @return {Array}
+     */
+    return function ($form) {
+        var product = _.findWhere($form.serializeArray(), {
+                name: 'product'
+            });
+
+        if (!_.isUndefined(product)) {
+            productInfo().push(
+                {
+                    'id': product.value
+                }
+            );
+        }
+
+        return _.uniq(productInfo(), function (item) {
+            return item.id;
+        });
+    };
+});
+

app/code/Magento/Catalog/view/frontend/web/js/product/view/product-info.js

@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'ko'
+], function (ko) {
+    'use strict';
+
+    return ko.observableArray([]);
+});

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1723,6 +1723,7 @@ protected function _saveProducts()
                 }
 
                 $rowData[self::COL_MEDIA_IMAGE] = [];
+                list($rowImages, $rowData) = $this->clearNoSelectionImages($rowImages, $rowData);
 
                 /*
                  * Note: to avoid problems with undefined sorting, the value of media gallery items positions
@@ -1929,6 +1930,27 @@ protected function _saveProducts()
     }
     //phpcs:enable Generic.Metrics.NestingLevel
 
+    /**
+     * Clears entries from Image Set and Row Data marked as no_selection
+     *
+     * @param array $rowImages
+     * @param array $rowData
+     * @return array
+     */
+    private function clearNoSelectionImages($rowImages, $rowData)
+    {
+        foreach ($rowImages as $column => $columnImages) {
+            foreach ($columnImages as $key => $image) {
+                if ($image == 'no_selection') {
+                    unset($rowImages[$column][$key]);
+                    unset($rowData[$column]);
+                }
+            }
+        }
+
+        return [$rowImages, $rowData];
+    }
+
     /**
      * Prepare array with image states (visible or hidden from product page)
      *

app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php

@@ -118,6 +118,10 @@ public function initialize(
             $product->getStore()->getWebsiteId()
         );
 
+        if ($result->getHasError() === true && in_array($result->getErrorCode(), ['qty_available', 'out_stock'])) {
+            $quoteItem->setHasError(true);
+        }
+
         /* We need to ensure that any possible plugin will not erase the data */
         $backOrdersQty = $this->stockStateProvider->checkQuoteItemQty($stockItem, $rowQty, $qtyForCheck, $qty)
             ->getItemBackorders();

app/code/Magento/CatalogInventory/Model/StockStateProvider.php

@@ -14,7 +14,7 @@
 use Magento\Framework\Math\Division as MathDivision;
 
 /**
- * Interface StockStateProvider
+ * Provider stocks state
  */
 class StockStateProvider implements StockStateProviderInterface
 {
@@ -156,6 +156,7 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
 
         if (!$stockItem->getIsInStock()) {
             $result->setHasError(true)
+                ->setErrorCode('out_stock')
                 ->setMessage(__('This product is out of stock.'))
                 ->setQuoteMessage(__('Some of the products are out of stock.'))
                 ->setQuoteMessageIndex('stock');
@@ -165,7 +166,11 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
 
         if (!$this->checkQty($stockItem, $summaryQty) || !$this->checkQty($stockItem, $qty)) {
             $message = __('The requested qty is not available');
-            $result->setHasError(true)->setMessage($message)->setQuoteMessage($message)->setQuoteMessageIndex('qty');
+            $result->setHasError(true)
+                ->setErrorCode('qty_available')
+                ->setMessage($message)
+                ->setQuoteMessage($message)
+                ->setQuoteMessageIndex('qty');
             return $result;
         } else {
             if ($stockItem->getQty() - $summaryQty < 0) {

app/code/Magento/CatalogInventory/etc/adminhtml/di.xml

@@ -14,11 +14,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\CatalogInventory\Model\Spi\StockStateProviderInterface">
-        <arguments>
-            <argument name="qtyCheckApplicable" xsi:type="boolean">false</argument>
-        </arguments>
-    </type>
     <type name="Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider">
         <arguments>
             <argument name="addFieldStrategies" xsi:type="array">

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -260,7 +260,12 @@ define([
 
             if (!_.isUndefined(productData)) {
                 $(document).trigger('ajax:removeFromCart', {
-                    productIds: [productData['product_id']]
+                    productIds: [productData['product_id']],
+                    productInfo: [
+                        {
+                            'id': productData['product_id']
+                        }
+                    ]
                 });
 
                 if (window.location.href.indexOf(this.shoppingCartUrl) === 0) {

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml

@@ -157,7 +157,12 @@
         <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
         <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
         <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
-        <waitForPageLoad stepKey="waitForSuccess"/>
-        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForError"/>
+        <!-- Check that error remains -->
+        <actionGroup ref="AssertAdminItemOrderedErrorActionGroup" stepKey="assertProductErrorRemains">
+            <argument name="productName" value="$createConfigChildProduct2.name$"/>
+            <argument name="messageType" value="error"/>
+            <argument name="message" value="This product is out of stock."/>
+        </actionGroup>
     </test>
 </tests>