Merge branch '2.3-develop' into Chaika-PR-2019-08-29-2

veloraven · veloraven · commit 56d919363b1e · 2019-08-30T15:35:10.000-05:00
diff --git a/app/code/Magento/AmqpStore/README.md b/app/code/Magento/AmqpStore/README.md
@@ -1,3 +1,9 @@
-# Amqp Store
+# Magento_AmqpStore module
 
-**AmqpStore** provides ability to specify store before publish messages with Amqp.
+The Magento_AmqpStore module provides the ability to specify a store before publishing messages with the Advanced Message Queuing Protocol (AMQP).
+
+## Extensibility
+
+Extension developers can interact with the Magento_AmqpStore module using plugins. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AmqpStore module.
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
@@ -50,7 +50,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                                 <?php if (isset($_formatedOptionValue['full_view'])) :?>
                                     <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
                                 <?php else :?>
-                                    <?= $block->escapeHtml($_formatedOptionValue['value'], ['span']) ?>
+                                    <?= $block->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?>
                                 <?php endif; ?>
                             </dd>
                         <?php endforeach; ?>
diff --git a/app/code/Magento/Dhl/etc/adminhtml/system.xml b/app/code/Magento/Dhl/etc/adminhtml/system.xml
@@ -137,6 +137,7 @@
                 </field>
                 <field id="sort_order" translate="label" type="text" sortOrder="2000" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Sort Order</label>
+                    <validate>validate-number validate-zero-or-greater</validate>
                 </field>
                 <field id="debug" translate="label" type="select" sortOrder="1950" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Debug</label>
diff --git a/app/code/Magento/Directory/Model/Data/ExchangeRate.php b/app/code/Magento/Directory/Model/Data/ExchangeRate.php
@@ -5,6 +5,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Directory\Model\Data;
 
 /**
@@ -17,6 +20,7 @@ class ExchangeRate extends \Magento\Framework\Api\AbstractExtensibleObject imple
 {
     const KEY_CURRENCY_TO = 'currency_to';
     const KEY_RATE = 'rate';
+    private const KEY_EXCHANGE_RATES = 'exchange_rates';
 
     /**
      * @inheritDoc
diff --git a/app/code/Magento/Fedex/etc/adminhtml/system.xml b/app/code/Magento/Fedex/etc/adminhtml/system.xml
@@ -135,6 +135,7 @@
                 </field>
                 <field id="sort_order" translate="label" type="text" sortOrder="290" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Sort Order</label>
+                    <validate>validate-number validate-zero-or-greater</validate>
                 </field>
             </group>
         </section>
diff --git a/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml b/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
@@ -31,6 +31,7 @@
                 </field>
                 <field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Sort Order</label>
+                    <validate>validate-number validate-zero-or-greater</validate>
                 </field>
                 <field id="title" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Title</label>
@@ -92,6 +93,7 @@
                 </field>
                 <field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Sort Order</label>
+                    <validate>validate-number validate-zero-or-greater</validate>
                 </field>
                 <field id="title" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Title</label>
@@ -130,6 +132,7 @@
                 </field>
                 <field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Sort Order</label>
+                    <validate>validate-number validate-zero-or-greater</validate>
                 </field>
                 <field id="title" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Title</label>
diff --git a/app/code/Magento/Ups/etc/adminhtml/system.xml b/app/code/Magento/Ups/etc/adminhtml/system.xml
@@ -97,6 +97,7 @@
                 </field>
                 <field id="sort_order" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Sort Order</label>
+                    <validate>validate-number validate-zero-or-greater</validate>
                 </field>
                 <field id="title" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Title</label>
diff --git a/app/code/Magento/Usps/etc/adminhtml/system.xml b/app/code/Magento/Usps/etc/adminhtml/system.xml
@@ -136,6 +136,7 @@
                 </field>
                 <field id="sort_order" translate="label" type="text" sortOrder="220" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Sort Order</label>
+                    <validate>validate-number validate-zero-or-greater</validate>
                 </field>
             </group>
         </section>
diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -267,17 +267,18 @@ define('globalNavigation', [
             if (subMenu.length) {
                 e.preventDefault();
             }
-
-            menuItem.addClass('_show')
-                .siblings(menuItemSelector)
-                .removeClass('_show');
-
-            subMenu.attr('aria-expanded', 'true');
-
             closeBtn.on('click', close);
 
-            this.overlay.show(0).on('click', close);
-            this.menuLinks.last().off('blur');
+            if ($(menuItem).hasClass('_show')) {
+                closeBtn.trigger('click');
+            } else {
+                menuItem.addClass('_show')
+                    .siblings(menuItemSelector)
+                    .removeClass('_show');
+                subMenu.attr('aria-expanded', 'true');
+                this.overlay.show(0).on('click', close);
+                this.menuLinks.last().off('blur');
+            }
         },
 
         /**
