PWA-1506: Billing address parameter 'same_as_shipping' cause error 'The shipping method is missing'

* Updated exception messages per code review suggestions

Co-authored-by: Kevin Harper <[email protected]>

Author: amolina-adobe

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

@@ -100,7 +100,7 @@ private function checkForInputExceptions(
 
         if (null === $customerAddressId && null === $addressInput && empty($sameAsShipping)) {
             throw new GraphQlInputException(
-                __('The billing address must contain either "customer_address_id", "address" or "same_as_shipping".')
+                __('The billing address must contain either "customer_address_id", "address", or "same_as_shipping".')
             );
         }
 
@@ -123,13 +123,13 @@ private function validateCanUseShippingForBilling(CartInterface $quote)
 
         if (count($shippingAddresses) > 1) {
             throw new GraphQlInputException(
-                __('Could not use the "same_as_shipping" option with multiple shipping addresses set.')
+                __('Could not use the "same_as_shipping" option, because multiple shipping addresses have been set.')
             );
         }
 
         if (empty($shippingAddresses) || $shippingAddresses[0]->validate() !== true) {
             throw new GraphQlInputException(
-                __('Could not use the "same_as_shipping" option as the shipping address has not been set.')
+                __('Could not use the "same_as_shipping" option, because the shipping address has not been set.')
             );
         }
     }
@@ -146,7 +146,7 @@ private function validateCanUseBillingForShipping(CartInterface $quote)
 
         if (count($shippingAddresses) > 1) {
             throw new GraphQlInputException(
-                __('Could not use the "use_for_shipping" option with multiple shipping addresses already set.')
+                __('Could not use the "use_for_shipping" option, because multiple shipping addresses have already been set.')
             );
         }
     }

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php

@@ -420,7 +420,7 @@ public function testSetNewBillingAddressWithoutCustomerAddressIdAndAddress()
 QUERY;
 
         self::expectExceptionMessage(
-            'The billing address must contain either "customer_address_id", "address" or "same_as_shipping".'
+           'The billing address must contain either "customer_address_id", "address", or "same_as_shipping".'
         );
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
@@ -532,7 +532,7 @@ public function testSetBillingAddressWithSameAsShippingWithoutShippingAddressOnC
 }
 QUERY;
         self::expectExceptionMessage(
-            'Could not use the "same_as_shipping" option as the shipping address has not been set.'
+            'Could not use the "same_as_shipping" option, because the shipping address has not been set.'
         );
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
@@ -570,7 +570,7 @@ public function testSetNewBillingAddressWithSameAsShippingAndMultishipping()
 QUERY;
 
         self::expectExceptionMessage(
-            'Could not use the "same_as_shipping" option with multiple shipping addresses set.'
+            'Could not use the "same_as_shipping" option, because multiple shipping addresses have been set.'
         );
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php

@@ -423,7 +423,7 @@ public function testSetBillingAddressWithoutProvidingAddress()
 QUERY;
 
         self::expectExceptionMessage(
-            'The billing address must contain either "customer_address_id", "address" or "same_as_shipping".'
+            'The billing address must contain either "customer_address_id", "address", or "same_as_shipping".'
         );
         $this->graphQlMutation($query);
     }
@@ -543,7 +543,7 @@ public function testSetBillingAddressWithSameAsShippingWithoutShippingAddressOnC
 }
 QUERY;
         self::expectExceptionMessage(
-            'Could not use the "same_as_shipping" option as the shipping address has not been set.'
+            'Could not use the "same_as_shipping" option, because the shipping address has not been set.'
         );
         $this->graphQlMutation($query);
     }
@@ -580,7 +580,7 @@ public function testSetBillingAddressWithSameAsShippingAndMultishipping()
 QUERY;
 
         self::expectExceptionMessage(
-            'Could not use the "same_as_shipping" option with multiple shipping addresses set.'
+            'Could not use the "same_as_shipping" option, because multiple shipping addresses have been set.'
         );
         $this->graphQlMutation($query);
     }