File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed
app/code/Magento/Sales/Model/AdminOrder
dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -787,6 +787,7 @@ public function getCustomerCompareList()
787
787
public function getCustomerGroupId ()
788
788
{
789
789
$ groupId = $ this ->getQuote ()->getCustomerGroupId ();
790
+ // @phpstan-ignore-next-line
790
791
if (!isset ($ groupId )) {
791
792
$ groupId = $ this ->getSession ()->getCustomerGroupId ();
792
793
}
@@ -1445,9 +1446,10 @@ public function setShippingAddress($address)
1445
1446
*/
1446
1447
$ saveInAddressBook = (int )(!empty ($ address ['save_in_address_book ' ]));
1447
1448
$ shippingAddress ->setData ('save_in_address_book ' , $ saveInAddressBook );
1448
- }
1449
- if ($ address instanceof \Magento \Quote \Model \Quote \Address) {
1449
+ } elseif ($ address instanceof \Magento \Quote \Model \Quote \Address) {
1450
1450
$ shippingAddress = $ address ;
1451
+ } else {
1452
+ $ shippingAddress = null ;
1451
1453
}
1452
1454
1453
1455
$ this ->setRecollect (true );
Original file line number Diff line number Diff line change @@ -684,7 +684,6 @@ public function testMoveQuoteItemToCart()
684
684
public function testGetCustomerCartNewCart ()
685
685
{
686
686
$ customerIdFromFixture = 1 ;
687
- $ customerEmailFromFixture = 'customer@example.com ' ;
688
687
689
688
/** Preconditions */
690
689
/** @var SessionQuote $session */
You can’t perform that action at this time.
0 commit comments