Skip to content

Commit 7cbfa57

Browse files
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-3854
2 parents 4bf6e1c + 97b2ea4 commit 7cbfa57

File tree

4 files changed

+81
-75
lines changed

4 files changed

+81
-75
lines changed

app/code/Magento/SalesGraphQl/Model/Formatter/Order.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function format(OrderInterface $orderModel): array
5757
'shipping_address' => $this->orderAddress->getOrderShippingAddress($orderModel),
5858
'billing_address' => $this->orderAddress->getOrderBillingAddress($orderModel),
5959
'payment_methods' => $this->orderPayments->getOrderPaymentMethod($orderModel),
60-
'applied_coupons' => $orderModel->getCouponCode() ? ['code' => $orderModel->getCouponCode()] : [],
60+
'applied_coupons' => $orderModel->getCouponCode() ? [['code' => $orderModel->getCouponCode()]] : [],
6161
'model' => $orderModel,
6262
'comments' => $this->getOrderComments($orderModel)
6363
];

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
padding: @page-main-actions__padding;
2525
}
2626

27-
.actions-scrollable {
27+
.customer-index-edit .actions-scrollable {
2828
.page-actions {
2929
display: flex;
3030
overflow-x: auto;

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"wikimedia/less.php": "^5.0"
9494
},
9595
"require-dev": {
96-
"magento/magento-allure-phpunit": "^3.0",
96+
"allure-framework/allure-phpunit": "^3.1",
9797
"dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0",
9898
"dg/bypass-finals": "^1.4",
9999
"friendsofphp/php-cs-fixer": "^3.22",

composer.lock

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

0 commit comments

Comments
 (0)