🔃 [EngCom] Public Pull Requests - 2.3-develop

Stanislav Idolov · web-flow · commit 0ad656df7fe6 · 2018-06-05T10:29:52.000+03:00
Accepted Public Pull Requests: - magento/magento2#15764: [Forwardport] [Resolved : Menu widget submenu alignment] (by @hitesh-wagento) - magento/magento2#15763: [Forwardport] Function unnecessarily called multiple time (by @vgelani) - magento/magento2#15752: [Forwardport] Refactor JavsScript for customer logout (by @vijay-wagento) - magento/magento2#15757: [Forwardport] Move buttons definition to separate file (by @vijay-wagento) - magento/magento2#15750: [Forwardport] Added language translation in template files (by @vijay-wagento) - magento/magento2#15747: [Forwardport] Refactor JavsScript for UrlRewrite module edit page (by @vijay-wagento) - magento/magento2#15696: [Forwardport] fixed Submitting search form (mini) with enter key fires event handle� (by @vgelani) - magento/magento2#15705: [Forwardport] Fix #13415 : Duplicated elements id (by @julienanquetil) - magento/magento2#15731: [Forwardport] Refactor javascript code of button split widget (by @vijay-wagento) - magento/magento2#15738: [Forwardport] fix: support multiple minisearch widget instances (by @vijay-wagento) - magento/magento2#15717: Fixed return type of wishlist's getImageData in DocBlock (by @rogyar) - magento/magento2#15709: [Forwardport] [Resolved : Menu widget submenu alignment #7897] (by @dmytro-ch) - magento/magento2#15707: [Forwardport] Typo correction (by @dmytro-ch) - magento/magento2#15706: [Forwardport] Use stored value of method instead of calling same method again. (by @dmytro-ch) - magento/magento2#15703: [Forwardport] Remove extra space and format the code in translation file (by @dmytro-ch) - magento/magento2#15701: [Forwardport] Fix HTML syntax in report.phtml error template (by @dmytro-ch) - magento/magento2#15665: [Forwardport] Wrong invoice prefix in multistore setup due to default store (by @vgelani) Fixed GitHub Issues: - magento/magento2#7897: Menu widget submenu alignment (reported by @slackerzz) has been fixed in magento/magento2#15764 by @hitesh-wagento in 2.3-develop branch Related commits: 1. ecc5f7b - magento/magento2#15355: Function is unnecessarily called multiple time (reported by @saurabh-aureate) has been fixed in magento/magento2#15763 by @vgelani in 2.3-develop branch Related commits: 1. bcdd8f2 - magento/magento2#15356: Refactore javascript for module URL rewrite (reported by @vgelani) has been fixed in magento/magento2#15747 by @vijay-wagento in 2.3-develop branch Related commits: 1. 6711694 - magento/magento2#13793: Submitting search form (mini) with enter key fires event handlers bound by jquery twice (reported by @koenner01) has been fixed in magento/magento2#15696 by @vgelani in 2.3-develop branch Related commits: 1. 04583ac - magento/magento2#13415: Duplicated elements id in checkout page (reported by @angelo983) has been fixed in magento/magento2#15705 by @julienanquetil in 2.3-develop branch Related commits: 1. 82d0491 2. fbb81c9 3. 6301ed4 - magento/magento2#15354: Refactor javascript code of button split widget call js component (reported by @amittiwari024) has been fixed in magento/magento2#15731 by @vijay-wagento in 2.3-develop branch Related commits: 1. eaa585d - magento/magento2#7897: Menu widget submenu alignment (reported by @slackerzz) has been fixed in magento/magento2#15709 by @dmytro-ch in 2.3-develop branch Related commits: 1. 14bf8af - magento/magento2#14063: Wrong invoice prefix in multistore setup due to default store id (reported by @shinesoftware) has been fixed in magento/magento2#15665 by @vgelani in 2.3-develop branch Related commits: 1. d5c3952
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/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>
+
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
@@ -84,7 +84,7 @@ $ccType = $block->getInfoData('cc_type');
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
             <label class="label" for="<?= /* @noEscape */ $code ?>_vault">
