🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #16278: MAGETWO-61209: Issue #7379 Calendar widget (jQuery UI DatePicker) with numberOfMonths = 2 or more (by @vasilii-b)
 - #16326: [Forwardport] Fixed typo error (by @vgelani)
 - #16321: [Forwardport] [Correct code formatting] (by @hitesh-wagento)
 - #16320: [Fowardport] Correct sentence in comment section in class file. (by @namratachangani)
 - #16245: [Forwardport 2.3] Captcha: Added integration test for checking admin login attempts cleanup (by @rogyar)
 - #16293: [Forwardport 2.3] Trim email address in customer account create and login form (by @dankhrapiyush)
 - #15812: [Forwardport] Refactored javascript code of admin notification modal popup (by @rahul-kachhadiya)
 - #16283: [Forwardport] DOBISSUE date format changed after customer tries to register with sa� (by @hitesh-wagento)
 - #14352:  Issue 14351: Product import doesn't change `Enable Qty Increments` field  (by @simpleadm)


Fixed GitHub Issues:
 - #7379: Calendar widget (jQuery UI DatePicker) with numberOfMonths = 2 or more (reported by @atihomirov) has been fixed in #16278 by @vasilii-b in 2.3-develop branch
   Related commits:
     1. 54e1a71
     2. e874ff0

 - #6058: IE11 user login email validation fails if field has leading or trailing space (reported by @dnadle) has been fixed in #16293 by @dankhrapiyush in 2.3-develop branch
   Related commits:
     1. 89ca28f
     2. 5c1e8f7
     3. bfce026
     4. 472c141

 - #14351: Product import doesn't change `Enable Qty Increments` field (reported by @simpleadm) has been fixed in #14352 by @simpleadm in 2.3-develop branch
   Related commits:
     1. 1268692
     2. 16b8b2c
     3. cb83575

Author: Stanislav Idolov

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

@@ -19,20 +19,12 @@
     </ul>
 </div>
 
-<script>
-require([
-    "jquery",
-    "Magento_Ui/js/modal/modal"
-], function($){
-    if (this.modal) {
-        this.modal.html($('[data-role="system_messages_list"]').html());
-    } else {
-        this.modal = $('[data-role="system_messages_list"]').modal({
-            modalClass: 'modal-system-messages ui-popup-message',
-            type: 'popup',
-            buttons: []
-        });
+<script type="text/x-magento-init">
+    {
+        "[data-role=system_messages_list]": {
+            "Magento_AdminNotification/js/system/messages/popup": {
+                class: 'modal-system-messages ui-popup-message'
+            }
+        }
     }
-    this.modal.modal('openModal');
-});
-</script>
+</script>

app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js

@@ -0,0 +1,24 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+*/
+
+define([
+    'jquery',
+    'Magento_Ui/js/modal/modal'
+], function ($) {
+    'use strict';
+
+    return function (data, element) {
+        if (this.modal) {
+            this.modal.html($(element).html());
+        } else {
+            this.modal = $(element).modal({
+                modalClass: data.class,
+                type: 'popup',
+                buttons: []
+            });
+        }
+        this.modal.modal('openModal');
+    };
+});

app/code/Magento/Catalog/etc/adminhtml/menu.xml

@@ -12,7 +12,6 @@
         <add id="Magento_Catalog::catalog_categories" title="Categories" translate="title" module="Magento_Catalog" sortOrder="20" parent="Magento_Catalog::inventory" action="catalog/category/" resource="Magento_Catalog::categories"/>
         <add id="Magento_Catalog::catalog_attributes_attributes" title="Product" translate="title" module="Magento_Catalog" sortOrder="30" parent="Magento_Backend::stores_attributes" action="catalog/product_attribute/" resource="Magento_Catalog::attributes_attributes"/>
         <add id="Magento_Catalog::catalog_attributes_sets" title="Attribute Set" translate="title" module="Magento_Catalog" sortOrder="40" parent="Magento_Backend::stores_attributes" action="catalog/product_set/" resource="Magento_Catalog::sets"/>
-
         <add id="Magento_Catalog::inventory" title="Inventory" translate="title" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::catalog" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
     </menu>
 </config>

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

@@ -10,6 +10,7 @@
 use Magento\CatalogImportExport\Model\Import\Product\MediaGalleryProcessor;
 use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogImportExport\Model\StockItemImporterInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
@@ -2618,7 +2619,10 @@ private function _setStockUseConfigFieldsValues($rowData)
     {
         $useConfigFields = [];
         foreach ($rowData as $key => $value) {
-            $useConfigName = self::INVENTORY_USE_CONFIG_PREFIX . $key;
+            $useConfigName = $key === StockItemInterface::ENABLE_QTY_INCREMENTS
+                ? StockItemInterface::USE_CONFIG_ENABLE_QTY_INC
+                : self::INVENTORY_USE_CONFIG_PREFIX . $key;
+
             if (isset($this->defaultStockData[$key])
                 && isset($this->defaultStockData[$useConfigName])
                 && !empty($value)

app/code/Magento/Customer/Block/Widget/Dob.php

@@ -127,7 +127,8 @@ protected function getFormFilter()
     protected function applyOutputFilter($value)
     {
         $filter = $this->getFormFilter();
-        if ($filter) {
+        if ($filter && $value) {
+            $value = date('Y-m-d', $this->getTime());
             $value = $filter->outputFilter($value);
         }
         return $value;

app/code/Magento/Customer/view/frontend/templates/form/login.phtml

@@ -24,7 +24,7 @@
                 <div class="field email required">
                     <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
                     <div class="control">
-                        <input name="login[username]" value="<?= $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-validate="{required:true, 'validate-email':true}">
+                        <input name="login[username]" value="<?= $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
                     </div>
                 </div>
                 <div class="field password required">
@@ -43,12 +43,3 @@
     </div>
 </div>
 
-<script type="text/x-magento-init">
-    {
-        ".field.email": {
-            "Magento_Customer/js/trim-username": {
-                "formSelector": "form.form-login"
-            }
-        }
-    }
-</script>

app/code/Magento/Customer/view/frontend/templates/form/register.phtml

@@ -131,7 +131,7 @@
         <div class="field required">
             <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
         <div class="field password required">

app/code/Magento/Customer/view/frontend/web/js/model/authentication-popup.js

@@ -34,7 +34,7 @@ define([
 
         /** Show login popup window */
         showModal: function () {
-            $(this.modalWindow).modal('openModal');
+            $(this.modalWindow).modal('openModal').trigger('contentUpdated');
         }
     };
 });

app/code/Magento/Customer/view/frontend/web/js/trim-username.js

@@ -60,6 +60,7 @@
                                    id="customer-email"
                                    type="email"
                                    class="input-text"
+                                   data-mage-init='{"mage/trim-input":{}}'
                                    data-bind="attr: {autocomplete: autocomplete}"
                                    data-validate="{required:true, 'validate-email':true}">
                         </div>