Reworked GraphQL tutorial

src/guides/v2.3/graphql/index.md

@@ -10,22 +10,22 @@ landing-page: GraphQL Developer's Guide
 
 As of Magento 2.3.4, GraphQL provides the following features:
 
-*  Support for all product types, payment methods, and shipping methods
-*  Achieved <.5 sec average response times with 500 concurrent requests
-*  Redesigned a feature rich layered navigation
+-  Support for all product types, payment methods, and shipping methods
+-  Achieved <.5 sec average response times with 500 concurrent requests
+-  Redesigned a feature rich layered navigation
 
 ## Where we're going
 
 The `graphql-ce` Community Engineering repository has been archived. Development for Magento 2.3.5 will be limited to bug fixes.
 
 For the 2.4.0 and 2.4.1 releases, Magento teams are working toward completing GraphQL coverage for Business to Consumer (B2C) uses cases, with emphasis on the following:
 
-*  Reorders
-*  Inventory Management store pickups
-*  Order history for logged in customers
-*  Replace product-specific mutations that add products to a cart with a single mutation that can handle all product types
-*  Gift wrapping and messages
-*  Saved payment methods
+-  Reorders
+-  Inventory Management store pickups
+-  Order history for logged in customers
+-  Replace product-specific mutations that add products to a cart with a single mutation that can handle all product types
+-  Gift wrapping and messages
+-  Saved payment methods
 
 We also expect to begin adding coverage for B2B scenarios.
 

src/guides/v2.3/graphql/tutorials/checkout/checkout-add-product-to-cart.md

@@ -31,9 +31,11 @@ If you add a product to the shopping cart as a registered customer, be sure to s
 
 ## Add a simple product into the shopping cart
 
-`{ CART_ID }` is the unique shopping cart ID from [Step 2. Create empty cart]({{ page.baseurl }}/graphql/tutorials/checkout/checkout-add-product-to-cart.html).
+The following mutation adds a simple product into the shopping cart.
 
-The following mutation adds a **simple product** into shopping cart.
+Replace `{ CART_ID }` with the unique shopping cart ID from [Step 2. Create empty cart]({{ page.baseurl }}/graphql/tutorials/checkout/checkout-add-product-to-cart.html).
+
+In this example, we will add the Aim Analog Watch (SKU 24-MG04) from the default Luma catalog to the cart. The SKU identifies the product to be added.
 
 **Request:**
 
@@ -46,7 +48,7 @@ mutation {
         {
           data: {
             quantity: 1
-            sku: "simple-product"
+            sku: "24-MG04"
           }
         }
       ]
