Skip to content

Commit 97b2ea4

Browse files
authored
Merge pull request #9768 from magento-gl/spartans_pr_30042025
[Spartans] BugFix Delivery
2 parents 87b8b34 + 0152cca commit 97b2ea4

File tree

2 files changed

+2
-2
lines changed
  • app
    • code/Magento/SalesGraphQl/Model/Formatter
    • design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main

2 files changed

+2
-2
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;

0 commit comments

Comments
 (0)