Skip to content

Commit 605d211

Browse files
committed
MC-35161: No Payment method is showing in Admin Create Order for one website only.
- Static tests fix
1 parent a80fa10 commit 605d211

File tree

2 files changed

+4
-3
lines changed
  • app/code/Magento/Sales/Model/AdminOrder
  • dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder

2 files changed

+4
-3
lines changed

app/code/Magento/Sales/Model/AdminOrder/Create.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,7 @@ public function getCustomerCompareList()
787787
public function getCustomerGroupId()
788788
{
789789
$groupId = $this->getQuote()->getCustomerGroupId();
790+
// @phpstan-ignore-next-line
790791
if (!isset($groupId)) {
791792
$groupId = $this->getSession()->getCustomerGroupId();
792793
}
@@ -1445,9 +1446,10 @@ public function setShippingAddress($address)
14451446
*/
14461447
$saveInAddressBook = (int)(!empty($address['save_in_address_book']));
14471448
$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) {
14501450
$shippingAddress = $address;
1451+
} else {
1452+
$shippingAddress = null;
14511453
}
14521454

14531455
$this->setRecollect(true);

dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,6 @@ public function testMoveQuoteItemToCart()
684684
public function testGetCustomerCartNewCart()
685685
{
686686
$customerIdFromFixture = 1;
687-
$customerEmailFromFixture = 'customer@example.com';
688687

689688
/** Preconditions */
690689
/** @var SessionQuote $session */

0 commit comments

Comments
 (0)