🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento#15331: set alignment purchase order form and place order button (by @neeta-wagento)
 - magento#15341: Refactored javascript code of admin notification modal popup (by @rahul-kachhadiya)
 - magento#15351: Refactor javascript code of  button split widget (by @amittiwari024)
 - magento#15411: [Backport-2.2] Fixed abstract.js typo (by @VitaliyBoyko)
 - magento#15350: 15319 :  misleading data-container in product list (by @sunilit42)
 - magento#15333: Added language translation for message string (by @yogeshks)
 - magento#15346: Function is unnecessarily called multiple time (by @saurabh-aureate)
 - magento#15362: Removed duplicate line and added comment on variable (by @vgelani)
 - magento#15265: declare var to fix scope error (by @keithbentrup)
 - magento#15343: Format the javascript code in Tax module (by @vgelani)


Fixed GitHub Issues:
 - magento#15334: Purchased Order Form button should visible properly (reported by @neeta-wagento) has been fixed in magento#15331 by @neeta-wagento in 2.2-develop branch
   Related commits:
     1. 0605a27
     2. eae0ac6

 - magento#15354: Refactor javascript code of button split widget call js component (reported by @amittiwari024) has been fixed in magento#15351 by @amittiwari024 in 2.2-develop branch
   Related commits:
     1. 37851f4

 - magento#15319: misleading data-container in product list (reported by @DanielRuf) has been fixed in magento#15350 by @sunilit42 in 2.2-develop branch
   Related commits:
     1. 8c144a2
     2. 9e0db30
     3. 03465eb

 - magento#15355: Function is unnecessarily called multiple time (reported by @saurabh-aureate) has been fixed in magento#15346 by @saurabh-aureate in 2.2-develop branch
   Related commits:
     1. 9339279

 - magento#15121: Magento 2.2.4 - Condition Category Chooser Crashes Page if Store has Several Nested Categories (reported by @rjtulloh) has been fixed in magento#15265 by @keithbentrup in 2.2-develop branch
   Related commits:
     1. b7179ad

 - magento#15352: Reformat the javascript code as per magento standards. (reported by @namratachangani) has been fixed in magento#15343 by @vgelani in 2.2-develop branch
   Related commits:
     1. 00bfbd0
     2. cdc5b2f
     3. f8d5312
     4. 2ecf8c6

Author: magento-engcom-team

app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

@@ -59,8 +59,10 @@ public function execute()
         if (empty($result)) {
             $result[] = [
                 'severity' => (string)\Magento\Framework\Notification\MessageInterface::SEVERITY_NOTICE,
-                'text' => 'You have viewed and resolved all recent system notices. '
-                    . 'Please refresh the web page to clear the notice alert.',
+                'text' => __(
+                    'You have viewed and resolved all recent system notices. '
+                    . 'Please refresh the web page to clear the notice alert.'
+                )
             ];
         }
         $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));

app/code/Magento/AdminNotification/i18n/en_US.csv

@@ -48,3 +48,4 @@ Severity,Severity
 "Date Added","Date Added"
 Message,Message
 Actions,Actions
+"You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert.","You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert."

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/Backend/view/adminhtml/templates/widget/button/split.phtml

@@ -41,11 +41,11 @@
     <?php endif; ?>
 </div>
 
-<script>
-require(['jquery'], function($){
-        $('.actions-split')
-            .on('click.splitDefault', '.action-default', function() {
-                $(this).siblings('.dropdown-menu').find('.item-default').trigger('click');
-            });
-});
+<script type="text/x-magento-init">
+    {
+        ".actions-split": {
+            "Magento_Ui/js/grid/controls/button/split": {}
+        }
+    }
 </script>
+

app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js

@@ -32,9 +32,7 @@ define([
             data = {},
             parameters = {},
             root = {},
-            len = 0,
-            key = '',
-            i = 0;
+            key = '';
 
         /* eslint-disable */
         /**
@@ -162,13 +160,14 @@ define([
              * @returns {void}
              */
             categoryLoader.buildCategoryTree = function (parent, config) {// eslint-disable-line no-shadow
+                var i = 0;
 
                 if (!config) {
                     return null;
                 }
 
                 if (parent && config && config.length) {
-                    for (i = 0; i < config.length; i++) {
+                    for (i; i < config.length; i++) {
                         categoryLoader.processCategoryTree(parent, config, i);
                     }
                 }
@@ -181,11 +180,14 @@ define([
              * @returns {Object}
              */
             categoryLoader.buildHashChildren = function (hash, node) {// eslint-disable-line no-shadow
+                var i = 0,
+                    len;
+
                 // eslint-disable-next-line no-extra-parens
                 if ((node.childNodes.length > 0) || (node.loaded === false && node.loading === false)) {
                     hash.children = [];
 
-                    for (i = 0, len = node.childNodes.length; i < len; i++) {
+                    for (i, len = node.childNodes.length; i < len; i++) {
                         /* eslint-disable */
                         if (!hash.children) {
                             hash.children = [];

app/code/Magento/Catalog/view/frontend/templates/product/list.phtml

@@ -47,7 +47,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
             <?php foreach ($_productCollection as $_product): ?>
                 <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
-                <div class="product-item-info" data-container="product-grid">
+                <div class="product-item-info" data-container="product-<?= /* @escapeNotVerified */ $viewMode ?>">
                     <?php
                     $productImage = $block->getImage($_product, $image);
                     if ($pos != null) {

app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml

@@ -13,8 +13,6 @@
  */
 ?>
 
-<?php $block->getCurrencySymbolsData();?>
-
 <form id="currency-symbols-form" action="<?= /* @escapeNotVerified */ $block->getFormActionUrl() ?>" method="post">
     <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
     <fieldset class="admin__fieldset">

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php

@@ -15,9 +15,9 @@
  */
 class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
-    //protected $_template = 'tax/checkout/subtotal.phtml';
-
-    //protected $_template = 'tax/checkout/subtotal.phtml';
+    /**
+     * @var \Magento\Tax\Model\Config
+     */
     protected $_taxConfig;
 
     /**

app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml

@@ -11,10 +11,10 @@
     <?= $block->getSaveButtonHtml() ?>
 </div>
 <?= $block->getRenameFormHtml() ?>
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
-
-    jQuery('#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>').mage('form').mage('validation');
-
-});
+<script type="text/x-magento-init">
+    {
+        "#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>": {
+            "Magento_Tax/js/page/validate": {}
+        }
+    }
 </script>

app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js

@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/mage'
+], function (jQuery) {
+    'use strict';
+
+    return function (data, element) {
+        jQuery(element).mage('form').mage('validation');
+    };
+});

app/code/Magento/Ui/view/base/web/js/form/element/abstract.js

@@ -220,7 +220,7 @@ define([
         },
 
         /**
-         * Sets 'value' as 'hidden' propertie's value, triggers 'toggle' event,
+         * Sets 'value' as 'hidden' property's value, triggers 'toggle' event,
          * sets instance's hidden identifier in params storage based on
          * 'value'.
          *

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less

@@ -46,6 +46,11 @@
                     .lib-css(border-top, @checkout-payment-method-title__border);
                 }
             }
+            form {
+                &.form-purchase-order {
+                    margin-bottom: 15px;
+                }
+            }
         }
 
         .payment-method-content {