-                <span><?= $block->escapeHtml('Save for later use.') ?></span>
+                <span><?= $block->escapeHtml(__('Save for later use.')) ?></span>
             </label>
         </div>
     <?php endif; ?>
diff --git a/app/code/Magento/Captcha/i18n/en_US.csv b/app/code/Magento/Captcha/i18n/en_US.csv
@@ -20,11 +20,7 @@ Forms,Forms
 "Number of Symbols","Number of Symbols"
 "Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Please specify 8 symbols at the most. Range allowed (e.g. 3-5)"
 "Symbols Used in CAPTCHA","Symbols Used in CAPTCHA"
-"
-                        Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
-                    ","
-                        Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
-                    "
+"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer."
 "Case Sensitive","Case Sensitive"
 "Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront"
 "CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen.","CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen."
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -252,7 +252,7 @@ public function getChildrenIds($parentId, $required = true)
     }
 
     /**
-     * Retrieve parent ids array by requered child
+     * Retrieve parent ids array by required child
      *
      * @param int|array $childId
      * @return array
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/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">
diff --git a/app/code/Magento/Customer/view/frontend/templates/logout.phtml b/app/code/Magento/Customer/view/frontend/templates/logout.phtml
@@ -7,13 +7,12 @@
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
 <p><?= $block->escapeHtml(__('You have signed out and will go to our homepage in 5 seconds.')) ?></p>
-<script>
-require([
-    "jquery",
-    "mage/mage"
-], function($){
-
-    $($.mage.redirect("<?= $block->escapeJs($block->escapeUrl($block->getUrl())) ?>", "assign", 5000));
-
-});
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Customer/js/logout-redirect": {
+                "url": "<?= $block->escapeJs($block->escapeUrl($block->getUrl())) ?>"
+            }
+        }
+    }
 </script>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js b/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/mage'
+], function ($) {
+    'use strict';
+
+    return function (data) {
+        $($.mage.redirect(data.url, 'assign', 5000));
+    };
+});
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
@@ -12,26 +12,24 @@
     <div class="gift-options-content">
         <fieldset class="fieldset">
             <div class="field field-to">
-                <label for="gift-message-whole-to" class="label">
+                <label data-bind="attr: {for: 'gift-message-whole-to-' + index }" class="label">
                     <span data-bind="i18n: 'To:'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
-                           id="gift-message-whole-to"
                            class="input-text"
-                           data-bind="value: getObservable('recipient')">
+                           data-bind="value: getObservable('recipient'), attr: { id: 'gift-message-whole-to-' + index }">
                 </div>
             </div>
 
             <div class="field field-from">
-                <label for="gift-message-whole-from" class="label">
+                <label data-bind="attr: {for: 'gift-message-whole-from-' + index }" class="label">
                     <span data-bind="i18n: 'From:'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
-                           id="gift-message-whole-from"
                            class="input-text"
-                           data-bind="value: getObservable('sender')">
+                           data-bind="value: getObservable('sender'), attr: { id: 'gift-message-whole-from-' + index }">
                 </div>
             </div>
             <div class="field text">
@@ -46,7 +44,6 @@
                 </div>
             </div>
         </fieldset>
-
     </div>
 </div>
 <!-- /ko -->
diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
@@ -11,7 +11,7 @@
 $partners = $block->getPartners();
 ?>
 <?php if ($partners) : ?>
-    <?php foreach ($block->getPartners() as $partner) : ?>
+    <?php foreach ($partners as $partner) : ?>
         <div class="partner">
             <img
                 class="partner-image"
diff --git a/app/code/Magento/Multishipping/i18n/en_US.csv b/app/code/Magento/Multishipping/i18n/en_US.csv
@@ -88,3 +88,5 @@ Options,Options
 "Review Order","Review Order"
 "Select Shipping Method","Select Shipping Method"
 "We received your order!","We received your order!"
+"Ship to:","Ship to:"
+"Error:","Error:"
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml
@@ -32,7 +32,7 @@ $orderIds = $block->getOrderIds();
                     <?php $shippingAddress = $block->getOrderShippingAddress($orderId); ?>
                     <div class="shipping-item">
                         <?php if ($shippingAddress) : ?>
-                        <span class="shipping-label"><?= $block->escapeHtml('Ship to:'); ?></span>
+                        <span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span>
                         <span class="shipping-address">
                             <?= $block->escapeHtml($block->formatOrderShippingAddress($shippingAddress)); ?>
                         </span>
@@ -65,7 +65,7 @@ $orderIds = $block->getOrderIds();
                     <dl class="shipping-item">
                         <dt class="shipping-block">
                             <?php if ($block->isShippingAddress($address)) : ?>
-                            <span class="shipping-label"><?= $block->escapeHtml('Ship to:'); ?></span>
+                            <span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span>
                             <span class="shipping-address">
                                 <?= $block->escapeHtml($block->formatQuoteShippingAddress($address)); ?>
                             </span>
@@ -76,7 +76,7 @@ $orderIds = $block->getOrderIds();
                             <?php endif; ?>
                         </dt>
                         <dd class="error-block">
-                            <span class="error-label"><?= $block->escapeHtml('Error:'); ?></span>
+                            <span class="error-label"><?= $block->escapeHtml(__('Error:')); ?></span>
                             <span class="error-description">
                                 <?= /* @noEscape */ $block->getAddressError($address); ?>
                             </span>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
