Skip to content

magento/magento2#26107: Exception message on cart with no shipment items #28904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 15, 2020
Merged

magento/magento2#26107: Exception message on cart with no shipment items #28904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1091a30
magento/magento2#26107: Exception message on cart with no shipment items
michalderlatka Jun 26, 2020
c8c4e06
magento/magento2#26107: Exception message on cart with no shipment items
michalderlatka Jun 27, 2020
77bd613
magento/magento2#26107: Exception message on cart with no shipment it…
michalderlatka Jun 28, 2020
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
11 changes: 9 additions & 2 deletions app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use Magento\Quote\Model\ShippingAddressManagementInterface;

/**
* Assign shipping address to cart
* Assigning shipping address to cart
*/
class AssignShippingAddressToCart
{
Expand Down Expand Up @@ -49,7 +49,14 @@ public function execute(
try {
$this->shippingAddressManagement->assign($cart->getId(), $shippingAddress);
} catch (NoSuchEntityException $e) {
throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
if ($cart->getIsVirtual()) {
throw new GraphQlNoSuchEntityException(
__('Shipping address is not allowed on cart: cart contains no items for shipment.'),
$e
);
} else {
throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
}
} catch (InputException $e) {
throw new GraphQlInputException(__($e->getMessage()), $e);
}
Expand Down
2 changes: 1 addition & 1 deletion .../api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function testSetNewShippingAddressOnCartWithSimpleProduct()
public function testSetNewShippingAddressOnCartWithVirtualProduct()
{
$this->expectException(\Exception::class);
$this->expectExceptionMessage('The Cart includes virtual product(s) only, so a shipping address is not used.');
$this->expectExceptionMessage('Shipping address is not allowed on cart: cart contains no items for shipment.');

$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');

Expand Down
2 changes: 1 addition & 1 deletion ...sts/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function testSetNewShippingAddressOnCartWithSimpleProduct()
public function testSetNewShippingAddressOnCartWithVirtualProduct()
{
$this->expectException(\Exception::class);
$this->expectExceptionMessage('The Cart includes virtual product(s) only, so a shipping address is not used.');
$this->expectExceptionMessage('Shipping address is not allowed on cart: cart contains no items for shipment.');

$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');

Expand Down