Skip to content

Commit 614ff51

Browse files
committed
Merge branch '2.4.6-develop' into ACQE-4594
2 parents cf84928 + b08e5a2 commit 614ff51

File tree

3 files changed

+23
-24
lines changed

3 files changed

+23
-24
lines changed

app/code/Magento/Sales/view/adminhtml/web/order/view/post-wrapper.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ define([
2525
}));
2626
}
2727

28-
$('#order-view-cancel-button').on('click', function () {
28+
$(document).on('click', '#order-view-cancel-button', function () {
2929
var msg = $.mage.__('Are you sure you want to cancel this order?'),
3030
url = $('#order-view-cancel-button').data('url');
3131

@@ -45,13 +45,13 @@ define([
4545
return false;
4646
});
4747

48-
$('#order-view-hold-button').on('click', function () {
48+
$(document).on('click', '#order-view-hold-button', function () {
4949
var url = $('#order-view-hold-button').data('url');
5050

5151
getForm(url).appendTo('body').trigger('submit');
5252
});
5353

54-
$('#order-view-unhold-button').on('click', function () {
54+
$(document).on('click', '#order-view-unhold-button', function () {
5555
var url = $('#order-view-unhold-button').data('url');
5656

5757
getForm(url).appendTo('body').trigger('submit');

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"config": {
1010
"allow-plugins": {
1111
"dealerdirect/phpcodesniffer-composer-installer": true,
12+
"laminas/laminas-dependency-plugin": true,
1213
"magento/*": true,
1314
"php-http/discovery": true
1415
},
@@ -67,9 +68,9 @@
6768
"laminas/laminas-validator": "^2.23",
6869
"league/flysystem": "^2.4",
6970
"league/flysystem-aws-s3-v3": "^2.4",
70-
"magento/composer": "^1.9.0-beta2",
71+
"magento/composer": "^1.9.0",
7172
"magento/composer-dependency-version-audit-plugin": "^0.1",
72-
"magento/magento-composer-installer": ">=0.4.0-beta1",
73+
"magento/magento-composer-installer": ">=0.4.0",
7374
"magento/zend-cache": "^1.16",
7475
"magento/zend-db": "^1.16",
7576
"magento/zend-pdf": "^1.16",

composer.lock

Lines changed: 17 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)