@@ -22,7 +22,7 @@
                 <?php $shippingAddress = $block->getCheckoutData()->getOrderShippingAddress($orderId); ?>
                     <div class="shipping-item">
                         <?php if ($shippingAddress) : ?>
-                        <span class="shipping-label"><?= $block->escapeHtml('Ship to:'); ?></span>
+                        <span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span>
                         <span class="shipping-address">
                         <?= $block->escapeHtml(
                             $block->getCheckoutData()->formatOrderShippingAddress($shippingAddress)
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
@@ -135,7 +135,7 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
             <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_vault">
-                <span><?= $block->escapeHtml('Save for later use.') ?></span>
+                <span><?= $block->escapeHtml(__('Save for later use.')) ?></span>
             </label>
         </div>
     <?php endif; ?>
diff --git a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
@@ -123,10 +123,15 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
         /** @var \Magento\Sales\Model\AbstractModel $object */
         if ($object instanceof EntityInterface && $object->getIncrementId() == null) {
+            $store = $object->getStore();
+            $storeId = $store->getId();
+            if ($storeId === null) {
+                $storeId = $store->getGroup()->getDefaultStoreId();
+            }
             $object->setIncrementId(
                 $this->sequenceManager->getSequence(
                     $object->getEntityType(),
-                    $object->getStore()->getGroup()->getDefaultStoreId()
+                    $storeId
                 )->getNextValue()
             );
         }
diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js
@@ -55,7 +55,7 @@ define([
             this.autoComplete = $(this.options.destinationSelector);
             this.searchForm = $(this.options.formSelector);
             this.submitBtn = this.searchForm.find(this.options.submitBtn)[0];
-            this.searchLabel = $(this.options.searchLabel);
+            this.searchLabel = this.searchForm.find(this.options.searchLabel);
             this.isExpandable = this.options.isExpandable;
 
             _.bindAll(this, '_onKeyDown', '_onPropertyChange', '_onSubmit');
@@ -226,6 +226,7 @@ define([
 
                 case $.ui.keyCode.ENTER:
                     this.searchForm.trigger('submit');
+                    e.preventDefault();
                     break;
 
                 case $.ui.keyCode.DOWN:
diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js
@@ -8,16 +8,12 @@
  */
 define([
     'jquery',
-    'underscore'
-], function ($, _) {
+    'underscore',
+    'Magento_Ui/js/form/adapter/buttons'
+], function ($, _, buttons) {
     'use strict';
 
-    var buttons = {
-            'reset':            '#reset',
-            'save':             '#save',
-            'saveAndContinue':  '#save_and_continue'
-        },
-        selectorPrefix = '',
+    var selectorPrefix = '',
         eventPrefix;
 
     /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define(function () {
+    'use strict';
+
+    return {
+        'reset': '#reset',
+        'save': '#save',
+        'saveAndContinue': '#save_and_continue'
+    };
+});
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
@@ -10,14 +10,13 @@
 ?>
 <?= $block->getChildHtml() ?>
 <?php if ($block->getChildBlock('form')): ?>
-<script>
-require([
-    'jquery',
-    'mage/backend/form',
-    'mage/backend/validation'
-], function($){
-    $('#edit_form').form()
-        .validation({validationUrl: '<?= $block->escapeUrl($block->getValidationUrl()) ?>'});
-});
+<script type="text/x-magento-init">
+    {
+        "#edit_form": {
+            "Magento_UrlRewrite/js/url-rewrite-validation" : {
+                "url": "<?= $block->escapeUrl($block->getValidationUrl()) ?>"
+            }
+        }
+    }
 </script>
 <?php endif; ?>
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/web/js/url-rewrite-validation.js b/app/code/Magento/UrlRewrite/view/adminhtml/web/js/url-rewrite-validation.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/backend/form',
+    'mage/backend/validation'
+], function ($) {
+    'use strict';
+
+    return function (data, element) {
+
+        $(element).form().validation({
+            validationUrl: data.url
+        });
+    };
+});
diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -144,7 +144,7 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
      * Retrieve product image data
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return \Magento\Catalog\Block\Product\Image
+     * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function getImageData($product)
diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less
@@ -305,6 +305,10 @@
             .lib-css(border-top, none);
         }
 
+        li.level1 {
+            position: relative;
+        }
+
         .level0 {
             .lib-css(margin, @_nav-level0-item-margin);
             display: inline-block;
diff --git a/pub/errors/default/report.phtml b/pub/errors/default/report.phtml
@@ -36,25 +36,25 @@
         </div>
         <div class="field lastname required">
             <label for="lastname" class="label">Last Name</label>
-            <div class=control">
+            <div class="control">
                 <input type="text" name="lastname" id="lastname" value="<?= $this->postData['lastName'] ?>" title="Last Name" class="required-entry input-text" />
             </div>
         </div>
         <div class="field email required">
             <label for="email_address" class="label">Email Address</label>
-            <div class=control">
+            <div class="control">
                 <input type="text" name="email" id="email_address" value="<?= $this->postData['email'] ?>" title="Email Address" class="validate-email required-entry input-text" />
             </div>
         </div>
         <div class="field telephone">
             <label for="telephone" class="label">Telephone</label>
-            <div class=control">
+            <div class="control">
                 <input type="text" name="telephone" id="telephone" value="<?= $this->postData['telephone'] ?>" title="Telephone" class="input-text" />
             </div>
         </div>
         <div class="field comment">
             <label for="comment" class="label">Comment</label>
-            <div class=control">
+            <div class="control">
                 <textarea name="comment" cols="5" rows="3" class="textarea"><?= $this->postData['comment'] ?></textarea>
             </div>
         </div>

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public function getChildrenIds($parentId, $required = true)`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`/**`
`255`		`- * Retrieve parent ids array by requered child`
	`255`	`+ * Retrieve parent ids array by required child`
`256`	`256`	`*`
`257`	`257`	`* @param int\|array $childId`
`258`	`258`	`* @return array`