Merge branch 'master' into hg-jan12-cloudimports

hguthrie · web-flow · commit 8e66dd554163 · 2022-01-20T10:20:13.000-06:00
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/src/_data/toc/graphql.yml b/src/_data/toc/graphql.yml
@@ -318,6 +318,11 @@ pages:
           edition: ee-only
           exclude_versions: ["2.3"]
 
+        - label: contactUs mutation
+          url: /graphql/mutations/contact-us.html
+          edition: pwa-only
+          exclude_versions: ["2.3"]
+
         - label: createBraintreeClientToken mutation
           url: /graphql/mutations/create-braintree-client-token.html
 
diff --git a/src/_data/var.yml b/src/_data/var.yml
@@ -17,6 +17,7 @@ ce: Magento Open Source
 ee: Adobe Commerce
 b2b: B2B for Adobe Commerce
 mbi: Adobe Commerce Reporting
+pwa: PWA Studio
 
 # Cloud product name variables
 
diff --git a/src/_data/whats-new.yml b/src/_data/whats-new.yml
@@ -4,8 +4,46 @@ description: This page contains recent changes that we think you'd like to know
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: "/whats-new.html"
 thread: "/whatsnew-feed.xml"
-updated: Mon Jan 10 15:38:44 2022
+updated: Mon Jan 17 15:38:41 2022
 entries:
