Merge branch '2.4.1-develop' into kh_rewards-mutations

Author: keharper

.github/CONTRIBUTING.md

@@ -24,6 +24,8 @@ If you write and contribute a full topic, we will add your name (or your company
 1. [Fork](https://help.github.com/articles/fork-a-repo/) the [DevDocs repository](https://github.com/magento/devdocs). Remember to [sync your fork](https://help.github.com/articles/syncing-a-fork/) and update branches as needed.
 1. Review the [DevDocs guidelines](#contribution-guidelines).
 
+**Note:** If you use a fork instead of a branch, please set permissions to allow maintainers to edit and update the PR. See [Allowing changes to a pull request branch created from a fork](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) in the _GitHub documentation_.
+
 ## Contribute documentation
 
 The following diagram shows the contribution workflow:

Gemfile.lock

@@ -96,7 +96,7 @@ GEM
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     json (2.3.0)
-    kramdown (2.2.1)
+    kramdown (2.3.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
@@ -153,7 +153,7 @@ GEM
     unicode-display_width (1.7.0)
     verbal_expressions (0.1.5)
     wdm (0.1.1)
-    whatsup_github (0.3.0)
+    whatsup_github (0.3.1)
       netrc (~> 0.10)
       octokit (~> 4.14)
       thor (~> 0.20)

src/_data/mde.yml

@@ -211,7 +211,7 @@ extensions:
     name: Product Recommendations
     versions:
       -
-        name: 3.0.4
+        name: 3.0.4+
         support:
           2.3.0: supported
           2.3.1: supported
@@ -240,3 +240,13 @@ extensions:
           2.3.4: supported
           2.3.5-p1: supported
           2.4.0: not supported
+      -
+        name: 1.x.x
+        support:
+          2.3.0: not supported
+          2.3.1: not supported
+          2.3.2: not supported
+          2.3.3: not supported
+          2.3.4: not supported
+          2.3.5-p1: not supported
+          2.4.0: not supported

src/_data/toc/b2b-developer-guide.yml

@@ -71,3 +71,5 @@ pages:
 
     - label: Develop B2B extensions
       url: /b2b/extensions.html
+    - label: B2B Release Notes
+      url: /release-notes/b2b-release-notes.html

src/_data/toc/graphql.yml

@@ -328,6 +328,10 @@ pages:
         - label: PayPal Payflow Pro
           url: /graphql/payment-methods/payflow-pro.html
 
+        - label: PayPal Payflow Pro Vault
+          url: /graphql/payment-methods/payflow-pro-vault.html
+          exclude_versions: ["2.3"]
+
         - label: PayPal Payments Advanced
           url: /graphql/payment-methods/payments-advanced.html
 

src/_data/toc/ui-components-guide.yml

@@ -279,6 +279,12 @@ pages:
         - label: Update the page URL type
           url: /ui_comp_guide/howto/update-url-type.html
 
+        - label: Render prices on the frontend
+          url: /ui_comp_guide/howto/price_rendering.html
+
+        - label: Declare a custom UI component
+          url: /ui_comp_guide/howto/new_component_declaration.html
+
     - label: Troubleshoot
       children:
 

src/_includes/cloud/service-config-integration-starter.md

@@ -1 +1,4 @@
-You can use the following instructions for service setup on {{site.data.var.ece}} Pro Integration environments and Starter environments, including `master` branch. You must submit a support ticket to configure the service on Pro Production and Staging environments. See [Services]({{ site.baseurl }}/cloud/project/project-conf-files_services.html).
+Use the following instructions for service setup on {{site.data.var.ece}} Pro Integration environments and Starter environments, including the `master` branch.
+
+{:.bs-callout-info}
+You must submit a support ticket to change the service configuration on Pro Production and Staging environments. See [Services]({{ site.baseurl }}/cloud/project/project-conf-files_services.html).

src/_includes/cloud/tip-change-installed-service-version.md

@@ -0,0 +1,2 @@
+{:.bs-callout-tip}
+After initial service setup, you can change the software version for an installed service by updating the `services.yaml` and `.magento.app.yaml` configuration files. See [Change service version]({{site.baseurl}}/cloud/project/project-conf-files_services.html#change-service-version).

src/_includes/graphql/customer-orders-output.md

@@ -63,15 +63,23 @@ Attribute | Data type | Description
 
 The deprecated attributes were previously defined in the `CustomerOrder` object in the `customerOrders` query, but have been deprecated for the `customer` query.
 
-#### BundleInvoiceItem {#BundleInvoiceItem}
+#### BundleCreditMemoItem attributes {#BundleCreditMemoItem}
+
+The `BundleCreditMemoItem` object implements the [`CreditMemoInterface`](#CreditMemoInterface). It also defines the following attribute:
+
+Attribute | Data type | Description
+--- | --- | ---
+`bundle_options` | [[ItemSelectedBundleOption]](#ItemSelectedBundleOption) | A list of bundle options that are assigned to the bundle product
+
+#### BundleInvoiceItem attributes {#BundleInvoiceItem}
 
 The `BundleInvoiceItem` object implements the [`InvoiceItemInterface`](#InvoiceItemInterface). It also defines the following attribute:
 
 Attribute | Data type | Description
 --- | --- | ---
 `bundle_options` | [[ItemSelectedBundleOption]](#ItemSelectedBundleOption) | A list of bundle options that are assigned to the bundle product
 
-#### BundleOrderItem {#BundleOrderItem}
+#### BundleOrderItem attributes {#BundleOrderItem}
 
 The `BundleOrderItem` object implements the [`OrderItemInterface`](#OrderItemInterface). It also defines the following attribute:
 
@@ -108,31 +116,37 @@ Attribute | Data type | Description
 `number` | String! | The sequential credit memo number
 `total` | [CreditMemoTotal](#CreditMemoTotal) | Contains details about the total refunded amount
 
-#### CreditMemoItem attributes {#CreditMemoItem}
+#### CreditMemoInterface attributes {#CreditMemoInterface}
 
-The `CreditMemoItem` object describes a specific credit memo.
+The `CreditMemoItemInterface` describes a specific credit memo.
 
 Attribute | Data type | Description
 --- | --- | ---
-`discounts` | [Discount] | The final discount information for the base product, including discounts on options
 `id` | ID! | The unique ID of the credit memo item
-`order_item` | [OrderItemInterface](#OrderItemInterface) | Contains details about a refunded order item
+`order_item` | [OrderItemInterface](#OrderItemInterface) | The order item the credit memo is applied to
 `product_name` | String | The name of the base product
 `product_sale_price` | Money! | The sale price for the base product, including selected options
 `product_sku` | String! | The SKU of the base product
-`quantity_invoiced` | Float | The number of invoiced items
+`quantity_refunded` | Float | The number of refunded items
+
+#### CreditMemoItem attributes {#CreditMemoItem}
+
+The `CreditMemoItem` object implements the [`CreditMemoInterface`](#CreditMemoInterface).
 
 #### CreditMemoTotal attributes {#CreditMemoTotal}
 
-The CreditMemoTotal object contains details about the totals of a credit memo.
+The `CreditMemoTotal` object contains details about the totals of a credit memo.
 
 Attribute | Data type | Description
 --- | --- | ---
+`adjustment` | Money! | An adjustment manually applied to the order
 `base_grand_total` | Money! | The final base grand total amount in the base currency
 `discounts` | [Discount] | The applied discounts to the order
 `grand_total` | Money! | The final total amount, including shipping, discounts, and taxes
+`shipping_handling` | [ShippingHandling](#ShippingHandling) | Contains details about the shipping and handling costs for the credit memo
 `subtotal` | Money! | The subtotal of the order, excluding shipping, discounts, and taxes
 `taxes` | [[TaxItem](#TaxItem)]! | An array containing information about taxes on individual orders
+`total_shipping` | Money! | The shipping amount for the credit memo
 `total_tax` | Money! | The amount of tax applied to all orders
 
 #### Discount attributes {#Discount}
@@ -412,6 +426,14 @@ Attribute | Data type | Description
 `number` | String | The tracking number of the order shipment
 `title` | String! | The shipment tracking title
 
+#### ShippingDiscount attributes {#ShippingDiscount}
+
+The ShippingDiscount object defines an individual discount that can be applied to shipping.
+
+Attribute | Data type | Description
+--- | --- | ---
+`amount` | Money! | The amount of the discount
+
 #### ShippingHandling attributes {#ShippingHandling}
 
 The `ShippingHandling` object provides details about shipping and handling charges.
@@ -420,7 +442,7 @@ Attribute | Data type | Description
 --- | --- | ---
 `amount_excluding_tax` | Money | The shipping amount, excluding tax
 `amount_including_tax` | Money | The shipping amount, including tax
-`discounts` | [Discount] | The applied discounts to the shipping
+`discounts` | [ShippingDiscount] | The applied discounts to the shipping
 `taxes` | [[TaxItem](#TaxItem)] | Contains details about taxes applied for shipping
 `total_amount`| Money! | The total amount for shipping
 

src/cloud/env/variables-build.md

@@ -207,7 +207,12 @@ stage:
 -  **Default**—_Not set_
 -  **Version**—Magento 2.1.4 and later
 
- Enables or disables the [Symfony](https://symfony.com/doc/current/console/verbosity.html) debug verbosity level for your logs. Choose the level of detail provided in the logs: `-v`, `-vv`, or `-vvv`.
+Enable or disable the [Symfony](https://symfony.com/doc/current/console/verbosity.html) debug verbosity level for `bin/magento` CLI commands performed during the deployment phase.
+
+{:.bs-callout}
+To use VERBOSE_COMMANDS to control the detail in command output for both successful and failed `bin/magento` CLI commands, you must set [MIN_LOGGING_LEVEL]({{ site.baseurl }}/cloud/env/variables-global.html#min_logging_level) `debug`.
+
+Choose the level of detail provided in the logs: `-v`, `-vv`, or `-vvv`.
 
 ```yaml
 stage:

src/cloud/env/variables-deploy.md

@@ -643,7 +643,12 @@ stage:
 -  **Default**—_Not set_
 -  **Version**—Magento 2.1.4 and later
 
- Enables or disables the [Symfony](https://symfony.com/doc/current/console/verbosity.html) debug verbosity level for your logs. Choose the level of detail provided in the logs: `-v`, `-vv`, or `-vvv`.
+Enable or disable the [Symfony](https://symfony.com/doc/current/console/verbosity.html) debug verbosity level for `bin/magento` CLI commands performed during the deployment phase.
+
+{:.bs-callout}
+To use the VERBOSE_COMMANDS setting to control the detail in command output for both successful and failed `bin/magento` CLI commands, you must set [MIN_LOGGING_LEVEL]({{ site.baseurl }}/cloud/env/variables-global.html#min_logging_level) `debug`.
+
+Choose the level of detail provided in the logs: `-v`, `-vv`, or `-vvv`.
 
 ```yaml
 stage:

src/cloud/project/project-conf-files_services-elastic.md

@@ -62,6 +62,8 @@ To enable Elasticsearch:
    bin/magento cache:clean
    ```
 
+{%include cloud/tip-change-installed-service-version.md%}
+
 ## Elasticsearch software compatibility
 
 When you install or upgrade your {{ site.data.var.ece }} project, always check for compatibility between the Elasticsearch service version and the [Elasticsearch PHP](https://github.com/elastic/elasticsearch-php) client for {{ site.data.var.ee }}.

src/cloud/project/project-conf-files_services-mysql.md

@@ -24,6 +24,9 @@ MariaDB 10.1 is the last version that support XtraDB as the storage engine. Vers
        disk: 2048
    ```
 
+   {:.bs-callout-tip}
+   MySQL errors, such as `PDO Exception: MySQL server has gone away`, can occur as a result of insufficient disk space. Verify that you have allocated sufficient disk space to the service in the [`.magento/services.yaml`]({{ site.baseurl }}/cloud/project/project-conf-files_magento-app.html#disk) file.
+
 1. Configure the relationships in the `.magento.app.yaml` file.
 
    ```yaml
@@ -39,8 +42,7 @@ MariaDB 10.1 is the last version that support XtraDB as the storage engine. Vers
 
 1. [Verify the service relationships]({{ site.baseurl }}/cloud/project/project-conf-files_services.html#service-relationships).
 
-{:.bs-callout-tip}
-MySQL errors such as `PDO Exception: MySQL server has gone away` may be a result of exhausting existing disk space. Verify that you have allocated sufficient disk space to the service in the [`.magento/services.yaml`]({{ site.baseurl }}/cloud/project/project-conf-files_magento-app.html#disk) file.
+   {%include cloud/tip-change-installed-service-version.md%}
 
 ## Set up multiple database users
 
@@ -134,7 +136,7 @@ Accessing the MariaDB database directly requires you to use a SSH to log in to t
          "query" : {
             "is_master" : true
          },
-         "type" : "mysql:10.0",
+         "type" : "mysql:10.3",
          "username" : "user",
          "scheme" : "mysql"
       }

src/cloud/project/project-conf-files_services-rabbit.md

@@ -36,14 +36,22 @@ To enable RabbitMQ:
 1. Add, commit, and push your code changes.
 
    ```bash
-   git add -A && git commit -m "Enable RabbitMQ service" && git push origin <branch-name>
+   git add -A
+   ```
+
+   ```bash
+   git commit -m "Enable RabbitMQ service"
+   ```
+
+   ```bash
+   git push origin <branch-name>
    ```
 
 1. [Verify the service relationships]({{ site.baseurl }}/cloud/project/project-conf-files_services.html#service-relationships).
 
 For information on how these changes affect your environments, see [`services.yaml`]({{ site.baseurl }}/cloud/project/project-conf-files_services.html).
 
-[Supported service versions]({{ site.baseurl }}/cloud/project/project-conf-files_services.html#service-versions)
+{% include cloud/tip-change-installed-service-version.md %}
 
 ## Connect to RabbitMQ for debugging {#connect}
 

src/cloud/project/project-conf-files_services-redis.md

@@ -17,17 +17,17 @@ To enable Redis:
 
 1. Add the required name and type to the `.magento/services.yaml` file.
 
-  ```yaml
-  myredis:
-      type: redis:<version>
-  ```
+   ```yaml
+   myredis:
+       type: redis:<version>
+   ```
 
-  To provide your own Redis configuration, add a `core_config` key in your `.magento/services.yaml` file:
+   To provide your own Redis configuration, add a `core_config` key in your `.magento/services.yaml` file:
 
-  ```yaml
-  cache:
-      type: redis:<version>
-  ```
+   ```yaml
+   cache:
+       type: redis:<version>
+   ```
 
 1. Configure the relationships in the `.magento.app.yaml` file.
 
@@ -48,6 +48,8 @@ To enable Redis:
 
 1. [Verify the service relationships]({{ site.baseurl }}/cloud/project/project-conf-files_services.html#service-relationships).
 
+{%include cloud/tip-change-installed-service-version.md%}
+
 ## Using the Redis CLI
 
 Assuming your Redis relationship is named `redis`, you can access it using the `redis-cli` tool.

src/common/images/graphql/paypal-payflow-pro-vault.svg

@@ -24,7 +24,7 @@ Creating a root category is optional, but we show how to do it in this tutorial
 {% collapsible To create a root category: %}
 
 1. Log in to the Magento Admin as a user authorized to create categories.
-1. Click **Products** > **Categories**.
+1. Click **Catalog** > **Categories**.
 1. Click **Add Root Category**.
 1. In the **Category Name** field, enter a unique name to identify this category.
 1. Make sure **Enable Category** is set to **Yes**.

src/guides/v2.3/config-guide/multi-site/ms_websites.md

@@ -35,7 +35,7 @@ Here is the example of composer.json file.
       "AFL-3.0"
     ],
     "require": {
-      "php": "~7.1.3||~7.2.0||~7.3.0"
+      "php": "~7.2.0||~7.3.0"
     },
     "autoload": {
       "files": [ "registration.php" ],

src/guides/v2.3/extension-dev-guide/build/composer-integration.md

@@ -51,7 +51,7 @@ Refer to [Module version dependencies]({{ page.baseurl }}/extension-dev-guide/ve
     "name": "your-name/module-Acme",
     "description": "Test component for Magento 2",
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.2.0||~7.3.0",
         "magento/module-store": "102.1",
         "magento/module-catalog": "102.1",
         "magento/module-catalog-inventory": "102.1",

src/guides/v2.3/extension-dev-guide/build/create_component.md

@@ -49,7 +49,7 @@ The following example is a `composer.json` for a metapackage:
     "version": "2.0.0",
     "type": "metapackage",
     "require": {
-        "php": "~7.1.3|~7.2.0",
+        "php": "~7.2.0||~7.3.0",
         "zendframework/zend-stdlib": "~2.4.6",
         "zendframework/zend-code": "~2.4.6",
         "zendframework/zend-server": "~2.4.6",
@@ -99,7 +99,7 @@ The following example is a `composer.json` file for a module:
     "AFL-3.0"
   ],
   "require": {
-    "php": "~7.1.3|~7.2.0",
+    "php": "~7.2.0||~7.3.0",
     "magento/framework": "~100.0.4"
   },
   "autoload": {

src/guides/v2.3/extension-dev-guide/package/package_module.md

@@ -456,7 +456,7 @@ Extending layout:
 In layout files you can change the elements order on a page. This can be done using one of the following:
 
 -  [`<move>` instruction]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_layout_xml-instruc_ex_mv): allows changing elements' order and parent.
--  [`before` and `after` attributes of `<block>`]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_xml-instrux_before-after): allows changing elements' order within one parent.
+-  [`before` and `after` attributes of `<block>`]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_xml-instrux_before-after): sets the order of elements within a parent.
 
 **Example of `<move>` usage:**
 put the stock availability and SKU blocks next to the product price on a product page.

src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md

@@ -18,13 +18,13 @@ To ensure that your new string is added to the dictionary and translated, use th
 For example:
 
 ```php
-<?php echo __('Create Backup') ?>
+<?= __('Create Backup') ?>
 ```
 
 If your string contains a variable, to add a placeholder for this variable in the dictionary, use syntax similar to the following:
 
 ```php
-<?php echo __('Hello %1', $yourVariable) ?>
+<?= __('Hello %1', $yourVariable) ?>
 ```
 
 In this example, the _'Hello %1'_ string is added to the dictionary when the i18n tool is run.

src/guides/v2.3/frontend-dev-guide/translations/translate_theory.md

@@ -5,10 +5,13 @@ title: GraphQL caching
 
 Magento can cache pages rendered from the results of certain GraphQL queries with [full-page caching]({{page.baseurl}}/extension-dev-guide/cache/page-caching.html). Full-page caching improves response time and reduces the load on the server. Without caching, each page might need to run blocks of code and retrieve large amounts of information from the database. Only queries submitted with an HTTP GET operation can be cached. POST queries cannot be cached.
 
-## Cached queries
+## Cached and uncached queries
 
 The definitions for some queries include cache tags. Full page caching uses these tags to keep track of cached content. They also allow public content to be invalidated. Private content invalidation is handled on the client side.
 
+{:.bs-callout-info}
+GraphQL allows you to make multiple queries in a single call. If you specify any query that Magento does not cache, Magento bypasses the cache for all queries in the call.
+
 Magento caches the following queries:
 
 *  `category` (deprecated)