Skip to content
This repository has been archived by the owner on Dec 19, 2019. It is now read-only.

Prevent Error When Getting Payment Method Before Setting #665

Merged
merged 1 commit into from
May 10, 2019
Merged

Prevent Error When Getting Payment Method Before Setting #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions app/code/Magento/QuoteGraphQl/Model/Resolver/SelectedPaymentMethod.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,15 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
return [];
}

try {
$methodTitle = $payment->getMethodInstance()->getTitle();
} catch (LocalizedException $e) {
$methodTitle = '';
}

return [
'code' => $payment->getMethod(),
'title' => $payment->getMethodInstance()->getTitle(),
'code' => $payment->getMethod() ?? '',
'title' => $methodTitle,
'purchase_order_number' => $payment->getPoNumber(),
];
}
Expand Down
21 changes: 21 additions & 0 deletions .../api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,27 @@ public function testGetSelectedPaymentMethod()
$this->assertEquals('checkmo', $response['cart']['selected_payment_method']['code']);
}

/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
*/
public function testGetSelectedPaymentMethodBeforeSet()
{
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');

$query = $this->getQuery($maskedQuoteId);
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());

$this->assertArrayHasKey('cart', $response);
$this->assertArrayHasKey('selected_payment_method', $response['cart']);
$this->assertArrayHasKey('code', $response['cart']['selected_payment_method']);
$this->assertEquals('', $response['cart']['selected_payment_method']['code']);
}

/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @expectedException \Exception
Expand Down
20 changes: 20 additions & 0 deletions ...sts/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,26 @@ public function testGetSelectedPaymentMethod()
$this->assertEquals('checkmo', $response['cart']['selected_payment_method']['code']);
}

/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
*/
public function testGetSelectedPaymentMethodBeforeSet()
{
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');

$query = $this->getQuery($maskedQuoteId);
$response = $this->graphQlQuery($query);

$this->assertArrayHasKey('cart', $response);
$this->assertArrayHasKey('selected_payment_method', $response['cart']);
$this->assertArrayHasKey('code', $response['cart']['selected_payment_method']);
$this->assertEquals('', $response['cart']['selected_payment_method']['code']);
}

/**
* @expectedException \Exception
*/
Expand Down