+- description: Added the [contactUs](https://devdocs.magento.com/guides/v2.4/graphql/mutations/contact-us.html)
+    mutation topic.
+  versions: 2.4.x
+  type: New Topic
+  date: January 14, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2737
+  merge_commit: 9b2b6d74a7e866d899ef83b4391de3d6c7e8b4ba
+  contributor: dobooth
+  membership: true
+  labels:
+  - New Topic
+  - 2.4.x
+- description: Redirected [Software Update Guide](https://devdocs.magento.com/guides/v2.4/comp-mgr/bk-compman-upgrade-guide.html)
+    topics to the new location on [Adobe Experience League](https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/overview.html).
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: January 12, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2734
+  merge_commit: 9e570a8ea66876b5086ba909810e95f5d7d21b77
+  contributor: jeff-matthews
+  membership: true
+  labels:
+  - Major Update
+  - 2.3.x
+  - 2.4.x
+- description: Added a new Tools section to the top navigation and moved the [Quality
+    Patches Tool](https://devdocs.magento.com/quality-patches/tool.html) content to
+    the new section.
+  versions: 2.x
+  type: Major Update
+  date: January 12, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2735
+  merge_commit: dce1c7fdc03ffa7f88a12b26b8907320d1c8143a
+  contributor: jeff-matthews
+  membership: true
+  labels:
+  - 2.x
+  - Major Update
 - description: Added new supported versions of Elasticsearch, OpenSearch, Redis, RabbitMQ,
     and Varnish to the [system requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html)
     for 2.4.4 and 2.4.5
diff --git a/src/_includes/graphql/store-config.md b/src/_includes/graphql/store-config.md
@@ -26,6 +26,7 @@ Attribute | Data Type | Description | Default or example value
 `cms_no_route` | String | Identifies a specific CMS page that you want to appear when a 404 “Page Not Found” error occurs | `no-route`
 `code` | String | Deprecated. Use `store_code` instead. A unique identifier for the store | `default`
 `configurable_thumbnail_source` | String | Determines which thumbnail should be used in the cart for configurable products. Possible values: `parent` or `itself` (child) | `parent`
+`contact_enabled` | Boolean! | Indicates whether the Contact Us form is enabled | true or false
 `copyright` | String | The copyright statement that appears at the bottom of each page | Copyright &#169; 2013-present Magento, Inc. All rights reserved.
 `default_description` | String | The description that provides a summary of your site for search engine listings and should not be more than 160 characters in length | null
 `default_display_currency_code` | String | The code representing the currency displayed on the store | `USD`
@@ -67,6 +68,7 @@ Attribute | Data Type | Description | Default or example value
 `magento_wishlist_general_is_enabled` | String | Indicates whether wish lists are enabled (1) or disabled (0) | 1
 `maximum_number_of_wishlists` | String | If multiple wish lists are enabled, the maximum number of wish lists the customer can have | 5
 `minimum_password_length` | String | The minimum number of characters required for a valid password. <br/>Configuration path: customer/password/minimum_password_length | 6
+`newsletter_enabled` | Boolean! | Indicates whether newsletters are enabled | true or false
 `no_route` | String | Contains the URL of the default page that you want to appear when if a 404 “Page not Found” error occurs | `cms/noroute/index`
 `payment_payflowpro_cc_vault_active` | String | Payflow Pro vault status | `0` (inactive) or `1` (active)
 `printed_card_price` | String | The default price of a printed card that accompanies an order | 10
diff --git a/src/_includes/layout/page-header.html b/src/_includes/layout/page-header.html
@@ -36,7 +36,7 @@
 
   {% if page.url contains "guides/v2.3/" %}
   <div class="bs-callout-warning">
-    PHP 7.3 reaches end of support in December 2021 and {{site.data.var.ee}} 2.3.x reaches end of support in April 2022. You may want to consider planning your upgrade now to {{site.data.var.ee}} 2.4.x and PHP 7.4.x to help maintain PCI compliance.
+    PHP 7.3 reached end of support in December 2021 and {{site.data.var.ee}} 2.3.x reaches end of support in April 2022. You may want to consider planning your upgrade now to {{site.data.var.ee}} 2.4.x and PHP 7.4.x to help maintain PCI compliance.
   </div>
   {% endif %}
 
diff --git a/src/guides/v2.3/index.html b/src/guides/v2.3/index.html
@@ -3,7 +3,7 @@
 ---
 
 <section class="home-features">
-  <div class="bs-callout-warning">PHP 7.3 reaches end of support in December 2021 and {{site.data.var.ee}} 2.3.x reaches end of support in April 2022. You may want to consider planning your upgrade now to {{site.data.var.ee}} 2.4.x and PHP 7.4.x to help maintain PCI compliance.</div>
+  <div class="bs-callout-warning">PHP 7.3 reached end of support in December 2021 and {{site.data.var.ee}} 2.3.x reaches end of support in April 2022. You may want to consider planning your upgrade now to {{site.data.var.ee}} 2.4.x and PHP 7.4.x to help maintain PCI compliance.</div>
   <div class="container">
     
     <div class="feature">
diff --git a/src/guides/v2.3/release-notes/2-3-7-p1.md b/src/guides/v2.3/release-notes/2-3-7-p1.md
@@ -7,7 +7,7 @@ title: Adobe Commerce 2.3.7-p1 Release Notes
 
 {:.bs-callout-info}
 
-PHP 7.3 reaches end of support in December 2021, and {{site.data.var.ee}} 2.3.x reaches end of support in April 2022. **We strongly recommend planning your upgrade now to {{site.data.var.ee}} 2.4.x or {{site.data.var.ce}} 2.4.x and PHP 7.4.x to help maintain PCI compliance**.
+PHP 7.3 reached end of support in December 2021, and {{site.data.var.ee}} 2.3.x reaches end of support in April 2022. **We strongly recommend planning your upgrade now to {{site.data.var.ee}} 2.4.x or {{site.data.var.ce}} 2.4.x and PHP 7.4.x to help maintain PCI compliance**.
 
 ## Apply MC-43048__set_rate_limits__2.3.7-p1.patch to address issue with API rate limiting
 
diff --git a/src/guides/v2.3/release-notes/2-3-7-p2.md b/src/guides/v2.3/release-notes/2-3-7-p2.md
@@ -6,7 +6,7 @@ title: Adobe Commerce 2.3.7-p2 Release Notes
 {{ site.data.var.ee }} 2.3.7-p2 is a security release that provides security fixes that enhance your {{ site.data.var.ee }} 2.3.7 or {{ site.data.var.ce }} 2.3.7 deployment. It provides fixes for vulnerabilities that have been identified in the previous release ({{ site.data.var.ee }} 2.3.7-p1).
 
 {:.bs-callout-info}
-PHP 7.3 reaches end of support in December 2021, and {{ site.data.var.ee }} 2.3.x and {{ site.data.var.ce }} 2.3.x reaches end of support in April 2022. **We strongly recommend planning your upgrade now to {{ site.data.var.ee }} 2.4.x or {{ site.data.var.ce }} 2.4.x deployment to help maintain PCI compliance**.
+PHP 7.3 reached end of support in December 2021, and {{ site.data.var.ee }} 2.3.x and {{ site.data.var.ce }} 2.3.x reaches end of support in April 2022. **We strongly recommend planning your upgrade now to {{ site.data.var.ee }} 2.4.x or {{ site.data.var.ce }} 2.4.x deployment to help maintain PCI compliance**.
 
 {:.bs-callout-info}
 Releases may contain backward-incompatible changes (BIC). To review minor backward-incompatible changes, see [BIC reference]({{page.baseurl}}/release-notes/backward-incompatible-changes/reference.html). (Major backward-incompatible issues are described in [BIC highlights]({{page.baseurl}}/release-notes/backward-incompatible-changes/index.html). Not all releases introduce major BICs.)
diff --git a/src/guides/v2.3/release-notes/commerce-2-3-7.md b/src/guides/v2.3/release-notes/commerce-2-3-7.md
@@ -7,7 +7,7 @@ title: Adobe Commerce 2.3.7 Release Notes
 
 {:.bs-callout-info}
 
-PHP 7.3 reaches end of support in December 2021, and {{site.data.var.ee}} 2.3.x reaches end of support in April 2022. **We strongly recommend planning your upgrade now to {{site.data.var.ee}} 2.4.x and PHP 7.4.x to help maintain PCI compliance**.
+PHP 7.3 reached end of support in December 2021, and {{site.data.var.ee}} 2.3.x reaches end of support in April 2022. **We strongly recommend planning your upgrade now to {{site.data.var.ee}} 2.4.x and PHP 7.4.x to help maintain PCI compliance**.
 
 ## Backward-Incompatible Changes (BiCs)
 
diff --git a/src/guides/v2.3/release-notes/open-source-2-3-7.md b/src/guides/v2.3/release-notes/open-source-2-3-7.md
@@ -7,7 +7,7 @@ title: Magento Open Source 2.3.7 Release Notes
 
 {:.bs-callout-info}
 
-PHP 7.3 reaches end of support in December 2021, and {{site.data.var.ce}} 2.3.x reaches end of support in April 2022. **We strongly recommend planning your upgrade now to {{site.data.var.ce}} 2.4.x and PHP 7.4.x to help maintain PCI compliance**.
+PHP 7.3 reached end of support in December 2021, and {{site.data.var.ce}} 2.3.x reaches end of support in April 2022. **We strongly recommend planning your upgrade now to {{site.data.var.ce}} 2.4.x and PHP 7.4.x to help maintain PCI compliance**.
 
 ## Backward-Incompatible Changes (BiCs)
 
diff --git a/src/guides/v2.4/graphql/mutations/contact-us.md b/src/guides/v2.4/graphql/mutations/contact-us.md
@@ -0,0 +1,66 @@
+---
+group: graphql
+title: contactUs mutation
+pwa_only: true
+---
+
+The `contactUs` mutation submits the contents of the Contact Us form.
+
+## Syntax
+
+ `mutation: contactUs(input: ContacUsInput!): ContactUsOutput`
+
+## Example usage
+
+The following example adds a Contact Us form to the site.
+
+**Request:**
+
+```graphql
+mutation {
+  contactUs(
+    input: {
+      comment: "My comment",
+      email: "bobloblaw@example.com",
+      telephone: "(555)-CALL-BOB",
+      name: "Bob Loblaw" }
+      ) {
+    status
+  }
+}
+```
+
+**Response:**
+
+```json
+{
+  "data": {
+    "contactUs": {
+      "status": true
+    }
+  }
+}
+```
+
+## Input attributes
+
+The `contactUs` mutation requires the  `contactUsInput` object.
+
+### contactUsInput object {#contactUsInput}
+
+The `contactUsInput` object must contain the following attributes:
+
+Attribute | Data Type | Description
+--- | --- | ---
+`email` | String! | The email address of the shopper
+`name` | String! | The full name of the shopper
+`telephone` | String | The shopper's telephone number
+`comment` | String! | The shopper's comment to the merchant
+
+## Output attributes
+
+The `contactUsOutput` object returns a Boolean value indicting the success or failure of the request.
+
+Attribute |  Data Type | Description
+--- | --- | ---
+`status` | Boolean! | Indicates whether the request was successful
diff --git a/src/recommendations/customize.md b/src/recommendations/customize.md
@@ -26,7 +26,7 @@ In addition to the `recommendations.html` file, the `ProductRecommendationsLayou
 |`web/js`|Contains the JavaScript files that fetch and render recommendations for your store|
 |`web/template`|Contains the template for the `magento/product-recommendations` module|
 
-## Customize recommendation unit positioning
+## Recommendation unit positioning
 
 When you [create a recommendation]({{ site.user_guide_url }}/marketing/create-new-rec.html), you specify [where you want the recommendation unit to appear]({{ site.user_guide_url }}/marketing/product-recommendations.html#productrecplacement) on your page. For example, you can select to place the recommendations either at the top or the bottom of the main content container. However, you can customize this placement. If you created a recommendation unit for Page Builder, you can use the Page Builder editing environment to customize where you want the recommendation unit to display on the page. For all other page types, you can edit the `*.xml` files responsible for the layout. Magento generates these `*.xml` files when you create a recommendation.
 
@@ -96,3 +96,15 @@ When you [create a recommendation]({{ site.user_guide_url }}/marketing/create-ne
     This change results in your recommendation unit appearing after the product image on the product detail page. If you want the recommendation unit to appear before the `product.info.media`, change the `after="-"` attribute to `before="-"`. The `pagePlacement` argument is an internal argument that should not be modified.
 
 Refer to [layout overview]({{ site.gdeurl }}/frontend-dev-guide/layouts/layout-overview.html) for more information about the types of blocks on the page.
+
+## Custom Product attributes
+
+Developers often need access to custom product attribute values in recommendations units on storefronts so that they can add visual treatments to products based on those attributes.
+
+For example, if your store sells some organic products, you might have a custom attribute on those products designating them as `Organic = true`. You may need access to this attribute value on the storefront so that you can give these products special visual treatment when they appear in Recommendations. Similarly, access to these custom product attribute values allows you to badge products or drive custom logic in the presentation layer of your site.
+
+![Add Badge]({{ page.baseurl }}/recommendations/images/unit.png)
+
+To make sure a custom product attribute is available when you render the recommendation unit on the page, set the `Used in Product Listing` property to `Yes` in the [Product Attributes](https://docs.magento.com/user-guide/stores/attribute-product-create.html#step-4-describe-the-storefront-properties) page in the Admin.
+
+When this property is set, that custom product attribute value is included in the JSON payload when the recommendations service fetches the product metadata. You can then apply custom storefront styling based on this attribute value.
diff --git a/src/recommendations/images/unit.png b/src/recommendations/images/unit.png
