#26107: Exception message on cart with no shipment items

Author: michalderlatka

app/code/Magento/Quote/Model/ShippingAddressManagement.php

@@ -88,7 +88,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
         $quote = $this->quoteRepository->getActive($cartId);
         if ($quote->isVirtual()) {
             throw new NoSuchEntityException(
-                __('Shipping address is not allowed on cart: cart contains no items for shipment.')
+                __('The Cart includes virtual product(s) only, so a shipping address is not used.')
             );
         }
 

app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php

@@ -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);
         }