Skip to content

Commit 0ebdbf1

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.3-develop
Accepted Community Pull Requests: - #24276: Update Magento_AmqpStore ReadMe (by @diazwatson) - #24296: Resolve All shipping method (Flat Rate, Table Rate,...) has No validate number (Sort Order) issue24295 (by @edenduong) - #24272: Resolve error when call getExchangeRates() and setExchangeRates(...) in Magento\Directory\Api\Data\ExchangeRateInterface (by @edenduong) - #24211: added fix for the ticket #24210 (by @sudheer-gajjala) - #24240: Resolved On cart page not able to check uploaded file of file type custom option #24239 (by @rani-webkul) Fixed GitHub Issues: - #24295: All shipping method (Flat Rate, Table Rate,...) has No validate number (Sort Order) (reported by @edenduong) has been fixed in #24296 by @edenduong in 2.3-develop branch Related commits: 1. 4a3456e - #24210: Toggle functionality for admin menu (reported by @Nagamaiah333) has been fixed in #24211 by @sudheer-gajjala in 2.3-develop branch Related commits: 1. fc87a57 - #24239: On cart page not able to check uploaded file of file type custom option (reported by @rani-webkul) has been fixed in #24240 by @rani-webkul in 2.3-develop branch Related commits: 1. 281a6a4 2. fff3f50
2 parents b0e9433 + 6045019 commit 0ebdbf1

File tree

9 files changed

+30
-12
lines changed

9 files changed

+30
-12
lines changed

‎app/code/Magento/AmqpStore/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# Amqp Store
1+
# Magento_AmqpStore module
22

3-
**AmqpStore** provides ability to specify store before publish messages with Amqp.
3+
The Magento_AmqpStore module provides the ability to specify a store before publishing messages with the Advanced Message Queuing Protocol (AMQP).
4+
5+
## Extensibility
6+
7+
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).
8+
9+
[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.

‎app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
5050
<?php if (isset($_formatedOptionValue['full_view'])) :?>
5151
<?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
5252
<?php else :?>
53-
<?= $block->escapeHtml($_formatedOptionValue['value'], ['span']) ?>
53+
<?= $block->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?>
5454
<?php endif; ?>
5555
</dd>
5656
<?php endforeach; ?>

‎app/code/Magento/Dhl/etc/adminhtml/system.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
</field>
138138
<field id="sort_order" translate="label" type="text" sortOrder="2000" showInDefault="1" showInWebsite="1" showInStore="0">
139139
<label>Sort Order</label>
140+
<validate>validate-number validate-zero-or-greater</validate>
140141
</field>
141142
<field id="debug" translate="label" type="select" sortOrder="1950" showInDefault="1" showInWebsite="1" showInStore="0">
142143
<label>Debug</label>

‎app/code/Magento/Directory/Model/Data/ExchangeRate.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
* Copyright © Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
8+
9+
declare(strict_types=1);
10+
811
namespace Magento\Directory\Model\Data;
912

1013
/**
@@ -17,6 +20,7 @@ class ExchangeRate extends \Magento\Framework\Api\AbstractExtensibleObject imple
1720
{
1821
const KEY_CURRENCY_TO = 'currency_to';
1922
const KEY_RATE = 'rate';
23+
private const KEY_EXCHANGE_RATES = 'exchange_rates';
2024

2125
/**
2226
* @inheritDoc

‎app/code/Magento/Fedex/etc/adminhtml/system.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
</field>
136136
<field id="sort_order" translate="label" type="text" sortOrder="290" showInDefault="1" showInWebsite="1" showInStore="0">
137137
<label>Sort Order</label>
138+
<validate>validate-number validate-zero-or-greater</validate>
138139
</field>
139140
</group>
140141
</section>

‎app/code/Magento/OfflineShipping/etc/adminhtml/system.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
</field>
3232
<field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
3333
<label>Sort Order</label>
34+
<validate>validate-number validate-zero-or-greater</validate>
3435
</field>
3536
<field id="title" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
3637
<label>Title</label>
@@ -92,6 +93,7 @@
9293
</field>
9394
<field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
9495
<label>Sort Order</label>
96+
<validate>validate-number validate-zero-or-greater</validate>
9597
</field>
9698
<field id="title" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
9799
<label>Title</label>
@@ -130,6 +132,7 @@
130132
</field>
131133
<field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
132134
<label>Sort Order</label>
135+
<validate>validate-number validate-zero-or-greater</validate>
133136
</field>
134137
<field id="title" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
135138
<label>Title</label>

‎app/code/Magento/Ups/etc/adminhtml/system.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
</field>
9898
<field id="sort_order" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="0">
9999
<label>Sort Order</label>
100+
<validate>validate-number validate-zero-or-greater</validate>
100101
</field>
101102
<field id="title" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
102103
<label>Title</label>

‎app/code/Magento/Usps/etc/adminhtml/system.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
</field>
137137
<field id="sort_order" translate="label" type="text" sortOrder="220" showInDefault="1" showInWebsite="1" showInStore="0">
138138
<label>Sort Order</label>
139+
<validate>validate-number validate-zero-or-greater</validate>
139140
</field>
140141
</group>
141142
</section>

‎app/design/adminhtml/Magento/backend/web/js/theme.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,18 @@ define('globalNavigation', [
267267
if (subMenu.length) {
268268
e.preventDefault();
269269
}
270-
271-
menuItem.addClass('_show')
272-
.siblings(menuItemSelector)
273-
.removeClass('_show');
274-
275-
subMenu.attr('aria-expanded', 'true');
276-
277270
closeBtn.on('click', close);
278271

279-
this.overlay.show(0).on('click', close);
280-
this.menuLinks.last().off('blur');
272+
if ($(menuItem).hasClass('_show')) {
273+
closeBtn.trigger('click');
274+
} else {
275+
menuItem.addClass('_show')
276+
.siblings(menuItemSelector)
277+
.removeClass('_show');
278+
subMenu.attr('aria-expanded', 'true');
279+
this.overlay.show(0).on('click', close);
280+
this.menuLinks.last().off('blur');
281+
}
281282
},
282283

283284
/**

0 commit comments

Comments
 (0)