Merge branch '2.4.1-develop' into kh_customer-v2

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

@@ -147,12 +147,17 @@ pages:
         - label: addVirtualProductsToCart mutation
           url: /graphql/mutations/add-virtual-products.html
 
+        - label: applyCouponToCart mutation
+          url: /graphql/mutations/apply-coupon.html
+
         - label: applyGiftCardToCart mutation
           url: /graphql/mutations/apply-giftcard.html
           edition: ee-only
 
-        - label: applyCouponToCart mutation
-          url: /graphql/mutations/apply-coupon.html
+        - label: applyRewardPointsToCart mutation
+          url: /graphql/mutations/apply-reward-points.html
+          edition: ee-only
+          exclude_versions: ["2.3"]
 
         - label: applyStoreCreditToCart mutation
           url: /graphql/mutations/apply-store-credit.html
@@ -215,6 +220,11 @@ pages:
         - label: removeItemFromCart mutation
           url: /graphql/mutations/remove-item.html
 
+        - label: removeRewardPointsFromCart mutation
+          url: /graphql/mutations/remove-reward-points.html
+          edition: ee-only
+          exclude_versions: ["2.3"]
+
         - label: removeStoreCreditFromCart mutation
           url: /graphql/mutations/remove-store-credit.html
           edition: ee-only
@@ -237,13 +247,13 @@ pages:
         - label: sendEmailToFriend mutation
           url: /graphql/mutations/send-email-to-friend.html
 
-        - label: subscribeEmailToNewsletter mutation
-          url: /graphql/mutations/subscribe-email-to-newsletter.html
-          exclude_versions: ["2.3"]
-
         - label: setBillingAddressesOnCart mutation
           url: /graphql/mutations/set-billing-address.html
 
+        - label: setGiftOptionsOnCart mutation
+          url: /graphql/mutations/set-gift-options.html
+          exclude_versions: ["2.3"]
+
         - label: setGuestEmailOnCart mutation
           url: /graphql/mutations/set-guest-email.html
 
@@ -259,6 +269,10 @@ pages:
         - label: setShippingMethodsOnCart mutation
           url: /graphql/mutations/set-shipping-method.html
 
+        - label: subscribeEmailToNewsletter mutation
+          url: /graphql/mutations/subscribe-email-to-newsletter.html
+          exclude_versions: ["2.3"]
+
         - label: updateCartItems mutation
           url: /graphql/mutations/update-cart-items.html
 
@@ -330,6 +344,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/cart-object-24.md

@@ -5,14 +5,18 @@ Attribute |  Data Type | Description
 `applied_gift_cards` | [[`AppliedGiftCard`]][AppliedGiftCard] | An array of `AppliedGiftCard` objects. An `AppliedGiftCard` object contains the `code` text attribute, which specifies the gift card code. `applied_gift_cards` is a Commerce-only attribute, defined in the GiftCardAccountGraphQl module
 `applied_reward_points`| [`RewardPointsAmount`][RewardPointsAmount] | The amount of reward points applied to the cart
 `applied_store_credit` | [`AppliedStoreCredit`][AppliedStoreCredit] | Contains store credit information applied to the cart. `applied_store_credit` is a Commerce-only attribute, defined in the CustomerBalanceGraphQl module
+`available_gift_wrappings` | [GiftWrapping]! | The list of available gift wrapping options for the cart
 `available_payment_methods` | [[AvailablePaymentMethod]][AvailablePaymentMethod] | Available payment methods
 `billing_address` | [BillingCartAddress][BillingCartAddress] | Contains the billing address specified in the customer's cart
 `email` | String | The customer's email address
 `gift_message` | [GiftMessage][GiftMessage] | A gift message added to the cart
+`gift_receipt_included` | Boolean! | Indicates if the customer requested a gift receipt for the cart
+`gift_wrapping` | GiftWrapping | The selected gift wrapping for the cart
 `id` | ID! | The ID of the cart
 `is_virtual` | Boolean! | Indicates whether the cart contains only virtual products
 `items` | [[CartItemInterface]][CartItemInterface] | Contains the items in the customer's cart
 `prices` | [CartPrices][CartPrices] | Contains subtotals and totals
+`printed_card_included` | Boolean! | Indicates if the customer requested a printed card for the cart
 `selected_payment_method` | [SelectedPaymentMethod][SelectedPaymentMethod] | Selected payment method
 `shipping_addresses` | [[ShippingCartAddress]][ShippingCartAddress]! | Contains one or more shipping addresses
 `total_quantity` | Float! | Total Quantity of products in the cart