Merge small-changes branch into master (#8462)

* correct path for di.xml

* Added the error coverage for redeemGiftCardBalanceAsStoreCredit mutation (#8444)

* added the error coverage for redeemGiftCardBalanceAsStoreCredit mutation

* Update redeem-giftcard-balance.md

Co-authored-by: Kevin Harper <keharper@users.noreply.github.com>

* added error coverage for remove-store-credit mutation (#8447)

* added the error coverage for removeRewardPointsFromCart mutation (#8448)

* added the error coverage for removeRewardPointsFromCart mutation

* Update remove-reward-points.md

Co-authored-by: Kevin Harper <keharper@users.noreply.github.com>

* added the errors coverage for apply giftCard mutation (#8449)

* added error coverage for apply giftcard mutation

* lint error

* Update apply-giftcard.md

Co-authored-by: Kevin Harper <keharper@users.noreply.github.com>

* Added the error coverage for applyStoreCreditToCart mutation (#8450)

* added the error coverage for applyStoreCreditToCart mutation

* added the error coverage for applyStoreCreditToCart mutation

* added the error coverage for applyStoreCreditToCart mutation

* Update apply-store-credit.md

* Update apply-store-credit.md

Co-authored-by: Kevin Harper <keharper@users.noreply.github.com>

* added the error coverage for pickupLocations query (#8452)

* Added the error coverage for urlResolver query (#8453)

* added error coverage for payflowtoken mutation (#8454)

* added error coverage for payflowtoken mutation

* fixed the lint errors

* Update create-payflow-pro-token.md

Co-authored-by: Kevin Harper <keharper@users.noreply.github.com>

* added error coverage for apply-reward-points mutation (#8455)

* Added the error coverage for giftCardAccount query (#8456)

* Added the error coverage for giftCardAccount query

* Update giftcard-account.md

Co-authored-by: Kevin Harper <keharper@users.noreply.github.com>

* Added errors documentation for paypal express token mutation (#8457)

Co-authored-by: Kevin Harper <keharper@users.noreply.github.com>

* sample-data-update (#8430)

* Token expires info added (#8463)

Co-authored-by: Kristof, Fooman <kristof@fooman.co.nz>
Co-authored-by: Dinesh V B <71248239+dineshvb@users.noreply.github.com>
Co-authored-by: Sathiya Prakash <50226394+sathiyaaa@users.noreply.github.com>
Co-authored-by: Rakesh  Jesadiya <jesadiya.rakesh@gmail.com>
Co-authored-by: Ajith <47966038+ajithkumar-maragathavel@users.noreply.github.com>

Author: 6 people

src/_includes/install/sampledata/sample-data_list-of-modules.md

@@ -21,7 +21,6 @@
 *  magento/module-theme-sample-data
 *  magento/module-widget-sample-data
 *  magento/module-wishlist-sample-data
-*  magento/sample-data
 *  magento/sample-data-media
 
 {{site.data.var.ee}} only:

src/guides/v2.3/frontend-dev-guide/themes/admin_theme_apply.md

@@ -42,9 +42,9 @@ Each step is described further with more details.
 
 ## Specify the custom Admin theme in `di.xml` {#specify_di}
 
-You need to specify the admin theme to be used in the `<your_module_dir>/etc/adminhtml/di.xml` file. Add it, if the file does not yet exist in your module.
+You need to specify the admin theme to be used in the `<your_module_dir>/etc/di.xml` file. Add it, if the file does not yet exist in your module.
 
-In `<your_module_dir>/etc/adminhtml/di.xml` add the following (replace the placeholders with the vendor name and theme code of your Admin theme):
+In `<your_module_dir>/etc/di.xml` add the following (replace the placeholders with the vendor name and theme code of your Admin theme):
 
 ```xml
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">

src/guides/v2.3/graphql/authorization-tokens.md

@@ -43,8 +43,12 @@ You can now use this token in the Authorization request header field for any que
 
 If necessary, you also can [revoke the customer's token]({{ page.baseurl }}/graphql/mutations/revoke-customer-token.html
 
+By default, a customer token is valid for 1 hour. You can change these values from Admin by selecting **Stores** > **Settings** > **Configuration** > **Services** > **OAuth** > **Access Token Expiration** > **Customer Token Lifetime**.
+
 ## Admin tokens
 
 In Magento GraphQL, you specify an admin token only if you need to query products, categories, price rules, or other entities that are scheduled to be in a campaign (staged content). Staging is supported in {{site.data.var.ee}} only. See [Staging queries]({{page.baseurl}}/graphql/queries/index.html#staging) for more information.
 
 Magento does not provide a GraphQL mutation that generates an admin token. You must use the `POST /V1/integration/admin/token` REST endpoint instead. [Generate the admin token]({{page.baseurl}}/rest/tutorials/prerequisite-tasks/create-admin-token.html) shows how to use this endpoint.
+
+By default, an admin token is valid for 4 hours. You can change these values from Admin by selecting **Stores** > **Settings** > **Configuration** > **Services** > **OAuth** > **Access Token Expiration** > **Admin Token Lifetime**.

src/guides/v2.3/graphql/mutations/apply-store-credit.md

@@ -110,3 +110,11 @@ Attribute |  Data Type | Description
 {% include graphql/cart-object.md %}
 
 [Cart query output]({{page.baseurl}}/graphql/queries/cart.html#cart-output) provides more information about the `Cart` object.
+
+## Errors
+
+Error | Description
+--- | ---
+`Could not find a cart with ID \"xxxxx\"` | The ID provided in the `cart_id` field is invalid or the cart does not exist for the customer.
+`The cart isn't active` | The cart with the given cart ID is unavailable, because the items have been purchased and the cart ID becomes inactive.
+`Field ApplyStoreCreditToCartInput.cart_id of required type String! was not provided` | The value specified in the `ApplyStoreCreditToCartInput.cart_id` argument is empty.

src/guides/v2.3/graphql/mutations/create-payflow-pro-token.md

@@ -103,3 +103,14 @@ Attribute |  Data Type | Description
 `result_code` | Int! |  The **RESULT** returned by PayPal. A value of `0` indicates the transaction was approved
 `secure_token` | String! | Secure token generated by PayPal
 `secure_token_id` | String! | Secure token ID generated by PayPal
+
+## Errors
+
+Error | Description
+--- | ---
+`Could not find a cart with ID "XXX"` | The specified `cart_id` value does not exist in the `quote_id_mask` table.
+`Field PayflowProTokenInput.cart_id of required type String! was not provided.` | You must specify the `cart_id` attribute.
+`Field PayflowProTokenInput.urls of required type PayflowProUrlInput! was not provided.` | You must specify the `urls` attribute.
+`Field PayflowProUrlInput.return_url of required type String! was not provided.` | You must specify the `return_url` attribute.
+`Field PayflowProUrlInput.error_url of required type String! was not provided.` | You must specify the `error_url` attribute.
+`Field PayflowProUrlInput.cancel_url of required type String! was not provided.` | You must specify the `cancel_url` attribute.

src/guides/v2.3/graphql/mutations/create-paypal-express-token.md

@@ -112,3 +112,14 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `edit` | String | The PayPal URL that allows the buyer to edit their checkout details
 `start` | String | The URL to the PayPal login page
+
+## Errors
+
+Error | Description
+--- | ---
+`Required parameter "cart_id" is missing` | The mutation does not contain a `cart_id` argument.
+`Could not find a cart with ID "XXX"` | The specified `cart_id` value does not exist in the `quote_id_mask` table.
+`Field PaypalExpressTokenInput.code of required type String! was not provided.` | The required attribute `code` is missing.
+`The requested Payment Method is not available.` | The payment method is not configured.
+`Field PaypalExpressUrlsInput.cancel_url of required type String! was not provided.` | The required attribute `cancel_url` is missing.
+`Field PaypalExpressUrlsInput.return_url of required type String! was not provided.` | The required attribute `return_url` is missing.

src/guides/v2.3/graphql/mutations/redeem-giftcard-balance.md

@@ -79,4 +79,11 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `balance` | Money | The remaining balance of the gift card, including the currency
 `code` | String | The gift card code
-`expiration_date` | String | The date when the gift card expires, if any
+`expiration_date` | String | The date when the gift card expires, if any
+
+## Errors
+
+Error | Description
+--- | ---
+`Gift card not found` | The specified `gift_card_code` value does not exist in the `giftcardaccount` table or the amount has been already redeemed.
+`Field GiftCardAccountInput.gift_card_code of required type String! was not provided` | The value specified in the `GiftCardAccountInput.gift_card_code` argument is empty.

src/guides/v2.3/graphql/queries/giftcard-account.md

@@ -69,3 +69,10 @@ Attribute |  Data Type | Description
 `balance` | Money | Returns the currency and remaining balance of the gift card
 `code` | String | Returns the gift card code
 `expiration_date` | String | Returns the date when the gift card expires, if any
+
+## Errors
+
+Error | Description
+--- | ---
+`Gift card not found` | The specified `gift_card_code` value does not exist in the `giftcardaccount` table, or the full amount has already been redeemed.
+`Field GiftCardAccountInput.gift_card_code of required type String! was not provided` | The value specified in the `GiftCardAccountInput.gift_card_code` argument is empty.

src/guides/v2.3/graphql/queries/url-resolver.md

@@ -134,3 +134,9 @@ Attribute |  Data Type | Description
 ## Related topics
 
 [Products endpoint]({{page.baseurl}}/graphql/queries/products.html)
+
+## Errors
+
+Error | Description
+--- | ---
+`Field urlResolver.url of type String! is required but not provided.` | The value specified in the `urlResolver.url` argument is empty.

src/guides/v2.4/graphql/authorization-tokens.md

@@ -43,8 +43,12 @@ You can now use this token in the Authorization request header field for any que
 
 If necessary, you also can [revoke the customer's token]({{ page.baseurl }}/graphql/mutations/revoke-customer-token.html
 
+By default, a customer token is valid for 1 hour. You can change these values from Admin by selecting **Stores** > **Settings** > **Configuration** > **Services** > **OAuth** > **Access Token Expiration** > **Customer Token Lifetime**.
+
 ## Admin tokens
 
 In Magento GraphQL, you specify an admin token only if you need to query products, categories, price rules, or other entities that are scheduled to be in a campaign (staged content). Staging is supported in {{site.data.var.ee}} only. See [Staging queries]({{page.baseurl}}/graphql/queries/index.html#staging) for more information.
 
 Magento does not provide a GraphQL mutation that generates an admin token. You must use a REST endpoint such as `POST /V1/tfa/provider/google/authenticate` instead. [Generate the admin token]({{page.baseurl}}/rest/tutorials/prerequisite-tasks/create-admin-token.html) shows how to use this endpoint.
+
+By default, an admin token is valid for 4 hours. You can change these values from Admin by selecting **Stores** > **Settings** > **Configuration** > **Services** > **OAuth** > **Access Token Expiration** > **Admin Token Lifetime**.