@@ -75,9 +77,9 @@ mutation {
       "cart": {
         "items": [
           {
-            "id": "508",
+            "id": "5",
             "product": {
-              "sku": "simple-product",
+              "sku": "24-MG04",
               "stock_status": "IN_STOCK"
             },
             "quantity": 1
@@ -91,7 +93,8 @@ mutation {
 
 ## Add a virtual product into the shopping cart
 
-The following mutation adds a **virtual product** into shopping cart.
+The following mutation adds a virtual product into the shopping cart.
+In this example, we add the Beginner's Yoga video downloadable product (SKU 240-LV04).
 
 **Request:**
 
@@ -104,7 +107,7 @@ mutation {
         {
           data: {
             quantity: 1
-            sku: "virtual-product"
+            sku: "240-LV04"
           }
         }
       ]
@@ -133,9 +136,17 @@ mutation {
       "cart": {
         "items": [
           {
-            "id": "509",
+            "id": "5",
             "product": {
-              "sku": "virtual-product",
+              "sku": "24-MG04",
+              "stock_status": "IN_STOCK"
+            },
+            "quantity": 1
+          },
+          {
+            "id": "6",
+            "product": {
+              "sku": "240-LV04",
               "stock_status": "IN_STOCK"
             },
             "quantity": 1
@@ -147,6 +158,8 @@ mutation {
 }
 ```
 
+The response lists all items currently in the cart, including the just-added video download.
+
 ## Verify this step {#verify-step}
 
 1. Sign in as a customer to the website using the email `[email protected]` and password `b1b2b3l@w+`.

src/guides/v2.3/graphql/tutorials/checkout/checkout-billing-address.md

@@ -17,21 +17,16 @@ contributor_link: https://www.atwix.com/
 {:.bs-callout-tip}
 You must always set the billing address to place an order.
 
-Use the [setBillingAddressOnCart]({{ page.baseurl }}/graphql/mutations/set-billing-address.html) mutation to set a billing address. You can set the billing address in the following ways:
+Use the [setBillingAddressOnCart]({{ page.baseurl }}/graphql/mutations/set-billing-address.html) mutation to set a billing address.
 
-*  Add a new billing address
-*  Add a new billing address and set it as the shipping addresses
-*  Use an address from the logged-in customer's address book
+## Add a billing address to the cart
 
-## Add a new billing address
+Similar to the shipping address, add a billing address to the cart. `{ CART_ID }` is the unique shopping cart ID from [Step 2. Create empty cart]({{ page.baseurl }}/graphql/tutorials/checkout/checkout-add-product-to-cart.html). The street address is also different, so we can see that different addresses are being created.
 
-The following mutation adds a new billing address. `{ CART_ID }` is the unique shopping cart ID from [Step 2. Create empty cart]({{ page.baseurl }}/graphql/tutorials/checkout/checkout-add-product-to-cart.html).
+Send the customer's authorization token in the `Authorization` parameter of the header. See [Authorization tokens]({{page.baseurl}}/graphql/authorization-tokens.html) for more information.
 
 **Request:**
 
-{:.bs-callout .bs-callout-info}
-For logged-in customers, send the customer's authorization token in the `Authorization` parameter of the header. See [Authorization tokens]({{page.baseurl}}/graphql/authorization-tokens.html) for more information.
-
 ```graphql
 mutation {
   setBillingAddressOnCart(
@@ -42,236 +37,15 @@ mutation {
           firstname: "John"
           lastname: "Doe"
           company: "Company Name"
-          street: ["320 N Crescent Dr", "Beverly Hills"]
+          street: ["64 Strawberry Dr", "Beverly Hills"]
           city: "Los Angeles"
           region: "CA"
+          region_id: 12
           postcode: "90210"
           country_code: "US"
           telephone: "123-456-0000"
-          save_in_address_book: false
-        }
-      }
-    }
-  ) {
-    cart {
-      billing_address {
-        firstname
-        lastname
-        company
-        street
-        city
-        region{
-          code
-          label
-        }
-        postcode
-        telephone
-        country {
-          code
-          label
-        }
-      }
-    }
-  }
-}
-```
-
-**Response:**
-
-```json
-{
-  "data": {
-    "setBillingAddressOnCart": {
-      "cart": {
-        "billing_address": {
-          "firstname": "John",
-          "lastname": "Doe",
-          "company": "Company Name",
-          "street": [
-            "320 N Crescent Dr",
-            "Beverly Hills"
-          ],
-          "city": "Los Angeles",
-          "region": {
-            "code": "CA",
-            "label": "California"
-          },
-          "postcode": "90210",
-          "telephone": "123-456-0000",
-          "country": {
-            "code": "US",
-            "label": "US"
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-## Add a new address for billing and shipping
-
-The following mutation includes the `same_as_shipping` attribute, which allows the same address to be used for billing and shipping.
-
-**Request:**
-
-```text
-mutation {
-  setBillingAddressOnCart(
-    input: {
-      cart_id: "{ CART_ID }"
-      billing_address: {
-        address: {
-          firstname: "John"
-            lastname: "Doe"
-            company: "Company Name"
-            street: ["320 N Crescent Dr", "Beverly Hills"]
-            city: "Los Angeles"
-            region: "CA"
-            postcode: "90210"
-            country_code: "US"
-            telephone: "123-456-0000"
-            save_in_address_book: false
-          }
-          same_as_shipping: true
-      }
-    }
-  ) {
-    cart {
-      billing_address {
-        firstname
-        lastname
-        company
-        street
-        city
-        region{
-          code
-          label
-        }
-        postcode
-        telephone
-        country {
-          code
-          label
-        }
-      }
-      shipping_addresses {
-        firstname
-        lastname
-        company
-        street
-        city
-        postcode
-        telephone
-        country {
-          code
-          label
-        }
-      }
-    }
-  }
-}
-```
-
-**Response:**
-
-```json
-{
-  "data": {
-    "setBillingAddressOnCart": {
-      "cart": {
-        "billing_address": {
-          "firstname": "John",
-          "lastname": "Doe",
-          "company": "Company Name",
-          "street": [
-            "320 N Crescent Dr",
-            "Beverly Hills"
-          ],
-          "city": "Los Angeles",
-          "region": {
-            "code": "CA",
-            "label": "California"
-          },
-          "postcode": "90210",
-          "telephone": "123-456-0000",
-          "country": {
-            "code": "US",
-            "label": "US"
-          }
-        },
-        "shipping_addresses": [
-          {
-            "firstname": "John",
-            "lastname": "Doe",
-            "company": "Company Name",
-            "street": [
-              "320 N Crescent Dr",
-              "Beverly Hills"
-            ],
-            "city": "Los Angeles",
-            "postcode": "90210",
-            "telephone": "123-456-0000",
-            "country": {
-              "code": "US",
-              "label": "US"
-            }
-          }
-        ]
-      }
-    }
-  }
-}
-```
-
-## Use an existing customer address
-
-First, query the customer to return the list of address IDs.
-
-**Request:**
-
-```text
-query {
-  customer {
-    addresses {
-      id
-      default_billing
-      default_shipping
-    }
-  }
-}
-```
-
-**Response:**
-
-```text
-  "data": {
-    "customer": {
-      "addresses": [
-        {
-          "id": 2,
-          "default_billing": true,
-          "default_shipping": true
+          save_in_address_book: true
         }
-      ]
-    }
-  }
-}
-```
-
-Set `{ CUSTOMER_ADDRESS_ID }` to an `id` returned in the query.
-
-`{ CART_ID }` is the unique shopping cart ID from [Step 2. Create empty cart]({{ page.baseurl }}/graphql/tutorials/checkout/checkout-add-product-to-cart.html).
-
-**Request:**
-
-```text
-mutation {
-  setBillingAddressOnCart(
-    input: {
-      cart_id: "{ CART_ID }"
-      billing_address: {
-          customer_address_id: { CUSTOMER_ADDRESS_ID }
       }
     }
   ) {
@@ -310,7 +84,7 @@ mutation {
           "lastname": "Doe",
           "company": "Company Name",
           "street": [
-            "320 N Crescent Dr",
+            "64 Strawberry Dr",
             "Beverly Hills"
           ],
           "city": "Los Angeles",