File tree Expand file tree Collapse file tree 3 files changed +9
-5
lines changed
SalesGraphQl/Model/Formatter
design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main Expand file tree Collapse file tree 3 files changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -242,11 +242,15 @@ public function sendMessage(): void
242
242
private function setReturnPath (SymfonyMessage $ email ): void
243
243
{
244
244
if ($ this ->isSetReturnPath === 2 && $ this ->returnPathValue ) {
245
- $ email ->getHeaders ()->addMailboxListHeader ('Sender ' , [ $ this ->returnPathValue ] );
245
+ $ email ->getHeaders ()->addMailboxHeader ('Sender ' , $ this ->returnPathValue );
246
246
} elseif ($ this ->isSetReturnPath === 1 &&
247
- !empty ($ fromAddresses = $ email ->getHeaders ()->get ('From ' )?->getAddresses())) {
247
+ !empty (
248
+ /** @var \Symfony\Component\Mime\Address[] $fromAddresses */
249
+ $ fromAddresses = $ email ->getHeaders ()->get ('From ' )?->getAddresses()
250
+ )
251
+ ) {
248
252
reset ($ fromAddresses );
249
- $ email ->getHeaders ()->addMailboxListHeader ('Sender ' , [ current ($ fromAddresses )-> getAddress ()] );
253
+ $ email ->getHeaders ()->addMailboxHeader ('Sender ' , current ($ fromAddresses ));
250
254
}
251
255
}
252
256
Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ public function format(OrderInterface $orderModel): array
57
57
'shipping_address ' => $ this ->orderAddress ->getOrderShippingAddress ($ orderModel ),
58
58
'billing_address ' => $ this ->orderAddress ->getOrderBillingAddress ($ orderModel ),
59
59
'payment_methods ' => $ this ->orderPayments ->getOrderPaymentMethod ($ orderModel ),
60
- 'applied_coupons ' => $ orderModel ->getCouponCode () ? ['code ' => $ orderModel ->getCouponCode ()] : [],
60
+ 'applied_coupons ' => $ orderModel ->getCouponCode () ? [[ 'code ' => $ orderModel ->getCouponCode ()] ] : [],
61
61
'model ' => $ orderModel ,
62
62
'comments ' => $ this ->getOrderComments ($ orderModel )
63
63
];
Original file line number Diff line number Diff line change 24
24
padding : @page-main-actions__padding ;
25
25
}
26
26
27
- .actions-scrollable {
27
+ .customer-index-edit . actions-scrollable {
28
28
.page-actions {
29
29
display : flex ;
30
30
overflow-x : auto ;
You can’t perform that action at this time.
0 commit comments