ENGCOM-4381: Cart Shipping Address and Method Fixes #391

Author: naydav

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

@@ -41,6 +41,7 @@ public function execute(QuoteAddress $address): array
         $addressData['model'] = $address;
 
         $addressData = array_merge($addressData, [
+            'address_id' => $address->getId(),
             'country' => [
                 'code' => $address->getCountryId(),
                 'label' => $address->getCountry()

app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php

@@ -72,10 +72,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (!$shippingMethod['cart_address_id']) {
             throw new GraphQlInputException(__('Required parameter "cart_address_id" is missing'));
         }
-        if (!$shippingMethod['shipping_carrier_code']) {
+        if (!$shippingMethod['carrier_code']) {
             throw new GraphQlInputException(__('Required parameter "shipping_carrier_code" is missing'));
         }
-        if (!$shippingMethod['shipping_method_code']) {
+        if (!$shippingMethod['method_code']) {
             throw new GraphQlInputException(__('Required parameter "shipping_method_code" is missing'));
         }
 
@@ -85,8 +85,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $this->setShippingMethodOnCart->execute(
             $cart,
             $shippingMethod['cart_address_id'],
-            $shippingMethod['shipping_carrier_code'],
-            $shippingMethod['shipping_method_code']
+            $shippingMethod['carrier_code'],
+            $shippingMethod['method_code']
         );
 
         return [

app/code/Magento/QuoteGraphQl/etc/schema.graphqls

@@ -128,6 +128,7 @@ type Cart {
 }
 
 type CartAddress {
+    address_id: Int
     firstname: String
     lastname: String
     company: String