🔃 [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
magento · Jun 25, 2018 · 4b49996 · 4b49996
2 parents 92b9a39 + 3d1babc
commit 4b49996
Show file tree

Hide file tree

Showing 33 changed files with 641 additions and 512 deletions.
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/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>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js b/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');
+    };
+});
diff --git a/app/code/Magento/Catalog/etc/adminhtml/menu.xml b/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>
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/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)

diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/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;

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml b/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>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/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">

diff --git a/app/code/Magento/Customer/view/frontend/web/js/model/authentication-popup.js b/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');
         }
     };
 });
diff --git a/app/code/Magento/Customer/view/frontend/web/js/trim-username.js b/app/code/Magento/Customer/view/frontend/web/js/trim-username.js
diff --git a/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html b/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
@@ -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>

diff --git a/app/code/Magento/Paypal/view/frontend/web/order-review.js b/app/code/Magento/Paypal/view/frontend/web/order-review.js
@@ -108,7 +108,7 @@ define([
         },
 
         /**
-         * trigger change for the update of shippping methods from server
+         * trigger change for the update of shipping methods from server
          */
         _updateOrderHandler: function () {
             $(this.options.shippingSelector).trigger('change');
@@ -297,7 +297,7 @@ define([
                 this._updateOrderSubmit(true);
                 this._toggleButton(this.options.updateOrderSelector, true);
 
-                // form data and callBack updated based on the shippping Form element
+                // form data and callBack updated based on the shipping Form element
                 if (this.isShippingSubmitForm) {
                     formData = $(this.options.shippingSubmitFormSelector).serialize() + '&isAjax=true';
 

diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
@@ -445,7 +445,7 @@
 					childCount = getChildCount(node);
 
 					// Remove empty nodes but only if there is multiple wrappers and they are not block
-					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
+					// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
 					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
 						dom.remove(node, 1);
 						return;

diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/dom/DOMUtils.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/dom/DOMUtils.js
@@ -1106,7 +1106,7 @@
 
 		/**
 		 * Returns a unique id. This can be useful when generating elements on the fly.
-		 * This method will not check if the element allready exists.
+		 * This method will not check if the element already exists.
 		 *
 		 * @method uniqueId
 		 * @param {String} p Optional prefix to add infront of all ids defaults to "mce_".

diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
@@ -14451,7 +14451,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					childCount = getChildCount(node);
 
 					// Remove empty nodes but only if there is multiple wrappers and they are not block
-					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
+					// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
 					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
 						dom.remove(node, 1);
 						return;

diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
@@ -15301,7 +15301,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					childCount = getChildCount(node);
 
 					// Remove empty nodes but only if there is multiple wrappers and they are not block
-					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
+					// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
 					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
 						dom.remove(node, 1);
 						return;

diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
@@ -15275,7 +15275,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					childCount = getChildCount(node);
 
 					// Remove empty nodes but only if there is multiple wrappers and they are not block
-					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
+					// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
 					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
 						dom.remove(node, 1);
 						return;

diff --git a/...design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less b/...design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less
@@ -87,7 +87,7 @@
 .form-el-checkbox {
     &:checked {
         + .form-label {
-            &::before {
+            &:before {
                 content: @checkbox-icon__content;
                 font-family: @icons__font-family;
             }

diff --git a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less
@@ -22,8 +22,8 @@
     vertical-align: middle;
     width: @component-indicator__size;
 
-    &::before,
-    &::after {
+    &:before,
+    &:after {
         background: @color-white;
         display: block;
         opacity: 0;
@@ -32,7 +32,7 @@
         visibility: hidden;
     }
 
-    &::before {
+    &:before {
         border: 1px solid @color-gray68;
         border-radius: 1px;
         box-shadow: 0 0 2px rgba(0,0,0,.4);
@@ -43,7 +43,7 @@
         padding: 4px 5px;
     }
 
-    &::after {
+    &:after {
         border-color: darken(@color-gray68, 8);
         border-style: solid;
         border-width: 1px 0 0 1px;
@@ -56,8 +56,8 @@
     }
 
     &:hover {
-        &::before,
-        &::after {
+        &:before,
+        &:after {
             opacity: 1;
             transition: opacity .2s linear;
             visibility: visible;
@@ -115,7 +115,7 @@
 
     &._tooltip {
         background: transparent;
-        margin: 0px 0px 8px 5px;
+        margin: 0 0 8px 5px;
 
         a {
             width: 21px;

diff --git a/...ontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less b/...ontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less
@@ -25,6 +25,7 @@
             padding: @block-auth__dropdown__padding;
         }
     }
+
     .authentication-wrapper {
         float: right;
         margin-top: -1.5*@indent__xl;
@@ -94,7 +95,7 @@
                 padding-top: @indent__xl;
                 position: relative;
 
-                &::before {
+                &:before {
                     .lib-css(height, @block-auth__or-label__size);
                     .lib-css(line-height, @block-auth__or-label__size - 2px);
                     .lib-css(margin, -(@block-auth__or-label__size/2 + 1px) 0 0 -(@block-auth__or-label__size / 2));
@@ -212,7 +213,7 @@
                 margin: 0;
                 padding: @indent__s 0 0 @indent__xl;
 
-                &::before {
+                &:before {
                     left: 0;
                     top: 50%;
                 }

diff --git a/...ntend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/...ntend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
@@ -198,6 +198,7 @@
         .payment-option-title {
             .lib-css(padding-left, @checkout-payment-option-content__padding__xl);
         }
+
         .payment-option-content {
             .payment-option-inner {
                 + .actions-toolbar {

diff --git a/...ign/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less b/...ign/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less
@@ -188,6 +188,7 @@
                     }
                 }
             }
+
             .row-error {
                 td {
                     border-top: none;
@@ -285,6 +286,7 @@
             .lib-css(max-width, @checkout-shipping-address__max-width);
         }
     }
+
     .table-checkout-shipping-method {
         width: auto;
     }
@@ -324,6 +326,7 @@
             }
         }
     }
+
     .table-checkout-shipping-method {
         min-width: 500px;
     }

diff --git a/app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less
@@ -15,6 +15,7 @@
         .actions-toolbar:not(:last-child) {
             margin-bottom: @indent__xl;
         }
+
         .fieldset {
             .nested {
                 .field:not(.choice) {