From 2d97b7bcaf64e3eff560cbaa4bc0e58866944571 Mon Sep 17 00:00:00 2001 From: Erik Marr Date: Thu, 12 Mar 2020 14:02:13 -0500 Subject: [PATCH 01/46] updating based on Arjun's feedback --- src/recommendations/customize.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/recommendations/customize.md b/src/recommendations/customize.md index b6f2600c578..4467baf8d53 100644 --- a/src/recommendations/customize.md +++ b/src/recommendations/customize.md @@ -17,7 +17,7 @@ The following table describes each subdirectory under `ProductRecommendationsLay This topic describes how you can customize the recommendations template as well as the placement of recommendation units on your site. -## Template updates +## Update template If you want to customize how the recommendations display on your storefront, you can modify or overwrite the following template: @@ -32,7 +32,7 @@ However, to ensure Magento can successfully collect metrics for the recommendati Refer to the [template overview]({{ site.baseurl }}/guides/v{{ site.version }}/frontend-dev-guide/templates/template-walkthrough.html) for more information about how to modify templates in Magento. -## Recommendation unit placement +## Reorder recommendation units When you [create a recommendation](https://docs.magento.com/m2/ee/user_guide/marketing/create-new-rec.html), you specify [where you want the recommendation unit to appear](https://docs.magento.com/m2/ee/user_guide/marketing/product-recommendations.html#productrecplacement) on your page. In the Admin, you can select to place the recommendations either above or below the main content. You can, however, customize that location by editing the `*.xml` files responsible for the layout. Magento generates these files when you create a recommendation. @@ -99,3 +99,17 @@ When you [create a recommendation](https://docs.magento.com/m2/ee/user_guide/mar 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.baseurl }}/guides/v{{ site.version }}/frontend-dev-guide/layouts/layout-overview.html) for more information about the types of blocks on the page. + +### Customizing recommendation units for new pages + +You can create new pages for your storefront, link an existing recommendation unit to that new page, and customize where that recommendation unit appears on your storefront. + +1. [Create a new page](https://docs.magento.com/m2/ee/user_guide/cms/page-add.html) in the Admin UI. + +1. Magento creates a page handle name. Here's how you can see it. + +1. In the `layout` directory, create an xml file with the same name as the page handle name, such as, `blah.xml`. + +1. Complete the steps above to modify where you want your recommendation units to display. + +from Misha: checkout_onepage_success.xml might be named checkout_multipage_success.xml depending on what the user has selected in the admin. From 49a9cbcdb91a2a2f4e47484c9c909d07d8ea35dd Mon Sep 17 00:00:00 2001 From: Sergiy Zhovnir Date: Mon, 16 Mar 2020 16:25:24 +0200 Subject: [PATCH 02/46] Add information about ignoreTmpls property --- .../concepts/ui_comp_template_literals.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md index a568c4d1846..b5e40049d37 100644 --- a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md +++ b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md @@ -40,6 +40,23 @@ As a result, a template literal used in the value of one the objects listed abov Perhaps the most important part of template literals in Magento is the `$` object that can be used inside expressions. (Remember an expression is anything within `${ }`.) The `$` provides access to the `this` context in the JavaScript class where the template literals are. To take it a step further, `this` (and the related `$`) is the KnockoutJS context for the template that can be bound to the UI Component. This object should not be confused with the `$` that marks the beginning of an expression. The `$` object can only appear inside of an expression. Here is an example: `${ $.submitUrl }`: the `$` references the current KnockoutJS context, and `.submitUrl` will return the `provider` property from that object. +### The `ignoreTmpls` property + +The `ignoreTmpls` property is an object that allows preventing template processing for selected properties. + +```javascript +return Element.extend({ + defaults: { + value: 'some component value', + property: '${ $.value }', // equal to 'some component value' after component initialization + propertyIgnoreTempls: '${ $.value }', // equal to '${ $.value }' after component initialization + ignoreTmpls: { + propertyIgnoreTempls: true + } + } +}); +``` + ## Example Perhaps the most useful aspect of template literals is the ability to access other UI Component JavaScript classes in the registry so we will use this as an example. First, there are a few things to explain. From 909bd09acfaef4b3cba242797330415e96e38e59 Mon Sep 17 00:00:00 2001 From: Erik Marr Date: Wed, 18 Mar 2020 10:27:24 -0500 Subject: [PATCH 03/46] updating topics based on feedback --- src/recommendations/customize.md | 17 +++-------------- src/recommendations/troubleshooting.md | 8 ++++---- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/recommendations/customize.md b/src/recommendations/customize.md index 4467baf8d53..951f59c744d 100644 --- a/src/recommendations/customize.md +++ b/src/recommendations/customize.md @@ -52,6 +52,9 @@ When you [create a recommendation](https://docs.magento.com/m2/ee/user_guide/mar |`checkout_onepage_success.xml`|Checkout| |`cms_index_index.xml`|Home| + {:.bs-callout-info} + The filenames in the `layout` directory might be different if your store uses third-party extensions. + 1. Let's modify the `catalog_product_view.xml` file so that the recommendation unit appears after the product image on the product detail page. Before you customize this XML file, let's take a look at the file and understand the sections you will need to modify: ```xml @@ -99,17 +102,3 @@ When you [create a recommendation](https://docs.magento.com/m2/ee/user_guide/mar 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.baseurl }}/guides/v{{ site.version }}/frontend-dev-guide/layouts/layout-overview.html) for more information about the types of blocks on the page. - -### Customizing recommendation units for new pages - -You can create new pages for your storefront, link an existing recommendation unit to that new page, and customize where that recommendation unit appears on your storefront. - -1. [Create a new page](https://docs.magento.com/m2/ee/user_guide/cms/page-add.html) in the Admin UI. - -1. Magento creates a page handle name. Here's how you can see it. - -1. In the `layout` directory, create an xml file with the same name as the page handle name, such as, `blah.xml`. - -1. Complete the steps above to modify where you want your recommendation units to display. - -from Misha: checkout_onepage_success.xml might be named checkout_multipage_success.xml depending on what the user has selected in the admin. diff --git a/src/recommendations/troubleshooting.md b/src/recommendations/troubleshooting.md index 34057ec34af..ee210c2503a 100644 --- a/src/recommendations/troubleshooting.md +++ b/src/recommendations/troubleshooting.md @@ -16,6 +16,10 @@ If you have configured the `product-recommendations` module correctly, but you a For issues related to the Catalog SaaS Export module: +- Confirm the [cron]({{ site.baseurl }}/guides/v{{ site.version }}/config-guide/cli/config-cli-subcommands-cron.html) jobs are running. + +- Confirm the [indexers]({{ site.baseurl }}/guides/v{{ site.version }}/config-guide/cli/config-cli-subcommands-index.html) are running and the `Product Feed` indexer is set to `Update by Schedule`. + - Confirm the modules are enabled. The `saas-export` metapackage installs the following modules, all of which must be enabled: ```text @@ -29,10 +33,6 @@ For issues related to the Catalog SaaS Export module: - Check the [logs]({{ site.baseurl }}/guides/v{{ site.version }}/config-guide/cli/logging.html). Make sure there are no errors associated with the above modules. -- Confirm the [indexers]({{ site.baseurl }}/guides/v{{ site.version }}/config-guide/cli/config-cli-subcommands-index.html) are running and the `Product Feed` indexer is set to `Update by Schedule`. - -- Confirm the [cron]({{ site.baseurl }}/guides/v{{ site.version }}/config-guide/cli/config-cli-subcommands-cron.html) jobs are running. - - Refresh Configuration cache. Go to **System** > **Tools** > **Cache Management**, and clear the configuration cache. - Confirm there is data in the `catalog_data_exporter_products` database table. From c26e56d67d3d809cd511357003395c108ab83bd8 Mon Sep 17 00:00:00 2001 From: Erik Marr Date: Fri, 20 Mar 2020 11:56:07 -0500 Subject: [PATCH 04/46] entering edits from review --- src/recommendations/customize.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/recommendations/customize.md b/src/recommendations/customize.md index 951f59c744d..22380816742 100644 --- a/src/recommendations/customize.md +++ b/src/recommendations/customize.md @@ -34,7 +34,7 @@ Refer to the [template overview]({{ site.baseurl }}/guides/v{{ site.version }}/f ## Reorder recommendation units -When you [create a recommendation](https://docs.magento.com/m2/ee/user_guide/marketing/create-new-rec.html), you specify [where you want the recommendation unit to appear](https://docs.magento.com/m2/ee/user_guide/marketing/product-recommendations.html#productrecplacement) on your page. In the Admin, you can select to place the recommendations either above or below the main content. You can, however, customize that location by editing the `*.xml` files responsible for the layout. Magento generates these files when you create a recommendation. +When you [create a recommendation](https://docs.magento.com/m2/ee/user_guide/marketing/create-new-rec.html), you specify [where you want the recommendation unit to appear](https://docs.magento.com/m2/ee/user_guide/marketing/product-recommendations.html#productrecplacement) on your page. In the Admin, you can select to place the recommendations either at the top or the bottom of the main content container. You can, however, customize that location more granularly by editing the `*.xml` files responsible for the layout. Magento generates these files when you create a recommendation. 1. Change to the `layout` directory: From 13c124b96cc126f8ef8489f6181684d986c292e5 Mon Sep 17 00:00:00 2001 From: Denys Saltanahmedov Date: Mon, 23 Mar 2020 15:01:43 +0200 Subject: [PATCH 05/46] Improvement - adding changes to Configure services as web APIs topic --- .../service-contracts/service-to-web-service.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md b/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md index 4a2388d46c5..6c3258dc2b9 100644 --- a/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md +++ b/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md @@ -9,7 +9,7 @@ functional_areas: You can configure a Magento or third-party service as a web [API](https://glossary.magento.com/api). -To [configure a web API](#configure-webapi), you define [XML](https://glossary.magento.com/xml) elements and attributes in the `webapi.xml` XML configuration file for the [module](https://glossary.magento.com/module) for the service. The `webapi.xml` file for your module specifies an XML schema file for validation. By default, this file is `app/code//Webapi/etc/webapi.xsd`. +To [configure a web API](#configure-webapi), you define [XML](https://glossary.magento.com/xml) elements and attributes in the `webapi.xml` XML configuration file for the [module](https://glossary.magento.com/module) for the service. The `webapi.xml` file for your module specifies an XML schema file for validation. By default, this file is `app/code/Magento/Webapi/etc/webapi.xsd` or `vendor/magento/module-webapi/etc/webapi.xsd`. Your module can use the default `webapi.xsd` file or you can create a customized XML schema file for validation. @@ -19,6 +19,8 @@ To configure a web API, read these topics: - [Configure a web API](#configure-webapi) +- [Service Interface Requirements](#service-interface-requirements) + - [webapi.xml configuration options](#configuration-options) - [Sample webapi.xml file](#sample-webapi) From 432e3be8d3ed210f742fe3c40f0c29044cbf96b4 Mon Sep 17 00:00:00 2001 From: David Alger Date: Tue, 24 Mar 2020 09:34:09 -0500 Subject: [PATCH 06/46] Added note regarding use of explicit_defaults_for_timestamps=on Per https://github.com/magento/magento2/issues/19597#issuecomment-573510633 and https://github.com/magento/magento2/issues/19597#issuecomment-580361785 the setting `explicit_defaults_for_timestamp=on` in `my.cnf` is required for Declarative Schema to report everything as up-to-date allowing for zero-down deployments. If this setting is not enabled, setup:db:status will continuously return the following; ``` Declarative Schema is not up to date Run 'setup:upgrade' to update your DB schema and data. ``` This affects MySQL, MariaDB and PerconaDB. --- src/guides/v2.3/install-gde/prereq/mysql.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/guides/v2.3/install-gde/prereq/mysql.md b/src/guides/v2.3/install-gde/prereq/mysql.md index 1537fec3357..08a79697b2b 100644 --- a/src/guides/v2.3/install-gde/prereq/mysql.md +++ b/src/guides/v2.3/install-gde/prereq/mysql.md @@ -405,6 +405,15 @@ To configure a MySQL database instance: * For optimal performance, make sure all MySQL and Magento index tables can be kept in memory (e.g., configure `innodb_buffer_pool_size`). +1. In order for MySQL `TIMESTAMP` fields to follow the preferences and composition expected by Magento's declarative schema architecture, the system variable `explicit_defaults_for_timestamp` must be set to `on`. + + References; + + * [MySQL 5.7](https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_explicit_defaults_for_timestamp) + * [MariaDB](https://mariadb.com/kb/en/server-system-variables/#explicit_defaults_for_timestamp) + + If this setting is not enabled, `setup:db:status` will always report that `Declarative Schema is not up to date` + {:.ref-header} Related topics From 2c01c1cbc4b0d49ea7166a5879797ef9c46f15df Mon Sep 17 00:00:00 2001 From: David Alger Date: Tue, 24 Mar 2020 09:45:33 -0500 Subject: [PATCH 07/46] Reduce whitespace to fix linting issues --- src/guides/v2.3/install-gde/prereq/mysql.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/guides/v2.3/install-gde/prereq/mysql.md b/src/guides/v2.3/install-gde/prereq/mysql.md index 08a79697b2b..615de7d46bc 100644 --- a/src/guides/v2.3/install-gde/prereq/mysql.md +++ b/src/guides/v2.3/install-gde/prereq/mysql.md @@ -407,10 +407,10 @@ To configure a MySQL database instance: 1. In order for MySQL `TIMESTAMP` fields to follow the preferences and composition expected by Magento's declarative schema architecture, the system variable `explicit_defaults_for_timestamp` must be set to `on`. - References; + References; - * [MySQL 5.7](https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_explicit_defaults_for_timestamp) - * [MariaDB](https://mariadb.com/kb/en/server-system-variables/#explicit_defaults_for_timestamp) + * [MySQL 5.7](https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_explicit_defaults_for_timestamp) + * [MariaDB](https://mariadb.com/kb/en/server-system-variables/#explicit_defaults_for_timestamp) If this setting is not enabled, `setup:db:status` will always report that `Declarative Schema is not up to date` From 9a296882179a0a813fa469bb4b83213ee0f85f47 Mon Sep 17 00:00:00 2001 From: David Alger Date: Tue, 24 Mar 2020 09:47:29 -0500 Subject: [PATCH 08/46] Update mysql.md --- src/guides/v2.3/install-gde/prereq/mysql.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/guides/v2.3/install-gde/prereq/mysql.md b/src/guides/v2.3/install-gde/prereq/mysql.md index 615de7d46bc..c9b2ed7f2fc 100644 --- a/src/guides/v2.3/install-gde/prereq/mysql.md +++ b/src/guides/v2.3/install-gde/prereq/mysql.md @@ -409,8 +409,8 @@ To configure a MySQL database instance: References; - * [MySQL 5.7](https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_explicit_defaults_for_timestamp) - * [MariaDB](https://mariadb.com/kb/en/server-system-variables/#explicit_defaults_for_timestamp) + * [MySQL 5.7](https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_explicit_defaults_for_timestamp) + * [MariaDB](https://mariadb.com/kb/en/server-system-variables/#explicit_defaults_for_timestamp) If this setting is not enabled, `setup:db:status` will always report that `Declarative Schema is not up to date` From 24f01365077bf1ff42a18d22f85805b624f00747 Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Tue, 24 Mar 2020 18:20:37 +0200 Subject: [PATCH 09/46] Fix admin auth example with curl --- .../v2.3/get-started/authentication/gs-authentication-token.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/get-started/authentication/gs-authentication-token.md b/src/guides/v2.3/get-started/authentication/gs-authentication-token.md index 4afb67139f2..94daef92dcc 100644 --- a/src/guides/v2.3/get-started/authentication/gs-authentication-token.md +++ b/src/guides/v2.3/get-started/authentication/gs-authentication-token.md @@ -71,7 +71,7 @@ The following example uses the `curl` command to request a token for a customer ```bash curl -X POST "https://magento.host/index.php/rest/V1/integration/customer/token" \ -H "Content-Type:application/json" \ - -d "{"username":"customer1", "password":"customer1pw"}" + -d '{"username":"admin_username", "password":"admin_password"}' ``` The following example makes the same request with [XML](https://glossary.magento.com/xml) for a customer account token: From 29698a7f34ac9e136c023dd218edfd5bb9af8dc1 Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Tue, 24 Mar 2020 18:24:00 +0200 Subject: [PATCH 10/46] Fix customer auth example with curl --- .../v2.3/get-started/authentication/gs-authentication-token.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/get-started/authentication/gs-authentication-token.md b/src/guides/v2.3/get-started/authentication/gs-authentication-token.md index 94daef92dcc..fa864a93a11 100644 --- a/src/guides/v2.3/get-started/authentication/gs-authentication-token.md +++ b/src/guides/v2.3/get-started/authentication/gs-authentication-token.md @@ -71,7 +71,7 @@ The following example uses the `curl` command to request a token for a customer ```bash curl -X POST "https://magento.host/index.php/rest/V1/integration/customer/token" \ -H "Content-Type:application/json" \ - -d '{"username":"admin_username", "password":"admin_password"}' + -d '{"username":"customer@example.com", "password":"customer_password"}' ``` The following example makes the same request with [XML](https://glossary.magento.com/xml) for a customer account token: From 920fce07911dac5f539b810e98fe21e0ad8de7ff Mon Sep 17 00:00:00 2001 From: Denys Saltanahmedov Date: Wed, 25 Mar 2020 09:33:08 +0200 Subject: [PATCH 11/46] #6905 fixing recomendation --- .../service-contracts/service-to-web-service.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md b/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md index 6c3258dc2b9..aa4070eef17 100644 --- a/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md +++ b/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md @@ -9,7 +9,7 @@ functional_areas: You can configure a Magento or third-party service as a web [API](https://glossary.magento.com/api). -To [configure a web API](#configure-webapi), you define [XML](https://glossary.magento.com/xml) elements and attributes in the `webapi.xml` XML configuration file for the [module](https://glossary.magento.com/module) for the service. The `webapi.xml` file for your module specifies an XML schema file for validation. By default, this file is `app/code/Magento/Webapi/etc/webapi.xsd` or `vendor/magento/module-webapi/etc/webapi.xsd`. +To [configure a web API](#configure-webapi), you define [XML](https://glossary.magento.com/xml) elements and attributes in the `webapi.xml` XML configuration file for the [module](https://glossary.magento.com/module) for the service. The `etc/webapi.xsd` file for your module specifies an XML schema file for validation. The default XML schema validation rules are stored in `app/code/Magento/Webapi/etc/webapi.xsd` or `vendor/magento/module-webapi/etc/webapi.xsd` file. Your module can use the default `webapi.xsd` file or you can create a customized XML schema file for validation. From 1b224b250f4d12a46b91fd30bce6b7e7a146daa8 Mon Sep 17 00:00:00 2001 From: Sergiy Zhovnir Date: Wed, 25 Mar 2020 15:31:19 +0200 Subject: [PATCH 12/46] Adjusted the example of ignoreTmpls property --- .../v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md index b5e40049d37..7a3da020fa2 100644 --- a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md +++ b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md @@ -48,11 +48,10 @@ The `ignoreTmpls` property is an object that allows preventing template processi return Element.extend({ defaults: { value: 'some component value', - property: '${ $.value }', // equal to 'some component value' after component initialization - propertyIgnoreTempls: '${ $.value }', // equal to '${ $.value }' after component initialization + propertyIgnoreTempls: '${ $.value }', // template literals will be ignored for this property ignoreTmpls: { propertyIgnoreTempls: true - } + } // ignoreTmpls object contains a list of properties with template literals ignored } }); ``` From 0705c4f44e910647f98c2365cf9808f4ea54b4cd Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Wed, 25 Mar 2020 13:14:02 -0500 Subject: [PATCH 13/46] Grammar fix --- .../v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md index 7a3da020fa2..6e8eb6ee547 100644 --- a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md +++ b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md @@ -42,7 +42,7 @@ Perhaps the most important part of template literals in Magento is the `$` objec ### The `ignoreTmpls` property -The `ignoreTmpls` property is an object that allows preventing template processing for selected properties. +The `ignoreTmpls` property is an object that prevents template processing for selected properties. ```javascript return Element.extend({ From 55e08a80f86aa5058f8950a39267d6334089af18 Mon Sep 17 00:00:00 2001 From: Dima Shevtsov Date: Wed, 25 Mar 2020 18:06:55 -0500 Subject: [PATCH 14/46] Update bundle Main reason is to upgrade whatsup_github --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1d786eae360..5124fcd1f5d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -118,7 +118,7 @@ GEM mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) - octokit (4.16.0) + octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) parallel (1.19.1) @@ -132,7 +132,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.16.0) + rouge (3.17.0) safe_yaml (1.0.5) sassc (2.2.1) ffi (~> 1.9) @@ -142,13 +142,13 @@ GEM terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thor (0.20.3) - tomlrb (1.2.9) + tomlrb (1.3.0) typhoeus (1.3.1) ethon (>= 0.9.0) - unicode-display_width (1.6.1) + unicode-display_width (1.7.0) verbal_expressions (0.1.5) wdm (0.1.1) - whatsup_github (0.0.1) + whatsup_github (0.1.0) netrc (~> 0.10) octokit (~> 4.14) thor (~> 0.20) From 418ae35c84d15e12ce7064245abc59652367d557 Mon Sep 17 00:00:00 2001 From: Dima Shevtsov Date: Wed, 25 Mar 2020 20:12:03 -0500 Subject: [PATCH 15/46] Bump whatsup_github to 0.1.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5124fcd1f5d..4c9d72856ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,7 +148,7 @@ GEM unicode-display_width (1.7.0) verbal_expressions (0.1.5) wdm (0.1.1) - whatsup_github (0.1.0) + whatsup_github (0.0.1) netrc (~> 0.10) octokit (~> 4.14) thor (~> 0.20) From 3679f6a4f6c4ae86957f5102c50b6a5f8bf4e858 Mon Sep 17 00:00:00 2001 From: jfrontain Date: Wed, 25 Mar 2020 20:25:52 -0500 Subject: [PATCH 16/46] minor formatting fixes --- .../ReleaseNotes2.3.0Commerce.md | 88 +++++++++---------- .../ReleaseNotes2.3.0OpenSource.md | 74 ++++++++-------- .../ReleaseNotes2.3.1Commerce.md | 51 +++++------ .../ReleaseNotes2.3.1OpenSource.md | 52 +++++------ .../ReleaseNotes2.3.2Commerce.md | 33 +++---- .../ReleaseNotes2.3.2OpenSource.md | 40 ++++----- .../release-notes-2-3-3-commerce.md | 18 ++-- .../release-notes-2-3-3-open-source.md | 14 +-- .../release-notes-2-3-4-commerce.md | 20 ++--- .../release-notes-2-3-4-open-source.md | 22 ++--- 10 files changed, 194 insertions(+), 218 deletions(-) diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md index 89d824dff8f..552cc55aafb 100644 --- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md +++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md @@ -26,17 +26,17 @@ See the description of PRODSECBUG-2198 in the [Magento Security Center](https Follow these steps to download and apply this patch: -* Access [My Account](https://account.magento.com/customer/account/login). +1. Access [My Account](https://account.magento.com/customer/account/login). -* Navigate to the **Downloads** tab. Select the Magento edition and version you need. +2. Navigate to the **Downloads** tab. Select the Magento edition and version you need. -* Select **Support Patches and Security Patches**, then **PRODSECBUG-2198**. +3. Select **Support Patches and Security Patches**, then **PRODSECBUG-2198**. -* Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). +4. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). -* From your project root, apply the patch. `git apply ./m2-hotfixes/`. +5. From your project root, apply the patch. `git apply ./m2-hotfixes/`. -* Refresh the cache from the Admin (**System** > **Tools** > **Cache Management**). +6. Refresh the cache from the Admin (**System** > **Tools** > **Cache Management**). ## Highlights @@ -46,11 +46,11 @@ Magento Commerce 2.3.0 includes a wealth of new features as well as hundreds of * **Inventory Management (provided by [Magento Inventory (was MSI)](https://github.com/magento/inventory))** is now available with Magento 2.3.0. It lets merchants manage inventory for all product types in a single warehouse and across complex shipping networks. Merchants can manage these locations as sources, tracking on-hand inventory quantities per product. Stocks map these sources and sales channels (websites) to provide an accurate, salable quantity as inventory pools for concurrent checkout and product reservations. Inventory Management also updates order and shipment options, giving you full control over your stock. - Magento Inventory is a Magento Community Engineering special project open to contributors. To take part and contribute, see the [Magento Inventory GitHub](https://github.com/magento/inventory) repository and [wiki](https://github.com/magento/inventory/wiki) to get started. Join us in our [Slack](https://magentocommeng.slack.com/messages/C5FU5E2HY) channel (or [self signup](https://tinyurl.com/engcom-slack)) to discuss the project. - * [Inventory Management overview]({{ page.baseurl }}/inventory/index.html) for developer documentation - * [Managing Inventory](https://docs.magento.com/m2/ce/user_guide/catalog/inventory-management.html) for merchant information and instructions + Magento Inventory is a Magento Community Engineering special project open to contributors. To take part and contribute, see the [Magento Inventory GitHub](https://github.com/magento/inventory) repository and [wiki](https://github.com/magento/inventory/wiki) to get started. Join us in our [Slack](https://magentocommeng.slack.com/messages/C5FU5E2HY) channel (or [self signup](https://tinyurl.com/engcom-slack)) to discuss the project. + * [Inventory Management overview]({{ page.baseurl }}/inventory/index.html) for developer documentation + * [Managing Inventory](https://docs.magento.com/m2/ce/user_guide/catalog/inventory-management.html) for merchant information and instructions -* **CMS enhancements** include banner enhancements. You can now create banner content in native Magento WYSIWYG (or Page Builder. See the `Page Builder` discussion below. (Within the product interface, we now use the term “dynamic block” instead of “banner”.) We've also updated the WYSIWYG editor to use TinyMCE 4.6. (TinyMCE is now integrated into Magento through an adapter that allows it to be replaced with any other WYSIWYG editor.) +* **CMS enhancements** include banner enhancements. You can now create banner content in native Magento WYSIWYG (or Page Builder. See the `Page Builder` discussion below. (Within the product interface, we now use the term *dynamic block* instead of *banner*.) We've also updated the WYSIWYG editor to use TinyMCE 4.6. (TinyMCE is now integrated into Magento through an adapter that allows it to be replaced with any other WYSIWYG editor.) * **PageBuilder** is a drag-and-drop visual content editing tool that lets merchants customize the appearance of their storefront without writing any HTML or CSS. Registered participants can install PageBuilder Beta on {{site.data.var.ee}} 2.3.0 code. See check [Magento 2.3 product availability](https://devdocs.magento.com/release/#availability) and [Magento blog](https://magento.com/blog/magento-news/magento-2.3-new-tools-fuel-your-growth-2019). @@ -158,9 +158,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* The `user.ini` files now recommend the correct values for `php_value memory_limit`. - -*Fix submitted by Mr. Lewis in pull request [11760](https://github.com/magento/magento2/pull/11760)*. [GitHub-11322](https://github.com/magento/magento2/issues/11322) +* The `user.ini` files now recommend the correct values for `php_value memory_limit`. *Fix submitted by Mr. Lewis in pull request [11760](https://github.com/magento/magento2/pull/11760)*. [GitHub-11322](https://github.com/magento/magento2/issues/11322) @@ -328,7 +326,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* You can now successfully create a new store view from the Admin. Previously, Magento displayed this message when you attempted to create a new storeview, `Requested store is not found`. *Fix submitted by Pieter Hoste in pull request [14043](https://github.com/magento/magento2/pull/14043)*. [GitHub-12421](https://github.com/magento/magento2/issues/12421), [GitHub-12405](https://github.com/magento/magento2/issues/12405) +* You can now successfully create a new store view from the Admin. Previously, Magento displayed this message when you attempted to create a new storeview: `Requested store is not found`. *Fix submitted by Pieter Hoste in pull request [14043](https://github.com/magento/magento2/pull/14043)*. [GitHub-12421](https://github.com/magento/magento2/issues/12421), [GitHub-12405](https://github.com/magento/magento2/issues/12405) @@ -362,11 +360,11 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Restricted Admin users can now successfully create and save product attributes. +* Restricted administrative users can now successfully create and save product attributes. -* Restricted Admins can now create and edit CMS blocks as expected. Previously, Magento displayed this error message when an administrator with restricted privileges tried to create a new CMS block: `Warning: array_intersect(): Argument #1 is not an array in /var/www/html/magento2ee/app/code/Magento/AdminGws/Model/Models.php on line 1075`. +* Restricted administrative users can now create and edit CMS blocks as expected. Previously, Magento displayed this error message when an administrator with restricted privileges tried to create a new CMS block: `Warning: array_intersect(): Argument #1 is not an array in /var/www/html/magento2ee/app/code/Magento/AdminGws/Model/Models.php on line 1075`. @@ -472,7 +470,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Magento now displays informative messages about both successful and failed actions when a company administrator adds or deletes entries in the Company Users section. Previously, Magento displayed this error message, `Something went wrong` in the response body, and did not display a message. +* Magento now displays informative messages about both successful and failed actions when a company administrator adds or deletes entries in the Company Users section. Previously, Magento displayed this error message: `Something went wrong` in the response body, and did not display a message. @@ -480,7 +478,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Merchants can now create a company for which the region or state is not required. Previously, Magento did not create this company, and displayed this error, `Invalid value of "" provided for the region_id field`. +* Merchants can now create a company for which the region or state is not required. Previously, Magento did not create this company, and displayed this error: `Invalid value of "" provided for the region_id field`. @@ -568,7 +566,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* You can now successfully change currency for an order before you complete the order. Previously, if you changed currency, when you proceeded to checkout by choosing a Bank Transfer Payment as Payment Method, Magento displayed, **Your credit card will be charged for**. *Fix submitted by Roman K. in pull request [993](https://github.com/magento/magento2/pull/993)*. [GitHub-12526](https://github.com/magento/magento2/issues/12526) +* You can now successfully change currency for an order before you complete the order. Previously, if you changed currency, when you proceeded to checkout by choosing a Bank Transfer Payment as Payment Method, Magento displayed this message: **Your credit card will be charged for**. *Fix submitted by Roman K. in pull request [993](https://github.com/magento/magento2/pull/993)*. [GitHub-12526](https://github.com/magento/magento2/issues/12526) @@ -768,7 +766,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* A type error in the payment void method of the Authorize. net module has been fixed. *Fix submitted by JeroenVanLeusden in pull request [16838](https://github.com/magento/magento2/pull/16838)*. [GitHub-5067](https://github.com/magento/magento2/issues/5067) +* A type error in the payment void method of the Authorizenet module has been fixed. *Fix submitted by JeroenVanLeusden in pull request [16838](https://github.com/magento/magento2/pull/16838)*. [GitHub-5067](https://github.com/magento/magento2/issues/5067) @@ -812,7 +810,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* You can now successfully create a product from API Product Management in deployments where the "Update by Schedule" indexer mode is set. +* You can now successfully create a product from API Product Management in deployments where the Update by Schedule indexer mode is set. @@ -908,7 +906,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* A restricted Admin user who is authorized to access only designated websites can no longer remove products from undesignated websites. +* A restricted administrative user who is authorized to access only designated websites can no longer remove products from undesignated websites. @@ -1186,7 +1184,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Breadcrumbs now work as expected when a product name contains quotation marks. Previously, the breadcrumbs on the product details page caused this syntax error to be thrown, `SyntaxError: Unexpected token x in JSON`. *Fix submitted by Jignesh Baldha in pull request [16148](https://github.com/magento/magento2/pull/16148)*. [GitHub-15037](https://github.com/magento/magento2/issues/15037) +* Breadcrumbs now work as expected when a product name contains quotation marks. Previously, the breadcrumbs on the product details page caused this syntax error to be thrown: `SyntaxError: Unexpected token x in JSON`. *Fix submitted by Jignesh Baldha in pull request [16148](https://github.com/magento/magento2/pull/16148)*. [GitHub-15037](https://github.com/magento/magento2/issues/15037) @@ -1344,7 +1342,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Customer objects are now properly differentiated from each other after a `customer_save_after_data_object` event. Previously, the `orig_customer_data_object` and`customer_data_object` objects remained identical even after customer information was changed on the storefront. [GitHub-7915](https://github.com/magento/magento2/issues/7915) +* Customer objects are now properly differentiated from each other after a `customer_save_after_data_object` event. Previously, the `orig_customer_data_object` and `customer_data_object` objects remained identical even after customer information was changed on the storefront. [GitHub-7915](https://github.com/magento/magento2/issues/7915) @@ -1424,7 +1422,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* When you edit an Admin user role, Magento now displays the Customer Groups section under the Customers section as expected. Previously, Magento displayed the Customer Groups section under the **Stores** > **Other settings** section. +* When you edit an administrative user role, Magento now displays the Customer Groups section under the Customers section as expected. Previously, Magento displayed the Customer Groups section under the **Stores** > **Other settings** section. ### Directory @@ -1640,7 +1638,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Categories are now populated as expected. Previously, `catalog_category_product_index` did not contain all category product relations that are in `catalog_category_product`.The highest category IDs per type were missing from the index. *Fix submitted by Anton Evers in pull request [12624](https://github.com/magento/magento2/pull/12624)*. +* Categories are now populated as expected. Previously, `catalog_category_product_index` did not contain all category product relations that are in `catalog_category_product`. The highest category IDs per type were missing from the index. *Fix submitted by Anton Evers in pull request [12624](https://github.com/magento/magento2/pull/12624)*. @@ -1772,7 +1770,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Magento no longer incorrectly overly encodes UTF-8 files when JavaScript Bundling is enabled. Previously, this issue resulted in poor character encoding on the storefront. [GitHub-10562](https://github.com/magento/magento2/issues/10562), [GitHub-6733](https://github.com/magento/magento2/issues/6733) +* Magento no longer incorrectly overly encodes UTF-8 files when JavaScript bundling is enabled. Previously, this issue resulted in poor character encoding on the storefront. [GitHub-10562](https://github.com/magento/magento2/issues/10562), [GitHub-6733](https://github.com/magento/magento2/issues/6733) @@ -2064,11 +2062,11 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Customers are now redirected to the Sign In form as expected when they navigate to this form using the Back arrow on this browser. [GitHub-12715](https://github.com/magento/magento2/issues/12715) +* Customers are now redirected to the Sign In form as expected when they navigate to this form using the **Back** button on this browser. [GitHub-12715](https://github.com/magento/magento2/issues/12715) -* The welcome message now displays the new customer’s first and last name after they have confirmed their account by clicking the Confirm Your Account button in the confirmation email. [GitHub-12719](https://github.com/magento/magento2/issues/12719) +* The welcome message now displays the new customer’s first and last name after they have confirmed their account by clicking the **Confirm Your Account** button in the confirmation email. [GitHub-12719](https://github.com/magento/magento2/issues/12719) @@ -2188,7 +2186,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Import now completes successfully when a product’s CSV entry is split over two import “bunches”. Previously, Magento threw this error, `Cannot add or update a child row: a foreign key constraint fails`, and import failed. +* Import now completes successfully when a product’s CSV entry is split over two import “bunches”. Previously, Magento threw this error: `Cannot add or update a child row: a foreign key constraint fails`, and import failed. @@ -2200,7 +2198,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Magento now displays the correct execution time for an import operation on the **System** > Data Transfer > **Import History** page. +* Magento now displays the correct execution time for an import operation on the **System** > **Data Transfer** > **Import History** page. @@ -2244,7 +2242,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* CatalogImportExport now supports empty row values. [GitHub-7468](https://github.com/magento/magento2/issues/7468) +* `CatalogImportExport` now supports empty row values. [GitHub-7468](https://github.com/magento/magento2/issues/7468) @@ -2252,7 +2250,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Magento no longer throws an exception after successfully validating a .csv for import. Previously, an exception message was mistakenly passed as a exception description argument instead of exception message, which triggered the exception. [GitHub-6924](https://github.com/magento/magento2/issues/6924) +* Magento no longer throws an exception after successfully validating a `.csv` fil for import. Previously, an exception message was mistakenly passed as a exception description argument instead of exception message, which triggered the exception. [GitHub-6924](https://github.com/magento/magento2/issues/6924) @@ -2286,7 +2284,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* `indexer:status` now outputs information about the schedule mview backlog. *Fix submitted by Luke Rodgers in pull request [12592](https://github.com/magento/magento2/pull/12592)*. +* `indexer:status` now outputs information about the schedule `mview` backlog. *Fix submitted by Luke Rodgers in pull request [12592](https://github.com/magento/magento2/pull/12592)*. @@ -2682,7 +2680,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Merchants can now provide customized error messages when a transaction fails at the payment stage. Previously, Magento displayed this default message when an error occurred: `Transaction has been declined. Please try again later.` For more details, see {{ page.baseurl }}/payments-integrations/payment-gateway/error-code-mapper.html. +* Merchants can now provide customized error messages when a transaction fails at the payment stage. Previously, Magento displayed this default message when an error occurred: `Transaction has been declined. Please try again later.` @@ -2714,7 +2712,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Default AVS and CVV codes are now mapped as (null or empty string) instead of "U". for Signifyd. +* Default AVS and CVV codes are now mapped as (null or empty string) instead of `U` for Signifyd. @@ -2750,7 +2748,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Magento no longer throws an error when you try to open an order page from the Admin or when setting the transaction ID in a payment module. Previously, Magento threw this error, `Notice: Undefined index: value in /app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php on line 72`. [GitHub-3596](https://github.com/magento/magento2/issues/3596) +* Magento no longer throws an error when you try to open an order page from the Admin or when setting the transaction ID in a payment module. Previously, Magento threw this error: `Notice: Undefined index: value in /app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php on line 72`. [GitHub-3596](https://github.com/magento/magento2/issues/3596) @@ -2768,7 +2766,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* The price indexer is now scoped and multithreaded, which improves layered navigation, search, and indexing actions for complex sites with multiple websites and that have many price books. +* The price indexer is now scoped and multithreaded, which improves layered navigation, search, and indexing actions for complex sites with multiple websites and many price books. @@ -2826,7 +2824,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Magento now displays the correct product price for an order created from the Admin in multisite deployments. Previously, when an order was created from the Admin in a multisite deployment where products were assigned different prices per store view, Magento defaulted to the product price of the primary storeview if the order was edited or updated. *Fix submitted by Pratik Oza in pull request [16893](https://github.com/magento/magento2/pull/16893)*. [GitHub-14869](https://github.com/magento/magento2/issues/14869) +* Magento now displays the correct product price for an order created from the Admin in multisite deployments. Previously, when an order was created from the Admin in a multisite deployment where products were assigned different prices per store view, Magento defaulted to the product price of the primary storeview if the order were edited or updated. *Fix submitted by Pratik Oza in pull request [16893](https://github.com/magento/magento2/pull/16893)*. [GitHub-14869](https://github.com/magento/magento2/issues/14869) @@ -2998,7 +2996,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* The wrong entity_model for `invoice` has been corrected in the `eav_entity_type` table. *Fix submitted by Malyovanets Nickolas*. +* The wrong `entity_model` for `invoice` has been corrected in the `eav_entity_type` table. *Fix submitted by Malyovanets Nickolas*. @@ -3064,7 +3062,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Magento no longer throws an error when a customer uses quick search to search on a term that does not exist in the search database. Previously, Magento returned this error, `TypeError: this._getFirstVisibleElement(...).addClass is not a function`. *Fix submitted by Dragan Atanasov in pull request [14301](https://github.com/magento/magento2/pull/14301)*. [GitHub-14274](https://github.com/magento/magento2/issues/14274) +* Magento no longer throws an error when a customer uses quick search to search on a term that does not exist in the search database. Previously, Magento returned this error: `TypeError: this._getFirstVisibleElement(...).addClass is not a function`. *Fix submitted by Dragan Atanasov in pull request [14301](https://github.com/magento/magento2/pull/14301)*. [GitHub-14274](https://github.com/magento/magento2/issues/14274) @@ -3080,7 +3078,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* You can now use an asterix when searching on customer names. Previously, if you used an asterix in a search query, Magento displayed this message, `Something went wrong with processing the default view and we have restored the filter to its original state.` *Fix submitted by adrian-martinez-interactiv4 in pull request [15077](https://github.com/magento/magento2/pull/15077)*. [GitHub-14855](https://github.com/magento/magento2/issues/14855) +* You can now use an asterix when searching on customer names. Previously, if you used an asterix in a search query, Magento displayed this message: `Something went wrong with processing the default view and we have restored the filter to its original state.` *Fix submitted by adrian-martinez-interactiv4 in pull request [15077](https://github.com/magento/magento2/pull/15077)*. [GitHub-14855](https://github.com/magento/magento2/issues/14855) @@ -3158,7 +3156,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* Customers can now view their completed order from the success page for orders that will be shipped to multiple addresses. Previously, when a customer took a link from the order success page to view their just-completed order, Magento displayed this error, **There has been an error processing your request**. +* Customers can now view their completed order from the success page for orders that will be shipped to multiple addresses. Previously, when a customer took a link from the order success page to view their just-completed order, Magento displayed this error: **There has been an error processing your request**. @@ -3188,7 +3186,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* The lastmod value in the `sitemap.xml` file for a category now contains the created_at timestamp. Previously, this timestamp contained invalid dates. [GitHub-9151](https://github.com/magento/magento2/issues/9151) +* The lastmod value in the `sitemap.xml` file for a category now contains the `created_at` timestamp. Previously, this timestamp contained invalid dates. [GitHub-9151](https://github.com/magento/magento2/issues/9151) @@ -3632,7 +3630,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code. -* A generated Admin API token no longer expires immediately. Previously, when you created a token for an Admin user and have set **Admin Token Lifetime (hours))** to empty, Magento denied access because the token immediately expired. *Fix submitted by Vijay Golani in pull request [15564](https://github.com/magento/magento2/pull/15564)*. [GitHub-15564](https://github.com/magento/magento2/issues/15564) +* A generated Admin API token no longer expires immediately. Previously, when you created a token for an administrative user and have set **Admin Token Lifetime (hours))** to empty, Magento denied access because the token immediately expired. *Fix submitted by Vijay Golani in pull request [15564](https://github.com/magento/magento2/pull/15564)*. [GitHub-15564](https://github.com/magento/magento2/issues/15564) diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md index 054c4501791..c3f5c5d7135 100644 --- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md +++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md @@ -24,11 +24,11 @@ See the description of PRODSECBUG-2198 in the [Magento Security Center](https Follow these steps to download and apply this patch: -* Access the Downloads page [here](https://magento.com/tech-resources/download#download2288). -* Select the Git-based option from **Select your format**. -* Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). -* From your project root, apply the patch. `git apply ./m2-hotfixes/`. -* Refresh the cache from the Admin (**System** > **Cache Management**). +1. Access the Downloads page [here](https://magento.com/tech-resources/download#download2288). +2. Select the Git-based option from **Select your format**. +3. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). +4. From your project root, apply the patch. `git apply ./m2-hotfixes/`. +5. Refresh the cache from the Admin (**System** > **Cache Management**). ## Highlights @@ -36,12 +36,12 @@ Follow these steps to download and apply this patch: ### Merchant tool enhancements -* **Inventory Management (provided by [Magento Inventory (was MSI)](https://github.com/magento/inventory))** is now available with Magento 2.3.0. It lets merchants manage inventory for all product types in a single warehouse and across complex shipping networks. Merchants can manage these locations as sources, tracking on-hand inventory quantities per product. Stocks map these sources and sales channels (websites) to provide an accurate, salable quantity as inventory pools for concurrent checkout and product reservations. Inventory Management also updates order and shipment options, giving you full control over your stock. +**Inventory Management (provided by [Magento Inventory (was MSI)](https://github.com/magento/inventory))** is now available with Magento 2.3.0. It lets merchants manage inventory for all product types in a single warehouse and across complex shipping networks. Merchants can manage these locations as sources, tracking on-hand inventory quantities per product. Stocks map these sources and sales channels (websites) to provide an accurate, salable quantity as inventory pools for concurrent checkout and product reservations. Inventory Management also updates order and shipment options, giving you full control over your stock. Magento Inventory is a Magento Community Engineering special project open to contributors. To take part and contribute, see the [Magento Inventory GitHub](https://github.com/magento/inventory) repository and [wiki](https://github.com/magento/inventory/wiki) to get started. Join us in our [Slack](https://magentocommeng.slack.com/messages/C5FU5E2HY) channel (or [self signup](https://tinyurl.com/engcom-slack)) to discuss the project. -[Inventory Management overview]({{ page.baseurl }}/inventory/index.html) for developer documentation -[Managing Inventory](https://docs.magento.com/m2/ce/user_guide/catalog/inventory-management.html) for merchant information and instructions +* [Inventory Management overview]({{ page.baseurl }}/inventory/index.html) for developer documentation +* [Managing Inventory](https://docs.magento.com/m2/ce/user_guide/catalog/inventory-management.html) for merchant information and instructions ### Improved developer experience @@ -63,7 +63,7 @@ Magento Inventory is a Magento Community Engineering special project open to con * Cache flush ACL provides granular access to cache management settings to prevent accidental changes that could potentially affect system performance. This ACL also lets merchants control which administrative users can clear site caches. -* 2FA/CAPTCHA protects the Admin panel against stolen passwords and affects stores against bots. +* 2FA/CAPTCHA protects the Admin against stolen passwords and affects stores against bots. See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7-and-2.1.16-security-update) for a comprehensive discussion of these issues. All exploitable security issues fixed in this release (2.3.0) have been ported to 2.2.7, 2.1.16, 1.14.4.0, and 1.9.4.0, as appropriate. @@ -165,7 +165,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* The links that the Admin panel provides to backup packages now link to the expected packages. Previously, these links permitted you to download only the latest backup package. *Fix submitted by will-b in pull request [10593](https://github.com/magento/magento2/pull/10593)*. [GitHub-10032](https://github.com/magento/magento2/issues/10032) +* The links that the Admin provides to backup packages now link to the expected packages. Previously, these links permitted you to download only the latest backup package. *Fix submitted by will-b in pull request [10593](https://github.com/magento/magento2/pull/10593)*. [GitHub-10032](https://github.com/magento/magento2/issues/10032) @@ -309,7 +309,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* You can now successfully create a new store view from the Admin. Previously, Magento displayed this message when you attempted to create a new storeview, `Requested store is not found`. *Fix submitted by Pieter Hoste in pull request [14043](https://github.com/magento/magento2/pull/14043)*. [GitHub-12421](https://github.com/magento/magento2/issues/12421), [GitHub-12405](https://github.com/magento/magento2/issues/12405) +* You can now successfully create a new store view from the Admin. Previously, Magento displayed this message when you attempted to create a new storeview: `Requested store is not found`. *Fix submitted by Pieter Hoste in pull request [14043](https://github.com/magento/magento2/pull/14043)*. [GitHub-12421](https://github.com/magento/magento2/issues/12421), [GitHub-12405](https://github.com/magento/magento2/issues/12405) @@ -467,7 +467,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* You can now successfully change currency for an order before you complete the order. Previously, if you changed currency, when you proceeded to checkout by choosing a Bank Transfer Payment as Payment Method, Magento displayed, **Your credit card will be charged for**. *Fix submitted by Roman K. in pull request [993](https://github.com/magento/magento2/pull/993)*. [GitHub-12526](https://github.com/magento/magento2/issues/12526) +* You can now successfully change currency for an order before you complete the order. Previously, if you changed currency, when you proceeded to checkout by choosing a Bank Transfer Payment as Payment Method, Magento displayed this message: **Your credit card will be charged for**. *Fix submitted by Roman K. in pull request [993](https://github.com/magento/magento2/pull/993)*. [GitHub-12526](https://github.com/magento/magento2/issues/12526) @@ -539,7 +539,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Newly registered customers can now successfully complete an order after entering a new address. Previously, Magento displayed this message on the checkout page, `An error occurred on the server. Please try to place the order again.` [GitHub-10583](https://github.com/magento/magento2/issues/10583) +* Newly registered customers can now successfully complete an order after entering a new address. Previously, Magento displayed this message on the checkout page: `An error occurred on the server. Please try to place the order again.` [GitHub-10583](https://github.com/magento/magento2/issues/10583) @@ -711,7 +711,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* You can now successfully create a product from API Product Management in deployments where the "Update by Schedule" indexer mode is set. +* You can now successfully create a product from API Product Management in deployments where the Update by Schedule indexer mode is set. @@ -751,7 +751,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* You can now create a product date attribute that contains a day value than exceeds 12 (in the format dd/mm/yyyy). Previously, when you created a product attribute with a default date specifying a day greater than 12, Magento did not save the attribute, but instead displayed this error, `Invalid default date`. +* You can now create a product date attribute that contains a day value than exceeds 12 (in the format dd/mm/yyyy). Previously, when you created a product attribute with a default date specifying a day greater than 12, Magento did not save the attribute, but instead displayed this error: `Invalid default date`. @@ -863,7 +863,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* You can now see category changes on the storefront as expected after the changes have been saved. Previously, Magento did not display changes to product categories on the storefront until reindexing occurred even if **update on schedule** was set and the cache had been cleaned. +* You can now see category changes on the storefront as expected after the changes have been saved. Previously, Magento did not display changes to product categories on the storefront until reindexing occurred even if the **Update on schedule** setting was set and the cache had been cleaned. @@ -1085,7 +1085,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Breadcrumbs now work as expected when a product name contains quotation marks. Previously, the breadcrumbs on the product details page caused this syntax error to be thrown, `SyntaxError: Unexpected token x in JSON`. *Fix submitted by Jignesh Baldha in pull request [16148](https://github.com/magento/magento2/pull/16148)*. [GitHub-15037](https://github.com/magento/magento2/issues/15037) +* Breadcrumbs now work as expected when a product name contains quotation marks. Previously, the breadcrumbs on the product details page caused this syntax error to be thrown: `SyntaxError: Unexpected token x in JSON`. *Fix submitted by Jignesh Baldha in pull request [16148](https://github.com/magento/magento2/pull/16148)*. [GitHub-15037](https://github.com/magento/magento2/issues/15037) @@ -1137,7 +1137,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 * Magento no longer displays an inappropriate product price when a configurable product has two price options. Previously, Magento displayed the out-of-stock price of a configurable product when both an out-of-stock and in-stock price were configured. -* + * Magento now reorders configurable attribute options as expected on the product page. *Fix submitted by wardcapp in pull request [12962](https://github.com/magento/magento2/pull/12962)*. [GitHub-7441](https://github.com/magento/magento2/issues/7441) @@ -1243,7 +1243,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Customer objects are now properly differentiated from each other after a `customer_save_after_data_object` event. Previously, the `orig_customer_data_object` and`customer_data_object` objects remained identical even after customer information was changed on the storefront. [GitHub-7915](https://github.com/magento/magento2/issues/7915) +* Customer objects are now properly differentiated from each other after a `customer_save_after_data_object` event. Previously, the `orig_customer_data_object` and `customer_data_object` objects remained identical even after customer information was changed on the storefront. [GitHub-7915](https://github.com/magento/magento2/issues/7915) @@ -1323,7 +1323,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* When you edit an Admin user role, Magento now displays the Customer Groups section under the Customers section as expected. Previously, Magento displayed the Customer Groups section under the **Stores** > **Other settings** section.. +* When you edit an Admin user role, Magento now displays the Customer Groups section under the Customers section as expected. Previously, Magento displayed the Customer Groups section under the **Stores** > **Other settings** section. ### Directory @@ -1507,7 +1507,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* After restart of MySQL, changelog tables now always contain at least one record. Previously, changelog tables were empty, which resulted in a loss of the last 'auro_increment' value for the product 'version_id'. *Fix submitted by Ihor Sviziev in pull request [14636](https://github.com/magento/magento2/pull/14636)*. [GitHub-14465](https://github.com/magento/magento2/issues/14465) +* After restart of MySQL, changelog tables now always contain at least one record. Previously, changelog tables were empty, which resulted in a loss of the last `auro_increment` value for the product `version_id`. *Fix submitted by Ihor Sviziev in pull request [14636](https://github.com/magento/magento2/pull/14636)*. [GitHub-14465](https://github.com/magento/magento2/issues/14465) @@ -1539,7 +1539,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Categories are now populated as expected. Previously, `catalog_category_product_index` did not contain all category product relations that are in `catalog_category_product`.The highest category IDs per type were missing from the index. *Fix submitted by Anton Evers in pull request [12624](https://github.com/magento/magento2/pull/12624)*. +* Categories are now populated as expected. Previously, `catalog_category_product_index` did not contain all category product relations that are in `catalog_category_product`. The highest category IDs per type were missing from the index. *Fix submitted by Anton Evers in pull request [12624](https://github.com/magento/magento2/pull/12624)*. @@ -1671,7 +1671,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Magento no longer incorrectly overly encodes UTF-8 files when JavaScript Bundling is enabled. Previously, this issue resulted in poor character encoding on the storefront. [GitHub-10562](https://github.com/magento/magento2/issues/10562), [GitHub-6733](https://github.com/magento/magento2/issues/6733) +* Magento no longer incorrectly overly encodes UTF-8 files when JavaScript bundling is enabled. Previously, this issue resulted in poor character encoding on the storefront. [GitHub-10562](https://github.com/magento/magento2/issues/10562), [GitHub-6733](https://github.com/magento/magento2/issues/6733) @@ -1963,11 +1963,11 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Customers are now redirected to the Sign In form as expected when they navigate to this form using the Back arrow on this browser. [GitHub-12715](https://github.com/magento/magento2/issues/12715) +* Customers are now redirected to the Sign In form as expected when they navigate to this form using the **Back** button on this browser. [GitHub-12715](https://github.com/magento/magento2/issues/12715) -* The welcome message now displays the new customer’s first and last name after they have confirmed their account by clicking the Confirm Your Account button in the confirmation email. [GitHub-12719](https://github.com/magento/magento2/issues/12719) +* The welcome message now displays the new customer’s first and last name after they have confirmed their account by clicking the **Confirm Your Account** button in the confirmation email. [GitHub-12719](https://github.com/magento/magento2/issues/12719) @@ -2077,7 +2077,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Import now completes successfully when a product’s CSV entry is split over two import “bunches”. Previously, Magento threw this error, `Cannot add or update a child row: a foreign key constraint fails`, and import failed. +* Import now completes successfully when a product’s CSV entry is split over two import “bunches”. Previously, Magento threw this error: `Cannot add or update a child row: a foreign key constraint fails`, and import failed. @@ -2171,7 +2171,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* `indexer:status` now outputs information about the schedule mview backlog. *Fix submitted by Luke Rodgers in pull request [12592](https://github.com/magento/magento2/pull/12592)*. +* `indexer:status` now outputs information about the schedule `mview` backlog. *Fix submitted by Luke Rodgers in pull request [12592](https://github.com/magento/magento2/pull/12592)*. @@ -2361,7 +2361,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* The `getToolbarBlock()` method has been refactored to permit removal of product_list_toolbar. [GitHub-9413](https://github.com/magento/magento2/issues/9413) +* The `getToolbarBlock()` method has been refactored to permit removal of `product_list_toolbar`. [GitHub-9413](https://github.com/magento/magento2/issues/9413) @@ -2561,7 +2561,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Merchants can now provide customized error messages when a transaction fails at the payment stage. Previously, Magento displayed this default message when an error occurred: `Transaction has been declined. Please try again later.` For more details, see {{ page.baseurl }}/payments-integrations/payment-gateway/error-code-mapper.html. +* Merchants can now provide customized error messages when a transaction fails at the payment stage. Previously, Magento displayed this default message when an error occurred: `Transaction has been declined. Please try again later.` @@ -2593,7 +2593,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Default AVS and CVV codes are now mapped as (null or empty string) instead of "U". for Signifyd. +* Default AVS and CVV codes are now mapped as (null or empty string) instead of `U` for Signifyd. @@ -2629,7 +2629,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Magento no longer throws an error when you try to open an order page from the Admin or when setting the transaction ID in a payment module. Previously, Magento threw this error, `Notice: Undefined index: value in /app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php on line 72`. [GitHub-3596](https://github.com/magento/magento2/issues/3596) +* Magento no longer throws an error when you try to open an order page from the Admin or when setting the transaction ID in a payment module. Previously, Magento threw this error: `Notice: Undefined index: value in /app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php on line 72`. [GitHub-3596](https://github.com/magento/magento2/issues/3596) @@ -2647,7 +2647,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* The price indexer is now scoped and multithreaded, which improves layered navigation, search, and indexing actions for complex sites with multiple websites and that have many price books. +* The price indexer is now scoped and multithreaded, which improves layered navigation, search, and indexing actions for complex sites with multiple websites and many price books. @@ -2705,7 +2705,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Magento now displays the correct product price for an order created from the Admin in multisite deployments. Previously, when an order was created from the Admin in a multisite deployment where products were assigned different prices per store view, Magento defaulted to the product price of the primary storeview if the order was edited or updated. *Fix submitted by Pratik Oza in pull request [16893](https://github.com/magento/magento2/pull/16893)*. [GitHub-14869](https://github.com/magento/magento2/issues/14869) +* Magento now displays the correct product price for an order created from the Admin in multisite deployments. Previously, when an order was created from the Admin in a multisite deployment where products were assigned different prices per store view, Magento defaulted to the product price of the primary storeview if the order were edited or updated. *Fix submitted by Pratik Oza in pull request [16893](https://github.com/magento/magento2/pull/16893)*. [GitHub-14869](https://github.com/magento/magento2/issues/14869) @@ -2907,7 +2907,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Magento no longer throws an error when a customer uses quick search to search on a term that does not exist in the search database. Previously, Magento returned this error, `TypeError: this._getFirstVisibleElement(...).addClass is not a function`. *Fix submitted by Dragan Atanasov in pull request [14301](https://github.com/magento/magento2/pull/14301)*. [GitHub-14274](https://github.com/magento/magento2/issues/14274) +* Magento no longer throws an error when a customer uses quick search to search on a term that does not exist in the search database. Previously, Magento returned this error: `TypeError: this._getFirstVisibleElement(...).addClass is not a function`. *Fix submitted by Dragan Atanasov in pull request [14301](https://github.com/magento/magento2/pull/14301)*. [GitHub-14274](https://github.com/magento/magento2/issues/14274) @@ -2923,7 +2923,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* You can now use an asterix when searching on customer names. Previously, if you used an asterix in a search query, Magento displayed this message, `Something went wrong with processing the default view and we have restored the filter to its original state.` *Fix submitted by Adrian Martinez in pull request [15077](https://github.com/magento/magento2/pull/15077)*. [GitHub-14855](https://github.com/magento/magento2/issues/14855) +* You can now use an asterix when searching on customer names. Previously, if you used an asterix in a search query, Magento displayed this message: `Something went wrong with processing the default view and we have restored the filter to its original state.` *Fix submitted by Adrian Martinez in pull request [15077](https://github.com/magento/magento2/pull/15077)*. [GitHub-14855](https://github.com/magento/magento2/issues/14855) @@ -3001,7 +3001,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* Customers can now view their completed order from the success page for orders that will be shipped to multiple addresses. Previously, when a customer took a link from the order success page to view their just-completed order, Magento displayed this error, **There has been an error processing your request**. +* Customers can now view their completed order from the success page for orders that will be shipped to multiple addresses. Previously, when a customer took a link from the order success page to view their just-completed order, Magento displayed this error: **There has been an error processing your request**. @@ -3031,7 +3031,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7 -* The lastmod value in the `sitemap.xml` file for a category now contains the created_at timestamp. Previously, this timestamp contained invalid dates. [GitHub-9151](https://github.com/magento/magento2/issues/9151) +* The lastmod value in the `sitemap.xml` file for a category now contains the `created_at` timestamp. Previously, this timestamp contained invalid dates. [GitHub-9151](https://github.com/magento/magento2/issues/9151) diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md index 3b9feb2bc84..c23b17c82be 100644 --- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md +++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md @@ -31,17 +31,12 @@ A critical SQL injection vulnerability has been identified in 2.3.x Magento code Follow these steps to download and apply this patch: -* Access [My Account](https://account.magento.com/customer/account/login). - -* Navigate to the **Downloads** tab. Select the Magento edition and version you need. - -* Select **Support Patches and Security Patches**, then **PRODSECBUG-2198**. - -* Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). - -* From your project root, apply the patch. `git apply ./m2-hotfixes/`. - -* Refresh the cache from the Admin (**System** > **Cache Management**). +1. Access [My Account](https://account.magento.com/customer/account/login). +2. Navigate to the **Downloads** tab. Select the Magento edition and version you need. +3. Select **Support Patches and Security Patches**, then **PRODSECBUG-2198** +4. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). +5. From your project root, apply the patch. `git apply ./m2-hotfixes/`. +6. Refresh the cache from the Admin (**System** > **Cache Management**). ## PayPal Payflow Pro active carding activity update @@ -111,9 +106,9 @@ This release includes over 30 security enhancements that help close cross-site s Infrastructure improvements are core enhancements that underlie both merchant and developer features. -* This release includes a **new Authorize.Net extension** to replace the Authorize.Net Direct Post module, which implemented an MD5-based hash that Authorize.Net will no longer support as of June 28, 2019. See [Authorize.Net](https://docs.magento.com/m2/ce/user_guide/payment/authorize-net.html) for information on configuring and using this new extension. Information about the deprecation of Authorize.Net Direct Post can be found [here](https://docs.magento.com/m2/ce/user_guide/payment/authorize-net-direct-post.html). Note that Magento released a patch in late February to address this issue on pre-2.3.1 installations of Magento, which is discussed in [Update Authorize.Net Direct Post from MD5 to SHA-512](https://support.magento.com/hc/en-us/articles/360024368392-Update-Authorize-Net-Direct-Post-from-MD5-to-SHA-512). +* This release includes a **new Authorizenet extension** to replace the Authorizenet Direct Post module, which implemented an MD5-based hash that Authorize.Net will no longer support as of June 28, 2019. See [Authorize.Net](https://docs.magento.com/m2/ce/user_guide/payment/authorize-net.html) for information on configuring and using this new extension. Information about the deprecation of Authorize.Net Direct Post can be found [here](https://docs.magento.com/m2/ce/user_guide/payment/authorize-net-direct-post.html). Note that Magento released a patch in late February to address this issue on pre-2.3.1 installations of Magento, which is discussed in [Update Authorize.Net Direct Post from MD5 to SHA-512](https://support.magento.com/hc/en-us/articles/360024368392-Update-Authorize-Net-Direct-Post-from-MD5-to-SHA-512). -* Accept.js library is now used for Authorize.Net payments. +* `Accept.js` library is now used for Authorize.Net payments. * Magento now supports **Elasticsearch 6.x**. *Fix submitted by community member Romain Ruaud in pull request [21458](https://github.com/magento/magento2/pull/21458)*. Thank you, Romain! @@ -209,7 +204,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* Administrators that have been assigned a backup module role resource can now access the backup controller as expected. s*Fix submitted by Mahesh Singh in pull request [18816](https://github.com/magento/magento2/pull/18816)*. [GitHub-18150](https://github.com/magento/magento2/issues/18150) +* Administrators that have been assigned a backup module role resource can now access the backup controller as expected. *Fix submitted by Mahesh Singh in pull request [18816](https://github.com/magento/magento2/pull/18816)*. [GitHub-18150](https://github.com/magento/magento2/issues/18150) @@ -261,7 +256,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now successfully save a role from the Admin. Previously, when you saved a role from the Admin, Magento removed all users from the role (no matter which checkbox was checked), and displayed this message, `This user has no tokens`. +* You can now successfully save a role from the Admin. Previously, when you saved a role from the Admin, Magento removed all users from the role (no matter which checkbox was checked), and displayed this message: `This user has no tokens`. ### Backend @@ -293,7 +288,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now successfully change the attribute set for a bundle product. Previously, the edit bundle page hung, and Magento threw this error, `Uncaught TypeError: Cannot read property 'length' of undefined`. [GitHub-5999](https://github.com/magento/magento2/issues/5999) +* You can now successfully change the attribute set for a bundle product. Previously, the edit bundle page hung, and Magento threw this error: `Uncaught TypeError: Cannot read property 'length' of undefined`. [GitHub-5999](https://github.com/magento/magento2/issues/5999) @@ -313,7 +308,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now add a bundle product to a requisition list from the category page. Previously, Magento threw this error, `PHP Fatal error: Uncaught Error: Call to a member function getParentProductId() on string in app/code/Magento/RequisitionList/Model/RequisitionListItem/Options/Builder.php:118`. +* You can now add a bundle product to a requisition list from the category page. Previously, Magento threw this error: `PHP Fatal error: Uncaught Error: Call to a member function getParentProductId() on string in app/code/Magento/RequisitionList/Model/RequisitionListItem/Options/Builder.php:118`. ### B2B @@ -339,7 +334,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* Merchants can now add a product to the default public catalog, and the product can be accessed by the product URL on the storefront. Previously, Magento did not add the product to the shared catalog and instead displayed this error, `Requested categories don't exist`. +* Merchants can now add a product to the default public catalog, and the product can be accessed by the product URL on the storefront. Previously, Magento did not add the product to the shared catalog and instead displayed this error: `Requested categories don't exist`. @@ -479,7 +474,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* Magento no longer displays a console error when a customer selects one-step checkout. Previously, Magento displayed this JavaScript error, `Cannot read property 'code' of undefined`. *Fix submitted by Ihor Sviziev in pull request [18494](https://github.com/magento/magento2/pull/18494)*. [GitHub-18164](https://github.com/magento/magento2/issues/18164) +* Magento no longer displays a console error when a customer selects one-step checkout. Previously, Magento displayed this JavaScript error: `Cannot read property 'code' of undefined`. *Fix submitted by Ihor Sviziev in pull request [18494](https://github.com/magento/magento2/pull/18494)*. [GitHub-18164](https://github.com/magento/magento2/issues/18164) @@ -523,7 +518,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now create a new product with a special price. Previously, when you saved the newly created product, Magento threw this error, `Special price date from" Failed to parse time string`. *Fix submitted by Hiren Pandya in pull request [18578](https://github.com/magento/magento2/pull/18578)*. [GitHub-18158](https://github.com/magento/magento2/issues/18158) +* You can now create a new product with a special price. Previously, when you saved the newly created product, Magento threw this error: `Special price date from" Failed to parse time string`. *Fix submitted by Hiren Pandya in pull request [18578](https://github.com/magento/magento2/pull/18578)*. [GitHub-18158](https://github.com/magento/magento2/issues/18158) @@ -773,7 +768,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now save and duplicate a linked product. Previously, Magento did not duplicate the product, and displayed this error, `Invalid data provided for linked products`. +* You can now save and duplicate a linked product. Previously, Magento did not duplicate the product, and displayed this error: `Invalid data provided for linked products`. @@ -1303,7 +1298,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* The `fileUploader` form element in the `ui_component` form now works as expected. Previously, during file upload, the countable interface was not implemented, and Magento threw this error, `Error Message : Warning: count(): Parameter must be an array or an object that implements Countable`. *Fix submitted by [gmachure](https://github.com/gmachure) in pull request [19249](https://github.com/magento/magento2/pull/19249)*. [GitHub-19247](https://github.com/magento/magento2/issues/19247) +* The `fileUploader` form element in the `ui_component` form now works as expected. Previously, during file upload, the countable interface was not implemented, and Magento threw this error: `Error Message : Warning: count(): Parameter must be an array or an object that implements Countable`. *Fix submitted by [gmachure](https://github.com/gmachure) in pull request [19249](https://github.com/magento/magento2/pull/19249)*. [GitHub-19247](https://github.com/magento/magento2/issues/19247) @@ -1839,7 +1834,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now add a product review from the Admin. Previously, when you clicked **New Review**, Magento displayed this error, `Error message showing : A technical problem with the server created an error. Try again to continue what you were doing. If the problem persists, try again later`. *Fix submitted by Suneet K. in pull request [20146](https://github.com/magento/magento2/pull/20146)*. [GitHub-20122](https://github.com/magento/magento2/issues/20122) +* You can now add a product review from the Admin. Previously, when you clicked **New Review**, Magento displayed this error: `Error message showing : A technical problem with the server created an error. Try again to continue what you were doing. If the problem persists, try again later`. *Fix submitted by Suneet K. in pull request [20146](https://github.com/magento/magento2/pull/20146)*. [GitHub-20122](https://github.com/magento/magento2/issues/20122) @@ -1875,7 +1870,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* Administrators can now process returns when a request includes a required image attribute. Previously, the Return Items tab displayed a validation error even though the image had been uploaded, and if you clicked on **Details**, Magento displayed this message, `Please select a file`. +* Administrators can now process returns when a request includes a required image attribute. Previously, the Return Items tab displayed a validation error even though the image had been uploaded, and if you clicked on **Details**, Magento displayed this message: `Please select a file`. @@ -1893,7 +1888,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now print order information from the customer dashboard. Previously, when you tried to print order information from the customer dashboard, Magento displayed this error, `Fatal error: Call to a member function getRealOrderId() on null in /vendor/magento/module-sales/Block/Order/PrintShipment.php`. *Fix submitted by Pratik Oza in pull request [18272](https://github.com/magento/magento2/pull/18272)*. [GitHub-10530](https://github.com/magento/magento2/issues/10530) +* You can now print order information from the customer dashboard. Previously, when you tried to print order information from the customer dashboard, Magento displayed this error: `Fatal error: Call to a member function getRealOrderId() on null in /vendor/magento/module-sales/Block/Order/PrintShipment.php`. *Fix submitted by Pratik Oza in pull request [18272](https://github.com/magento/magento2/pull/18272)*. [GitHub-10530](https://github.com/magento/magento2/issues/10530) @@ -1941,7 +1936,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* Magento now displays a success message when you create an order through the Admin and the **create shipment** and **Email copy of invoice** checkboxes are checked. *Fix submitted by Surabhi Srivastava](https://github.com/Surabhi-Cedcoss) in pull request [20142](https://github.com/magento/magento2/pull/20142)*. [GitHub-19942](https://github.com/magento/magento2/issues/19942) +* Magento now displays a success message when you create an order through the Admin and the **create shipment** and **Email copy of invoice** checkboxes are checked. *Fix submitted by Surabhi Srivastava in pull request [20142](https://github.com/magento/magento2/pull/20142)*. [GitHub-19942](https://github.com/magento/magento2/issues/19942) @@ -1993,7 +1988,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* The sales rule indexer now runs without error. Previously, the sales rule indexer returned an error during reindexing because of the Magento_AdvancedSalesRule module. +* The sales rule indexer now runs without error. Previously, the sales rule indexer returned an error during reindexing because of the `Magento_AdvancedSalesRule` module. @@ -2277,7 +2272,7 @@ See [Filterable attributes](https://docs.magento.com/m2/ee/user_guide/catalog/na -* Usage of unsupported includes has been removed. Previously, when you chose a user to edit on the customers grid, Magento installations running on Internet Explorer 11.x did not load the expected page, but instead displayed this message, `object does not support method includes`. *Fix submitted by Oleksandr Miroshnichenko in pull request [19010](https://github.com/magento/magento2/pull/19010)*. [GitHub-18562](https://github.com/magento/magento2/issues/18562) +* Usage of unsupported includes has been removed. Previously, when you chose a user to edit on the customers grid, Magento installations running on Internet Explorer 11.x did not load the expected page, but instead displayed this message: `object does not support method includes`. *Fix submitted by Oleksandr Miroshnichenko in pull request [19010](https://github.com/magento/magento2/pull/19010)*. [GitHub-18562](https://github.com/magento/magento2/issues/18562) ### URL rewrites diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md index 7185ec9511f..7addd4f4ba2 100644 --- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md +++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md @@ -28,15 +28,12 @@ A critical SQL injection vulnerability has been identified in 2.3.x Magento code Follow these steps to download and apply this patch: -* Access the Downloads page [here](https://magento.com/tech-resources/download#download2288). - -* Select the Git-based option from **Select your format**. - -* Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). - -* From your project root, apply the patch. `git apply ./m2-hotfixes/`. - -* Refresh the cache from the Admin (**System** > **Cache Management**). +1. Access [My Account](https://account.magento.com/customer/account/login). +2. Navigate to the **Downloads** tab. Select the Magento edition and version you need. +3. Select **Support Patches and Security Patches**, then **PRODSECBUG-2198** +4. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). +5. From your project root, apply the patch. `git apply ./m2-hotfixes/`. +6. Refresh the cache from the Admin (**System** > **Cache Management**). ## PayPal Payflow Pro active carding activity update @@ -102,7 +99,7 @@ Infrastructure improvements are core enhancements that underlie both merchant an * This release includes a **new Authorize.Net extension** to replace the Authorize.Net Direct Post module, which implemented an MD5-based hash that Authorize.Net will no longer support as of June 28, 2019. See [Authorize.Net](https://docs.magento.com/m2/ce/user_guide/payment/authorize-net.html) for information on configuring and using this new extension. Information about the deprecation of Authorize.Net Direct Post can be found [here](https://docs.magento.com/m2/ce/user_guide/payment/authorize-net-direct-post.html). Note that Magento released a patch in late February to address this issue on pre-2.3.1 installations of Magento, which is discussed in [Update Authorize.Net Direct Post from MD5 to SHA-512](https://support.magento.com/hc/en-us/articles/360024368392-Update-Authorize-Net-Direct-Post-from-MD5-to-SHA-512). -* Accept.js library is now used for Authorize.NET payments. +* `Accept.js` library is now used for Authorize.NET payments. * Magento now supports **Elasticsearch 6.x**. *Fix submitted by community member [Romain Ruaud](https://github.com/romainruaud) in pull request [21458](https://github.com/magento/magento2/pull/21458)*. Thank you, Romain! @@ -194,7 +191,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* Administrators that have been assigned a backup module role resource can now access the backup controller as expected. s*Fix submitted by Mahesh Singh in pull request [18816](https://github.com/magento/magento2/pull/18816)*. [GitHub-18150](https://github.com/magento/magento2/issues/18150) +* Administrators that have been assigned a backup module role resource can now access the backup controller as expected. *Fix submitted by Mahesh Singh in pull request [18816](https://github.com/magento/magento2/pull/18816)*. [GitHub-18150](https://github.com/magento/magento2/issues/18150) @@ -238,7 +235,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now successfully save a role from the Admin. Previously, when you saved a role from the Admin, Magento removed all users from the role (no matter which checkbox was checked), and displayed this message, `This user has no tokens`. +* You can now successfully save a role from the Admin. Previously, when you saved a role from the Admin, Magento removed all users from the role (no matter which checkbox was checked), and displayed this message: `This user has no tokens`. ### Backend @@ -270,7 +267,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now successfully change the attribute set for a bundle product. Previously, the edit bundle page hung, and Magento threw this error, `Uncaught TypeError: Cannot read property 'length' of undefined`. [GitHub-5999](https://github.com/magento/magento2/issues/5999) +* You can now successfully change the attribute set for a bundle product. Previously, the edit bundle page hung, and Magento threw this error: `Uncaught TypeError: Cannot read property 'length' of undefined`. [GitHub-5999](https://github.com/magento/magento2/issues/5999) @@ -290,7 +287,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now add a bundle product to a requisition list from the category page. Previously, Magento threw this error, `PHP Fatal error: Uncaught Error: Call to a member function getParentProductId() on string in app/code/Magento/RequisitionList/Model/RequisitionListItem/Options/Builder.php:118`. +* You can now add a bundle product to a requisition list from the category page. Previously, Magento threw this error: `PHP Fatal error: Uncaught Error: Call to a member function getParentProductId() on string in app/code/Magento/RequisitionList/Model/RequisitionListItem/Options/Builder.php:118`. ### CAPTCHA @@ -414,7 +411,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* Magento no longer displays a console error when a customer selects one-step checkout. Previously, Magento displayed this JavaScript error, `Cannot read property 'code' of undefined`. *Fix submitted by Ihor Sviziev in pull request [18494](https://github.com/magento/magento2/pull/18494)*. [GitHub-18164](https://github.com/magento/magento2/issues/18164) +* Magento no longer displays a console error when a customer selects one-step checkout. Previously, Magento displayed this JavaScript error: `Cannot read property 'code' of undefined`. *Fix submitted by Ihor Sviziev in pull request [18494](https://github.com/magento/magento2/pull/18494)*. [GitHub-18164](https://github.com/magento/magento2/issues/18164) @@ -458,7 +455,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now create a new product with a special price. Previously, when you saved the newly created product, Magento threw this error, `Special price date from" Failed to parse time string`. *Fix submitted by Hiren Pandya in pull request [18578](https://github.com/magento/magento2/pull/18578)*. [GitHub-18158](https://github.com/magento/magento2/issues/18158) +* You can now create a new product with a special price. Previously, when you saved the newly created product, Magento threw this error: `Special price date from" Failed to parse time string`. *Fix submitted by Hiren Pandya in pull request [18578](https://github.com/magento/magento2/pull/18578)*. [GitHub-18158](https://github.com/magento/magento2/issues/18158) @@ -1182,7 +1179,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* Magento no longer changes the ute source_model when you create an attribute option through the API. Previously, the `source_model` of an EAV attribute was set to `Magento\Eav\Model\Entity\Attribute\Source\Table` when updating an EAV attribute's options through the API. This eliminated the ability to update this attribute's options through the Admin. *Fix submitted by Pieter Hoste in pull request [18244](https://github.com/magento/magento2/pull/18244)*. [GitHub-13156](https://github.com/magento/magento2/issues/13156) +* Magento no longer changes the `source_model` when you create an attribute option through the API. Previously, the `source_model` of an EAV attribute was set to `Magento\Eav\Model\Entity\Attribute\Source\Table` when updating an EAV attribute's options through the API. This eliminated the ability to update this attribute's options through the Admin. *Fix submitted by Pieter Hoste in pull request [18244](https://github.com/magento/magento2/pull/18244)*. [GitHub-13156](https://github.com/magento/magento2/issues/13156) @@ -1230,7 +1227,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* The `fileUploader` form element in `ui_component` form now works as expected. Previously, during file upload, the countable interface not implemented, and Magento threw this error, `Error Message : Warning: count(): Parameter must be an array or an object that implements Countable in /vendor/magento/framework/File/Uploader.php on line 550`. *Fix submitted by gmachure in pull request [19249](https://github.com/magento/magento2/pull/19249)*. [GitHub-19247](https://github.com/magento/magento2/issues/19247) +* The `fileUploader` form element in `ui_component` form now works as expected. Previously, during file upload, the countable interface not implemented, and Magento threw this error: `Error Message : Warning: count(): Parameter must be an array or an object that implements Countable in /vendor/magento/framework/File/Uploader.php on line 550`. *Fix submitted by gmachure in pull request [19249](https://github.com/magento/magento2/pull/19249)*. [GitHub-19247](https://github.com/magento/magento2/issues/19247) @@ -1298,7 +1295,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* events.xml can now have child nodes. *Fix submitted by Lisovyi Yevhenii in pull request [19146](https://github.com/magento/magento2/pull/19146)*. [GitHub-15931](https://github.com/magento/magento2/issues/15931) +* `events.xml` can now have child nodes. *Fix submitted by Lisovyi Yevhenii in pull request [19146](https://github.com/magento/magento2/pull/19146)*. [GitHub-15931](https://github.com/magento/magento2/issues/15931) #### JavaScript framework @@ -1352,7 +1349,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* Magento no longer displays a console error when a customer selects one step checkout. Previously, Magento displayed this JavaScript error, `Cannot read property 'code' of undefined`. *Fix submitted by Ihor Sviziev in pull request [18494](https://github.com/magento/magento2/pull/18494)*. [GitHub-18164](https://github.com/magento/magento2/issues/18164) +* Magento no longer displays a console error when a customer selects one step checkout. Previously, Magento displayed this JavaScript error: `Cannot read property 'code' of undefined`. *Fix submitted by Ihor Sviziev in pull request [18494](https://github.com/magento/magento2/pull/18494)*. [GitHub-18164](https://github.com/magento/magento2/issues/18164) @@ -1435,7 +1432,6 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. * We've resolved the following issues with imported images: * images of all sizes reverted to the default placeholder size after import. - * images that were removed through the Admin before import returned after import. Magento now displays an informative error message if images are not imported as expected. @@ -1510,7 +1506,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* `json_encode` errors are now caught and logged in console.log. Previously, the JSON serializer threw an error, which blocked all frontend behavior, *Fix submitted by Tommy Quissens in pull request [16154](https://github.com/magento/magento2/pull/16154)*. [GitHub-14937](https://github.com/magento/magento2/issues/14937) +* `json_encode` errors are now caught and logged in console.log. Previously, the JSON serializer threw an error, which blocked all frontend behavior. *Fix submitted by Tommy Quissens in pull request [16154](https://github.com/magento/magento2/pull/16154)*. [GitHub-14937](https://github.com/magento/magento2/issues/14937) @@ -1728,7 +1724,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now add a product review from the Admin. Previously, when you clicked **New Review**, Magento displayed this error, `Error message showing : A technical problem with the server created an error. Try again to continue what you were doing. If the problem persists, try again later`. *Fix submitted by Suneet K. in pull request [20146](https://github.com/magento/magento2/pull/20146)*. [GitHub-20122](https://github.com/magento/magento2/issues/20122) +* You can now add a product review from the Admin. Previously, when you clicked **New Review**, Magento displayed this error: `Error message showing : A technical problem with the server created an error. Try again to continue what you were doing. If the problem persists, try again later`. *Fix submitted by Suneet K. in pull request [20146](https://github.com/magento/magento2/pull/20146)*. [GitHub-20122](https://github.com/magento/magento2/issues/20122) @@ -1760,7 +1756,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* Administrators can now process returns when a request includes a required image attribute. Previously, the Return Items tab displayed a validation error even though the image had been uploaded, and if you clicked on **Details**, Magento displayed this message, `Please select a file`. +* Administrators can now process returns when a request includes a required image attribute. Previously, the Return Items tab displayed a validation error even though the image had been uploaded, and if you clicked on **Details**, Magento displayed this message: `Please select a file`. @@ -1778,7 +1774,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* You can now print order information from the customer dashboard. Previously, when you tried to print order information from the customer dashboard, Magento displayed this error, `Fatal error: Call to a member function getRealOrderId() on null in /vendor/magento/module-sales/Block/Order/PrintShipment.php`. *Fix submitted by Pratik Oza in pull request [18272](https://github.com/magento/magento2/pull/18272)*. [GitHub-10530](https://github.com/magento/magento2/issues/10530) +* You can now print order information from the customer dashboard. Previously, when you tried to print order information from the customer dashboard, Magento displayed this error: `Fatal error: Call to a member function getRealOrderId() on null in /vendor/magento/module-sales/Block/Order/PrintShipment.php`. *Fix submitted by Pratik Oza in pull request [18272](https://github.com/magento/magento2/pull/18272)*. [GitHub-10530](https://github.com/magento/magento2/issues/10530) @@ -1860,7 +1856,7 @@ We've fixed hundreds of issues in the Magento 2.3.1 core code. -* The sales rule indexer now runs without error. Previously, the sales rule indexer returned an error during reindexing because of the Magento_AdvancedSalesRule module. +* The sales rule indexer now runs without error. Previously, the sales rule indexer returned an error during reindexing because of the `Magento_AdvancedSalesRule` module. @@ -1978,7 +1974,7 @@ See [Filterable attributes](https://docs.magento.com/m2/ee/user_guide/catalog/na -* The "Not yet calculated" string for the tax field in the summary section of the checkout page can now be translated. *Fix submitted by p-bystritsky in pull request [19174](https://github.com/magento/magento2/pull/19174)*. [GitHub-18939](https://github.com/magento/magento2/issues/18939), [GitHub-7849](https://github.com/magento/magento2/issues/7849) +* The **Not yet calculated** string for the tax field in the summary section of the checkout page can now be translated. *Fix submitted by p-bystritsky in pull request [19174](https://github.com/magento/magento2/pull/19174)*. [GitHub-18939](https://github.com/magento/magento2/issues/18939), [GitHub-7849](https://github.com/magento/magento2/issues/7849) @@ -2106,7 +2102,7 @@ See [Filterable attributes](https://docs.magento.com/m2/ee/user_guide/catalog/na -* Usage of unsupported includes has been removed. Previously, when you chose a user to edit on the customers grid, Magento installations running on Internet Explorer 11.x did not load the expected page, but instead displayed this message, `object does not support method includes`. *Fix submitted by Oleksandr Miroshnichenko in pull request [19010](https://github.com/magento/magento2/pull/19010)*. [GitHub-18562](https://github.com/magento/magento2/issues/18562) +* Usage of unsupported includes has been removed. Previously, when you chose a user to edit on the customers grid, Magento installations running on Internet Explorer 11.x did not load the expected page, but instead displayed this message: `object does not support method includes`. *Fix submitted by Oleksandr Miroshnichenko in pull request [19010](https://github.com/magento/magento2/pull/19010)*. [GitHub-18562](https://github.com/magento/magento2/issues/18562) ### URL rewrites diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.md index 8e26f94c969..3da0486d036 100644 --- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.md +++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.md @@ -45,7 +45,7 @@ Starting with the release of Magento Commerce 2.3.2, Magento will assign and pu ### Performance boosts -* **Redesign of checkout page to support customers working with many addresses**. The checkout page now provides the ability to search addresses instead of listing addresses only on the Select shipping and Billing address steps. This new search feature can substantially increase checkout performance for customers with thousands of addresses. It is disabled by default and must be enabled from Admin. See [Checkout](https://docs.magento.com/m2/ee/user_guide/configuration/sales/checkout.html#Checkout). +* **Redesign of checkout page to support customers working with many addresses**. The checkout page now provides the ability to search addresses instead of listing addresses only on the Select shipping and Billing address steps. This new search feature can substantially increase checkout performance for customers with thousands of addresses. It is disabled by default and must be enabled from the Admin. See [Checkout](https://docs.magento.com/m2/ee/user_guide/configuration/sales/checkout.html#Checkout). * **Significant improvement to storefront page response time**. The page response times for the catalog, search, and advanced search pages have been significantly improved under high load. @@ -83,7 +83,7 @@ Magento now performs the following tasks as **asynchronous background processes* * **New commands** allow merchants to check for reservation inconsistencies and resolve any that occur. See [Inventory CLI reference]({{ page.baseurl }}/inventory/inventory-cli-reference.html). -* Improved user interface for assigning sources to products. This redesigned interface includes: +* **Improved user interface** for assigning sources to products. This redesigned interface includes: * Support for decimal order quantity * New test scenarios created to cover Credit Memo use cases @@ -118,11 +118,11 @@ See [Release notes]({{ page.baseurl }}/graphql/release-notes.html) for a more de ### Progressive Web Apps (PWA) -* **Improved modular component library**. PWA Studio continues to build out the concept for functional and data components through the Peregrine library. Components can now be reused and scaled for frontend needs. Magento has planned a phased rollout for Peregrine functional and data components, starting with the Search component which is launching with this release. +**Improved modular component library**. PWA Studio continues to build out the concept for functional and data components through the Peregrine library. Components can now be reused and scaled for frontend needs. Magento has planned a phased rollout for Peregrine functional and data components, starting with the Search component which is launching with this release. ### BlueFoot to Page Builder content migration -* **Assistance for BlueFoot to Page Builder migration**. The BlueFoot content migration module (PageBuilderDataMigration) enables merchants who are running Magento 2.1.x or 2.2.x with BlueFoot to upgrade to Magento 2.3.1+ with PageBuilder 1.0 without losing their website content. This module migrates only content created with native BlueFoot. See [Overview of content migration](https://devdocs.magento.com/page-builder-migration/docs/) for information about module installation and supported content types. +**Assistance for BlueFoot to Page Builder migration**. The BlueFoot content migration module (PageBuilderDataMigration) enables merchants who are running Magento 2.1.x or 2.2.x with BlueFoot to upgrade to Magento 2.3.1+ with PageBuilder 1.0 without losing their website content. This module migrates only content created with native BlueFoot. See [Overview of content migration](https://devdocs.magento.com/page-builder-migration/docs/) for information about module installation and supported content types. ### Vendor-developed extension enhancements @@ -192,7 +192,7 @@ We have fixed hundreds of issues in the Magento 2.3.2 core code. -* Fixed display of **Option Title** label on **Catalog** > **Product** > **Customizable Options** > **Add Option**. *Fix submitted by Arvinda kumar in pull request [20339](https://github.com/magento/magento2/pull/20339)*. [GitHub-20337](https://github.com/magento/magento2/issues/20337) +* Fixed display of **Option Title** label on **Catalog** > **Product** > **Customizable Options** > **Add Option**. *Fix submitted by Arvinda Kumar in pull request [20339](https://github.com/magento/magento2/pull/20339)*. [GitHub-20337](https://github.com/magento/magento2/issues/20337) @@ -298,7 +298,7 @@ We have fixed hundreds of issues in the Magento 2.3.2 core code. -* Magento now displays an error message as expected when a customer clicks on **Add to cart* without selecting at least one product from the recently ordered product list. *Fix submitted by Prince Patel in pull request [21401](https://github.com/magento/magento2/pull/21401)*. [GitHub-21398](https://github.com/magento/magento2/issues/21398) +* Magento now displays an error message as expected when a customer clicks on **Add to cart** without selecting at least one product from the recently ordered product list. *Fix submitted by Prince Patel in pull request [21401](https://github.com/magento/magento2/pull/21401)*. [GitHub-21398](https://github.com/magento/magento2/issues/21398) @@ -330,7 +330,7 @@ We have fixed hundreds of issues in the Magento 2.3.2 core code. -* The checkout page now provides the ability to search addresses instead of listing addresses only on the Select shipping and Billing address steps. This new search feature can substantially increase checkout performance for customers with thousands of addresses. It is disabled by default and must be enabled from Admin. See [Checkout](https://docs.magento.com/m2/ee/user_guide/configuration/sales/checkout.html#Checkout). +* The checkout page now provides the ability to search addresses instead of listing addresses only on the Select shipping and Billing address steps. This new search feature can substantially increase checkout performance for customers with thousands of addresses. It is disabled by default and must be enabled from the Admin. See [Checkout](https://docs.magento.com/m2/ee/user_guide/configuration/sales/checkout.html#Checkout). ### Cart Price rules @@ -346,9 +346,7 @@ We have fixed hundreds of issues in the Magento 2.3.2 core code. -* Product search results now display the correct special price as set by a scheduled update. Previously, search results displayed the original special price, not the price set by the scheduled update. - -**This fix can degrade performance in deployments that implement flat catalogs. To avoid this potential performance degradation, consider disabling flat catalogs**. +* Product search results now display the correct special price as set by a scheduled update. Previously, search results displayed the original special price, not the price set by the scheduled update. **This fix can degrade performance in deployments that implement flat catalogs. To avoid this potential performance degradation, consider disabling flat catalogs**. @@ -476,10 +474,7 @@ We have fixed hundreds of issues in the Magento 2.3.2 core code. -* We have fixed the wrong proxy `resourceStock` argument for the `\Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver` in `di.xml`. (Specifically, `Magento\CatalogInventory\Model\ResourceModel\Stock\Proxy` - -has been changed to `Magento\CatalogInventory\Model\ResourceModel\Stock\Item\Proxy`.) -*Fix submitted by VitaliyBoyko in pull request [21731](https://github.com/magento/magento2/pull/21731)*. [GitHub-167](https://github.com/magento/magento2/issues/167) +* We have fixed the wrong proxy `resourceStock` argument for the `\Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver` in `di.xml`. (Specifically, `Magento\CatalogInventory\Model\ResourceModel\Stock\Proxy` has been changed to `Magento\CatalogInventory\Model\ResourceModel\Stock\Item\Proxy`.) *Fix submitted by VitaliyBoyko in pull request [21731](https://github.com/magento/magento2/pull/21731)*. [GitHub-167](https://github.com/magento/magento2/issues/167) ### Catalog URL rewrite @@ -835,7 +830,7 @@ has been changed to `Magent -* The `stream_wrapper_unregister('phar')` function in `app/boostrap.php` is now run only when a stream wrapper is registered. Previously, calling `stream_wrapper_unregister('phar')` without checking to see if it was registered triggered a warning. *Fix submitted by Antoine Daudenthun in pull request [22171](https://github.com/magento/magento2/pull/22171)*. [GitHub-22190](https://github.com/magento/magento2/issues/22190), [GitHub-21973](https://github.com/magento/magento2/issues/21973) +* The `stream_wrapper_unregister('phar')` function in `app/boostrap.php` is now run only when a stream wrapper is registered. Previously, calling `stream_wrapper_unregister('phar')` without checking to see if it were registered triggered a warning. *Fix submitted by Antoine Daudenthun in pull request [22171](https://github.com/magento/magento2/pull/22171)*. [GitHub-22190](https://github.com/magento/magento2/issues/22190), [GitHub-21973](https://github.com/magento/magento2/issues/21973) @@ -975,9 +970,9 @@ has been changed to `Magent * Magento no longer throws an exception under these conditions: - * A product configuration specifies a `Minimum Qty Allowed in Shopping Cart` as a decimal value less than one + * A product configuration specifies a **Minimum Qty Allowed in Shopping Cart** as a decimal value less than one - * This configuration is later updated to set `Qty Uses Decimals` to **no**. *Fix submitted by Valerij Ivashchenko in pull request [21928](https://github.com/magento/magento2/pull/21928)*. [GitHub-21926](https://github.com/magento/magento2/issues/21926) + * This configuration is later updated to set **Qty Uses Decimals** to **no**. *Fix submitted by Valerij Ivashchenko in pull request [21928](https://github.com/magento/magento2/pull/21928)*. [GitHub-21926](https://github.com/magento/magento2/issues/21926) ### Layered navigation @@ -1369,13 +1364,13 @@ has been changed to `Magent -* Magento now retains filter terms after you apply a filter to the Admin `url_rewrites` table, and subsequently click the Back button. *Fix submitted by Vaibhav Bhalerao in pull request [21834](https://github.com/magento/magento2/pull/21834)*. [GitHub-21805](https://github.com/magento/magento2/issues/21805) +* Magento now retains filter terms after you apply a filter to the Admin `url_rewrites` table, and subsequently click the **Back** button. *Fix submitted by Vaibhav Bhalerao in pull request [21834](https://github.com/magento/magento2/pull/21834)*. [GitHub-21805](https://github.com/magento/magento2/issues/21805) ### Web API -* You can now use REST in scope `all` to save an existing category that does not have a `name` attribute. Previously, Magento threw this exception, `Could not save category with message. The "Name" attribute value is empty. Set the attribute and try again`. *Fix submitted by Nirav Patel in pull request [22362](https://github.com/magento/magento2/pull/22362)*. [GitHub-22309](https://github.com/magento/magento2/issues/22309) +* You can now use REST in scope `all` to save an existing category that does not have a `name` attribute. Previously, Magento threw this exception: `Could not save category with message. The "Name" attribute value is empty. Set the attribute and try again`. *Fix submitted by Nirav Patel in pull request [22362](https://github.com/magento/magento2/pull/22362)*. [GitHub-22309](https://github.com/magento/magento2/issues/22309) diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.md index 6621b970745..e4d9f3de4de 100644 --- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.md +++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.md @@ -173,7 +173,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* Magento now redirects to you the Admin home page or a 404 page as expected when you try to access a nonexisting Admin page and **Stores** > **Configuration** > **Advanced** > **Admin** > **Security** > **Add Secret Key to URLs** is enabled. Previously, redirects did not work properly, and Magento displayed the following message, `The page isn’t redirecting properly`. *Fix submitted by Jitheesh in pull request [21455](https://github.com/magento/magento2/pull/21455)*. [GitHub-21454](https://github.com/magento/magento2/issues/21454) +* Magento now redirects to you the Admin home page or a 404 page as expected when you try to access a nonexisting Admin page and **Stores** > **Configuration** > **Advanced** > **Admin** > **Security** > **Add Secret Key to URLs** is enabled. Previously, redirects did not work properly, and Magento displayed the following message: `The page isn’t redirecting properly`. *Fix submitted by Jitheesh in pull request [21455](https://github.com/magento/magento2/pull/21455)*. [GitHub-21454](https://github.com/magento/magento2/issues/21454) ### Back up @@ -253,7 +253,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* The checkout page now provides the ability to search addresses instead of listing addresses only on the Select shipping and Billing address steps. This new search feature can substantially increase checkout performance for customers with thousands of addresses. It is disabled by default and must be enabled from Admin. See [Checkout](https://docs.magento.com/m2/ee/user_guide/configuration/sales/checkout.html#Checkout). +* The checkout page now provides the ability to search addresses instead of listing addresses only on the Select shipping and Billing address steps. This new search feature can substantially increase checkout performance for customers with thousands of addresses. It is disabled by default and must be enabled from the Admin. See [Checkout](https://docs.magento.com/m2/ee/user_guide/configuration/sales/checkout.html#Checkout). ### Cart Price rules @@ -269,9 +269,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* Product search results now display the correct special price as set by a scheduled update. Previously, search results displayed the original special price, not the price set by the scheduled update. - -**This fix can degrade performance in deployments that implement flat catalogs. To avoid this potential performance degradation, consider disabling flat catalogs**. +* Product search results now display the correct special price as set by a scheduled update. Previously, search results displayed the original special price, not the price set by the scheduled update. **This fix can degrade performance in deployments that implement flat catalogs. To avoid this potential performance degradation, consider disabling flat catalogs**. @@ -383,9 +381,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* We have fixed the wrong proxy `resourceStock` argument for the `\Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver` in `di.xml`. (Specifically, `Magento\CatalogInventory\Model\ResourceModel\Stock\Proxy` has been changed to `Magento\CatalogInventory\Model\ResourceModel\Stock\Item\Proxy`.) - -*Fix submitted by Vitaliy in pull request [21731](https://github.com/magento/magento2/pull/21731)*. [GitHub-167](https://github.com/magento/magento2/issues/167) +* We have fixed the wrong proxy `resourceStock` argument for the `\Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver` in `di.xml`. (Specifically, `Magento\CatalogInventory\Model\ResourceModel\Stock\Proxy` has been changed to `Magento\CatalogInventory\Model\ResourceModel\Stock\Item\Proxy`.) *Fix submitted by Vitaliy in pull request [21731](https://github.com/magento/magento2/pull/21731)*. [GitHub-167](https://github.com/magento/magento2/issues/167) ### Catalog URL rewrite @@ -453,7 +449,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* Added missing asterix adjacent to the Checkout Agreements checkbox. *Fix submitted by Karla Saaremäe in pull request [21649](https://github.com/magento/magento2/pull/21649)*. [GitHub-21648](https://github.com/magento/magento2/issues/21648) +* Added missing asterisk adjacent to the Checkout Agreements checkbox. *Fix submitted by Karla Saaremäe in pull request [21649](https://github.com/magento/magento2/pull/21649)*. [GitHub-21648](https://github.com/magento/magento2/issues/21648) @@ -691,7 +687,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* You can now use a period (`.`) for inline CMS content edits. Previously, if you included a period (`.`) in your edits, Magento displayed this error, `There are 1 messages requires your attention. Please make corrections to the errors in the table below and re-submit`. *Fix submitted by Nirav Patel in pull request [21376](https://github.com/magento/magento2/pull/21376)*. [GitHub-21374](https://github.com/magento/magento2/issues/21374) +* You can now use a period (`.`) for inline CMS content edits. Previously, if you included a period (`.`) in your edits, Magento displayed this error: `There are 1 messages requires your attention. Please make corrections to the errors in the table below and re-submit`. *Fix submitted by Nirav Patel in pull request [21376](https://github.com/magento/magento2/pull/21376)*. [GitHub-21374](https://github.com/magento/magento2/issues/21374) @@ -711,7 +707,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* The Reporting Security Issues section of the Magento 2 README file (https://github.com/magento/magento2/blob/2.3-develop/README.md) has been updated to reflect use of hackerone. *Fix submitted by Andreas Mautz in pull request [22195](https://github.com/magento/magento2/pull/22195)*. [GitHub-22166](https://github.com/magento/magento2/issues/22166) +* The Reporting Security Issues section of the [Magento 2 README file] (https://github.com/magento/magento2/blob/2.3-develop/README.md) has been updated to reflect the use of HackerOne for the Magento 2 Bug Bounty program. *Fix submitted by Andreas Mautz in pull request [22195](https://github.com/magento/magento2/pull/22195)*. [GitHub-22166](https://github.com/magento/magento2/issues/22166) @@ -723,7 +719,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* `stream_wrapper_unregister('phar')` in `app/boostrap.php` is now unregistered only when appropriate. Previously, calling `stream_wrapper_unregister('phar')` without checking to see if it was registered triggered a warning. *Fix submitted by Antoine Daudenthun in pull request [22171](https://github.com/magento/magento2/pull/22171)*. [GitHub-22190](https://github.com/magento/magento2/issues/22190), [GitHub-21973](https://github.com/magento/magento2/issues/21973) +* `stream_wrapper_unregister('phar')` in `app/boostrap.php` is now unregistered only when appropriate. Previously, calling `stream_wrapper_unregister('phar')` without checking to see if it were registered triggered a warning. *Fix submitted by Antoine Daudenthun in pull request [22171](https://github.com/magento/magento2/pull/22171)*. [GitHub-22190](https://github.com/magento/magento2/issues/22190), [GitHub-21973](https://github.com/magento/magento2/issues/21973) @@ -757,7 +753,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* Magento now imports existing products that have a price change and unchanged url-key with no unnecessary updates. Previously, the product's price was updated as expected, but its unchanged url-key was deleted. +* Magento now imports existing products that have a price change and unchanged `url-key` with no unnecessary updates. Previously, the product's price was updated as expected, but its unchanged `url-key` was deleted. @@ -853,9 +849,9 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. * Magento no longer throws an exception under these conditions: - * a product configuration specifies a `Minimum Qty Allowed in Shopping Cart` as a decimal value less than one + * a product configuration specifies a **Minimum Qty Allowed in Shopping Cart** as a decimal value less than one - * this configuration is later updated by setting `Qty Uses Decimals` to **no**, and later updating the **Qty Uses Decimals** attribute in the product congiration to **no**. *Fix submitted by Valerij Ivashchenko in pull request [21928](https://github.com/magento/magento2/pull/21928)*. [GitHub-21926](https://github.com/magento/magento2/issues/21926) + * this configuration is later updated by setting **Qty Uses Decimals** to **no**, and later updating the **Qty Uses Decimals** attribute in the product congiration to **no**. *Fix submitted by Valerij Ivashchenko in pull request [21928](https://github.com/magento/magento2/pull/21928)*. [GitHub-21926](https://github.com/magento/magento2/issues/21926) ### Layered navigation @@ -1067,7 +1063,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* The CGI URL gateway endpoint in the UPS module has been updated from HTTP to HTTPS in response to the disablement of the HTTP gateway by UPS in mid-2019. See [Magento User Guide](https://docs.magento.com/m2/ee/user_guide/shipping/ups.html) for a discussion of using the UPS shipment method. Shipping method configuration settings are described in the [Shipping methods] (https://docs.magento.com/m2/ee/user_guide/configuration/sales/shipping-methods.html#UPS). +* The CGI URL gateway endpoint in the UPS module has been updated from HTTP to HTTPS in response to the disablement of the HTTP gateway by UPS in mid-2019. See [Magento User Guide](https://docs.magento.com/m2/ee/user_guide/shipping/ups.html) for a discussion of using the UPS shipment method. Shipping method configuration settings are described in the [Shipping methods](https://docs.magento.com/m2/ee/user_guide/configuration/sales/shipping-methods.html#UPS). @@ -1107,10 +1103,6 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. * The value of `product_price_value` in the shopping cart data section now includes taxes if the configuration settings are set accordingly (**Stores** > **Configuration** > **Sales** > **Tax** > **Shopping Cart Display Settings** > **Display Prices** > **Including Tax**). *Fix submitted by Nick de Kleijn in pull request [20316](https://github.com/magento/magento2/pull/20316)*. [GitHub-20310](https://github.com/magento/magento2/issues/20310) - - -* The tax that is applied to simple child product is now based on the tax class of that product. Previously, the tax was based on the tax class of the parent product. - * You can now successfully search for a tax rule based on both the **Name** and **Tax Rate** fields. Previously, Magento threw an MySQL error. *Fix submitted by Tuyen Nguyen in pull request [21701](https://github.com/magento/magento2/pull/21701)*. [GitHub-21521](https://github.com/magento/magento2/issues/21521) @@ -1129,7 +1121,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* Logo files for transactional emails can now be successfully uploaded using **Content** > **Configuration** > **Edit theme** > **Transactional Emails**. Previously, Magento did not upload the logo, but displayed this error, `A technical problem with the server created an error. Try again to continue what you were doing. If the problem persists, try again later.` *Fix submitted by chaplynsky in pull request [20092](https://github.com/magento/magento2/pull/20092)*. [GitHub-20091](https://github.com/magento/magento2/issues/20091) +* Logo files for transactional emails can now be successfully uploaded using **Content** > **Configuration** > **Edit theme** > **Transactional Emails**. Previously, Magento did not upload the logo, but displayed this error: `A technical problem with the server created an error. Try again to continue what you were doing. If the problem persists, try again later.` *Fix submitted by chaplynsky in pull request [20092](https://github.com/magento/magento2/pull/20092)*. [GitHub-20091](https://github.com/magento/magento2/issues/20091) @@ -1193,7 +1185,7 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* Magento now displays warning messages when validation fails on a form field that has a validation rule associated with it. Previously, Magento displayed this error, `Javascript Error: Uncaught TypeError: msg.replace is not a function`, if validation failed on a form field. *Fix submitted by Seth Daugherty in pull request [20079](https://github.com/magento/magento2/pull/20079)*. [GitHub-20078](https://github.com/magento/magento2/issues/20078) +* Magento now displays warning messages when validation fails on a form field that has a validation rule associated with it. Previously, Magento displayed this error: `Javascript Error: Uncaught TypeError: msg.replace is not a function`, if validation failed on a form field. *Fix submitted by Seth Daugherty in pull request [20079](https://github.com/magento/magento2/pull/20079)*. [GitHub-20078](https://github.com/magento/magento2/issues/20078) @@ -1211,13 +1203,13 @@ We've fixed hundreds of issues in the Magento 2.3.2 core code. -* Magento now retains filter terms after you've applied a filter to the Admin `url_rewrites` table, then click the Back button. *Fix submitted by Vaibhav Bhalerao in pull request [21834](https://github.com/magento/magento2/pull/21834)*. [GitHub-21805](https://github.com/magento/magento2/issues/21805) +* Magento now retains filter terms after you've applied a filter to the Admin `url_rewrites` table, then click the **Back** button. *Fix submitted by Vaibhav Bhalerao in pull request [21834](https://github.com/magento/magento2/pull/21834)*. [GitHub-21805](https://github.com/magento/magento2/issues/21805) ### Web API framework -* You can now use REST in scope `all` to save an existing category that does not have a `name` attribute. Previously, Magento threw this exception, `Could not save category with message. The "Name" attribute value is empty. Set the attribute and try again`. *Fix submitted by Nirav Patel in pull request [22362](https://github.com/magento/magento2/pull/22362)*. [GitHub-22309](https://github.com/magento/magento2/issues/22309) +* You can now use REST in scope `all` to save an existing category that does not have a `name` attribute. Previously, Magento threw this exception: `Could not save category with message. The "Name" attribute value is empty. Set the attribute and try again`. *Fix submitted by Nirav Patel in pull request [22362](https://github.com/magento/magento2/pull/22362)*. [GitHub-22309](https://github.com/magento/magento2/issues/22309) diff --git a/src/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md b/src/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md index fdd49d49c1f..7f67326c0ee 100644 --- a/src/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md +++ b/src/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md @@ -121,7 +121,7 @@ This release contains enhancements to core quality, which improve the quality o -* As part of our efforts to better understand the Admin user experience and improve product design, Magento is introducing the tracking of user actions and events on the Admin. After you upgrade to Magento 2.3.3, the first administrative user who logs into the Admin will be prompted to **Allow admin usage data collection**. If the user agrees to data collection, the data captured from Admin activity is sent to Adobe Analytics for analysis and reporting. Typical events include page views, save actions, and changes to Magento mode. See Store Admin for more information. +As part of our efforts to better understand the Admin user experience and improve product design, Magento is introducing the tracking of user actions and events on the Admin. After you upgrade to Magento 2.3.3, the first administrative user who logs into the Admin will be prompted to **Allow admin usage data collection**. If the user agrees to data collection, the data captured from Admin activity is sent to Adobe Analytics for analysis and reporting. Typical events include page views, save actions, and changes to Magento mode. See Store Admin for more information. ### Page Builder @@ -133,7 +133,7 @@ Page Builder enhancements for this release include: ### Inventory Management enhancements -* Fixes to multiple bugs. See [Inventory Management release notes](https://devdocs.magento.com/guides/v2.3/inventory/release-notes.html). +Fixes to multiple bugs. See [Inventory Management release notes](https://devdocs.magento.com/guides/v2.3/inventory/release-notes.html). ### GraphQL @@ -569,7 +569,7 @@ We have fixed hundreds of issues in the Magento 2.3.3 core code. -* Magento no longer automatically assigns a storeID to a saved product that is not assigned to a store. *Fix submitted by manishgoswamij in pull request [23500](https://github.com/magento/magento2/pull/23500)*. [GitHub-23383](https://github.com/magento/magento2/issues/23383), [GitHub-23500](https://github.com/magento/magento2/issues/23500) +* Magento no longer automatically assigns a `storeID` to a saved product that is not assigned to a store. *Fix submitted by manishgoswamij in pull request [23500](https://github.com/magento/magento2/pull/23500)*. [GitHub-23383](https://github.com/magento/magento2/issues/23383), [GitHub-23500](https://github.com/magento/magento2/issues/23500) @@ -963,7 +963,7 @@ We have fixed hundreds of issues in the Magento 2.3.3 core code. -* The **Save in address book** checkbox on the Shipping Address section of the Admin Create Order page now behaves as expected. When this checkbox is enabled, the address in the Shipping Address field is saved, and merchants can disable or enable the checkbox +* The **Save in address book** checkbox on the Shipping Address section of the Admin Create Order page now behaves as expected. When this checkbox is enabled, the address in the Shipping Address field is saved, and merchants can disable or enable the checkbox. @@ -1100,7 +1100,7 @@ We have fixed hundreds of issues in the Magento 2.3.3 core code. * You can now successfully download a CSV file after export. Previously, Magento redirected you to the Admin dashboard when you tried to download the CSV file that was created during export. - Products are successfully updated through import of an CSV file in **Add/Update** mode. Previously, the import process failed, and Magento displayed this error: `The value specified in the URL Key field would generate a URL that already exists`. +* Products are successfully updated through import of an CSV file in **Add/Update** mode. Previously, the import process failed, and Magento displayed this error: `The value specified in the URL Key field would generate a URL that already exists`. @@ -1216,7 +1216,7 @@ This release includes the following changes to integrations for core payment met -* Authorize.net now provides 3D Secure verification through third-party services through the `cardholderAuthentication` request field. Starting from this release,the Authorize.Net `accept.js` integration will support 3DS 2.0 through CardinalCommerce. +* Authorize.net now provides 3D Secure verification through third-party services through the `cardholderAuthentication` request field. Starting from this release, the Authorize.net `accept.js` integration will support 3DS 2.0 through CardinalCommerce. @@ -1344,7 +1344,7 @@ This release includes the following changes to integrations for core payment met -* The access controls on the **Reports** > **Product** > **Downloads** have been refactored to permit access to only administrators with the correct permissions. Previously, administrators with no access to this area could access the Downloads report. *Fix submitted by Eden Duong in pull request [23901](https://github.com/magento/magento2/pull/23901)*. [GitHub-23900](https://github.com/magento/magento2/issues/23900) +* The access controls on the **Reports** > **Product** > **Downloads** page have been refactored to permit access to only administrators with the correct permissions. Previously, administrators with no access to this area could access the Downloads report. *Fix submitted by Eden Duong in pull request [23901](https://github.com/magento/magento2/pull/23901)*. [GitHub-23900](https://github.com/magento/magento2/issues/23900) @@ -1378,7 +1378,7 @@ This release includes the following changes to integrations for core payment met -* Online refunds now work as expected when the **Refund Reward Points Automatically** configuration setting is enabled. Previously, the Refund button was disabled under these conditions. +* Online refunds now work as expected when the **Refund Reward Points Automatically** configuration setting is enabled. Previously, the **Refund** button was disabled under these conditions. ### Sales @@ -1420,7 +1420,7 @@ This release includes the following changes to integrations for core payment met -* Magento no longer throws a fatal error when you click **View Order** on an order that contains a product that was available when the order was created but which was subsequently deleted from the storefront. +* Magento no longer throws a fatal error when you click **View Order** on an order that contains a product that was available when the order was created but that was subsequently deleted from the storefront. diff --git a/src/guides/v2.3/release-notes/release-notes-2-3-3-open-source.md b/src/guides/v2.3/release-notes/release-notes-2-3-3-open-source.md index e961a1454ce..579e1002feb 100644 --- a/src/guides/v2.3/release-notes/release-notes-2-3-3-open-source.md +++ b/src/guides/v2.3/release-notes/release-notes-2-3-3-open-source.md @@ -116,11 +116,11 @@ This release contains enhancements to core quality, which improve the quality o -* As part of our efforts to better understand the Admin user experience and improve product design, Magento is introducing the tracking of user actions and events on the Admin. After you upgrade to Magento 2.3.3, the first administrative user who logs into the Admin will be prompted to **Allow admin usage data collection**. If the user agrees to data collection, the data captured from Admin activity is sent to Adobe Analytics for analysis and reporting. Typical events include page views, save actions, and changes to Magento mode. See [Store Admin](https://docs.magento.com/m2/ce/user_guide/stores/admin.html) for more information. +As part of our efforts to better understand the Admin user experience and improve product design, Magento is introducing the tracking of user actions and events on the Admin. After you upgrade to Magento 2.3.3, the first administrative user who logs into the Admin will be prompted to **Allow admin usage data collection**. If the user agrees to data collection, the data captured from Admin activity is sent to Adobe Analytics for analysis and reporting. Typical events include page views, save actions, and changes to Magento mode. See [Store Admin](https://docs.magento.com/m2/ce/user_guide/stores/admin.html) for more information. ### Inventory Management enhancements -* Fixes to multiple bugs. See [Inventory Management release notes](https://devdocs.magento.com/guides/v2.3/inventory/release-notes.html). +Fixes to multiple bugs. See [Inventory Management release notes](https://devdocs.magento.com/guides/v2.3/inventory/release-notes.html). ### GraphQL @@ -415,7 +415,7 @@ We've fixed hundreds of issues in the Magento 2.3.3 core code. -* Magento no longer automatically assigns a storeID to a saved product that is not assigned to a store. *Fix submitted by manishgoswamij in pull request [23500](https://github.com/magento/magento2/pull/23500)*. [GitHub-23383](https://github.com/magento/magento2/issues/23383), [GitHub-23500](https://github.com/magento/magento2/issues/23500) +* Magento no longer automatically assigns a `storeID` to a saved product that is not assigned to a store. *Fix submitted by manishgoswamij in pull request [23500](https://github.com/magento/magento2/pull/23500)*. [GitHub-23383](https://github.com/magento/magento2/issues/23383), [GitHub-23500](https://github.com/magento/magento2/issues/23500) @@ -785,7 +785,7 @@ We've fixed hundreds of issues in the Magento 2.3.3 core code. -* The **Save in address book** checkbox on the Shipping Address section of the Admin Create Order page now behaves as expected. When this checkbox is enabled, the address in the Shipping Address field is saved, and merchants can disable or enable the checkbox +* The **Save in address book** checkbox on the Shipping Address section of the Admin Create Order page now behaves as expected. When this checkbox is enabled, the address in the Shipping Address field is saved, and merchants can disable or enable the checkbox. @@ -1013,7 +1013,7 @@ This release includes the following changes to integrations for core payment met -* Authorize.net now provides 3D Secure verification through third-party services through the `cardholderAuthentication` request field. Starting from this release,the Authorize.Net `accept.js` integration will support 3DS 2.0 through CardinalCommerce. +* Authorize.net now provides 3D Secure verification through third-party services through the `cardholderAuthentication` request field. Starting from this release, the Authorize.net `accept.js` integration will support 3DS 2.0 through CardinalCommerce. @@ -1141,7 +1141,7 @@ This release includes the following changes to integrations for core payment met -* The access controls on the **Reports** > **Product** > **Downloads** have been refactored to permit access to only administrators with the correct permissions. Previously, administrators with no access to this area could access the Downloads report. *Fix submitted by Eden Duong in pull request [23901](https://github.com/magento/magento2/pull/23901)*. [GitHub-23900](https://github.com/magento/magento2/issues/23900) +* The access controls on the **Reports** > **Product** > **Downloads** page have been refactored to permit access to only administrators with the correct permissions. Previously, administrators with no access to this area could access the Downloads report. *Fix submitted by Eden Duong in pull request [23901](https://github.com/magento/magento2/pull/23901)*. [GitHub-23900](https://github.com/magento/magento2/issues/23900) @@ -1193,7 +1193,7 @@ This release includes the following changes to integrations for core payment met -* Magento no longer throws a fatal error when you click **View Order** on an order that contains a product that was available when the order was created but which was subsequently deleted from the storefront. +* Magento no longer throws a fatal error when you click **View Order** on an order that contains a product that was available when the order was created but that was subsequently deleted from the storefront. diff --git a/src/guides/v2.3/release-notes/release-notes-2-3-4-commerce.md b/src/guides/v2.3/release-notes/release-notes-2-3-4-commerce.md index e8ea703143e..a0c1782bc11 100644 --- a/src/guides/v2.3/release-notes/release-notes-2-3-4-commerce.md +++ b/src/guides/v2.3/release-notes/release-notes-2-3-4-commerce.md @@ -79,7 +79,7 @@ This release contains 250 enhancements to core quality, which improve the qualit ### Merchant tool enhancements -* **Integration with Adobe Stock image galleries**. The new bundled Adobe stock integration extension enables merchants to add high quality media assets to their website content without leaving the Magento Admin. Merchants can use the searchable interface in the Magento Media Gallery to explore, preview, license, and deploy stock images in website content. See [Adobe Stock Integration](https://docs.magento.com/m2/ee/user_guide/cms/adobe-stock.html) and [Using Adobe Stock Images](https://docs.magento.com/m2/ee/user_guide/cms/adobe-stock-manage.html). +**Integration with Adobe Stock image galleries**. The new bundled Adobe stock integration extension enables merchants to add high quality media assets to their website content without leaving the Magento Admin. Merchants can use the searchable interface in the Magento Media Gallery to explore, preview, license, and deploy stock images in website content. See [Adobe Stock Integration](https://docs.magento.com/m2/ee/user_guide/cms/adobe-stock.html) and [Using Adobe Stock Images](https://docs.magento.com/m2/ee/user_guide/cms/adobe-stock-manage.html). ### Page Builder @@ -109,7 +109,7 @@ This release includes improved GraphQL coverage for search, layered navigation, * **Guest carts can now be merged with customer carts.** The [`mergeCarts`]({{page.baseurl}}/graphql/mutations/merge-carts.html) mutation transfers the contents of a guest cart into the cart of a logged-in customer. -* **A customer can start an order on one device and complete it on another.** Use the [`customerCart]({{page.baseurl}}/graphql/queries/customer-cart.html) query to obtain the cart ID for a logged-in customer. +* **A customer can start an order on one device and complete it on another.** Use the [`customerCart`]({{page.baseurl}}/graphql/queries/customer-cart.html) query to obtain the cart ID for a logged-in customer. * **Layered navigation can use custom filters.** The `filter` attribute of the [`products`]({{page.baseurl}}/graphql/queries/products.html) query now requires the `ProductAttributeFilterInput` object. You can specify a pre-defined filter in this object, or [define a custom filter]({{page.baseurl}}/graphql/custom-filters.html). As a result, layered navigation on your website filters on the attributes you need. @@ -159,7 +159,7 @@ New B2B features and improvements include the following: * **Ability to export Requisition Lists into CSV format**. B2B buyers can export the contents of Requisition Lists for local editing. These exported lists can then be uploaded into B2B Quick Order for creation of new orders, quotes, or lists. See [Managing Requisition Lists](https://docs.magento.com/m2/b2b/user_guide/customers/account-dashboard-requisition-lists-manage.html). -* **Granular ACLs for B2B modules**. Merchants can now restrict access to B2B features from the Admin, controlling which employees can work with B2B items and settings. See [Role Resources](https://docs.magento.com/m2/b2b/user_guide/system/permissions-role-resources.html. +* **Granular ACLs for B2B modules**. Merchants can now restrict access to B2B features from the Admin, controlling which employees can work with B2B items and settings. ### Vendor-developed extension enhancements @@ -483,7 +483,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* The storefront and Admin shopping cart summary fields are now displayed consistently and follow setting preferences. *Fix submitted by Eden Duong in pull request [25037](https://github.com/magento/magento2/pull/25037)*. [GitHub-25036](https://github.com/magento/magento2/issues/25036) +* The storefront and Admin shopping cart summary fields are now displayed consistently and reflect setting preferences. *Fix submitted by Eden Duong in pull request [25037](https://github.com/magento/magento2/pull/25037)*. [GitHub-25036](https://github.com/magento/magento2/issues/25036) @@ -593,7 +593,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* The Date field customizable option for products now saves accurate values for stores in different time zones. +* The **Date** field customizable option for products now saves accurate values for stores in different time zones. @@ -631,7 +631,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* An incorrect XML namespace url was removed from the generated sitemaps displayed at **Marketing** > **SEO & Search** > **Sitemap**. Previously, Magento returned a 404 error when you clicked on the sitemap link. *Fix submitted by Sunil in pull request [23716](https://github.com/magento/magento2/pull/23716)*. [GitHub-23706](https://github.com/magento/magento2/issues/23706) +* An incorrect XML namespace URL was removed from the generated sitemaps displayed at **Marketing** > **SEO & Search** > **Sitemap**. Previously, Magento returned a 404 error when you clicked on the sitemap link. *Fix submitted by Sunil in pull request [23716](https://github.com/magento/magento2/pull/23716)*. [GitHub-23706](https://github.com/magento/magento2/issues/23706) @@ -967,7 +967,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* Magento now correctly redirects you to the customer account page when you click the Back button on the Manage Addresses page. *Fix submitted by Eden Duong in pull request [24079](https://github.com/magento/magento2/pull/24079)*. [GitHub-24058](https://github.com/magento/magento2/issues/24058) +* Magento now correctly redirects you to the customer account page when you click the **Back** button on the Manage Addresses page. *Fix submitted by Eden Duong in pull request [24079](https://github.com/magento/magento2/pull/24079)*. [GitHub-24058](https://github.com/magento/magento2/issues/24058) @@ -1051,7 +1051,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* You can now successfully select an image from the image gallery when you configure a theme ( **Admin** > **Content** > **Configuration**). *Fix submitted by Rani Priya in pull request [24431](https://github.com/magento/magento2/pull/24431)*. [GitHub-24430](https://github.com/magento/magento2/issues/24430) +* You can now successfully select an image from the image gallery when you configure a theme (**Admin** > **Content** > **Configuration**). *Fix submitted by Rani Priya in pull request [24431](https://github.com/magento/magento2/pull/24431)*. [GitHub-24430](https://github.com/magento/magento2/issues/24430) @@ -1425,7 +1425,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* Removed the redundant XML code in the`` node of the PayPal `config.xml` configuration file. Previously, this redundancy caused errors. *Fix submitted by yupik in pull request [24694](https://github.com/magento/magento2/pull/24694)*. [GitHub-23880](https://github.com/magento/magento2/issues/23880) +* Removed the redundant XML code in the `` node of the PayPal `config.xml` configuration file. Previously, this redundancy caused errors. *Fix submitted by yupik in pull request [24694](https://github.com/magento/magento2/pull/24694)*. [GitHub-23880](https://github.com/magento/magento2/issues/23880) @@ -1691,7 +1691,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* The Back button on the Check Out with Multiple Addresses page now returns you to the correct page. Previously, clicking the Back button from this page returned a 404 error. *Fix submitted by Max Souza in pull request [24827](https://github.com/magento/magento2/pull/24827)*. [GitHub-24701](https://github.com/magento/magento2/issues/24701) +* The Back button on the Check Out with Multiple Addresses page now returns you to the correct page. Previously, clicking the **Back** button from this page returned a 404 error. *Fix submitted by Max Souza in pull request [24827](https://github.com/magento/magento2/pull/24827)*. [GitHub-24701](https://github.com/magento/magento2/issues/24701) diff --git a/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md b/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md index 6c7cc8a6eb3..7af87b4e3a9 100644 --- a/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md +++ b/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md @@ -73,7 +73,7 @@ This release contains 250 enhancements to core quality, which improve the qualit ### Merchant tool enhancements -* **Integration with Adobe Stock image galleries**. The new bundled Adobe stock integration extension enables merchants to add high quality media assets to their website content without leaving the Magento Admin. Merchants can use the searchable interface in the Magento Media Gallery to explore, preview, license, and deploy stock images in website content. See [Adobe Stock Integration](https://docs.magento.com/m2/ee/user_guide/cms/adobe-stock.html) and [Using Adobe Stock Images](https://docs.magento.com/m2/ee/user_guide/cms/adobe-stock-manage.html). +**Integration with Adobe Stock image galleries**. The new bundled Adobe stock integration extension enables merchants to add high quality media assets to their website content without leaving the Magento Admin. Merchants can use the searchable interface in the Magento Media Gallery to explore, preview, license, and deploy stock images in website content. See [Adobe Stock Integration](https://docs.magento.com/m2/ee/user_guide/cms/adobe-stock.html) and [Using Adobe Stock Images](https://docs.magento.com/m2/ee/user_guide/cms/adobe-stock-manage.html). ### Inventory Management @@ -93,11 +93,11 @@ This release includes improved GraphQL coverage for search, layered navigation, * **Guest carts can now be merged with customer carts.** The [`mergeCarts`]({{page.baseurl}}/graphql/mutations/merge-carts.html) mutation transfers the contents of a guest cart into the cart of a logged-in customer. -* **A customer can start an order on one device and complete it on another.** Use the [`customerCart]({{page.baseurl}}/graphql/queries/customer-cart.html) query to obtain the cart ID for a logged-in customer. +* **A customer can start an order on one device and complete it on another.** Use the [`customerCart`]({{page.baseurl}}/graphql/queries/customer-cart.html) query to obtain the cart ID for a logged-in customer. * **Layered navigation can use custom filters.** The `filter` attribute of the [`products`]({{page.baseurl}}/graphql/queries/products.html) query now requires the `ProductAttributeFilterInput` object. You can specify a pre-defined filter in this object, or [define a custom filter]({{page.baseurl}}/graphql/custom-filters.html). As a result, layered navigation on your website filters on the attributes you need. -* **You can search categories by ID, name, and/or URL key.** The [`categoryList]({{page.baseurl}}/graphql/queries/category-list.html) query replaces the deprecated`category` query. +* **You can search categories by ID, name, and/or URL key.** The [`categoryList`]({{page.baseurl}}/graphql/queries/category-list.html) query replaces the deprecated `category` query. * **The [`ProductInterface`]({{page.baseurl}}/graphql/product/product-interface.html) supports fixed product taxes (such as WEEE).** Use the [`storeConfig`]({{page.baseurl}}/graphql/queries/store-config.html) query to determine whether to store supports these taxes. @@ -349,7 +349,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* The storefront and Admin shopping cart summary fields are now displayed consistently and follow setting preferences. *Fix submitted by Eden Duong in pull request [25037](https://github.com/magento/magento2/pull/25037)*. [GitHub-25036](https://github.com/magento/magento2/issues/25036) +* The storefront and Admin shopping cart summary fields are now displayed consistently and reflect setting preferences. *Fix submitted by Eden Duong in pull request [25037](https://github.com/magento/magento2/pull/25037)*. [GitHub-25036](https://github.com/magento/magento2/issues/25036) @@ -455,7 +455,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* The Date field customizable option for products now saves accurate values for stores in different time zones. +* The **Date** field customizable option for products now saves accurate values for stores in different time zones. @@ -483,7 +483,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* An incorrect XML namespace url was removed from the generated sitemaps displayed at **Marketing** > **SEO & Search** > **Sitemap**. Previously, Magento returned a 404 error when you clicked on the sitemap link. *Fix submitted by Sunil in pull request [23716](https://github.com/magento/magento2/pull/23716)*. [GitHub-23706](https://github.com/magento/magento2/issues/23706) +* An incorrect XML namespace URL was removed from the generated sitemaps displayed at **Marketing** > **SEO & Search** > **Sitemap**. Previously, Magento returned a 404 error when you clicked on the sitemap link. *Fix submitted by Sunil in pull request [23716](https://github.com/magento/magento2/pull/23716)*. [GitHub-23706](https://github.com/magento/magento2/issues/23706) @@ -697,7 +697,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* You can now perform mass actions on items in a grid that uses an EAV collection. Previously, grids created with the now-deprecated Magento\Backend\Block\Widget\Grid (as many third-party extensions are) threw an exception when you tried to performa a mass action. *Fix submitted by Thomas Klein in pull request [23452](https://github.com/magento/magento2/pull/23452)*. [GitHub-23451](https://github.com/magento/magento2/issues/23451) +* You can now perform mass actions on items in a grid that uses an EAV collection. Previously, grids created with the now-deprecated `Magento\Backend\Block\Widget\Grid` (as many third-party extensions are) threw an exception when you tried to perform a mass action. *Fix submitted by Thomas Klein in pull request [23452](https://github.com/magento/magento2/pull/23452)*. [GitHub-23451](https://github.com/magento/magento2/issues/23451) ### Email @@ -773,7 +773,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* Magento now correctly redirects you to the customer account page when you click the Back button on the Manage Addresses page. *Fix submitted by Eden Duong in pull request [24079](https://github.com/magento/magento2/pull/24079)*. [GitHub-24058](https://github.com/magento/magento2/issues/24058) +* Magento now correctly redirects you to the customer account page when you click the **Back** button on the Manage Addresses page. *Fix submitted by Eden Duong in pull request [24079](https://github.com/magento/magento2/pull/24079)*. [GitHub-24058](https://github.com/magento/magento2/issues/24058) @@ -857,7 +857,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* You can now successfully select an image from the image gallery when you configure a theme ( **Admin** > **Content** > **Configuration**). *Fix submitted by Rani Priya in pull request [24431](https://github.com/magento/magento2/pull/24431)*. [GitHub-24430](https://github.com/magento/magento2/issues/24430) +* You can now successfully select an image from the image gallery when you configure a theme (**Admin** > **Content** > **Configuration**). *Fix submitted by Rani Priya in pull request [24431](https://github.com/magento/magento2/pull/24431)*. [GitHub-24430](https://github.com/magento/magento2/issues/24430) @@ -1201,7 +1201,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* Removed the redundant XML code in the`` node of the PayPal `config.xml` configuration file. Previously, this redundancy caused errors. *Fix submitted by yupik in pull request [24694](https://github.com/magento/magento2/pull/24694)*. [GitHub-23880](https://github.com/magento/magento2/issues/23880) +* Removed the redundant XML code in the `` node of the PayPal `config.xml` configuration file. Previously, this redundancy caused errors. *Fix submitted by yupik in pull request [24694](https://github.com/magento/magento2/pull/24694)*. [GitHub-23880](https://github.com/magento/magento2/issues/23880) @@ -1411,7 +1411,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* The Back button on the Check Out with Multiple Addresses page now returns you to the correct page. Previously, clicking the Back button from this page returned a 404 error. *Fix submitted by Max Souza in pull request [24827](https://github.com/magento/magento2/pull/24827)*. [GitHub-24701](https://github.com/magento/magento2/issues/24701) +* The **Back** button on the Check Out with Multiple Addresses page now returns you to the correct page. Previously, clicking the Back button from this page returned a 404 error. *Fix submitted by Max Souza in pull request [24827](https://github.com/magento/magento2/pull/24827)*. [GitHub-24701](https://github.com/magento/magento2/issues/24701) From caa7131ab95ed364db48a38263da650bcc8746a6 Mon Sep 17 00:00:00 2001 From: jfrontain Date: Thu, 26 Mar 2020 08:43:43 -0500 Subject: [PATCH 17/46] fixed list formatting --- .../v2.3/release-notes/ReleaseNotes2.3.0Commerce.md | 10 +++++----- .../release-notes/ReleaseNotes2.3.0OpenSource.md | 12 ++++++------ .../v2.3/release-notes/ReleaseNotes2.3.1Commerce.md | 12 ++++++------ .../release-notes/ReleaseNotes2.3.1OpenSource.md | 12 ++++++------ .../release-notes/release-notes-2-3-3-commerce.md | 1 + 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md index 552cc55aafb..4b2edf6ecff 100644 --- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md +++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md @@ -28,15 +28,15 @@ Follow these steps to download and apply this patch: 1. Access [My Account](https://account.magento.com/customer/account/login). -2. Navigate to the **Downloads** tab. Select the Magento edition and version you need. +1. Navigate to the **Downloads** tab. Select the Magento edition and version you need. -3. Select **Support Patches and Security Patches**, then **PRODSECBUG-2198**. +1. Select **Support Patches and Security Patches**, then **PRODSECBUG-2198**. -4. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). +1. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). -5. From your project root, apply the patch. `git apply ./m2-hotfixes/`. +1. From your project root, apply the patch. `git apply ./m2-hotfixes/`. -6. Refresh the cache from the Admin (**System** > **Tools** > **Cache Management**). +1. Refresh the cache from the Admin (**System** > **Tools** > **Cache Management**). ## Highlights diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md index c3f5c5d7135..6741de92a31 100644 --- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md +++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md @@ -25,10 +25,10 @@ See the description of PRODSECBUG-2198 in the [Magento Security Center](https Follow these steps to download and apply this patch: 1. Access the Downloads page [here](https://magento.com/tech-resources/download#download2288). -2. Select the Git-based option from **Select your format**. -3. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). -4. From your project root, apply the patch. `git apply ./m2-hotfixes/`. -5. Refresh the cache from the Admin (**System** > **Cache Management**). +1. Select the Git-based option from **Select your format**. +1. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). +1. From your project root, apply the patch. `git apply ./m2-hotfixes/`. +1. Refresh the cache from the Admin (**System** > **Cache Management**). ## Highlights @@ -40,8 +40,8 @@ Follow these steps to download and apply this patch: Magento Inventory is a Magento Community Engineering special project open to contributors. To take part and contribute, see the [Magento Inventory GitHub](https://github.com/magento/inventory) repository and [wiki](https://github.com/magento/inventory/wiki) to get started. Join us in our [Slack](https://magentocommeng.slack.com/messages/C5FU5E2HY) channel (or [self signup](https://tinyurl.com/engcom-slack)) to discuss the project. -* [Inventory Management overview]({{ page.baseurl }}/inventory/index.html) for developer documentation -* [Managing Inventory](https://docs.magento.com/m2/ce/user_guide/catalog/inventory-management.html) for merchant information and instructions +* [Inventory Management overview]({{ page.baseurl }}/inventory/index.html) for developer documentation +* [Managing Inventory](https://docs.magento.com/m2/ce/user_guide/catalog/inventory-management.html) for merchant information and instructions ### Improved developer experience diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md index c23b17c82be..6fc7d203899 100644 --- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md +++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md @@ -31,12 +31,12 @@ A critical SQL injection vulnerability has been identified in 2.3.x Magento code Follow these steps to download and apply this patch: -1. Access [My Account](https://account.magento.com/customer/account/login). -2. Navigate to the **Downloads** tab. Select the Magento edition and version you need. -3. Select **Support Patches and Security Patches**, then **PRODSECBUG-2198** -4. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). -5. From your project root, apply the patch. `git apply ./m2-hotfixes/`. -6. Refresh the cache from the Admin (**System** > **Cache Management**). +1. Access [My Account](https://account.magento.com/customer/account/login). +1. Navigate to the **Downloads** tab. Select the Magento edition and version you need. +1. Select **Support Patches and Security Patches**, then **PRODSECBUG-2198**. +1. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). +1. From your project root, apply the patch. `git apply ./m2-hotfixes/`. +1. Refresh the cache from the Admin (**System** > **Cache Management**). ## PayPal Payflow Pro active carding activity update diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md index 7addd4f4ba2..02056ad30be 100644 --- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md +++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md @@ -28,12 +28,12 @@ A critical SQL injection vulnerability has been identified in 2.3.x Magento code Follow these steps to download and apply this patch: -1. Access [My Account](https://account.magento.com/customer/account/login). -2. Navigate to the **Downloads** tab. Select the Magento edition and version you need. -3. Select **Support Patches and Security Patches**, then **PRODSECBUG-2198** -4. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). -5. From your project root, apply the patch. `git apply ./m2-hotfixes/`. -6. Refresh the cache from the Admin (**System** > **Cache Management**). +1. Access [My Account](https://account.magento.com/customer/account/login). +1. Navigate to the **Downloads** tab. Select the Magento edition and version you need. +1. Select **Support Patches and Security Patches**, then **PRODSECBUG-2198**. +1. Download the patch and upload to a specific directory in your Magento installation such as `m2-hotfixes` (confirm that the directory is not accessible publicly). +1. From your project root, apply the patch. `git apply ./m2-hotfixes/`. +1. Refresh the cache from the Admin (**System** > **Cache Management**). ## PayPal Payflow Pro active carding activity update diff --git a/src/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md b/src/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md index 7f67326c0ee..ed8aac4c090 100644 --- a/src/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md +++ b/src/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md @@ -1100,6 +1100,7 @@ We have fixed hundreds of issues in the Magento 2.3.3 core code. * You can now successfully download a CSV file after export. Previously, Magento redirected you to the Admin dashboard when you tried to download the CSV file that was created during export. + * Products are successfully updated through import of an CSV file in **Add/Update** mode. Previously, the import process failed, and Magento displayed this error: `The value specified in the URL Key field would generate a URL that already exists`. From 74dc362a26c3f851aba26cff272de3b0b13dbe56 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Thu, 26 Mar 2020 09:02:17 -0500 Subject: [PATCH 18/46] removed dupe space --- .../v2.3/release-notes/release-notes-2-3-4-open-source.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md b/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md index 7af87b4e3a9..42440bd10d2 100644 --- a/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md +++ b/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md @@ -349,7 +349,7 @@ We have fixed hundreds of issues in the Magento 2.3.4 core code. -* The storefront and Admin shopping cart summary fields are now displayed consistently and reflect setting preferences. *Fix submitted by Eden Duong in pull request [25037](https://github.com/magento/magento2/pull/25037)*. [GitHub-25036](https://github.com/magento/magento2/issues/25036) +* The storefront and Admin shopping cart summary fields are now displayed consistently and reflect setting preferences. *Fix submitted by Eden Duong in pull request [25037](https://github.com/magento/magento2/pull/25037)*. [GitHub-25036](https://github.com/magento/magento2/issues/25036) From da4193d7cf78af43fe89719ebdeb91c95a80185f Mon Sep 17 00:00:00 2001 From: Sergiy Zhovnir Date: Thu, 26 Mar 2020 16:52:51 +0200 Subject: [PATCH 19/46] Added documentation for TimelineColumns UI component --- src/_data/toc/ui-components-guide.yml | 3 + .../ui_comps/ui-timeline-columns-result.png | Bin 0 -> 10188 bytes .../components/ui-timeline-columns.md | 69 ++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 src/common/images/ui_comps/ui-timeline-columns-result.png create mode 100644 src/guides/v2.3/ui_comp_guide/components/ui-timeline-columns.md diff --git a/src/_data/toc/ui-components-guide.yml b/src/_data/toc/ui-components-guide.yml index 95ca77e049b..d50db4c8777 100644 --- a/src/_data/toc/ui-components-guide.yml +++ b/src/_data/toc/ui-components-guide.yml @@ -196,6 +196,9 @@ pages: - label: ThumbnailColumn component url: /ui_comp_guide/components/ui-thumbnailcolumn.html + - label: TimelineColumns component + url: /ui_comp_guide/components/ui-timeline-columns.html + - label: ListingToolbar component url: /ui_comp_guide/components/ui-toolbar.html diff --git a/src/common/images/ui_comps/ui-timeline-columns-result.png b/src/common/images/ui_comps/ui-timeline-columns-result.png new file mode 100644 index 0000000000000000000000000000000000000000..57f8064a80cf309527474efeb05ad1e27eb1f276 GIT binary patch literal 10188 zcmbt)2T)U8w{`?XR6v>#5J7q`hhC&85IP9bI|;pt6sdxOLf{}osv;;-1T6F>T|+>6 z?+O}P5D=s{xhL=Ye&2le{{KI7XZ{(6bN1S6ul20*tn4tLZy9J(U0}HYgTbh@wbYGa zu(NO&?94|BQb=NAJ2eSC$Xsve-+;l&lP(@Ro`u$D{Eanl!anq|5}-x=Ej<&B&CSg} zfBqaE9v&YbKlsFUa&mHTaL}`bIXyjn_UzgI{{HUn?)LV!xVZRD8L_Rct=~@)K79DF zl>{m&Db3BzX{xD=jg76W5I%kSWOVD6uaA#|yHb<6gE6Ub#Klu2cfR^x3kI%7 zth8JlJV@?#Ee=hsFRx=#i6Rc31Uh45kl}7js<4ihHelRIYh1z4!Sf$V@=ueWYMd7k zK-}f#;CVqj21y`9I`J4*ZLRZsMCB*k`7tTUkT*>_<4@ZETTq+6<{(LY%NLBw5`Q?0 zGdi-dH#posB6Y1fYCCgt?dRK@WwF9KFCTvWEze$0LAajkYbnzubLvdTmn)sO+TVLN zk9pMvi#?b8_!>U!ThkSKd$mxq-GTi5?K>#RJ{4V%4rU>+d(4y)Y7OK#z`xESK&DvX z;10Hx@7mTR;s<$OKZ=c}RagEHJ(q(Bq=vmVvJ02)-@~knu83YcT*^4>5c0ltu_>XN zq)Un{tMFO;g`)VKR4%@yPeFxR~~(a~erjBGL6j%rp{zWdMu z>_FM>VGsvk)~a*0a*5ARP$dtJm+8o5eTWzBns4F3*(6-7 zs`}%8BY#=M%oG-N(EaS{TYA*H^=nw~yWFE8*O@QMD3O-wa3TqLJ}M+v{9}r9%DhDK zFBvIU9D8-IBz+)@0wa?uN%%j1l#7Pri`2zQ=3)#LqHIVNC(U);5R!2h$>o(D+kc^r z9`Q;7f{ammWU2y}WvzbQjly&D)?9_Lj&Gc>3GzMg_}L;6aRcN^S@C=H06v)S&S@G0 z8~H*~m4K#2hfGsAs3es-vKxct=+?th8=cwDmoEu5<^|2%;J?AF`~KVoF*(6-5!BVf znH_d*%`Mrw?*vz6ye{71^ z(_E@s?u9YoSA^R=>|-$GHr3NqbRjuTR#5?$xa5DGWCYxq^r}f}hG4QGVW`x&k!6hPcPBr;1TTvVJmV4ls|o+B=c1z&w)MBf|9a z6;+;!JZWK>uYac*4}vK}S^1J9@7J>-cVAfDltiO1sHc{yfmhV3&pCWrJ{l6$&qLB6 z8|CtiUcvd?Q0JKp!KwTqleUy6CG~EzoQNz+%U)QNZMbBNsS>$#qlL$*kNFh+fazuT zu`A;)E4$8lXh8ni2d#9U%pIgm<(VpKVE2v&_j00xfURZiS--TPTSuI%sW;h4v=4ef zUyi1U>iF{bJ^R8VD?7s(QlZ8rL;A8X$?lUG=Tpyo4jrH9<5#zHW4E+rDHFDpx);-9 z$Tlv=ZBni}&~IS%;vPAke`x-3tx;d?EWSJ89IlCxy>|}zJr=Ad2gb~9{h~rG&wrWT zX6~$vcpD}XhkiGm?{yWap0fM#u_^EKx-ZlIbHCr-e?f(n(+DFe55yMfvrNmt#+}1O zr)1Ga{KGZLx})RGf(I8~r_1*hX21e%nO>TKN>N3opS2p&Zxs8KUNo?Icwd7Xe&+5- z!#*PrL|IaDK5o#{^1L#vp5C#b;#JcJikfM0cuE>ZMtnwS!`@6NYxJnYp;RU;M0JMz z-QjyP!OD!2%JiXeO{~T1H$qXz`#H|uPqBdxv3uz9vIUa1tNPSQpXeMP)@(T6ad#F9 zWD`9ro$ueO=0ctwfhTBW{IEr?GEn6@QqB+4CtHv6pO-&WSOwo{fQ8&+1D-`eUjoil zy%tASoTbSolcB+rd6R>_UOn)X&_F``k8|kq0sedD?_$s<^ZtOrf{Ge>@Uf`7F*S~`CC6j%4|23Qk0 z@On!cc=DMpKuwZB{?Lzs=~=-s#&zj}h2+!b&y=j=FYQNmW@+=HM9n%a0@$6f31+JD z#?^V578tnX*I%8vS^-C@f-ExDBWSYRhV=_x>7+BV1hX_jO%Ru#GplRBf9QJNciK*h#O{OS zNGaYOtVKjB+@HhAoUAu&xKd09R+H3R0B^dh%|L&!uE*xpysRfzG}B5Z(5woMnkMzO z#wKM96$6%+860=m8HG0_V1Lf%`?0JAk_OGU@aekmQWxwW7!K3*YXTBn1r2ibIi2-}@z2L!UE;I}3dM z8vbmKT1%8eg{(v-4jqU#5@601e(>i>&x7b8((4V3u06lR3NE>v>w{`S7*8Kk_GeCw z@Vu<~{DrA*<9<4l;U3z^u!%hRjXx@;k}hHC>>E3?sqlIZoT4>Z{2}#s88H^AI$NsW zl3KkL`S2rOb#SkB#mDMZ+x3a)uLACibO&DfECmQaRj)FWp5z z#ONj7kX41WxM61@Sgd8Ur=A7)Ap#nxGu^XV3O@H%EO>kDSNjQGL1O<03a{UF?3ex7 zJg!_SY45XNXoM#ltI?kq$m{wt_7c`E7w`R8am&&n`S6PkX>%K>*|ovAvmG^$_uq<< zB>#S2wRR(B&=`3==|r}xDa@fdHv%Mgh)(M|#0DFjPLTM8=EIq+Wkwaty+2Yz1Cfh9 zFg2SuOYAl>pj)1q^Ql~M8T*QB>&cm4NK<5$wR*#hS994iZe8|THS$G~)jdXMQ{=l` zsT;V>2Y+-1*kV+`$j9N5>Yu5m3P(xpy{9{~s)EinzTFnWT1<`=Rs^LpPjsTsH_Bb9 zj7QGvWtEES2b{nBc&^-7JHMY$BxdCf_q%wC`b9ZGXZjH)d{~^W-T#eSQd8VvI_l)K zpAHSFf~*;+aOaKGwno$EExwTKqCk!ySF)pF6e6c8m&beTL181`Eq; zz0JN=ikw5W<~xL`$Xniei@PbgERzqISEoC!2@RbH_=`(UeD7Y>Ro1x7tSO@5fspre zDZ##!c9V+R9FSHV%s8iTl8!CHaaD^B1!Z^nOkTs4PX4yMhyTJusP_zYwgqN9|B!po z6Ld*3Qe@iQ3RLdz7soEf{?;UvKd8N-mTYLRuuZU%S1@eriFoY|H1}3K1y?4goMJz& zB(wLaRCTj^tSO|KdRTtWE${@*LPArdrtmBm>} zS1_efWan#FS9VsSwPGKl>EPqmox=Q3;LJol(me`$ap+Vne~QpQ0%&t z?6}T=f8ZI^WY^N&z81XjU*L` zDhU0g`4(xSwpF=TeY~jvj%Rr3#4SC(#-xyws2m3}yqn>hVnmhJ!G3bg=FLA@@fwlh zm^`%fbt#1Rnm#Y6{rKG6Zm`b4RbD{hLccIV*Z!oIO~jo3r|I6N+@VfUdsn9TybUuR zdw9#b`=G>zZojze`{c>&vrFUE$ES42@S?AS&hMSS@k-7v4>~Bt+1qH2~M+}+e=k(cIq zgW9TcrT%R{AzvC;{HWD#F)4Bd%WvpB!fJWAv9H5*TWGzwvpsS4+H9$LX-ZIgrd{jL zh$B?O(jdxiQ3(FK(yih4^7I zj}Hu827mb9Jp-)Y@Xhgk-iG{e^VrqE&C(TJC2KC(YE`}VrlnX9ZAGqV)zgwCyyN#x ze0D_u^W4bbal*l?YH6X_`p7YF`>!Hb#9d4yp1-kvC9!IJLUp)BsBQQ}i%~XxSjC82 z`Eb_#i*(J-#kF$7s?h5@iSUu@pU3)4KSui-nlw~1WuB|3o&_QXTMm#rE|mwHVl5ro z_}=%Zt92MLCPJH$onK;3MWmh3&z>4HH#s>Q`=LrI*&KX?BWBiz>Kzfgg-O=h@^)413V+ll%Jg0Laod7e} zm8V1lI=Ifq+{Qn+p&c1+3>_b&U%`P+l|!e37%J_2taiQ==%vNUW5B5aI)Uo(a5Mw( z6rd9zI?}>v<;P*PXt|iVFr0}0t3s!!X8t=PP9BugztB{4(+YT|YF)aFuQy`Glfqi{ z{r!MHvG6mmtdS#;R|Z+EE`%tuQpQGadx|e#st`*VX;o?g}7w(rXJ^(MtPC^?8$GH+sX1t0=EkgJRLn?J^WM+gvFJ6B84S! zHX!LqH5aN!JEh$NXR-PE8Sv!HtIIT~B}v>8C(7v_xhi?Rcf6^f+S5E3}6 zM9f!a7!cHmlgr0ZM8Utnivf~r2yF0oWkirGjF^H%S{N|Y@z>)iV2mPD1-GF!q`SAY zP@stUOA@yk_P4CxFLWwf>u($TO>hEHowE5B@uAAj1w)b@!q3of4G@n%V1d>#x?_JU zIe{a@9c1I6GLFAkMC+3{D8~q+!5bC>2)nZYTSJX)<*PF9>C?W#oHxFS85jE1-bBH3 zqa#4$Xx{H~L$&7;jG7H!`(z{0OA|HSv}AFcCE^WzM$))fqB!+$xWn85sy(K>^jG2D z$zmI$(;Ns@Fm96!uzQ;X1YEX4ULdsagMpaxsu?yU!{HYrj2Cb59a^qyIM0_kL3~45 zKT!doi5Q=LI*zy2C9F*o?5}zoJts|GW8RJkZCsb9`;P zw!`G+d-V{Z-+PsxVE_p-hI$WRLG}!NF5_3^Mc|6aO&A_b4${Zo=NDnw&kZ;E#-#87 z?1-bK;R>iv^0NkgQs8)GZptca%b@G9V6i#~h1@-^HrbMI7yV1#W^H_rnrn z+n~UE^$GRwawej9svj<<#E#MjH*4UdoTHI>xZ;yC)%i9hMP&aL9prk`#UUtr*Aw&!#B@<<40nGn{2LLF!;i~aL4lH` z&P`JXoQ71oo|3$N&cS7`(C}43I7HB%akd4tS__;%A1Wc9K z$1vcV7cQ8f{O={i9~{L7eS7Ds06DtH8`K1azE;&oL)d03m5V)GDAg+gX}y7{(1RNvPUVF0@M(lVa#082rLvk z0i_OkhNAxaESsNzJd$ib1lhQ;s$lyT0tU?tcD$KFBK*w#9Jtu^27~dx%@1{S&Rv8d zA^5}ra|ow}g8c6bTpTeqk0cR`C^E=O;y;SkG$<2$npnrqT$n0uALRksr8x<+PHUI+ zpZA_V7%Q~PpVfDo<-@Qamd{a;5WTNec+#D3h?m{nS<6N0c}-tUdgOiX(3;li7ZWe5 zS`@rAbpAHVOAX9v97X5cu`REKa}iq0L*JJ+Z*|KC$Ulb4_Z$jTc$nY zc619~!H3?F5)U;c03V>4P|SP1Kf!bj*!5OSo}KR=rKssfOF>Q959RWDF>YBlpF zbA$65)VwN!C{Uwse-?>NAof&aNRU3KUliPQOTY018VWWCQGE7u!3V`sc4XLKE=^@= zTunRN9GkiNLRi!Og4>fOelhZ3S{l4}JVqHOk*!>YH&?Y%mIH$<5`q zjBuJMnmnLdT>~tpi$nzgR$Q@_)Ew`2MdMLj36an+@gYNCVEz$ldia zKEHy*&%yq?!dawb{sv{)Ok^Y*KW^;*dHIW=CsGynx?!C~p+z@3-i?>O?)S^Eb!r&7 zAWkLxV_(xK98G%-5dn(*kOD{!(3_WDe(?8|Mj*-JjM(#fnWEr303DYqc=(SRmVzcv z`LEqX4Ezl8_#sQ)7W|AB=mGwZoso`xKUU5&^ZftQ&GsxzLY;VchA~eW7lwV!zTc?P z!omfR)QLbih-Qe3U|(ba8}x*}Drtc*;LrOc=tvQSCCab}SV3_kRFNjoZz4Xsmek|> z2pupAI!DK~Q7w(LIf9=aEd7TJ`s>5r(fli1EQKl&!?D+Y^Fp)>BZe|(P7i@|L~oYW zHM&+#D}@L^;`+GFvXw1-$FNsTQ}Dp=1zYn!{jZx6h0UtpgVG&FPE`6bP3t_n^@g_PdzJ!^EUobbCBXTz2H+B@uErZWfWF! zp9QaKFkYO|T6xkQkua%=ov_&U8;j}b{ark|pqEX1Fb3u4+s=mobMUB_*J_QXpr+Vz z8(TN!RcpR$LS0#e)ew}j6CQbAzyT!{LM9`Pd(%;)Rksr7SMIfL9fV(StesqYUhUtw z7PR}08{w1%8Kk}iHcVay)(vY`MH|KTeAAn{pqg<*)l;Lz-%neKmX582qwHox7_*vB z?C9|vCkct;G{4^i3Q2wrNG}OgO*`QqbPdh#3oK>}K&RQjWNlNP@zx=Ah@1*#?`R<1!1H~KSch;UC=jFZ^2(RMl=y=jj> zdm_VE|KJze`&DJoz>+eqK}G#Xbe5R8FjL0Rj+oioH&r=yYhqZrEzXD7Ov^;SIiwAg z#IQAz76``9-8ara3LN8~2#hP^&aiO~#+O&_91G*}>s`d0N2gPLQtK4GtGsG^WsepX zcBQWYF1JvuW$@v%BHau4#qb4P1y{fNucGWn@^?~F>y&tUyhA4>Y%NZTQfLo&prl5B z4VT|>yGMIG3C4Pdk?kE!lt=jQuX-Jg%pybd_>!tc zt{?3_Y%P%NNDfRiV#nJiY+j~5I{DH5T`s}%Ui0zrzPK2>7DViGdUEa)_E;f3wDdho5)wVqNKsai`V`SBWc7T zfu>D{|4;VmK)@g`bbm1(^0dhU8ILm}GIJRfo^_<4PSWa{OLXRw0BJ@w8llLdrjaAW z?*q^+Wv&T57y?}{jG!CQg$NL~kp^`SZR<5UXhgxF!2xOQ0L?h1tDKJcE+bkhzWE+t z&Rv8DB5}J0+R4FJVHOpPC7Mg>2gC-vW7LtdffYr7a{bRXRla4q_|8hvQ3$srr#yAu4|L0_@!xKC`aW!XY z{fge)+l9&tLvOw&rgU8a`16D~%ZUXefmOi zh=`IYitNrTk_<+}1#9F%z*?E1_y5Ju#v^Q{NiPXNA}3Iuz|4V&x~%wSJ@T|K5li7z z+PNb{QexZHvx`$sVXK^`iiJvkOO1Z=~lKG~ko}r)LP?w)E zc2*o>fn})QeI4{yEL@FC5<-{(w-z(wW3NG%pRDI9JR1y$&}cY#tt6O=aR)^fwV3H= z8#zIaGahXh#r<41u-xPXWZn{xPJlkBDsz#rsgSB4*5`@#QxN$a>h+IMkTro|jRw~B z+0~qhBHjmnCg*S=_a?)o0fQw+B{nql;papT4^vpJ1!_E3(VbeLs`7*KMoQ3>*>GIo ztsU}3kD7o4gfAA($HCBq4OVb?^CBod@sb7wJraTwo3>qd;isLeK?r3B&CN!Uuy$Nv z5pHYIgiHlU?(D&59?*TRn$H1N=}Yw9$ZxwB|v%)gHe>bw^h- zbRCgLZ!%CWMF4$@S)*782sQHfEh8Ra$nLi5x~Pyfdg;5I0hOZ56ZnH034Yh9b2pI} z9^*5R*Y8O^7H6Y}QX0McLmM3ScY4v^{mr$u1&BEvJx;i%3bvla`$;K_6{N5)F$H*l z8VvXr$bRca`^37A?3c0?_wo|apn?vrL@<4*buMElFUb5O8q^rgTehK1!4`eaf#yyK6Wje{F{=%z4a;0frn2o<3^|Q0R7Gd0QAuUm_^L ztXyRkzMOs2EJl2E4yphn@&y*vp)lTzoyG=CQGvrD{Cq?#1MQjAm`rT6ha$Q>OwPL& z8%#Nh<$%8ZLblxZoGX-@H0SD{HDoXiYm7K5l?y>!V~C7%pGQwY3e!>%Ux z;pcK@-z0N)0u-4CE`_BdZ*ijB=tR1(y-0(ot0GxA0Ozr2DEkAl6Fegf;}aSoa6vBN z)QN!fF1*?g!-S^ol#)Wo)&zmGCp#H+(DqpF=27iDF27^Rx0y%eHzz>C{I)y@CDdUR zUwzpf8UQn+ne)M%Umfk@XyY=OWxi6RL(TwdonH9YW8E$%f6_9aaK;3r;Wmkmo>85So3PL*|~?b z6UlJIkBa{H(GFx|vNQ!sxb4^Xj5}wSG&3)M6Zl~q3M!$JP1?td=)qPiS6r}MhOA5rp0DyZ-C`;2)5x1_Os&ZZ6_RqXEABhz3F#bQ z-DI;p9yJA)tcO!=)g+I}=?_o1WeT>`(z|xtc*8_c6(@Q768?Vt{kVgfo8Zuks*oc) zcEsDuI<`up(;XFoG+?U-AI^${t + + + + 7 + + + + + text + + + + + + YYYY-MM-DD HH:mm:ss + + + + + + YYYY-MM-DD HH:mm:ss + + + + + +``` + +#### Result + +![TimelineColumns Component Example]({{ site.baseurl }}/common/images/ui_comps/ui-timeline-columns-result.png) From 6821699e9207bf3463a77f6273129c7faf3565aa Mon Sep 17 00:00:00 2001 From: Andrii Beziazychnyi Date: Wed, 25 Mar 2020 22:55:41 +0200 Subject: [PATCH 20/46] Fixed code style for JSON blocks and styles of the collapsible elements --- src/common/css/devdocs.css | 5 + .../rest/tutorials/orders/order-add-items.md | 115 +- .../tutorials/orders/order-admin-token.md | 2 +- .../tutorials/orders/order-create-customer.md | 44 +- .../tutorials/orders/order-create-invoice.md | 435 ++-- .../tutorials/orders/order-create-order.md | 2138 +++++++++-------- .../tutorials/orders/order-create-quote.md | 4 +- .../tutorials/orders/order-create-shipment.md | 4 +- .../tutorials/orders/order-issue-refund.md | 4 +- .../orders/order-prepare-checkout.md | 478 ++-- 10 files changed, 1622 insertions(+), 1607 deletions(-) diff --git a/src/common/css/devdocs.css b/src/common/css/devdocs.css index 62ce24e3273..bdfc886414a 100644 --- a/src/common/css/devdocs.css +++ b/src/common/css/devdocs.css @@ -36,3 +36,8 @@ font-size: 1.3em; margin: 1.5em 0 0.5em 0; } + +/* Collapsible styles */ +.collapsible { + margin: 0 0 1.3em; +} diff --git a/src/guides/v2.3/rest/tutorials/orders/order-add-items.md b/src/guides/v2.3/rest/tutorials/orders/order-add-items.md index c13529072d1..a887fd857d2 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-add-items.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-add-items.md @@ -33,9 +33,9 @@ The following example adds an orange medium-sized Radiant women's t-shirt (`sku` **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer ` **Payload:** @@ -57,6 +57,7 @@ The following example adds an orange medium-sized Radiant women's t-shirt (`sku` "sku": "WS12-M-Orange", "qty": 1, "name": "Radiant Tee-M-Orange", + "price": 19.99, "product_type": "simple", "quote_id": "4" } @@ -74,9 +75,9 @@ The following example adds the downloadable product Advanced Pilates & Yoga (`sk **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer ` **Payload:** @@ -144,9 +145,9 @@ We now know the values for `option_value` for `size` and `color` are `168` and ` **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer ` **Payload:** @@ -179,27 +180,27 @@ We now know the values for `option_value` for `size` and `color` are `168` and ` ```json { - "item_id": 13, - "sku": "MH01-S-Gray", - "qty": 1, - "name": "Chaz Kangeroo Hoodie", - "price": 52, - "product_type": "configurable", - "quote_id": "4", - "product_option": { - "extension_attributes": { - "configurable_item_options": [ - { - "option_id": "93", - "option_value": 52 - }, - { - "option_id": "141", - "option_value": 168 - } - ] + "item_id": 13, + "sku": "MH01-S-Gray", + "qty": 1, + "name": "Chaz Kangeroo Hoodie", + "price": 52, + "product_type": "configurable", + "quote_id": "4", + "product_option": { + "extension_attributes": { + "configurable_item_options": [ + { + "option_id": "93", + "option_value": 52 + }, + { + "option_id": "141", + "option_value": 168 } + ] } + } } ``` @@ -326,9 +327,9 @@ For this example, we'll configure the Sprite Yoga Companion Kit as follows: **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer ` **Payload:** @@ -336,37 +337,37 @@ For this example, we'll configure the Sprite Yoga Companion Kit as follows: ```json { - "cartItem": { - "sku": "24-WG080", - "qty": "1", - "quote_id": "4", - "product_option": { - "extension_attributes": { - "bundle_options": [ - { - "option_id": 1, - "option_qty": 1, - "option_selections": [2] - }, - { - "option_id": 2, - "option_qty": 1, - "option_selections": [4] - }, - { - "option_id": 3, - "option_qty": 1, - "option_selections": [6] - }, - { - "option_id": 4, - "option_qty": 1, - "option_selections": [8] - } - ] - } - } + "cartItem": { + "sku": "24-WG080", + "qty": 1, + "quote_id": "4", + "product_option": { + "extension_attributes": { + "bundle_options": [ + { + "option_id": 1, + "option_qty": 1, + "option_selections": [2] + }, + { + "option_id": 2, + "option_qty": 1, + "option_selections": [4] + }, + { + "option_id": 3, + "option_qty": 1, + "option_selections": [6] + }, + { + "option_id": 4, + "option_qty": 1, + "option_selections": [8] + } + ] + } } + } } ``` diff --git a/src/guides/v2.3/rest/tutorials/orders/order-admin-token.md b/src/guides/v2.3/rest/tutorials/orders/order-admin-token.md index 638766a369f..f9d08dad652 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-admin-token.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-admin-token.md @@ -58,7 +58,7 @@ See [Token-based authentication]({{ page.baseurl }}/get-started/authentication/g **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` **Payload:** diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-customer.md b/src/guides/v2.3/rest/tutorials/orders/order-create-customer.md index e89791b1a96..61ec2b8fbde 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-customer.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-customer.md @@ -35,7 +35,7 @@ This example shows a simplified way of creating a customer account. Typically, y **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` **Payload:** @@ -49,22 +49,26 @@ It is recommended that you substitute the value of the `email` parameter with a "email": "jdoe@example.com", "firstname": "Jane", "lastname": "Doe", - "addresses": [{ - "defaultShipping": true, - "defaultBilling": true, - "firstname": "Jane", - "lastname": "Doe", - "region": { - "regionCode": "NY", - "region": "New York", - "regionId":43 - }, - "postcode": "10755", - "street": ["123 Oak Ave"], - "city": "Purchase", - "telephone": "512-555-1111", - "countryId": "US" - }] + "addresses": [ + { + "defaultShipping": true, + "defaultBilling": true, + "firstname": "Jane", + "lastname": "Doe", + "region": { + "regionCode": "NY", + "region": "New York", + "regionId": 43 + }, + "postcode": "10755", + "street": [ + "123 Oak Ave" + ], + "city": "Purchase", + "telephone": "512-555-1111", + "countryId": "US" + } + ] }, "password": "Password1" } @@ -135,14 +139,14 @@ By default, a customer token is valid for 1 hour. To change this value, log in t **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` **Payload:** ```json { -"username": "jdoe@example.com", -"password": "Password1" + "username": "jdoe@example.com", + "password": "Password1" } ``` diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-invoice.md b/src/guides/v2.3/rest/tutorials/orders/order-create-invoice.md index 9926aeedd24..96767ab2754 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-invoice.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-invoice.md @@ -30,11 +30,12 @@ where `3` is the `orderid` **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer` `` **Payload:** + ```json { "capture": true, @@ -56,9 +57,9 @@ An invoice is structurally similar to an order, but an order contains more detai **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer` `` **Payload:** @@ -72,219 +73,219 @@ You will use the `order_item_id` values to create a [shipment](https://glossary. ```json { - "base_currency_code": "USD", - "base_discount_amount": 0, - "base_grand_total": 165, - "base_discount_tax_compensation_amount": 0, - "base_shipping_amount": 5, - "base_shipping_incl_tax": 5, - "base_shipping_tax_amount": 0, - "base_subtotal": 160, - "base_subtotal_incl_tax": 160, - "base_tax_amount": 0, - "base_to_global_rate": 1, - "base_to_order_rate": 1, - "billing_address_id": 6, - "can_void_flag": 0, - "created_at": "2017-08-21 22:36:02", - "discount_amount": 0, - "email_sent": 1, - "entity_id": 3, - "global_currency_code": "USD", - "grand_total": 165, - "discount_tax_compensation_amount": 0, - "increment_id": "000000003", - "order_currency_code": "USD", - "order_id": 3, - "shipping_address_id": 5, - "shipping_amount": 5, - "shipping_discount_tax_compensation_amount": 0, - "shipping_incl_tax": 5, - "shipping_tax_amount": 0, - "state": 2, - "store_currency_code": "USD", - "store_id": 1, - "store_to_base_rate": 0, - "store_to_order_rate": 0, - "subtotal": 160, - "subtotal_incl_tax": 160, - "tax_amount": 0, - "total_qty": 9, - "updated_at": "2017-08-21 22:36:03", - "items": [ - { - "base_discount_tax_compensation_amount": 0, - "base_price": 22, - "base_price_incl_tax": 22, - "base_row_total": 22, - "base_row_total_incl_tax": 22, - "base_tax_amount": 0, - "entity_id": 3, - "discount_tax_compensation_amount": 0, - "name": "Radiant Tee-M-Orange", - "parent_id": 3, - "price": 22, - "price_incl_tax": 22, - "product_id": 1553, - "row_total": 22, - "row_total_incl_tax": 22, - "sku": "WS12-M-Orange", - "tax_amount": 0, - "order_item_id": 3, - "qty": 1 - }, - { - "base_discount_tax_compensation_amount": 0, - "base_price": 18, - "base_price_incl_tax": 18, - "base_row_total": 18, - "base_row_total_incl_tax": 18, - "base_tax_amount": 0, - "entity_id": 4, - "discount_tax_compensation_amount": 0, - "name": "Advanced Pilates & Yoga (Strength)", - "parent_id": 3, - "price": 18, - "price_incl_tax": 18, - "product_id": 49, - "row_total": 18, - "row_total_incl_tax": 18, - "sku": "240-LV08", - "tax_amount": 0, - "order_item_id": 4, - "qty": 1 - }, - { - "base_price": 68, - "base_price_incl_tax": 68, - "entity_id": 5, - "name": "Sprite Yoga Companion Kit", - "parent_id": 3, - "price": 68, - "price_incl_tax": 68, - "product_id": 51, - "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", - "order_item_id": 5, - "qty": 1 - }, - { - "base_discount_tax_compensation_amount": 0, - "base_price": 27, - "base_price_incl_tax": 27, - "base_row_total": 27, - "base_row_total_incl_tax": 27, - "base_tax_amount": 0, - "entity_id": 6, - "discount_tax_compensation_amount": 0, - "name": "Sprite Stasis Ball 65 cm", - "parent_id": 3, - "price": 27, - "price_incl_tax": 27, - "product_id": 29, - "row_total": 27, - "row_total_incl_tax": 27, - "sku": "24-WG082-blue", - "tax_amount": 0, - "order_item_id": 6, - "qty": 1 - }, - { - "base_discount_tax_compensation_amount": 0, - "base_price": 5, - "base_price_incl_tax": 5, - "base_row_total": 5, - "base_row_total_incl_tax": 5, - "base_tax_amount": 0, - "entity_id": 7, - "discount_tax_compensation_amount": 0, - "name": "Sprite Foam Yoga Brick", - "parent_id": 3, - "price": 5, - "price_incl_tax": 5, - "product_id": 21, - "row_total": 5, - "row_total_incl_tax": 5, - "sku": "24-WG084", - "tax_amount": 0, - "order_item_id": 7, - "qty": 1 - }, - { - "base_discount_tax_compensation_amount": 0, - "base_price": 17, - "base_price_incl_tax": 17, - "base_row_total": 17, - "base_row_total_incl_tax": 17, - "base_tax_amount": 0, - "entity_id": 8, - "discount_tax_compensation_amount": 0, - "name": "Sprite Yoga Strap 8 foot", - "parent_id": 3, - "price": 17, - "price_incl_tax": 17, - "product_id": 34, - "row_total": 17, - "row_total_incl_tax": 17, - "sku": "24-WG086", - "tax_amount": 0, - "order_item_id": 8, - "qty": 1 - }, - { - "base_discount_tax_compensation_amount": 0, - "base_price": 19, - "base_price_incl_tax": 19, - "base_row_total": 19, - "base_row_total_incl_tax": 19, - "base_tax_amount": 0, - "entity_id": 9, - "discount_tax_compensation_amount": 0, - "name": "Sprite Foam Roller", - "parent_id": 3, - "price": 19, - "price_incl_tax": 19, - "product_id": 22, - "row_total": 19, - "row_total_incl_tax": 19, - "sku": "24-WG088", - "tax_amount": 0, - "order_item_id": 9, - "qty": 1 - }, - { - "base_discount_tax_compensation_amount": 0, - "base_price": 52, - "base_price_incl_tax": 52, - "base_row_total": 52, - "base_row_total_incl_tax": 52, - "base_tax_amount": 0, - "entity_id": 10, - "discount_tax_compensation_amount": 0, - "name": "Chaz Kangeroo Hoodie", - "parent_id": 3, - "price": 52, - "price_incl_tax": 52, - "product_id": 67, - "row_total": 52, - "row_total_incl_tax": 52, - "sku": "MH01-S-Gray", - "tax_amount": 0, - "order_item_id": 10, - "qty": 1 - }, - { - "base_price": 0, - "entity_id": 11, - "name": "Chaz Kangeroo Hoodie-S-Gray", - "parent_id": 3, - "price": 0, - "product_id": 56, - "sku": "MH01-S-Gray", - "order_item_id": 11, - "qty": 1 - } - ], - "comments": [] + "base_currency_code": "USD", + "base_discount_amount": 0, + "base_grand_total": 165, + "base_discount_tax_compensation_amount": 0, + "base_shipping_amount": 5, + "base_shipping_incl_tax": 5, + "base_shipping_tax_amount": 0, + "base_subtotal": 160, + "base_subtotal_incl_tax": 160, + "base_tax_amount": 0, + "base_to_global_rate": 1, + "base_to_order_rate": 1, + "billing_address_id": 6, + "can_void_flag": 0, + "created_at": "2017-08-21 22:36:02", + "discount_amount": 0, + "email_sent": 1, + "entity_id": 3, + "global_currency_code": "USD", + "grand_total": 165, + "discount_tax_compensation_amount": 0, + "increment_id": "000000003", + "order_currency_code": "USD", + "order_id": 3, + "shipping_address_id": 5, + "shipping_amount": 5, + "shipping_discount_tax_compensation_amount": 0, + "shipping_incl_tax": 5, + "shipping_tax_amount": 0, + "state": 2, + "store_currency_code": "USD", + "store_id": 1, + "store_to_base_rate": 0, + "store_to_order_rate": 0, + "subtotal": 160, + "subtotal_incl_tax": 160, + "tax_amount": 0, + "total_qty": 9, + "updated_at": "2017-08-21 22:36:03", + "items": [ + { + "base_discount_tax_compensation_amount": 0, + "base_price": 22, + "base_price_incl_tax": 22, + "base_row_total": 22, + "base_row_total_incl_tax": 22, + "base_tax_amount": 0, + "entity_id": 3, + "discount_tax_compensation_amount": 0, + "name": "Radiant Tee-M-Orange", + "parent_id": 3, + "price": 22, + "price_incl_tax": 22, + "product_id": 1553, + "row_total": 22, + "row_total_incl_tax": 22, + "sku": "WS12-M-Orange", + "tax_amount": 0, + "order_item_id": 3, + "qty": 1 + }, + { + "base_discount_tax_compensation_amount": 0, + "base_price": 18, + "base_price_incl_tax": 18, + "base_row_total": 18, + "base_row_total_incl_tax": 18, + "base_tax_amount": 0, + "entity_id": 4, + "discount_tax_compensation_amount": 0, + "name": "Advanced Pilates & Yoga (Strength)", + "parent_id": 3, + "price": 18, + "price_incl_tax": 18, + "product_id": 49, + "row_total": 18, + "row_total_incl_tax": 18, + "sku": "240-LV08", + "tax_amount": 0, + "order_item_id": 4, + "qty": 1 + }, + { + "base_price": 68, + "base_price_incl_tax": 68, + "entity_id": 5, + "name": "Sprite Yoga Companion Kit", + "parent_id": 3, + "price": 68, + "price_incl_tax": 68, + "product_id": 51, + "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", + "order_item_id": 5, + "qty": 1 + }, + { + "base_discount_tax_compensation_amount": 0, + "base_price": 27, + "base_price_incl_tax": 27, + "base_row_total": 27, + "base_row_total_incl_tax": 27, + "base_tax_amount": 0, + "entity_id": 6, + "discount_tax_compensation_amount": 0, + "name": "Sprite Stasis Ball 65 cm", + "parent_id": 3, + "price": 27, + "price_incl_tax": 27, + "product_id": 29, + "row_total": 27, + "row_total_incl_tax": 27, + "sku": "24-WG082-blue", + "tax_amount": 0, + "order_item_id": 6, + "qty": 1 + }, + { + "base_discount_tax_compensation_amount": 0, + "base_price": 5, + "base_price_incl_tax": 5, + "base_row_total": 5, + "base_row_total_incl_tax": 5, + "base_tax_amount": 0, + "entity_id": 7, + "discount_tax_compensation_amount": 0, + "name": "Sprite Foam Yoga Brick", + "parent_id": 3, + "price": 5, + "price_incl_tax": 5, + "product_id": 21, + "row_total": 5, + "row_total_incl_tax": 5, + "sku": "24-WG084", + "tax_amount": 0, + "order_item_id": 7, + "qty": 1 + }, + { + "base_discount_tax_compensation_amount": 0, + "base_price": 17, + "base_price_incl_tax": 17, + "base_row_total": 17, + "base_row_total_incl_tax": 17, + "base_tax_amount": 0, + "entity_id": 8, + "discount_tax_compensation_amount": 0, + "name": "Sprite Yoga Strap 8 foot", + "parent_id": 3, + "price": 17, + "price_incl_tax": 17, + "product_id": 34, + "row_total": 17, + "row_total_incl_tax": 17, + "sku": "24-WG086", + "tax_amount": 0, + "order_item_id": 8, + "qty": 1 + }, + { + "base_discount_tax_compensation_amount": 0, + "base_price": 19, + "base_price_incl_tax": 19, + "base_row_total": 19, + "base_row_total_incl_tax": 19, + "base_tax_amount": 0, + "entity_id": 9, + "discount_tax_compensation_amount": 0, + "name": "Sprite Foam Roller", + "parent_id": 3, + "price": 19, + "price_incl_tax": 19, + "product_id": 22, + "row_total": 19, + "row_total_incl_tax": 19, + "sku": "24-WG088", + "tax_amount": 0, + "order_item_id": 9, + "qty": 1 + }, + { + "base_discount_tax_compensation_amount": 0, + "base_price": 52, + "base_price_incl_tax": 52, + "base_row_total": 52, + "base_row_total_incl_tax": 52, + "base_tax_amount": 0, + "entity_id": 10, + "discount_tax_compensation_amount": 0, + "name": "Chaz Kangeroo Hoodie", + "parent_id": 3, + "price": 52, + "price_incl_tax": 52, + "product_id": 67, + "row_total": 52, + "row_total_incl_tax": 52, + "sku": "MH01-S-Gray", + "tax_amount": 0, + "order_item_id": 10, + "qty": 1 + }, + { + "base_price": 0, + "entity_id": 11, + "name": "Chaz Kangeroo Hoodie-S-Gray", + "parent_id": 3, + "price": 0, + "product_id": 56, + "sku": "MH01-S-Gray", + "order_item_id": 11, + "qty": 1 + } + ], + "comments": [] } ``` diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-order.md b/src/guides/v2.3/rest/tutorials/orders/order-create-order.md index 9746b70bf23..a8537b425ab 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-order.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-order.md @@ -31,9 +31,9 @@ Use the `V1/guest-carts//payment-information` endpoint to set the paymen **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer ` **Payload:** @@ -41,22 +41,24 @@ Use the `V1/guest-carts//payment-information` endpoint to set the paymen ```json { - "paymentMethod": { - "method": "banktransfer" - }, - "billing_address": { - "email": "jdoe@example.com", - "region": "New York", - "region_id": 43, - "region_code": "NY", - "country_id": "US", - "street": ["123 Oak Ave"], - "postcode": "10577", - "city": "Purchase", - "telephone": "512-555-1111", - "firstname": "Jane", - "lastname": "Doe" - } + "paymentMethod": { + "method": "banktransfer" + }, + "billing_address": { + "email": "jdoe@example.com", + "region": "New York", + "region_id": 43, + "region_code": "NY", + "country_id": "US", + "street": [ + "123 Oak Ave" + ], + "postcode": "10577", + "city": "Purchase", + "telephone": "512-555-1111", + "firstname": "Jane", + "lastname": "Doe" + } } ``` @@ -78,9 +80,9 @@ where `3` is the `orderid` **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer` `` **Payload:** @@ -92,64 +94,808 @@ Not applicable ```json { - "applied_rule_ids": "1", - "base_currency_code": "USD", - "base_discount_amount": 0, - "base_grand_total": 165, - "base_discount_tax_compensation_amount": 0, + "applied_rule_ids": "1", + "base_currency_code": "USD", + "base_discount_amount": 0, + "base_grand_total": 165, + "base_discount_tax_compensation_amount": 0, + "base_shipping_amount": 5, + "base_shipping_discount_amount": 0, + "base_shipping_incl_tax": 5, + "base_shipping_tax_amount": 0, + "base_subtotal": 160, + "base_subtotal_incl_tax": 160, + "base_tax_amount": 0, + "base_total_due": 165, + "base_to_global_rate": 1, + "base_to_order_rate": 1, + "billing_address_id": 6, + "created_at": "2017-08-21 22:22:19", + "customer_email": "jdoe@example.com", + "customer_firstname": "Jane", + "customer_group_id": 1, + "customer_id": 3, + "customer_is_guest": 0, + "customer_lastname": "Doe", + "customer_note_notify": 1, + "discount_amount": 0, + "email_sent": 1, + "entity_id": 3, + "global_currency_code": "USD", + "grand_total": 165, + "discount_tax_compensation_amount": 0, + "increment_id": "000000003", + "is_virtual": 0, + "order_currency_code": "USD", + "protect_code": "61f76d", + "quote_id": 4, + "shipping_amount": 5, + "shipping_description": "Best Way - Table Rate", + "shipping_discount_amount": 0, + "shipping_discount_tax_compensation_amount": 0, + "shipping_incl_tax": 5, + "shipping_tax_amount": 0, + "state": "new", + "status": "pending", + "store_currency_code": "USD", + "store_id": 1, + "store_name": "Main Website\nMain Website Store\n", + "store_to_base_rate": 0, + "store_to_order_rate": 0, + "subtotal": 160, + "subtotal_incl_tax": 160, + "tax_amount": 0, + "total_due": 165, + "total_item_count": 7, + "total_qty_ordered": 4, + "updated_at": "2017-08-21 22:22:20", + "weight": 2, + "items": [ + { + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_discount_tax_compensation_amount": 0, + "base_original_price": 22, + "base_price": 22, + "base_price_incl_tax": 22, + "base_row_invoiced": 0, + "base_row_total": 22, + "base_row_total_incl_tax": 22, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "discount_tax_compensation_amount": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 3, + "name": "Radiant Tee-M-Orange", + "no_discount": 0, + "order_id": 3, + "original_price": 22, + "price": 22, + "price_incl_tax": 22, + "product_id": 1553, + "product_type": "simple", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 6, + "row_invoiced": 0, + "row_total": 22, + "row_total_incl_tax": 22, + "row_weight": 1, + "sku": "WS12-M-Orange", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "tax_percent": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 1 + }, + { + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_discount_tax_compensation_amount": 0, + "base_original_price": 18, + "base_price": 18, + "base_price_incl_tax": 18, + "base_row_invoiced": 0, + "base_row_total": 18, + "base_row_total_incl_tax": 18, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "discount_tax_compensation_amount": 0, + "is_qty_decimal": 0, + "is_virtual": 1, + "item_id": 4, + "name": "Advanced Pilates & Yoga (Strength)", + "no_discount": 0, + "order_id": 3, + "original_price": 18, + "price": 18, + "price_incl_tax": 18, + "product_id": 49, + "product_type": "downloadable", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 7, + "row_invoiced": 0, + "row_total": 18, + "row_total_incl_tax": 18, + "row_weight": 0, + "sku": "240-LV08", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "tax_percent": 0, + "updated_at": "2017-08-21 22:22:19" + }, + { + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_original_price": 68, + "base_price": 68, + "base_price_incl_tax": 68, + "base_row_invoiced": 0, + "base_row_total": 68, + "base_row_total_incl_tax": 68, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 5, + "name": "Sprite Yoga Companion Kit", + "no_discount": 0, + "order_id": 3, + "original_price": 68, + "price": 68, + "price_incl_tax": 68, + "product_id": 51, + "product_type": "bundle", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 8, + "row_invoiced": 0, + "row_total": 68, + "row_total_incl_tax": 68, + "row_weight": 0, + "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 0 + }, + { + "amount_refunded": 0, + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_discount_tax_compensation_amount": 0, + "base_original_price": 27, + "base_price": 27, + "base_price_incl_tax": 27, + "base_row_invoiced": 0, + "base_row_total": 27, + "base_row_total_incl_tax": 27, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "discount_tax_compensation_amount": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 6, + "name": "Sprite Stasis Ball 65 cm", + "no_discount": 0, + "order_id": 3, + "original_price": 27, + "parent_item_id": 5, + "price": 27, + "price_incl_tax": 27, + "product_id": 29, + "product_type": "simple", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 9, + "row_invoiced": 0, + "row_total": 27, + "row_total_incl_tax": 27, + "row_weight": 0, + "sku": "24-WG082-blue", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "tax_percent": 0, + "updated_at": "2017-08-21 22:22:19", + "parent_item": { + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_original_price": 68, + "base_price": 68, + "base_price_incl_tax": 68, + "base_row_invoiced": 0, + "base_row_total": 68, + "base_row_total_incl_tax": 68, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 5, + "name": "Sprite Yoga Companion Kit", + "no_discount": 0, + "order_id": 3, + "original_price": 68, + "price": 68, + "price_incl_tax": 68, + "product_id": 51, + "product_type": "bundle", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 8, + "row_invoiced": 0, + "row_total": 68, + "row_total_incl_tax": 68, + "row_weight": 0, + "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 0 + } + }, + { + "amount_refunded": 0, + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_discount_tax_compensation_amount": 0, + "base_original_price": 5, + "base_price": 5, + "base_price_incl_tax": 5, + "base_row_invoiced": 0, + "base_row_total": 5, + "base_row_total_incl_tax": 5, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "discount_tax_compensation_amount": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 7, + "name": "Sprite Foam Yoga Brick", + "no_discount": 0, + "order_id": 3, + "original_price": 5, + "parent_item_id": 5, + "price": 5, + "price_incl_tax": 5, + "product_id": 21, + "product_type": "simple", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 10, + "row_invoiced": 0, + "row_total": 5, + "row_total_incl_tax": 5, + "row_weight": 0, + "sku": "24-WG084", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "tax_percent": 0, + "updated_at": "2017-08-21 22:22:19", + "parent_item": { + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_original_price": 68, + "base_price": 68, + "base_price_incl_tax": 68, + "base_row_invoiced": 0, + "base_row_total": 68, + "base_row_total_incl_tax": 68, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 5, + "name": "Sprite Yoga Companion Kit", + "no_discount": 0, + "order_id": 3, + "original_price": 68, + "price": 68, + "price_incl_tax": 68, + "product_id": 51, + "product_type": "bundle", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 8, + "row_invoiced": 0, + "row_total": 68, + "row_total_incl_tax": 68, + "row_weight": 0, + "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 0 + } + }, + { + "amount_refunded": 0, + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_discount_tax_compensation_amount": 0, + "base_original_price": 17, + "base_price": 17, + "base_price_incl_tax": 17, + "base_row_invoiced": 0, + "base_row_total": 17, + "base_row_total_incl_tax": 17, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "discount_tax_compensation_amount": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 8, + "name": "Sprite Yoga Strap 8 foot", + "no_discount": 0, + "order_id": 3, + "original_price": 17, + "parent_item_id": 5, + "price": 17, + "price_incl_tax": 17, + "product_id": 34, + "product_type": "simple", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 11, + "row_invoiced": 0, + "row_total": 17, + "row_total_incl_tax": 17, + "row_weight": 0, + "sku": "24-WG086", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "tax_percent": 0, + "updated_at": "2017-08-21 22:22:19", + "parent_item": { + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_original_price": 68, + "base_price": 68, + "base_price_incl_tax": 68, + "base_row_invoiced": 0, + "base_row_total": 68, + "base_row_total_incl_tax": 68, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 5, + "name": "Sprite Yoga Companion Kit", + "no_discount": 0, + "order_id": 3, + "original_price": 68, + "price": 68, + "price_incl_tax": 68, + "product_id": 51, + "product_type": "bundle", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 8, + "row_invoiced": 0, + "row_total": 68, + "row_total_incl_tax": 68, + "row_weight": 0, + "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 0 + } + }, + { + "amount_refunded": 0, + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_discount_tax_compensation_amount": 0, + "base_original_price": 19, + "base_price": 19, + "base_price_incl_tax": 19, + "base_row_invoiced": 0, + "base_row_total": 19, + "base_row_total_incl_tax": 19, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "discount_tax_compensation_amount": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 9, + "name": "Sprite Foam Roller", + "no_discount": 0, + "order_id": 3, + "original_price": 19, + "parent_item_id": 5, + "price": 19, + "price_incl_tax": 19, + "product_id": 22, + "product_type": "simple", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 12, + "row_invoiced": 0, + "row_total": 19, + "row_total_incl_tax": 19, + "row_weight": 0, + "sku": "24-WG088", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "tax_percent": 0, + "updated_at": "2017-08-21 22:22:19", + "parent_item": { + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_original_price": 68, + "base_price": 68, + "base_price_incl_tax": 68, + "base_row_invoiced": 0, + "base_row_total": 68, + "base_row_total_incl_tax": 68, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 5, + "name": "Sprite Yoga Companion Kit", + "no_discount": 0, + "order_id": 3, + "original_price": 68, + "price": 68, + "price_incl_tax": 68, + "product_id": 51, + "product_type": "bundle", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 8, + "row_invoiced": 0, + "row_total": 68, + "row_total_incl_tax": 68, + "row_weight": 0, + "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 0 + } + }, + { + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_discount_tax_compensation_amount": 0, + "base_original_price": 52, + "base_price": 52, + "base_price_incl_tax": 52, + "base_row_invoiced": 0, + "base_row_total": 52, + "base_row_total_incl_tax": 52, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "discount_tax_compensation_amount": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 10, + "name": "Chaz Kangeroo Hoodie", + "no_discount": 0, + "order_id": 3, + "original_price": 52, + "price": 52, + "price_incl_tax": 52, + "product_id": 67, + "product_type": "configurable", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 13, + "row_invoiced": 0, + "row_total": 52, + "row_total_incl_tax": 52, + "row_weight": 1, + "sku": "MH01-S-Gray", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "tax_percent": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 1 + }, + { + "amount_refunded": 0, + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_price": 0, + "base_row_invoiced": 0, + "base_row_total": 0, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 11, + "name": "Chaz Kangeroo Hoodie-S-Gray", + "no_discount": 0, + "order_id": 3, + "original_price": 0, + "parent_item_id": 10, + "price": 0, + "product_id": 56, + "product_type": "simple", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 14, + "row_invoiced": 0, + "row_total": 0, + "row_weight": 0, + "sku": "MH01-S-Gray", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "tax_percent": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 1, + "parent_item": { + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_discount_tax_compensation_amount": 0, + "base_original_price": 52, + "base_price": 52, + "base_price_incl_tax": 52, + "base_row_invoiced": 0, + "base_row_total": 52, + "base_row_total_incl_tax": 52, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "discount_tax_compensation_amount": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 10, + "name": "Chaz Kangeroo Hoodie", + "no_discount": 0, + "order_id": 3, + "original_price": 52, + "price": 52, + "price_incl_tax": 52, + "product_id": 67, + "product_type": "configurable", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 13, + "row_invoiced": 0, + "row_total": 52, + "row_total_incl_tax": 52, + "row_weight": 1, + "sku": "MH01-S-Gray", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "tax_percent": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 1 + } + } + ], + "billing_address": { + "address_type": "billing", + "city": "Purchase", + "country_id": "US", + "email": "jdoe@example.com", + "entity_id": 6, + "firstname": "Jane", + "lastname": "Doe", + "parent_id": 3, + "postcode": "10577", + "region": "New York", + "region_code": "NY", + "region_id": 43, + "street": [ + "123 Oak Ave" + ], + "telephone": "512-555-1111" + }, + "payment": { + "account_status": null, + "additional_information": [ + "Bank Transfer Payment", + "" + ], + "amount_ordered": 165, + "base_amount_ordered": 165, "base_shipping_amount": 5, - "base_shipping_discount_amount": 0, - "base_shipping_incl_tax": 5, - "base_shipping_tax_amount": 0, - "base_subtotal": 160, - "base_subtotal_incl_tax": 160, - "base_tax_amount": 0, - "base_total_due": 165, - "base_to_global_rate": 1, - "base_to_order_rate": 1, - "billing_address_id": 6, - "created_at": "2017-08-21 22:22:19", - "customer_email": "jdoe@example.com", - "customer_firstname": "Jane", - "customer_group_id": 1, - "customer_id": 3, - "customer_is_guest": 0, - "customer_lastname": "Doe", - "customer_note_notify": 1, - "discount_amount": 0, - "email_sent": 1, + "cc_last4": null, "entity_id": 3, - "global_currency_code": "USD", - "grand_total": 165, - "discount_tax_compensation_amount": 0, - "increment_id": "000000003", - "is_virtual": 0, - "order_currency_code": "USD", - "protect_code": "61f76d", - "quote_id": 4, - "shipping_amount": 5, - "shipping_description": "Best Way - Table Rate", - "shipping_discount_amount": 0, - "shipping_discount_tax_compensation_amount": 0, - "shipping_incl_tax": 5, - "shipping_tax_amount": 0, - "state": "new", - "status": "pending", - "store_currency_code": "USD", - "store_id": 1, - "store_name": "Main Website\nMain Website Store\n", - "store_to_base_rate": 0, - "store_to_order_rate": 0, - "subtotal": 160, - "subtotal_incl_tax": 160, - "tax_amount": 0, - "total_due": 165, - "total_item_count": 7, - "total_qty_ordered": 4, - "updated_at": "2017-08-21 22:22:20", - "weight": 2, - "items": [ - { + "method": "banktransfer", + "parent_id": 3, + "shipping_amount": 5 + }, + "status_histories": [], + "extension_attributes": { + "shipping_assignments": [ + { + "shipping": { + "address": { + "address_type": "shipping", + "city": "Purchase", + "country_id": "US", + "email": "jdoe@example.com", + "entity_id": 5, + "firstname": "Jane", + "lastname": "Doe", + "parent_id": 3, + "postcode": "10577", + "region": "New York", + "region_code": "NY", + "region_id": 43, + "street": [ + "123 Oak Ave" + ], + "telephone": "512-555-1111" + }, + "method": "tablerate_bestway", + "total": { + "base_shipping_amount": 5, + "base_shipping_discount_amount": 0, + "base_shipping_incl_tax": 5, + "base_shipping_tax_amount": 0, + "shipping_amount": 5, + "shipping_discount_amount": 0, + "shipping_discount_tax_compensation_amount": 0, + "shipping_incl_tax": 5, + "shipping_tax_amount": 0 + } + }, + "items": [ + { "amount_refunded": 0, "applied_rule_ids": "1", "base_amount_refunded": 0, @@ -198,8 +944,8 @@ Not applicable "tax_percent": 0, "updated_at": "2017-08-21 22:22:19", "weight": 1 - }, - { + }, + { "amount_refunded": 0, "applied_rule_ids": "1", "base_amount_refunded": 0, @@ -247,8 +993,8 @@ Not applicable "tax_invoiced": 0, "tax_percent": 0, "updated_at": "2017-08-21 22:22:19" - }, - { + }, + { "amount_refunded": 0, "applied_rule_ids": "1", "base_amount_refunded": 0, @@ -294,8 +1040,8 @@ Not applicable "tax_invoiced": 0, "updated_at": "2017-08-21 22:22:19", "weight": 0 - }, - { + }, + { "amount_refunded": 0, "base_amount_refunded": 0, "base_discount_amount": 0, @@ -344,54 +1090,54 @@ Not applicable "tax_percent": 0, "updated_at": "2017-08-21 22:22:19", "parent_item": { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_original_price": 68, - "base_price": 68, - "base_price_incl_tax": 68, - "base_row_invoiced": 0, - "base_row_total": 68, - "base_row_total_incl_tax": 68, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 5, - "name": "Sprite Yoga Companion Kit", - "no_discount": 0, - "order_id": 3, - "original_price": 68, - "price": 68, - "price_incl_tax": 68, - "product_id": 51, - "product_type": "bundle", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 8, - "row_invoiced": 0, - "row_total": 68, - "row_total_incl_tax": 68, - "row_weight": 0, - "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 0 + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_original_price": 68, + "base_price": 68, + "base_price_incl_tax": 68, + "base_row_invoiced": 0, + "base_row_total": 68, + "base_row_total_incl_tax": 68, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 5, + "name": "Sprite Yoga Companion Kit", + "no_discount": 0, + "order_id": 3, + "original_price": 68, + "price": 68, + "price_incl_tax": 68, + "product_id": 51, + "product_type": "bundle", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 8, + "row_invoiced": 0, + "row_total": 68, + "row_total_incl_tax": 68, + "row_weight": 0, + "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 0 } - }, - { + }, + { "amount_refunded": 0, "base_amount_refunded": 0, "base_discount_amount": 0, @@ -440,54 +1186,54 @@ Not applicable "tax_percent": 0, "updated_at": "2017-08-21 22:22:19", "parent_item": { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_original_price": 68, - "base_price": 68, - "base_price_incl_tax": 68, - "base_row_invoiced": 0, - "base_row_total": 68, - "base_row_total_incl_tax": 68, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 5, - "name": "Sprite Yoga Companion Kit", - "no_discount": 0, - "order_id": 3, - "original_price": 68, - "price": 68, - "price_incl_tax": 68, - "product_id": 51, - "product_type": "bundle", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 8, - "row_invoiced": 0, - "row_total": 68, - "row_total_incl_tax": 68, - "row_weight": 0, - "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 0 + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_original_price": 68, + "base_price": 68, + "base_price_incl_tax": 68, + "base_row_invoiced": 0, + "base_row_total": 68, + "base_row_total_incl_tax": 68, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 5, + "name": "Sprite Yoga Companion Kit", + "no_discount": 0, + "order_id": 3, + "original_price": 68, + "price": 68, + "price_incl_tax": 68, + "product_id": 51, + "product_type": "bundle", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 8, + "row_invoiced": 0, + "row_total": 68, + "row_total_incl_tax": 68, + "row_weight": 0, + "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 0 } - }, - { + }, + { "amount_refunded": 0, "base_amount_refunded": 0, "base_discount_amount": 0, @@ -536,54 +1282,54 @@ Not applicable "tax_percent": 0, "updated_at": "2017-08-21 22:22:19", "parent_item": { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_original_price": 68, - "base_price": 68, - "base_price_incl_tax": 68, - "base_row_invoiced": 0, - "base_row_total": 68, - "base_row_total_incl_tax": 68, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 5, - "name": "Sprite Yoga Companion Kit", - "no_discount": 0, - "order_id": 3, - "original_price": 68, - "price": 68, - "price_incl_tax": 68, - "product_id": 51, - "product_type": "bundle", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 8, - "row_invoiced": 0, - "row_total": 68, - "row_total_incl_tax": 68, - "row_weight": 0, - "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 0 + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_original_price": 68, + "base_price": 68, + "base_price_incl_tax": 68, + "base_row_invoiced": 0, + "base_row_total": 68, + "base_row_total_incl_tax": 68, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 5, + "name": "Sprite Yoga Companion Kit", + "no_discount": 0, + "order_id": 3, + "original_price": 68, + "price": 68, + "price_incl_tax": 68, + "product_id": 51, + "product_type": "bundle", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 8, + "row_invoiced": 0, + "row_total": 68, + "row_total_incl_tax": 68, + "row_weight": 0, + "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 0 } - }, - { + }, + { "amount_refunded": 0, "base_amount_refunded": 0, "base_discount_amount": 0, @@ -632,54 +1378,54 @@ Not applicable "tax_percent": 0, "updated_at": "2017-08-21 22:22:19", "parent_item": { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_original_price": 68, - "base_price": 68, - "base_price_incl_tax": 68, - "base_row_invoiced": 0, - "base_row_total": 68, - "base_row_total_incl_tax": 68, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 5, - "name": "Sprite Yoga Companion Kit", - "no_discount": 0, - "order_id": 3, - "original_price": 68, - "price": 68, - "price_incl_tax": 68, - "product_id": 51, - "product_type": "bundle", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 8, - "row_invoiced": 0, - "row_total": 68, - "row_total_incl_tax": 68, - "row_weight": 0, - "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 0 + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_original_price": 68, + "base_price": 68, + "base_price_incl_tax": 68, + "base_row_invoiced": 0, + "base_row_total": 68, + "base_row_total_incl_tax": 68, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 5, + "name": "Sprite Yoga Companion Kit", + "no_discount": 0, + "order_id": 3, + "original_price": 68, + "price": 68, + "price_incl_tax": 68, + "product_id": 51, + "product_type": "bundle", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 8, + "row_invoiced": 0, + "row_total": 68, + "row_total_incl_tax": 68, + "row_weight": 0, + "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 0 } - }, - { + }, + { "amount_refunded": 0, "applied_rule_ids": "1", "base_amount_refunded": 0, @@ -728,8 +1474,8 @@ Not applicable "tax_percent": 0, "updated_at": "2017-08-21 22:22:19", "weight": 1 - }, - { + }, + { "amount_refunded": 0, "base_amount_refunded": 0, "base_discount_amount": 0, @@ -772,804 +1518,60 @@ Not applicable "updated_at": "2017-08-21 22:22:19", "weight": 1, "parent_item": { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_discount_tax_compensation_amount": 0, - "base_original_price": 52, - "base_price": 52, - "base_price_incl_tax": 52, - "base_row_invoiced": 0, - "base_row_total": 52, - "base_row_total_incl_tax": 52, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "discount_tax_compensation_amount": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 10, - "name": "Chaz Kangeroo Hoodie", - "no_discount": 0, - "order_id": 3, - "original_price": 52, - "price": 52, - "price_incl_tax": 52, - "product_id": 67, - "product_type": "configurable", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 13, - "row_invoiced": 0, - "row_total": 52, - "row_total_incl_tax": 52, - "row_weight": 1, - "sku": "MH01-S-Gray", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "tax_percent": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 1 - } - } - ], - "billing_address": { - "address_type": "billing", - "city": "Purchase", - "country_id": "US", - "email": "jdoe@example.com", - "entity_id": 6, - "firstname": "Jane", - "lastname": "Doe", - "parent_id": 3, - "postcode": "10577", - "region": "New York", - "region_code": "NY", - "region_id": 43, - "street": [ - "123 Oak Ave" - ], - "telephone": "512-555-1111" - }, - "payment": { - "account_status": null, - "additional_information": [ - "Bank Transfer Payment", - "" - ], - "amount_ordered": 165, - "base_amount_ordered": 165, - "base_shipping_amount": 5, - "cc_last4": null, - "entity_id": 3, - "method": "banktransfer", - "parent_id": 3, - "shipping_amount": 5 - }, - "status_histories": [], - "extension_attributes": { - "shipping_assignments": [ - { - "shipping": { - "address": { - "address_type": "shipping", - "city": "Purchase", - "country_id": "US", - "email": "jdoe@example.com", - "entity_id": 5, - "firstname": "Jane", - "lastname": "Doe", - "parent_id": 3, - "postcode": "10577", - "region": "New York", - "region_code": "NY", - "region_id": 43, - "street": [ - "123 Oak Ave" - ], - "telephone": "512-555-1111" - }, - "method": "tablerate_bestway", - "total": { - "base_shipping_amount": 5, - "base_shipping_discount_amount": 0, - "base_shipping_incl_tax": 5, - "base_shipping_tax_amount": 0, - "shipping_amount": 5, - "shipping_discount_amount": 0, - "shipping_discount_tax_compensation_amount": 0, - "shipping_incl_tax": 5, - "shipping_tax_amount": 0 - } - }, - "items": [ - { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_discount_tax_compensation_amount": 0, - "base_original_price": 22, - "base_price": 22, - "base_price_incl_tax": 22, - "base_row_invoiced": 0, - "base_row_total": 22, - "base_row_total_incl_tax": 22, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "discount_tax_compensation_amount": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 3, - "name": "Radiant Tee-M-Orange", - "no_discount": 0, - "order_id": 3, - "original_price": 22, - "price": 22, - "price_incl_tax": 22, - "product_id": 1553, - "product_type": "simple", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 6, - "row_invoiced": 0, - "row_total": 22, - "row_total_incl_tax": 22, - "row_weight": 1, - "sku": "WS12-M-Orange", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "tax_percent": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 1 - }, - { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_discount_tax_compensation_amount": 0, - "base_original_price": 18, - "base_price": 18, - "base_price_incl_tax": 18, - "base_row_invoiced": 0, - "base_row_total": 18, - "base_row_total_incl_tax": 18, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "discount_tax_compensation_amount": 0, - "is_qty_decimal": 0, - "is_virtual": 1, - "item_id": 4, - "name": "Advanced Pilates & Yoga (Strength)", - "no_discount": 0, - "order_id": 3, - "original_price": 18, - "price": 18, - "price_incl_tax": 18, - "product_id": 49, - "product_type": "downloadable", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 7, - "row_invoiced": 0, - "row_total": 18, - "row_total_incl_tax": 18, - "row_weight": 0, - "sku": "240-LV08", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "tax_percent": 0, - "updated_at": "2017-08-21 22:22:19" - }, - { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_original_price": 68, - "base_price": 68, - "base_price_incl_tax": 68, - "base_row_invoiced": 0, - "base_row_total": 68, - "base_row_total_incl_tax": 68, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 5, - "name": "Sprite Yoga Companion Kit", - "no_discount": 0, - "order_id": 3, - "original_price": 68, - "price": 68, - "price_incl_tax": 68, - "product_id": 51, - "product_type": "bundle", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 8, - "row_invoiced": 0, - "row_total": 68, - "row_total_incl_tax": 68, - "row_weight": 0, - "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 0 - }, - { - "amount_refunded": 0, - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_discount_tax_compensation_amount": 0, - "base_original_price": 27, - "base_price": 27, - "base_price_incl_tax": 27, - "base_row_invoiced": 0, - "base_row_total": 27, - "base_row_total_incl_tax": 27, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "discount_tax_compensation_amount": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 6, - "name": "Sprite Stasis Ball 65 cm", - "no_discount": 0, - "order_id": 3, - "original_price": 27, - "parent_item_id": 5, - "price": 27, - "price_incl_tax": 27, - "product_id": 29, - "product_type": "simple", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 9, - "row_invoiced": 0, - "row_total": 27, - "row_total_incl_tax": 27, - "row_weight": 0, - "sku": "24-WG082-blue", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "tax_percent": 0, - "updated_at": "2017-08-21 22:22:19", - "parent_item": { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_original_price": 68, - "base_price": 68, - "base_price_incl_tax": 68, - "base_row_invoiced": 0, - "base_row_total": 68, - "base_row_total_incl_tax": 68, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 5, - "name": "Sprite Yoga Companion Kit", - "no_discount": 0, - "order_id": 3, - "original_price": 68, - "price": 68, - "price_incl_tax": 68, - "product_id": 51, - "product_type": "bundle", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 8, - "row_invoiced": 0, - "row_total": 68, - "row_total_incl_tax": 68, - "row_weight": 0, - "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 0 - } - }, - { - "amount_refunded": 0, - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_discount_tax_compensation_amount": 0, - "base_original_price": 5, - "base_price": 5, - "base_price_incl_tax": 5, - "base_row_invoiced": 0, - "base_row_total": 5, - "base_row_total_incl_tax": 5, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "discount_tax_compensation_amount": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 7, - "name": "Sprite Foam Yoga Brick", - "no_discount": 0, - "order_id": 3, - "original_price": 5, - "parent_item_id": 5, - "price": 5, - "price_incl_tax": 5, - "product_id": 21, - "product_type": "simple", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 10, - "row_invoiced": 0, - "row_total": 5, - "row_total_incl_tax": 5, - "row_weight": 0, - "sku": "24-WG084", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "tax_percent": 0, - "updated_at": "2017-08-21 22:22:19", - "parent_item": { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_original_price": 68, - "base_price": 68, - "base_price_incl_tax": 68, - "base_row_invoiced": 0, - "base_row_total": 68, - "base_row_total_incl_tax": 68, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 5, - "name": "Sprite Yoga Companion Kit", - "no_discount": 0, - "order_id": 3, - "original_price": 68, - "price": 68, - "price_incl_tax": 68, - "product_id": 51, - "product_type": "bundle", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 8, - "row_invoiced": 0, - "row_total": 68, - "row_total_incl_tax": 68, - "row_weight": 0, - "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 0 - } - }, - { - "amount_refunded": 0, - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_discount_tax_compensation_amount": 0, - "base_original_price": 17, - "base_price": 17, - "base_price_incl_tax": 17, - "base_row_invoiced": 0, - "base_row_total": 17, - "base_row_total_incl_tax": 17, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "discount_tax_compensation_amount": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 8, - "name": "Sprite Yoga Strap 8 foot", - "no_discount": 0, - "order_id": 3, - "original_price": 17, - "parent_item_id": 5, - "price": 17, - "price_incl_tax": 17, - "product_id": 34, - "product_type": "simple", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 11, - "row_invoiced": 0, - "row_total": 17, - "row_total_incl_tax": 17, - "row_weight": 0, - "sku": "24-WG086", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "tax_percent": 0, - "updated_at": "2017-08-21 22:22:19", - "parent_item": { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_original_price": 68, - "base_price": 68, - "base_price_incl_tax": 68, - "base_row_invoiced": 0, - "base_row_total": 68, - "base_row_total_incl_tax": 68, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 5, - "name": "Sprite Yoga Companion Kit", - "no_discount": 0, - "order_id": 3, - "original_price": 68, - "price": 68, - "price_incl_tax": 68, - "product_id": 51, - "product_type": "bundle", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 8, - "row_invoiced": 0, - "row_total": 68, - "row_total_incl_tax": 68, - "row_weight": 0, - "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 0 - } - }, - { - "amount_refunded": 0, - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_discount_tax_compensation_amount": 0, - "base_original_price": 19, - "base_price": 19, - "base_price_incl_tax": 19, - "base_row_invoiced": 0, - "base_row_total": 19, - "base_row_total_incl_tax": 19, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "discount_tax_compensation_amount": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 9, - "name": "Sprite Foam Roller", - "no_discount": 0, - "order_id": 3, - "original_price": 19, - "parent_item_id": 5, - "price": 19, - "price_incl_tax": 19, - "product_id": 22, - "product_type": "simple", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 12, - "row_invoiced": 0, - "row_total": 19, - "row_total_incl_tax": 19, - "row_weight": 0, - "sku": "24-WG088", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "tax_percent": 0, - "updated_at": "2017-08-21 22:22:19", - "parent_item": { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_original_price": 68, - "base_price": 68, - "base_price_incl_tax": 68, - "base_row_invoiced": 0, - "base_row_total": 68, - "base_row_total_incl_tax": 68, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 5, - "name": "Sprite Yoga Companion Kit", - "no_discount": 0, - "order_id": 3, - "original_price": 68, - "price": 68, - "price_incl_tax": 68, - "product_id": 51, - "product_type": "bundle", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 8, - "row_invoiced": 0, - "row_total": 68, - "row_total_incl_tax": 68, - "row_weight": 0, - "sku": "24-WG080-24-WG084-24-WG088-24-WG082-blue-24-WG086", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 0 - } - }, - { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_discount_tax_compensation_amount": 0, - "base_original_price": 52, - "base_price": 52, - "base_price_incl_tax": 52, - "base_row_invoiced": 0, - "base_row_total": 52, - "base_row_total_incl_tax": 52, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "discount_tax_compensation_amount": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 10, - "name": "Chaz Kangeroo Hoodie", - "no_discount": 0, - "order_id": 3, - "original_price": 52, - "price": 52, - "price_incl_tax": 52, - "product_id": 67, - "product_type": "configurable", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 13, - "row_invoiced": 0, - "row_total": 52, - "row_total_incl_tax": 52, - "row_weight": 1, - "sku": "MH01-S-Gray", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "tax_percent": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 1 - }, - { - "amount_refunded": 0, - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_price": 0, - "base_row_invoiced": 0, - "base_row_total": 0, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 11, - "name": "Chaz Kangeroo Hoodie-S-Gray", - "no_discount": 0, - "order_id": 3, - "original_price": 0, - "parent_item_id": 10, - "price": 0, - "product_id": 56, - "product_type": "simple", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 14, - "row_invoiced": 0, - "row_total": 0, - "row_weight": 0, - "sku": "MH01-S-Gray", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "tax_percent": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 1, - "parent_item": { - "amount_refunded": 0, - "applied_rule_ids": "1", - "base_amount_refunded": 0, - "base_discount_amount": 0, - "base_discount_invoiced": 0, - "base_discount_tax_compensation_amount": 0, - "base_original_price": 52, - "base_price": 52, - "base_price_incl_tax": 52, - "base_row_invoiced": 0, - "base_row_total": 52, - "base_row_total_incl_tax": 52, - "base_tax_amount": 0, - "base_tax_invoiced": 0, - "created_at": "2017-08-21 22:22:19", - "discount_amount": 0, - "discount_invoiced": 0, - "discount_percent": 0, - "free_shipping": 0, - "discount_tax_compensation_amount": 0, - "is_qty_decimal": 0, - "is_virtual": 0, - "item_id": 10, - "name": "Chaz Kangeroo Hoodie", - "no_discount": 0, - "order_id": 3, - "original_price": 52, - "price": 52, - "price_incl_tax": 52, - "product_id": 67, - "product_type": "configurable", - "qty_canceled": 0, - "qty_invoiced": 0, - "qty_ordered": 1, - "qty_refunded": 0, - "qty_shipped": 0, - "quote_item_id": 13, - "row_invoiced": 0, - "row_total": 52, - "row_total_incl_tax": 52, - "row_weight": 1, - "sku": "MH01-S-Gray", - "store_id": 1, - "tax_amount": 0, - "tax_invoiced": 0, - "tax_percent": 0, - "updated_at": "2017-08-21 22:22:19", - "weight": 1 - } - } - ] + "amount_refunded": 0, + "applied_rule_ids": "1", + "base_amount_refunded": 0, + "base_discount_amount": 0, + "base_discount_invoiced": 0, + "base_discount_tax_compensation_amount": 0, + "base_original_price": 52, + "base_price": 52, + "base_price_incl_tax": 52, + "base_row_invoiced": 0, + "base_row_total": 52, + "base_row_total_incl_tax": 52, + "base_tax_amount": 0, + "base_tax_invoiced": 0, + "created_at": "2017-08-21 22:22:19", + "discount_amount": 0, + "discount_invoiced": 0, + "discount_percent": 0, + "free_shipping": 0, + "discount_tax_compensation_amount": 0, + "is_qty_decimal": 0, + "is_virtual": 0, + "item_id": 10, + "name": "Chaz Kangeroo Hoodie", + "no_discount": 0, + "order_id": 3, + "original_price": 52, + "price": 52, + "price_incl_tax": 52, + "product_id": 67, + "product_type": "configurable", + "qty_canceled": 0, + "qty_invoiced": 0, + "qty_ordered": 1, + "qty_refunded": 0, + "qty_shipped": 0, + "quote_item_id": 13, + "row_invoiced": 0, + "row_total": 52, + "row_total_incl_tax": 52, + "row_weight": 1, + "sku": "MH01-S-Gray", + "store_id": 1, + "tax_amount": 0, + "tax_invoiced": 0, + "tax_percent": 0, + "updated_at": "2017-08-21 22:22:19", + "weight": 1 } + } ] - } + } + ] + } } ``` diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-quote.md b/src/guides/v2.3/rest/tutorials/orders/order-create-quote.md index ec984646e58..a2c109ac8b9 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-quote.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-quote.md @@ -46,9 +46,9 @@ Use the `V1/guest-carts` endpoint to create a cart on behalf of a guest. Do not **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer ` **Payload:** diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-shipment.md b/src/guides/v2.3/rest/tutorials/orders/order-create-shipment.md index dd6cf8023ee..b3d59734347 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-shipment.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-shipment.md @@ -31,9 +31,9 @@ where `3` is the order id. **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer` `` **Payload:** diff --git a/src/guides/v2.3/rest/tutorials/orders/order-issue-refund.md b/src/guides/v2.3/rest/tutorials/orders/order-issue-refund.md index 2d2b4e12b8f..995526c163b 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-issue-refund.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-issue-refund.md @@ -39,9 +39,9 @@ The `return_to_stock_items` array specifies which `order_item_id`s can be return **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer` `` **Payload:** diff --git a/src/guides/v2.3/rest/tutorials/orders/order-prepare-checkout.md b/src/guides/v2.3/rest/tutorials/orders/order-prepare-checkout.md index 8c004d4d8ed..fee4b3757df 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-prepare-checkout.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-prepare-checkout.md @@ -34,35 +34,38 @@ Use the `V1/guest-carts//estimate-shipping-methods` endpoint to estimate **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer ` **Payload:** The payload contains the shipping address. {% collapsible Show code sample %} + ```json -{ "address": { - "region": "New York", - "region_id": 43, - "region_code": "NY", - "country_id": "US", - "street": [ - "123 Oak Ave" - ], - "postcode": "10577", - "city": "Purchase", - "firstname": "Jane", - "lastname": "Doe", - "customer_id": 4, - "email": "jdoe@example.com", - "telephone": "(512) 555-1111", - "same_as_billing": 1 +{ + "address": { + "region": "New York", + "region_id": 43, + "region_code": "NY", + "country_id": "US", + "street": [ + "123 Oak Ave" + ], + "postcode": "10577", + "city": "Purchase", + "firstname": "Jane", + "lastname": "Doe", + "customer_id": 4, + "email": "jdoe@example.com", + "telephone": "(512) 555-1111", + "same_as_billing": 1 } } ``` + {% endcollapsible %} **Response:** @@ -70,35 +73,36 @@ The payload contains the shipping address. Note that the cost for the `flatrate` shipping method is $15. The Sprite Yoga Companion Kit bundled product counts as one item. The Advanced Pilates & Yoga item does not have a shipping charge because the customer downloads this item. {% collapsible Show code sample %} -```json +```json [ - { - "carrier_code": "flatrate", - "method_code": "flatrate", - "carrier_title": "Flat Rate", - "method_title": "Fixed", - "amount": 15, - "base_amount": 15, - "available": true, - "error_message": "", - "price_excl_tax": 15, - "price_incl_tax": 15 - }, - { - "carrier_code": "tablerate", - "method_code": "bestway", - "carrier_title": "Best Way", - "method_title": "Table Rate", - "amount": 5, - "base_amount": 5, - "available": true, - "error_message": "", - "price_excl_tax": 5, - "price_incl_tax": 5 - } + { + "carrier_code": "flatrate", + "method_code": "flatrate", + "carrier_title": "Flat Rate", + "method_title": "Fixed", + "amount": 15, + "base_amount": 15, + "available": true, + "error_message": "", + "price_excl_tax": 15, + "price_incl_tax": 15 + }, + { + "carrier_code": "tablerate", + "method_code": "bestway", + "carrier_title": "Best Way", + "method_title": "Table Rate", + "amount": 5, + "base_amount": 5, + "available": true, + "error_message": "", + "price_excl_tax": 5, + "price_incl_tax": 5 + } ] ``` + {% endcollapsible %} ### Set shipping and billing information {#set-addresses} @@ -116,49 +120,49 @@ Use the `V1/guest-carts//shipping-information` endpoint to set the billi **Headers:** -`Content-Type` `application/json` +`Content-Type`: `application/json` -`Authorization` `Bearer ` +`Authorization`: `Bearer ` **Payload:** {% collapsible Show code sample %} ```json - -{ "addressInformation": { - "shipping_address": { - "region": "New York", - "region_id": 43, - "region_code": "NY", - "country_id": "US", - "street": [ - "123 Oak Ave" - ], - "postcode": "10577", - "city": "Purchase", - "firstname": "Jane", - "lastname": "Doe", - "email": "jdoe@example.com", - "telephone": "512-555-1111" - }, - "billing_address": { - "region": "New York", - "region_id": 43, - "region_code": "NY", - "country_id": "US", - "street": [ - "123 Oak Ave" - ], - "postcode": "10577", - "city": "Purchase", - "firstname": "Jane", - "lastname": "Doe", - "email": "jdoe@example.com", - "telephone": "512-555-1111" - }, - "shipping_carrier_code": "tablerate", - "shipping_method_code": "bestway" +{ + "addressInformation": { + "shipping_address": { + "region": "New York", + "region_id": 43, + "region_code": "NY", + "country_id": "US", + "street": [ + "123 Oak Ave" + ], + "postcode": "10577", + "city": "Purchase", + "firstname": "Jane", + "lastname": "Doe", + "email": "jdoe@example.com", + "telephone": "512-555-1111" + }, + "billing_address": { + "region": "New York", + "region_id": 43, + "region_code": "NY", + "country_id": "US", + "street": [ + "123 Oak Ave" + ], + "postcode": "10577", + "city": "Purchase", + "firstname": "Jane", + "lastname": "Doe", + "email": "jdoe@example.com", + "telephone": "512-555-1111" + }, + "shipping_carrier_code": "tablerate", + "shipping_method_code": "bestway" } } ``` @@ -174,172 +178,170 @@ The available payment methods are `banktransfer` and `checkmo`. The customer wil {% collapsible Show code sample %} ```json - { - "payment_methods": [ - { - "code": "cashondelivery", - "title": "Cash On Delivery" - }, - { - "code": "banktransfer", - "title": "Bank Transfer Payment" - }, - { - "code": "purchaseorder", - "title": "Purchase Order" - }, - { - "code": "checkmo", - "title": "Check / Money order" - } - ], - "totals": { - "grand_total": 165, - "base_grand_total": 165, - "subtotal": 160, - "base_subtotal": 160, + "payment_methods": [ + { + "code": "cashondelivery", + "title": "Cash On Delivery" + }, + { + "code": "banktransfer", + "title": "Bank Transfer Payment" + }, + { + "code": "purchaseorder", + "title": "Purchase Order" + }, + { + "code": "checkmo", + "title": "Check / Money order" + } + ], + "totals": { + "grand_total": 165, + "base_grand_total": 165, + "subtotal": 160, + "base_subtotal": 160, + "discount_amount": 0, + "base_discount_amount": 0, + "subtotal_with_discount": 160, + "base_subtotal_with_discount": 160, + "shipping_amount": 5, + "base_shipping_amount": 5, + "shipping_discount_amount": 0, + "base_shipping_discount_amount": 0, + "tax_amount": 0, + "base_tax_amount": 0, + "weee_tax_applied_amount": null, + "shipping_tax_amount": 0, + "base_shipping_tax_amount": 0, + "subtotal_incl_tax": 160, + "shipping_incl_tax": 5, + "base_shipping_incl_tax": 5, + "base_currency_code": "USD", + "quote_currency_code": "USD", + "items_qty": 4, + "items": [ + { + "item_id": 6, + "price": 22, + "base_price": 22, + "qty": 1, + "row_total": 22, + "base_row_total": 22, + "row_total_with_discount": 0, + "tax_amount": 0, + "base_tax_amount": 0, + "tax_percent": 0, "discount_amount": 0, "base_discount_amount": 0, - "subtotal_with_discount": 160, - "base_subtotal_with_discount": 160, - "shipping_amount": 5, - "base_shipping_amount": 5, - "shipping_discount_amount": 0, - "base_shipping_discount_amount": 0, + "discount_percent": 0, + "price_incl_tax": 22, + "base_price_incl_tax": 22, + "row_total_incl_tax": 22, + "base_row_total_incl_tax": 22, + "options": "[]", + "weee_tax_applied_amount": null, + "weee_tax_applied": null, + "name": "Radiant Tee-M-Orange" + }, + { + "item_id": 7, + "price": 18, + "base_price": 18, + "qty": 1, + "row_total": 18, + "base_row_total": 18, + "row_total_with_discount": 0, "tax_amount": 0, "base_tax_amount": 0, + "tax_percent": 0, + "discount_amount": 0, + "base_discount_amount": 0, + "discount_percent": 0, + "price_incl_tax": 18, + "base_price_incl_tax": 18, + "row_total_incl_tax": 18, + "base_row_total_incl_tax": 18, + "options": "[{\"value\":\"Advanced Pilates & Yoga (Strength)\",\"label\":\"Downloads\"}]", "weee_tax_applied_amount": null, - "shipping_tax_amount": 0, - "base_shipping_tax_amount": 0, - "subtotal_incl_tax": 160, - "shipping_incl_tax": 5, - "base_shipping_incl_tax": 5, - "base_currency_code": "USD", - "quote_currency_code": "USD", - "items_qty": 4, - "items": [ - { - "item_id": 6, - "price": 22, - "base_price": 22, - "qty": 1, - "row_total": 22, - "base_row_total": 22, - "row_total_with_discount": 0, - "tax_amount": 0, - "base_tax_amount": 0, - "tax_percent": 0, - "discount_amount": 0, - "base_discount_amount": 0, - "discount_percent": 0, - "price_incl_tax": 22, - "base_price_incl_tax": 22, - "row_total_incl_tax": 22, - "base_row_total_incl_tax": 22, - "options": "[]", - "weee_tax_applied_amount": null, - "weee_tax_applied": null, - "name": "Radiant Tee-M-Orange" - }, - { - "item_id": 7, - "price": 18, - "base_price": 18, - "qty": 1, - "row_total": 18, - "base_row_total": 18, - "row_total_with_discount": 0, - "tax_amount": 0, - "base_tax_amount": 0, - "tax_percent": 0, - "discount_amount": 0, - "base_discount_amount": 0, - "discount_percent": 0, - "price_incl_tax": 18, - "base_price_incl_tax": 18, - "row_total_incl_tax": 18, - "base_row_total_incl_tax": 18, - "options": "[{\"value\":\"Advanced Pilates & Yoga (Strength)\",\"label\":\"Downloads\"}]", - "weee_tax_applied_amount": null, - "weee_tax_applied": null, - "name": "Advanced Pilates & Yoga (Strength)" - }, - { - "item_id": 8, - "price": 68, - "base_price": 68, - "qty": 1, - "row_total": 68, - "base_row_total": 68, - "row_total_with_discount": 0, - "tax_amount": 0, - "base_tax_amount": 0, - "discount_amount": 0, - "base_discount_amount": 0, - "discount_percent": 0, - "price_incl_tax": 68, - "base_price_incl_tax": 68, - "row_total_incl_tax": 68, - "base_row_total_incl_tax": 68, - "options": "[{\"value\":\"1 x Sprite Stasis Ball 65 cm $27.00<\\/span>\",\"label\":\"Sprite Stasis Ball\"},{\"value\":\"1 x Sprite Foam Yoga Brick $5.00<\\/span>\",\"label\":\"Sprite Foam Yoga Brick\"},{\"value\":\"1 x Sprite Yoga Strap 8 foot $17.00<\\/span>\",\"label\":\"Sprite Yoga Strap\"},{\"value\":\"1 x Sprite Foam Roller $19.00<\\/span>\",\"label\":\"Sprite Foam Roller\"}]", - "weee_tax_applied_amount": null, - "weee_tax_applied": null, - "name": "Sprite Yoga Companion Kit" - }, - { - "item_id": 13, - "price": 52, - "base_price": 52, - "qty": 1, - "row_total": 52, - "base_row_total": 52, - "row_total_with_discount": 0, - "tax_amount": 0, - "base_tax_amount": 0, - "tax_percent": 0, - "discount_amount": 0, - "base_discount_amount": 0, - "discount_percent": 0, - "price_incl_tax": 52, - "base_price_incl_tax": 52, - "row_total_incl_tax": 52, - "base_row_total_incl_tax": 52, - "options": "[{\"value\":\"Gray\",\"label\":\"Color\"},{\"value\":\"S\",\"label\":\"Size\"}]", - "weee_tax_applied_amount": null, - "weee_tax_applied": null, - "name": "Chaz Kangeroo Hoodie" - } - ], - "total_segments": [ - { - "code": "subtotal", - "title": "Subtotal", - "value": 160 - }, - { - "code": "shipping", - "title": "Shipping & Handling (Best Way - Table Rate)", - "value": 5 - }, - { - "code": "tax", - "title": "Tax", - "value": 0, - "extension_attributes": { - "tax_grandtotal_details": [] - } - }, - { - "code": "grand_total", - "title": "Grand Total", - "value": 165, - "area": "footer" - } - ] - } + "weee_tax_applied": null, + "name": "Advanced Pilates & Yoga (Strength)" + }, + { + "item_id": 8, + "price": 68, + "base_price": 68, + "qty": 1, + "row_total": 68, + "base_row_total": 68, + "row_total_with_discount": 0, + "tax_amount": 0, + "base_tax_amount": 0, + "discount_amount": 0, + "base_discount_amount": 0, + "discount_percent": 0, + "price_incl_tax": 68, + "base_price_incl_tax": 68, + "row_total_incl_tax": 68, + "base_row_total_incl_tax": 68, + "options": "[{\"value\":\"1 x Sprite Stasis Ball 65 cm $27.00<\\/span>\",\"label\":\"Sprite Stasis Ball\"},{\"value\":\"1 x Sprite Foam Yoga Brick $5.00<\\/span>\",\"label\":\"Sprite Foam Yoga Brick\"},{\"value\":\"1 x Sprite Yoga Strap 8 foot $17.00<\\/span>\",\"label\":\"Sprite Yoga Strap\"},{\"value\":\"1 x Sprite Foam Roller $19.00<\\/span>\",\"label\":\"Sprite Foam Roller\"}]", + "weee_tax_applied_amount": null, + "weee_tax_applied": null, + "name": "Sprite Yoga Companion Kit" + }, + { + "item_id": 13, + "price": 52, + "base_price": 52, + "qty": 1, + "row_total": 52, + "base_row_total": 52, + "row_total_with_discount": 0, + "tax_amount": 0, + "base_tax_amount": 0, + "tax_percent": 0, + "discount_amount": 0, + "base_discount_amount": 0, + "discount_percent": 0, + "price_incl_tax": 52, + "base_price_incl_tax": 52, + "row_total_incl_tax": 52, + "base_row_total_incl_tax": 52, + "options": "[{\"value\":\"Gray\",\"label\":\"Color\"},{\"value\":\"S\",\"label\":\"Size\"}]", + "weee_tax_applied_amount": null, + "weee_tax_applied": null, + "name": "Chaz Kangeroo Hoodie" + } + ], + "total_segments": [ + { + "code": "subtotal", + "title": "Subtotal", + "value": 160 + }, + { + "code": "shipping", + "title": "Shipping & Handling (Best Way - Table Rate)", + "value": 5 + }, + { + "code": "tax", + "title": "Tax", + "value": 0, + "extension_attributes": { + "tax_grandtotal_details": [] + } + }, + { + "code": "grand_total", + "title": "Grand Total", + "value": 165, + "area": "footer" + } + ] + } } - ``` {% endcollapsible %} From c1279dc84bf417809ea6ec79d61f17759a2620a1 Mon Sep 17 00:00:00 2001 From: eduard13 Date: Thu, 26 Mar 2020 19:57:12 +0200 Subject: [PATCH 21/46] Adding the implementation of HTTP Action interfaces --- src/guides/v2.3/extension-dev-guide/routing.md | 3 ++- src/guides/v2.3/ui_comp_guide/howto/update-url-type.md | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/guides/v2.3/extension-dev-guide/routing.md b/src/guides/v2.3/extension-dev-guide/routing.md index a2187d8ba21..3ed98fd9fdf 100644 --- a/src/guides/v2.3/extension-dev-guide/routing.md +++ b/src/guides/v2.3/extension-dev-guide/routing.md @@ -235,6 +235,7 @@ namespace OrangeCompany\RoutingExample\Controller\Index; use Magento\Framework\App\Action\Action; use Magento\Framework\App\Action\Context; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\ResponseInterface; use Magento\Framework\Controller\ResultInterface; use Magento\Framework\View\Result\Page; @@ -243,7 +244,7 @@ use Magento\Framework\View\Result\PageFactory; /** * Class Index */ -class Index extends Action +class Index extends Action implements HttpGetActionInterface { /** * @var PageFactory diff --git a/src/guides/v2.3/ui_comp_guide/howto/update-url-type.md b/src/guides/v2.3/ui_comp_guide/howto/update-url-type.md index c424d0a64ae..c78340c7e0d 100644 --- a/src/guides/v2.3/ui_comp_guide/howto/update-url-type.md +++ b/src/guides/v2.3/ui_comp_guide/howto/update-url-type.md @@ -210,9 +210,11 @@ declare(strict_types=1); namespace %path to your module namespace%; +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\UrlInterface; -class Search extends \Magento\Backend\App\Action +class Search extends \Magento\Backend\App\Action implements HttpGetActionInterface, HttpPostActionInterface { /** * Authorization level of a basic admin session @@ -290,7 +292,9 @@ declare(strict_types=1); namespace %path to your module%; -class GetSelected extends \Magento\Backend\App\Action +use Magento\Framework\App\Action\HttpGetActionInterface; + +class GetSelected extends \Magento\Backend\App\Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session From 53c77c83e5a540273b8cadbbc5ac7682f2469214 Mon Sep 17 00:00:00 2001 From: hguthrie Date: Thu, 26 Mar 2020 14:19:28 -0500 Subject: [PATCH 22/46] MAGECLOUD-5381 Update extensions and B2B module instructions (#6888) * Clean up the cli-get-started snippet * Clean up include file for module names * Create tip-creating-branches.md * Update setup-b2b.md * Add cleanup and verify * Update troubleshooting topic for components * Update extensions topic and fix XREFS * Update setup-b2b.md * fix b2b links * more minor fixes * fix small space problems * Clean up based on technical feedback * More improvements from technical feedback * Apply suggestions from code review Co-Authored-By: Margaret Eker * updates from editorial feedback Co-authored-by: Margaret Eker --- src/_includes/cloud/cli-get-started.md | 42 ++--- src/_includes/cloud/composer-name.md | 24 ++- src/_includes/cloud/tip-creating-branches.md | 2 + src/cloud/cdn/configure-fastly.md | 2 +- src/cloud/cdn/trouble-fastly.md | 2 +- src/cloud/configure/setup-b2b.md | 105 ++++++----- src/cloud/howtos/install-components.md | 174 +++++++++--------- src/cloud/trouble/trouble_comp-deploy-fail.md | 54 +++--- src/extensions/b2b/index.md | 3 + 9 files changed, 208 insertions(+), 200 deletions(-) create mode 100644 src/_includes/cloud/tip-creating-branches.md diff --git a/src/_includes/cloud/cli-get-started.md b/src/_includes/cloud/cli-get-started.md index 75464d215ab..8c6e038d617 100644 --- a/src/_includes/cloud/cli-get-started.md +++ b/src/_includes/cloud/cli-get-started.md @@ -1,56 +1,56 @@ +{:.procedure} +To get started with environment branches: -1. Log in to your local development system, or switch to, the [Magento file system owner]({{ site.baseurl }}/cloud/before/before-workspace-file-sys-owner.html). -1. Change to a directory to which the Magento file system owner has write access. -1. Enter the following command in a terminal to log in to your project: +1. On your local workstation, change to your Cloud project directory. - ```bash - magento-cloud login - ``` +1. Switch to the [Magento file system owner]({{ site.baseurl }}/cloud/before/before-workspace-file-sys-owner.html). -1. List your projects. With the project ID, you can complete additional commands. +1. Log in to your Magento project. ```bash - magento-cloud project:list + magento-cloud login ``` -1. If necessary, clone the project to your local. You should have cloned when setting up your local development workspace. +1. List your projects. ```bash - magento-cloud project:get + magento-cloud project:list ``` -1. Change to a project directory. For example, `cd /var/www/html/magento2` -1. List environments in the project. Every environment includes an active Git branch of your code, database, environment variables, configurations, and services. +1. List environments in the project. Every environment includes an active Git branch that contains your code, database, environment variables, configurations, and services. ```bash magento-cloud environment:list ``` {:.bs-callout-info} - `magento-cloud environment:list`—displays environment hierarchies whereas the `git branch` command does not. + It is important to use the `magento-cloud environment:list` command because it displays environment hierarchies, whereas the `git branch` command does not. -1. Fetch origin branches to get the latest code: +1. Fetch origin branches to get the latest code. ```bash git fetch origin ``` -1. Check out, or switch to, a specific branch and environment. Git commands only checkout the Git branch. The Magento Cloud command also switches to the active environment. +1. Checkout, or switch to, a specific branch and environment. ```bash - magento-cloud environment:checkout + magento-cloud environment:checkout ``` - To create a new environment, use `magento-cloud environment:branch ` + Git commands only checkout the Git branch. The `magento-cloud checkout` command checks out the branch and switches to the active environment. + + {:.bs-callout-tip} + You can create a new environment branch using the `magento-cloud environment:branch ` command syntax. It may take some additional time to create and activate a new environment branch. -1. Pull any updated code to your local for the environment ID (which is the Git branch): +1. Use the environment ID to pull any updated code to your local. This is not necessary if the environment branch is new. ```bash - git pull origin + git pull origin ``` -1. Create a [snapshot]({{ site.baseurl }}/cloud/project/project-webint-snap.html) of the environment as a backup: +1. (_Optional_) Create a [snapshot]({{ site.baseurl }}/cloud/project/project-webint-snap.html) of the environment as a backup. ```bash - magento-cloud snapshot:create -e + magento-cloud snapshot:create -e ``` diff --git a/src/_includes/cloud/composer-name.md b/src/_includes/cloud/composer-name.md index f6eee037b6d..8702c395f5b 100644 --- a/src/_includes/cloud/composer-name.md +++ b/src/_includes/cloud/composer-name.md @@ -1,30 +1,36 @@ -This section discusses how to get a module's Composer name and its version from Magento Marketplace. Alternatively, you can find the name and version of *any* module (whether or not you purchased it on Marketplace) in the module's `composer.json` file. Open `composer.json` in a text editor and write down the values of `"name"` and `"version"`. +## Composer name of an extension + +Although this section discusses how to get the Composer name and version of an extension or module from Magento Marketplace, you can find the name and version of *any* module (whether or not you purchased it on Marketplace) in the Composer file of the module. Open the `composer.json` file in a text editor and note the `"name"` and `"version"` values. {:.procedure} -To get the module's Composer name from Magento Marketplace: +To get the Composer name of a module from the Magento Marketplace: 1. Log in to [Magento Marketplace](https://marketplace.magento.com) with the username and password you used to purchase the component. -1. In the upper right corner, click **<your username>** > **My Account** as the following figure shows. + +1. In the upper right corner, click **Username** > **My Account**. ![Access your Marketplace account]({{ site.baseurl }}/common/images/cloud_marketplace-account.png){:width="650px"} -1. On the My Account page, click **My Purchases** as the following figure shows. +1. On the _My Account_ page, click **My Purchases**. ![Marketplace purchase history]({{ site.baseurl }}/common/images/cloud_marketplace-purch-history.png){:width="650px"} -1. On the My Purchases page, click **Technical Details** for the module you purchased as the following figure shows. +1. On the _My Purchases_ page, click **Technical Details** for the module you purchased. ![Technical details shows the module's Composer name]({{ site.baseurl }}/common/images/cloud_marketplace-download-invoice.png){:width="200px"} 1. Click **Copy** to copy the component name to the clipboard. -1. Open a text editor. -1. Paste the module name in the text editor. + +1. Open a text editor and paste the module name. + 1. Append a colon character (`:`) to the component name. -1. In **Technical Details** on the My Purchases page, click **Copy** to copy the version to the clipboard. + +1. In **Technical Details** on the _My Purchases_ page, click **Copy** to copy the version to the clipboard. + 1. Append the version number to the component name after the colon. A sample follows: ```text pixlee/magento2:1.0.1 - ``` + ``` \ No newline at end of file diff --git a/src/_includes/cloud/tip-creating-branches.md b/src/_includes/cloud/tip-creating-branches.md new file mode 100644 index 00000000000..34381c851fd --- /dev/null +++ b/src/_includes/cloud/tip-creating-branches.md @@ -0,0 +1,2 @@ +{:.bs-callout-tip} +We highly recommend that you have your Magento application fully deployed to an Integration or Staging environment before attempting to add a module. Always work in a development branch when adding a module to your implementation. If you do not have a branch, see [Get started creating branches]({{ site.baseurl }}/cloud/env/environments-start.html#getstarted). \ No newline at end of file diff --git a/src/cloud/cdn/configure-fastly.md b/src/cloud/cdn/configure-fastly.md index 654edc79bda..0a614b89c71 100644 --- a/src/cloud/cdn/configure-fastly.md +++ b/src/cloud/cdn/configure-fastly.md @@ -296,7 +296,7 @@ To check the version of Fastly CDN module for Magento 2: {:.procedure} To upgrade the Fastly module: -1. In your local Integration environment, use the following module information to [upgrade the Fastly module]({{ site.baseurl }}/cloud/howtos/install-components.html#update). +1. In your local Integration environment, use the following module information to [upgrade the Fastly module]({{ site.baseurl }}/cloud/howtos/install-components.html). ```text module name: fastly/magento2 diff --git a/src/cloud/cdn/trouble-fastly.md b/src/cloud/cdn/trouble-fastly.md index d97f505765e..b3c66cda566 100644 --- a/src/cloud/cdn/trouble-fastly.md +++ b/src/cloud/cdn/trouble-fastly.md @@ -266,7 +266,7 @@ Based on the status returned, use the following instructions to update the Fastl - `Module does not exist`—If the module does not exist [install and configure](https://github.com/fastly/fastly-magento2/blob/master/Documentation/INSTALLATION.md) the Fastly CDN Module for Magento 2 in an Integration branch. After installation completes, enable and configure the module. See [Set up Fastly]({{ site.baseurl }}/cloud/cdn/configure-fastly.html). -- `Module is disabled`—If the Fastly module is disabled, update the environment configuration on an Integration branch in your local environment to enable it. Then, push the changes to Staging and Production. See [Manage extensions]({{ site.baseurl }}/cloud/howtos/install-components.html#manage). +- `Module is disabled`—If the Fastly module is disabled, update the environment configuration on an Integration branch in your local environment to enable it. Then, push the changes to Staging and Production. See [Manage extensions]({{ site.baseurl }}/cloud/howtos/install-components.html). If you use [Configuration Management]({{site.baseurl}}/cloud/live/sens-data-over.html#cloud-config-specific-recomm), check the Fastly CDN module status in the `app/etc/config.php` configuration file before you push changes to the Production or Staging environment. diff --git a/src/cloud/configure/setup-b2b.md b/src/cloud/configure/setup-b2b.md index d699cfc7e22..533a1b0cde5 100644 --- a/src/cloud/configure/setup-b2b.md +++ b/src/cloud/configure/setup-b2b.md @@ -1,84 +1,95 @@ --- group: cloud-guide -title: Set up Magento B2B +title: Set up Magento B2B module +functional_areas: + - Cloud + - Extensions + - Module + - B2B --- -With the {{site.data.var.ece}} Pro subscription for v2.2 and later, you can install and setup Magento Business to Business (B2B) Commerce features. B2B supports merchants whose customers are other companies. This section provides specific information for installing and setting up B2B in {{site.data.var.ece}}. +If your customers are companies, you can install the {{site.data.var.b2b}} module to extend your {{site.data.var.ece}} Pro project to accommodate a business-to-business model. Although this topic provides information specific to installing and configuring the B2B module for {{site.data.var.ece}}, you can find additional B2B information in the following guides: -For additional information on using and extending B2B, see the following guides: +- [Magento B2B Developer Guide][b2b-dev] +- [Magento B2B User Guide][b2b-user] -* [Magento B2B Developer Guide]({{ site.baseurl }}/guides/v2.3/b2b/bk-b2b.html) -* [Magento B2B User Guide](http://docs.magento.com/m2/b2b/user_guide/getting-started.html) +{:.bs-callout-tip} +Because we provide B2B as a module for {{site.data.var.ece}}, we highly recommend that you have your Magento application fully deployed to an Integration or Staging environment before beginning. -We provide these features as a module you can install and setup in {{site.data.var.ece}}. Installation of B2B in a Pro project require additional steps to add the module and update your Git branch. +## Install B2B module -## Prerequisites for adding B2B {#prereqs} +We recommend working in a development branch when adding the B2B module to your project. If you do not have a branch, see the [Get started creating branches][branching] topic. When installing the B2B module, the `Magento_B2b` module name is automatically inserted in the [`app/etc/config.php`][config] file. There is no need to edit the file directly. -Prior to adding the B2B module, you should have the following: +{:.procedure} +To install the B2B module: -* Upgraded to a {{site.data.var.ece}} 2.2.X on your environments -* A Git branch to add the new B2B module -* Have your Magento Authentication keys (public and private) available +1. On your local workstation, change to the Cloud project root directory. -We provide B2B as a module for Magento. For new Pro projects, we highly recommend having {{site.data.var.ece}} fully deployed to Integration, Staging, and Production environments. For more information, see [First time deployment]({{ site.baseurl }}/cloud/setup/first-time-deploy.html). Adding a module as part of your initial deployment could cause issues. +1. Create or checkout a development branch. See [branching][]. -## Create a branch to work in {#branch} - -We recommend working in a branch to add the B2B module and features to your implementation. If you have a branch, continue to [Add B2B in the cloud](#add). - -{% include cloud/cli-get-started.md %} - -## Add B2B in the cloud {#add} - -You need to add the module to `composer.json`. All extensions and modules must be added to this file. These instructions are specific to {{site.data.var.ece}}. For more information, you can also review the [installation instructions]({{ site.baseurl }}/extensions/b2b/) in the B2B guide. - -1. Open a terminal application. -1. Change to your local development environment root directory. -1. Install the B2B module using composer. +1. Add the B2B module to the `require` section of the `composer.json` file. ```bash - composer require magento/extension-b2b + composer require magento/extension-b2b --no-update ``` - You may be prompted to enter your Magento Authentication keys (public and private). If copying and pasting your keys, do not introduce additional spaces. Spaces could cause the following error: +1. Update the project dependencies. - ```terminal - InvalidArgumentException - Could not find package magento/extension-b2b at any version for your minimum-stability (stable). Check the package spelling or your minimum-stability. + ```bash + composer update ``` -1. Add and commit the updated `composer.json` and `composer.lock` files. +1. Add, commit, and push code changes. ```bash - git add composer.json composer.lock && git commit -a -m "install b2b module" + git add -A ``` -1. Enable all missing modules, including B2B, for updating. + ```bash + git commit -m "Install the B2B module." + ``` ```bash - ./vendor/bin/ece-tools module:refresh + git push origin ``` -1. Complete the upgrade with B2B using the following command: +1. After the build and deploy finishes, use SSH to log in to the remote environment and verify that the B2B module installed. ```bash - php bin/magento setup:upgrade + bin/magento module:status Magento_B2b ``` -If you have a config.php file as part of your deployment, you should also add the B2B module in the modules section of the file. + An extension name uses the format: `_`. -1. Change to the app/etc directory. -1. Edit the config.php with a text editor. -1. In the modules list, add the B2B module. -1. Save the file and update Git. + Sample response: - ```bash - git add -f app/etc/config.php + ```terminal + Module is enabled ``` - ```bash - git commit -a -m “Add config.php.” - ``` + If you encounter deployment errors, see [extension deployment failure][trouble]. + +## Enable the B2B module + +When you install the B2B module using Composer, the deployment process automatically enables the module. If you already have the B2B module installed, you can enable or disable the module using the CLI. See [Manage extensions][]. + +## Configure the B2B module + +After installing the {{site.data.var.b2b}} module, you must [start the message consumers][messages] so that you can enable the _Shared Catalog_ module, and you must [enable the B2B module in the Magento Admin panel][admin-enable]. + +For additional information on using and configuring B2B, review the [Magento B2B User Guide][b2b-user]. + +To extend functionality, see the [Magento B2B Developer Guide][b2b-dev] and the [Extension Guide][extensions]. -## Configure and use B2B {#use} + -For additional information on using and configuring B2B, review the [Magento B2B User Guide](http://docs.magento.com/m2/b2b/user_guide/getting-started.html). To extend functionality, see the [Magento B2B Developer Guide]({{ site.baseurl }}/guides/v2.3/b2b/bk-b2b.html). +[admin-enable]: {{ site.baseurl }}/extensions/b2b/#enable-b2b-features-in-magento-admin +[b2b-dev]: {{ site.baseurl }}/guides/v2.3/b2b/bk-b2b.html +[b2b-user]: http://docs.magento.com/m2/b2b/user_guide/getting-started.html +[branching]: {{ site.baseurl }}/cloud/env/environments-start.html#getstarted +[config]: {{ site.baseurl }}/guides/v2.3/config-guide/config/config-php.html +[extensions]: {{ site.baseurl }}/extensions/ +[install-b2b]: {{ site.baseurl }}/extensions/b2b/ +[Manage extensions]: {{ site.baseurl }}/cloud/howtos/install-components.html#manage-extensions +[messages]: {{ site.baseurl }}/extensions/b2b/#start-message-consumers +[trouble]: {{ site.baseurl }}/cloud/trouble/trouble_comp-deploy-fail.html diff --git a/src/cloud/howtos/install-components.md b/src/cloud/howtos/install-components.md index 10ee925bc84..b1928b8240d 100644 --- a/src/cloud/howtos/install-components.md +++ b/src/cloud/howtos/install-components.md @@ -1,63 +1,34 @@ --- group: cloud-guide title: Install, manage, and upgrade extensions -redirect_from: - - /cloud/howtos/update-components.html functional_areas: - Cloud - Configuration + - Extensions + - Module --- -This information includes information for [adding extensions](#install) to {{site.data.var.ece}}, [managing](#manage) enabled and disabled extensions, and [upgrading extension code](#update). +You can extend your Magento application capabilities by adding an extension from the [Magento Marketplace][]. For example, you can add a theme to change the look and feel of your storefront, or you can add a language package to localize your storefront and Admin panel. -When adding extensions to {{site.data.var.ece}}, you should add the code to a Git branch, test in Integration, deploy and test in Staging, before finally pushing and using in Production. - -Extensions include the following: - -* Modules to extend Magento capabilities, with options through Magento Marketplace and directly through company sites -* Themes to change the look and feel of your storefronts -* Language packages to localize the storefront and Admin - -These instructions walk through extension installation purchased from Magento Marketplace. You can use the same procedure to install any extension with the extension's Composer name. To find it, open the extension's `composer.json` file and note the values for `"name"` and `"version"`. - -We also include instructions for [updating extensions](#update). - -## Create a branch for adding or updating the extension {#getstarted} - -We recommend using a branch for adding or updating, configuring, and testing your extension. - -{% include cloud/cli-get-started.md %} - -## Install an extension {#install} -[Extension installation](#install) uses the following steps: - -1. Purchase an extension or module from [Magento Marketplace](https://marketplace.magento.com) or another site. -1. [Create a branch](#getstarted) to work with the files. -1. [Get the extension's Composer name](#compose) and version from your purchase history. -1. In your local {{site.data.var.ece}} project, [update the Magento `composer.json`](#update) file with the name and version of the extension and add the code to Git. The code builds, deploys, and is available through the environment. -1. [Verify](#verify) the extension installed properly. - -### Step 1: Get the extension's Composer name and version {#compose} - -If you already know the extension's Composer name and version, skip this step and continue with [Update Magento's `composer.json`](#update). +{% include cloud/tip-creating-branches.md %} {% include cloud/composer-name.md %} -### Step 2: Update Magento's `composer.json` {#update} +## Install an extension -When adding the module to `composer.json`, the file [`app/etc/config.php`]({{ site.baseurl }}/guides/v2.3/config-guide/config/config-php.html) will also be updated. This file includes a list of installed modules, themes, and language packages, shared configuration settings. This file also includes [Configuration Management]({{ site.baseurl }}/cloud/live/sens-data-over.html) (Pipeline Deployment) values too. +We recommend working in a development branch when adding an extension to your implementation. If you do not have a branch, see the [Get started creating branches][branching] topic. When installing an extension, the extension name (`_`) is automatically inserted in the [`app/etc/config.php`][config] file. There is no need to edit the file directly. -To update `composer.json`: +{:.procedure} +To install an extension: -1. If you haven't done so already, change to your environment root directory. -1. Enter the following commands to update it: +1. On your local workstation, change to the Cloud project root directory. - ```bash - composer require : --no-update - ``` +1. Create or checkout a development branch. See [branching][]. + +1. Using the Composer name and version, add the extension to the `require` section of the `composer.json` file. ```bash - composer update + composer require : --no-update ``` For example: @@ -66,116 +37,135 @@ To update `composer.json`: composer require pixlee/magento2:1.0.1 --no-update ``` +1. Update the project dependencies. + ```bash composer update ``` -1. Wait for project dependencies to update. -1. Enter the following commands in the order shown to commit your changes, including `composer.lock`: +1. Add, commit, and push code changes. ```bash git add -A ``` ```bash - git commit -m "" + git commit -m "Install " ``` ```bash - git push magento + git push origin ``` -If there are errors, see [extension deployment failure]({{ site.baseurl }}/cloud/trouble/trouble_comp-deploy-fail.html). + {:.bs-callout-warning} + When installing an extension, you must include the `composer.lock` file when you push code changes to the remote environment. The `composer install` command reads the `composer.lock` file to enable the defined dependencies in the remote environment. -{:.bs-callout-warning} -When installing and adding the module, you must add the `composer.lock` to your Git branch for deployment. If the extension is not in the file, the extension won't load in {{site.data.var.ece}}. This ensures when the `composer install` command is used, the extension properly loads. This command uses the `composer.lock` file. +1. After the build and deploy finishes, use a SSH to log in to the remote environment and verify the extension installed. -### Step 3: Verify the extension {#verify} + ```bash + bin/magento module:status + ``` -To verify the extension installed properly, you can check its functionality in the Magento Admin or you can view enabled modules using the CLI: + An extension name uses the format: `_`. -1. Open a terminal. -1. [Checkout the branch]({{ site.baseurl }}/cloud/before/before-setup-env-2_clone.html#branch) where the module is installed. -1. List all enabled modules: + Sample response: - ```bash - php bin/magento module:status + ```terminal + Module is enabled ``` -1. Verify the extension is listed. + If you encounter deployment errors, see [extension deployment failure][trouble]. -The extension name is in the format `_`. It will not be in the same format as the Composer name. +## Manage extensions -## Manage extensions {#manage} +When you add an extension using Composer, the deployment process automatically enables the extension. If you already have the extension installed, you can enable or disable the extension using the CLI. When managing extensions, use the format: `_`. Never enable or disable an extension while logged in to the remote environments. -To manage your extensions, you can enable and disable or change settings per environment. +{:.procedure} +To enable or disable an extension: -### Enable and disable extensions {#enable-disable} +1. On your local workstation, change to the Cloud project root directory. -To enable or disable extensions, you must begin those changes on your local in a branch. You should never enable or disable extensions directly on your environments. These instructions assume you have `config.php` in your Git branch and implementation. If you do not use [Configuration Management]({{ site.baseurl }}/cloud/live/sens-data-over.html) or `config.php`, we strongly recommend you do. +1. Enable or disable a module. The `module` command updates the `config.php` file with the requested status of the module. -Trying to enable and disable extensions not following this method can lead to permissions and other issues. - -1. [Work in a branch](#getstarted) to update `config.php`. -1. In a terminal, access your local development environment. -1. List all module. + >Enable a module. + ```bash + bin/magento module:enable + ``` + >Disable a module. ```bash - php bin/magento module:status + bin/magento module:disable ``` -1. Enable a module.This command updates the `config.php` file with the enabled status of the module. +1. If you enabled a module, use `ece-tools` to refresh the configuration. ```bash - php bin/magento module:enable + ./vendor/bin/ece-tools module:refresh ``` -1. Disable a module. This command updates the `config.php` file with the disable status of the module. +1. Verify the status of a module. ```bash - php bin/magento module:disable + bin/magento module:status ``` -1. Verify the status of a module: +1. Add, commit, and push code changes. ```bash - php bin/magento module:status + git add -A ``` -1. Push your updates to the Git branch. -1. [Complete deployment]({{ site.baseurl }}/cloud/live/stage-prod-live.html) to Integration for testing, then Staging for testing, and finally Production. - -### Modify configurations {#configure} + ```bash + git commit -m "Disable " + ``` -You update configurations according to [Configuration Management]({{ site.baseurl }}/cloud/live/sens-data-over.html#cloud-clp-settings) for `config.php`. + ```bash + git push origin + ``` ## Upgrade an extension -You should have a branch to work in when updating your extension. These instructions use composer to update the files. Before you continue, you must: - -* Know the extension's Composer name and version -* Know the extension is compatible with your project and {{site.data.var.ece}} version. In particular, check the required PHP version. +Before you continue, you need the Composer name and version for the extension. Also, confirm that the extension is compatible with your project and {{site.data.var.ece}} version. In particular, check the required PHP version before you begin. +{:.procedure} To update an extension: -1. If you haven't done so already, change to your environment root directory. -1. Open `composer.json` in a text editor. +1. On your local workstation, change to the Cloud project root directory. + +1. Create or checkout a development branch. See [branching][]. + +1. Open the `composer.json` file in a text editor. + 1. Locate your extension and update the version. -1. Save your changes to `composer.json` and exit the text editor. -1. Update project dependencies: + +1. Save your changes and exit the text editor. + +1. Update the project dependencies. ```bash composer update ``` -1. Enter the following commands in the order to commit the changes and deploy the project, including `composer.lock`: +1. Add, commit, and push your code changes. ```bash git add -A - git commit -m "" - git push origin ``` -1. Wait for the project to deploy and verify in your environment. + ```bash + git commit -m "Update " + ``` + + ```bash + git push origin + ``` + +If you encounter errors, see [extension deployment failure][]. + + -If there are errors, see [Component deployment failure]({{ site.baseurl }}/cloud/trouble/trouble_comp-deploy-fail.html). +[branching]: {{ site.baseurl }}/cloud/env/environments-start.html#getstarted +[config]: {{ site.baseurl }}/guides/v2.3/config-guide/config/config-php.html +[extensions]: {{ site.baseurl }}/extensions/ +[Magento Marketplace]: https://marketplace.magento.com +[trouble]: {{ site.baseurl }}/cloud/trouble/trouble_comp-deploy-fail.html diff --git a/src/cloud/trouble/trouble_comp-deploy-fail.md b/src/cloud/trouble/trouble_comp-deploy-fail.md index 44eb8bad079..54bbf7ed981 100644 --- a/src/cloud/trouble/trouble_comp-deploy-fail.md +++ b/src/cloud/trouble/trouble_comp-deploy-fail.md @@ -1,56 +1,51 @@ --- group: cloud-guide -subgroup: 170_trouble title: Component deployment failure -menu_title: Component deployment failure -menu_order: 15 -menu_node: functional_areas: - Cloud - Deploy --- -This topic discusses how to recover from a failed component deployment. Typical examples are components that have dependencies that are not met by your environment; for example, incompatible [PHP](https://glossary.magento.com/php) versions. +This topic discusses how to recover from a failed component deployment. Typical examples include components that have dependencies that are not met by your environment, such as incompatible PHP versions. You can recover from a failed deployment in any of the following ways: -* [Restore a snapshot]({{ site.baseurl }}/cloud/project/project-webint-snap.html) if you have one -* Remove the component from your environment's `composer.json` and redeploy the environment +- [Restore a snapshot]({{ site.baseurl }}/cloud/project/project-webint-snap.html) +- Remove the component from the `composer.json` and redeploy the environment -## Remove the component from `composer.json` and redeploy +## Clean, remove, and redeploy -This section discusses how to remove the component from the root `composer.json` in your environment and redeploy the environment: +To clean up from the previous deployment, you must log in to the remote environment and manually clear the contents of the Magento `var` directory. And then you must remove the component from the `composer.json` file in your local environment and redeploy. -## Get started +{:.procedure} +To clean the `var` directories: -{% include cloud/cli-get-started.md %} +1. On your local workstation, change to the Cloud project root directory. -## Find a component's Composer name - -{% include cloud/composer-name.md %} - -## Clear `var` directories - -To clean up from the previous deployment, you must SSH to the environment and manually clear the contents of the Magento `var` directory. - -1. Enter the following command to SSH to the current environment: +1. Use a SSH to log in to the remote environment. ```bash magento-cloud environment:ssh ``` -1. Clear the `var` directory: +1. Clear the `var` directories. - ```bash + ```shell rm -rf var/* ``` -## Remove the component - +{:.procedure} To remove the component: -1. Change to your environment's root directory if you haven't already done so. -1. Enter the following command: +1. On your local workstation, change to the Cloud project root directory. + +1. Clear the cache. + + ```bash + composer clear-cache + ``` + +1. Remove the component from the `composer.json` file. ```bash composer remove : @@ -62,8 +57,9 @@ To remove the component: Package ":" listed for update is not installed. Ignoring. ``` -1. Wait while dependencies are updated. -1. Enter the following commands in the order shown to commit the changes and deploy the project: +1. Wait while the dependencies are updated. + +1. Add, commit, and push code changes. ```bash git add -A @@ -74,5 +70,5 @@ To remove the component: ``` ```bash - git push origin + git push origin ``` diff --git a/src/extensions/b2b/index.md b/src/extensions/b2b/index.md index c47af643746..7ad1281a6b2 100644 --- a/src/extensions/b2b/index.md +++ b/src/extensions/b2b/index.md @@ -9,6 +9,9 @@ redirect_from: {:.bs-callout-warning} The {{site.data.var.b2b}} extension is only available for {{site.data.var.ee}} v2.2.0 or later. You must install it after installing {{site.data.var.ee}}. +{:.bs-callout-info} +For {{site.data.var.ece}} projects, see [Set up Magento B2B module]({{ site.baseurl }}/cloud/configure/setup-b2b.html) in the _Cloud Guide_. + 1. Change to your Magento installation directory and enter the following command to update your `composer.json` file and install the {{site.data.var.b2b}} extension: ```bash From 382d2592f8a10023f040a3dc9af26d53782a5327 Mon Sep 17 00:00:00 2001 From: Burlacu Vasilii Date: Fri, 27 Mar 2020 15:13:53 +0200 Subject: [PATCH 23/46] Example on how to use the viewModel in the phtml file --- .../v2.3/frontend-dev-guide/layouts/xml-manage.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md index 8b9c8248bb6..c085773baf8 100644 --- a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md +++ b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md @@ -484,9 +484,23 @@ class Class implements \Magento\Framework\View\Element\Block\ArgumentInterface { } + + public function canShowAdditionalData() { + return true; + } } ``` +Then, in the `cart/item/default.phtml` file get use of the viewModel + +```php +$viewModel = $block->getData('viewModel'); + +$viewModel->canShowAdditionalData(); +``` + +Note that the name provided to the `$block->getData()` function should match the name of the view model provided in the `xml` file. + ## Modify layout with plugins (interceptors) {#layout_markup_modify_with_plugins} Plugins can be also useful, when we need to make some layout updates. From 24b05d3022439b2118628de72db41fd360af6735 Mon Sep 17 00:00:00 2001 From: Burlacu Vasilii Date: Fri, 27 Mar 2020 15:23:56 +0200 Subject: [PATCH 24/46] wrap the note sentence with a proper syntax for notes --- src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md index c085773baf8..d2098ebd7f4 100644 --- a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md +++ b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md @@ -499,7 +499,7 @@ $viewModel = $block->getData('viewModel'); $viewModel->canShowAdditionalData(); ``` -Note that the name provided to the `$block->getData()` function should match the name of the view model provided in the `xml` file. +{:.bs-callout-info} The name provided to the `$block->getData()` function should match the name of the view model provided in the `xml` file. ## Modify layout with plugins (interceptors) {#layout_markup_modify_with_plugins} From a3bf1c35b2e80b9de3ff5ba5542193b0bb0b5236 Mon Sep 17 00:00:00 2001 From: Burlacu Vasilii Date: Fri, 27 Mar 2020 15:28:04 +0200 Subject: [PATCH 25/46] remove trailing spaces --- src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md index d2098ebd7f4..28641e48888 100644 --- a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md +++ b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md @@ -484,7 +484,7 @@ class Class implements \Magento\Framework\View\Element\Block\ArgumentInterface { } - + public function canShowAdditionalData() { return true; } From cf862e5062000c9549a7bf5ac8855d232ee58bb9 Mon Sep 17 00:00:00 2001 From: Burlacu Vasilii Date: Fri, 27 Mar 2020 15:53:58 +0200 Subject: [PATCH 26/46] fixed code style issue --- src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md index 28641e48888..d0fcea1d9d0 100644 --- a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md +++ b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md @@ -485,7 +485,8 @@ class Class implements \Magento\Framework\View\Element\Block\ArgumentInterface } - public function canShowAdditionalData() { + public function canShowAdditionalData() + { return true; } } From 80c1bb46c8ab967ba332ad8654b0ed800e298e36 Mon Sep 17 00:00:00 2001 From: Burlacu Vasilii Date: Fri, 27 Mar 2020 16:03:52 +0200 Subject: [PATCH 27/46] adjusted code style --- .../v2.3/frontend-dev-guide/layouts/xml-manage.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md index d0fcea1d9d0..6e6e849012d 100644 --- a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md +++ b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md @@ -480,21 +480,22 @@ namespace Vendor\CustomModule\ViewModel; class Class implements \Magento\Framework\View\Element\Block\ArgumentInterface { - public function __construct() - { + public function __construct() + { - } + } - public function canShowAdditionalData() - { - return true; - } + public function canShowAdditionalData() + { + return true; + } } ``` Then, in the `cart/item/default.phtml` file get use of the viewModel ```php +/** @var \Vendor\CustomModule\ViewModel\Class $viewModel */ $viewModel = $block->getData('viewModel'); $viewModel->canShowAdditionalData(); From c9944e9e901c483c0ebc2b08cac14be9e65ad493 Mon Sep 17 00:00:00 2001 From: Burlacu Vasilii Date: Fri, 27 Mar 2020 16:39:07 +0200 Subject: [PATCH 28/46] set block visibility using ACL resource --- .../v2.3/frontend-dev-guide/layouts/xml-manage.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md index 8b9c8248bb6..782e8fa8874 100644 --- a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md +++ b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md @@ -324,6 +324,16 @@ Any block can be configured to show or not based on a [Magento/Config/Model/Conf ``` +Also, the visibility can be adjusted using the [ACL Resource]({{ page.baseurl }}/ext-best-practices/tutorials/create-access-control-list-rule.html). Though it is used mostly in the admin area, the same approach works for the storefront as well. + +```xml + + + +``` + +In the admin area this is implemented for the [global search]({{ site.mage2bloburl }}/{{page.guide_version}}/app/code/Magento/Backend/view/adminhtml/layout/default.xml) and for [admin notification list]({{ site.mage2bloburl }}/{{page.guide_version}}/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml). + ## Set the template used by a block {#set_template} There are two ways to set the template for a block: From d7c2206bb857928f15526db3daa26a03768540b8 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Fri, 27 Mar 2020 09:57:36 -0500 Subject: [PATCH 29/46] Formatting --- .../service-contracts/service-to-web-service.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md b/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md index aa4070eef17..925154b797d 100644 --- a/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md +++ b/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md @@ -18,15 +18,10 @@ Users can make REST or SOAP calls to access the [web API](https://glossary.magen To configure a web API, read these topics: - [Configure a web API](#configure-webapi) - - [Service Interface Requirements](#service-interface-requirements) - - [webapi.xml configuration options](#configuration-options) - - [Sample webapi.xml file](#sample-webapi) - - [webapi.xsd XML schema file](#validate-webapi) - - [Forcing Request Parameters](#forced-parameters) ## Configure a web API {#configure-webapi} From 48b1ab61d3f37dd6a9bd5f68b9f684d7f4cb5fd2 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Fri, 27 Mar 2020 12:41:01 -0500 Subject: [PATCH 30/46] Grammar and formatting --- src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md index 782e8fa8874..8052a2ec97f 100644 --- a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md +++ b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md @@ -324,7 +324,7 @@ Any block can be configured to show or not based on a [Magento/Config/Model/Conf ``` -Also, the visibility can be adjusted using the [ACL Resource]({{ page.baseurl }}/ext-best-practices/tutorials/create-access-control-list-rule.html). Though it is used mostly in the admin area, the same approach works for the storefront as well. +The visibility can also be adjusted using the [ACL Resource]({{ page.baseurl }}/ext-best-practices/tutorials/create-access-control-list-rule.html). Although it is used mostly in the admin area, the same approach works for the storefront as well. ```xml @@ -332,7 +332,7 @@ Also, the visibility can be adjusted using the [ACL Resource]({{ page.baseurl }} ``` -In the admin area this is implemented for the [global search]({{ site.mage2bloburl }}/{{page.guide_version}}/app/code/Magento/Backend/view/adminhtml/layout/default.xml) and for [admin notification list]({{ site.mage2bloburl }}/{{page.guide_version}}/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml). +In the admin area, this is implemented for [global search]({{ site.mage2bloburl }}/{{page.guide_version}}/app/code/Magento/Backend/view/adminhtml/layout/default.xml) and for [admin notification list]({{ site.mage2bloburl }}/{{page.guide_version}}/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml). ## Set the template used by a block {#set_template} From ddd3846a4694478147bd6c55119ba3f4d5468c32 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Fri, 27 Mar 2020 13:43:54 -0500 Subject: [PATCH 31/46] Update to remove EOL versions --- .../install-gde/prereq/install-rabbitmq.md | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md b/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md index a2997dd1abe..05c3526d8ef 100644 --- a/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md +++ b/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md @@ -13,7 +13,7 @@ RabbitMQ is an open source message broker that offers a reliable, highly availab Message queues provide an asynchronous communications mechanism in which the sender and the receiver of a message do not contact each other. Nor do they need to communicate with the message queue at the same time. When a sender places a messages onto a queue, it is stored until the recipient receives them. -{{site.data.var.ce}} uses RabbitMQ to manage these message queues. As of Magento release 2.3.0, RabbitMQ can be used on {{site.data.var.ce}} installations. +{{site.data.var.ce}} uses RabbitMQ to manage these message queues. The message queue system must be established before you install Magento. The basic sequence is @@ -33,9 +33,9 @@ sudo apt install -y rabbitmq-server This command also installs the required Erlang packages. -If you have an older version of Ubuntu, RabbitMQ recommends installing the package from their [website](https://glossary.magento.com/website). +If you have an older version of Ubuntu, RabbitMQ recommends installing the package from their website. -1. Download [rabbitmq-server_3.6.6-1_all.deb](https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.6/rabbitmq-server_3.6.6-1_all.deb){:target="_blank"}. +1. Download the .deb package from [rabbitmq-server](https://www.rabbitmq.com/download.html){:target="_blank"}. 1. Install the package with `dpkg`. Refer to [Installing on Debian/Ubuntu](https://www.rabbitmq.com/install-debian.html){:target="_blank"} for more information. @@ -48,31 +48,13 @@ RabbitMQ was written using the Erlang programming language, which must be instal See [Manual installation](https://www.erlang-solutions.com/resources/download.html){:target="_blank"} for more information. -Run the following commands to install this feature. - -```bash -wget http://packages.erlang-solutions.com/erlang-solutions-1.0-1.noarch.rpm -``` - -```bash -rpm -Uvh erlang-solutions-1.0-1.noarch.rpm -``` +Refer to the [RabbitMQ/Erlang version matrix](https://www.rabbitmq.com/which-erlang.html) to install the correct version. ### Install RabbitMQ The RabbitMQ server is included on CentOS, but the version is often old. RabbitMQ recommends installing the package from their website. -1. Download [rabbitmq-server-3.5.6-1.noarch.rpm](https://www.rabbitmq.com/releases/rabbitmq-server/v3.5.6/rabbitmq-server-3.5.6-1.noarch.rpm){:target="_blank"}. - -1. Run the following commands as a user with root permissions: - - ```bash - rpm --import https://www.rabbitmq.com/rabbitmq-signing-key-public.asc - ``` - - ```bash - yum install rabbitmq-server-3.5.6-1.noarch.rpm - ``` +Refer to the RabbitMQ install page to get the latest supported vesion. Magento 2.3 supports RabbitM 3.8.x. Refer to [Installing on RPM-based Linux](https://www.rabbitmq.com/install-rpm.html){:target="_blank"} for more information. @@ -156,7 +138,7 @@ Related topics * [Installing optional software]({{page.baseurl}}/install-gde/prereq/optional.html) * [Apache]({{page.baseurl}}/install-gde/prereq/apache.html) -* [PHP 7.1 or 7.2]({{page.baseurl}}/install-gde/prereq/php-settings.html) +* [Required PHP Settings]({{page.baseurl}}/install-gde/prereq/php-settings.html) * [Configuring security options]({{page.baseurl}}/install-gde/prereq/security.html) * [How to get the Magento software]({{ page.baseurl }}/install-gde/bk-install-guide.html) * [Message queue overview]({{page.baseurl}}/config-guide/mq/rabbitmq-overview.html) From e8e5c24d7dd75d67c8da6d0bb675f852a6786d52 Mon Sep 17 00:00:00 2001 From: eduard13 Date: Sun, 29 Mar 2020 11:50:57 +0300 Subject: [PATCH 32/46] Adding additional information related to tooltip element --- .../images/fdg/tooltip-element-result.png | Bin 0 -> 7421 bytes .../css-topics/theme-ui-lib.md | 31 +++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/common/images/fdg/tooltip-element-result.png diff --git a/src/common/images/fdg/tooltip-element-result.png b/src/common/images/fdg/tooltip-element-result.png new file mode 100644 index 0000000000000000000000000000000000000000..2d22b253913454b0dec61b40e779a803254fe58d GIT binary patch literal 7421 zcmaKRWn2_Y)Gr_)-QC?KAh~o%cZs01G%MX5k}J~P-MzBH5)#tO62gLXw{*YU=e}R> z{ctAE%>3rWf96cY>S(>g#iGJOLPEk-RZ-MKLPFksDO+Qpyre6Fs24~`G{008@zUEJgG&mLfhV1d|?I+&J_`fx*muNeLx z`RUGoZ5X1VKz%jwXHAg&iTug?SNncwlj5JGmJT}(gFYZ- z;E4|9TsHH-h09W{5)fvrg(z6|Tgf&;L zq4?MF=8~&RJPj*i(%J|3J@lbSQc+0qlMFV<)eLf>NX1s|w2EPZ_T>$ z-)?Y$OvrH%#Ej1vjNni(nAZders;P`sFxuDTW7sp2g)e`F$&HUyn!C^j33(tf* z`e{%)B@pd--*M-BYaYUhkUmo!0qPlcip>B`?{2|pZ7u4&aAjp}ITkf~~m>npO-;Fp5so>?3l18LfiRX>S?%nTOyVqw@Yp)!ZrV0Ct zVz_R9`jr`_;Cbu}){pI%>b7xVvHN&WsJ-1X>M-Rs7c6fcI9yWY&N9jCU)p0b{j^)u z>516lNpL`199PK?)vGrEKk;Q;Qy=@3)wTDWuLRvC(m!seOg^DIa2rYbp8YO>-aZyU zZ#F*L=Zy?CRmXaHdPM*HZ{a!Q`ZNDC>S3(?Q2xuWGUe@}bkjVHUWBIuv)^oQ$yEbrTQxg@q2aj#O` z6PvS)x61x0KC+rMHmZwr-RmkpbRkuNi1G%}w&)$yNAyjsGkVRK%=FK6r`NaRDnx~f zu8coyfT0I}MPmXRGEy=|w@wc8&^!^tWYH(qc6N3j?f5D*sQ(ChWHfOKwe;hPe4%;a zim}L{c2Nw0=o*$)3qBk4}Cwr|sOXvAg(A!`JI!Np{h zfiNVWcpq_|_|UX3t8~Hl`Niveui6^d1H-T8KTHc7jq1Z(R_QQ3NOC^nkmyj5t{DGY zmsICDXngjoo9yn}HvWDG-6zFyQn2v4S?Stv_s2C)ugaRV34MoJixo}UeO)kCFRIn~ zAcP?<(QnRA8u|{W)}VKT5F4LlH+qQRx5^g{_i%=Q|1`v1O9$8*ueIx+$5uK5K_jyt zP7QM>T6&kx!$|8mI1gZ%%9&qo(kqDg%YD!?a9r@JVxlra+9gg0G2rm`uRSbbWu?^X zQn>@$7PMm$K20-Uzv2$YescNus-Z{9QZqR%g+Hbv^z&3f`;EPZHw&J!X#c-I0ZHZ0 ze-6e(lm?2xNv&3O5mj%6%%^(wSLw+dZrtjzBHl8FASgSH4XMq9zUjk{LP=TAuBM{Am7=|cBi_=(@kc`qgw*} zmDr(oYSag1CmzOop zO2ysFINTeqA>xLTj>?!&c`0y|OIJ4NYtz7`z`@wWH|1=4p*v;qKW6SL$EV4vBHW*- zrjW4tm4rPDf1UkA&-C*1uxBRv49~IX=C2(yn7bDLJiPgRs!!u14z|r*O~6Q!4SOjBXy-V_D~=$7?V%>Bg!br?`+*vu}m2HImr+_Tgfs# z{ipgjApE<}d$0_Ljg8G(drEYt-CkiP0rfzlK+?cmPjz8|v%! z3m_V4rpu)DTK9j$lw|7nhstk9os(qX^Ts!3A^%MTH#7akgyOn}sSv>5u7l~5e**`) z590l4ta^L$1>f-wcY~IUsZA5Js^EsFDLcU1725ngX^<0@Q1oUl^qq6^-?*=Jk9H=s zTibP>ZHfDxgFQn2{R6_L-irK&s!%j}lH-Jg1mm58@5#x2&~H%)xtw?)yt}6(&E#wZZB-LSujeojQfSa}@v&IKROb?vm(zsxAq))Sny6@StC6__-n5mv?_oAIwO+ z9sS_q6F%T<34gvZ0%Bv1{g4CwX5_4FZQ_D8an2!v4}ybBLbwH;^=G_UA^6)I6BRS@ zJ6OU3ho??qTh-H7go-@Qbg1}SCq67o9Wu|}Cl?NXt6T$wPJBgPZx3lBg7V0XPfGIU zwAaT2^)4?j9UL5*fuqBLQ^VLmv#1=^!ql)x=PfpqdMFCJ|AIKSi;$BNp9=;8GKwbs#WGNMEJ&7@@yGxNQ7gNplLj^;2g`}A|wu%aw{?K z(^4uH;+$U6Ao%&L4+8ou<;(FI7WVyp#mFa&h7Fz+=evR_JZwYVw0^$6qfT*-{eIn| zjz|B!g}fr(VxZ*in|eF^zCdV=xaLHUtW{1iCZMEdF{|Xe>FlfcwC6y+%Oc{a4qEo&ePCyfa>X<}*(lN}hk}&ihP{R0ZGlvUniH(OWxe zceol8FCpgy<4@)Y&O!LcOlnW*HuTtHM&{at!1X|~ZmQp?3k9VSQ6pcgrFE0{#1$#q zo0@((xMQQ;RTY2>5JYp~ksPJu?#dQTCj&H{c^CU$@ou<)qS_g+7C9v$tkIJEi&4MX zAivj4>>9-ug-yLxi`LfG&-yNj${W>-^qFv8W@ct=(G#wvT7ptpJVRXHkE6~9KFUcL z#JN2Sm3ubZ0%KA{CVvwY1GUI`em-d^ww*V#d@@HrCvRu{+b-nn>r4|ny5MNye&oL} z)fZ3Ns5@(&t=PBU__)2`X+mqLNd(eUmOC@m7ao#HokGU8Djt>C!xO=RlBG>+-Kyrk z*PVt`bg%mbD=5atzfTBI!& zg!0%*2{XHuc#PYf*BE{vbEV9}$9WHae%3{iq}8wHsK}>FtdH1&`DscOXTpks`6cDV zS!|gecc!sau}yE*Rv;hBUR_H*9qcR3+}i=v%*&)( zT8V5Y>x%x88Zy#5Hnv@uN;r69uCxvNKsx$Fc;7?gje9ejeIsL#ZPZQ7uH@&7F9lvQ z5b)Vg8z=2`@ZMM4(eIbCa62;<}RUTMbC_uBYk_i(47=Sis5@9{JHt zR-&~Dg?%tfq1dSA6RE~OOkI~Vx3h_7y^{@SbV35p5}(InPE2X25lO9z?`y-}2*RjY z5()WHjJV&$$hK91!Yh3D-aG|VNubL3fG2Pyg#=XDu838d%&D^MD=6=%6bg>F+hQJ|Y z!{Ef5T2WF2pA>-q8?Xbh+LSSG&Z`iesOPnDw#f(HIV~$?GGa%wX^>9A2bpu~;WN(S zEqnt-*%8^DpnLaQt|cBroY^VDQ#IFbdn$HZno`JsR|3}hzguq$v#*^ z!s&elflq5aHE4#@Rtl0X&N4OKK?`d)#t$3g+q$0eHE&`!*VDa*nB4q0H#_)aq<^xX z`s(Pd^k5L3vDRT<_9Fiv+MnqBs=IPgbYU1Z8G4dBzT@Dhe zPN&h|zk6r@&z0~U2)yJDQm}ND?6*6?%Yw4+Iv9Fq_~|_O2!a-{-PPYxU5-z7g)l|s z?A*=^AFqUYLqGMsEHdnl8h30I{$P?YVpM9|%@)0}b5vVrstVe6Sa-yT<-UO0y-4RO zgB5$8dbjw2bFq=o!Jr!UtTwC&8OC8Ku`}U0?pp1sBT9V)f_JBxYR;_ixX#!V*DUOM ztJIa~NqO02?tU~{%$?LIi!I+0@#ji?!s?oFOxB`&n;qAJ)hQw2rZ&y~4?Cq{&R%Yv z7tg>-dqKcYCOJ7O2Y|jv^Bt{M=P{$VN-Ti`wYY1OD&vI6XC56zsAomc2x#KO-f_{E ztDOJzNDlx_$X-<@S^kv=7s3@7omy$%kQ(#eq%WqAm}Q#X5N*HHpvNof@f~^0YBb(; z3$dQ?La*;pQYCutW6#ydo=FyhTvWD3(U07LTa7Ls)s5~Ky-&IMIz`l3&w`^;CgweM zXOFGi{M$syzC+9)o*aGg9d}c{;s^T&czHs}VkDueFc* zI)}gFj$_)PH3~DNsbVTD7-%Yn@^1?l%^cU0a8l3J_#%m7{l9?5rn&L;8TJOdK1R`6lMq_ z0SCvV3x|T;*Kz*8>%#&RJnpd$ufJJ|lKB;One5wOmZn3kSEWG%MzzA)hqaNU-fYGo z`~g4+IKc7*M=S#~T!1c=frCqlh>)OgS7_!lhAaUCTCd!(BuS_k$+r&-Ti=J}Hr;0* z^)V}RU;Skr1atb44glYg}!F)Ow2J)e#gM0>7*Vmuk62bXtHk}JTZuqL7%+ATm9 z--|0>Msz_gY{0W~qP=^!=UIFiiO&qFm&_S2hgVrrr2Mv#E;zZqzkhtXdLrPWxWV+7 zj1(<)$gZxIbyU(7%t|oB^n2DETs-o=4eb8dAoC~=$fyq!$?w=h-!q$Y``Y{X!vt|; zgz@EvSr4*jusc!*PmK;oDSS_bg$OUky2(T^i-##^2qxY z{l{qZvJX`TSg0uR1M4uCHq#;eljx@g|I(EVd~b#>^yH-r{6gxepAapClH#KnEQ&2)T6p99{Q3H?)qC}q19 zX7y&*n8Fs9q z9$!YR(IK(%#+g`}8d^kepfpG#FR`y58CYjjGhp?5%e_nwQ+y$#aW%8V{lpvc+h+RY z`m-QqB?^JYLBY6Po>t5ZhM#PR*vV#}HS3-ym5?%1vSXV>!Q|O^dV>*W4{plq3VQ(x z#S)kf$Bbj!)%{~kk6FV!%sy3x8`#p$8UhbXwDlTg($e6PFchPwg8|PUFXW9y8S;#fgtrCrW|7}AD zs?e(ny}^pI5~H!gI9VUEdIMQbLPQ9Blr`ze^JA-kW6rf0)u3@4Ty`!vr>m7c1{bis zAdM>xE0rDSB%Iy9){}kYO`YBW-;0c7VCV7GKpqJ}>*!xQy$x)1YUJE~T`JF)ao{PT zLVJWqMT{2%JGt~vCWh#6rKS9i{6`Y6gn_h)TrT4|yycF(wHuTE$63UglASSU-0GcU zn}5r~!{r6`e;(Ndk-Wg|^1(ih0tY?xzUDdJpE$Qqh}{!GF!q8~gO2df&BB^0`tOXBV}z@3}V&mMXMiPFb+AtdATb90rf1fzRS! z|Ez0;%j|4!{*q0w3JO|IL_1?wb0=SQjOY2gu<&K#-#Cm>$8QR9r!QER2f@}SfKSPwJ)8l! z-RI8%0Ret{@?5$o?`qQ0NY#}7Aiq4{=;(B`wno-2HHuZO^SSjPySk zsWi-PNJ&Wj*3B^?ltY{SQFQ=gggMv_n8i#?Q|W$9&P7Y9xBOeu~c< z%4I50CJ##-=wtvg7cwKeN};fhGjh3-^>50h#_)gO7lF5+)6vj?O}Sb|`D9wq?riZA z5of2dDNfVOoso}XZ0N=9LHS%h@rlBoB?84rqO=b$%b~lh_4aGT)X%NEab>XEj9@}y zVpRDG&i}O*w=0;1d6ndS7Lj~21JAcuN_K<7Exrdem9a=XCGM7%P$k5AiL0$*n3B>P zxrgoTLAeRsdY571QWtf<2gaAXZIKm%4UXjMp->Hm!9UWiN6UW%$@{<>e~Mu)*}fT4 zB%<;elbxng@^4LtnsI|bpd!K_>?(Sy3Yj&|(rW$W(bhSjJhgE+*kf~ebz)U{r=z1| zety1n`sV40?t}3!5a{Cm=_y*pq6-QQ2@Xy=-@s(FKUfI1r^COfoIkMtP-m1q2f8TU>>5i67hS33hCB?ARhl?Tlzx2XL z1~M;&{zt}`q6|wI|4V(iihYT|SN{?3l57X&OV|G@b&F>vxISJ5ugd0FJH#!o~QroJKo4f6CP=ar9N5&ZNC&9D86|3ndA}4 zxdZVpdBs@-vg|6D<++{s0WyDZ2^1S^K0L4#rV6@#_09G@fV1GS*P_w1u9ML9IrrzX zYfS%|r$pZ5j^`ofsxM%$A{e^zsbM~Z&=o0?S{95<@c+w0KlT1$U4&`}_P%^;BB?5A KDb~wdg#QnHw|sH{ literal 0 HcmV?d00001 diff --git a/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md b/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md index dcd99599e4a..7e3e16e4f4f 100644 --- a/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md +++ b/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md @@ -29,7 +29,7 @@ The Magento UI library provides the ability to customize and reuse the following * ratings * sections - tabs and accordions * tables -* tooltips +* [tooltips](#tooltip-element) * typography * list of theme variables @@ -180,6 +180,35 @@ To set navigation using breakpoints, see the following example: } ``` +## Tooltip element + +To create a tooltip element, you may use the `.lib-tooltip()` mixin. + +| Option | Default | +| --- | --- | +| `position` | `top` | +| `selector-toggle` | `.tooltip-toggle` | +| `selector-content` | `.tooltip-content` | + +```html + + Hover me + Details here + +``` + +```css +.my-tooltip { + .lib-tooltip(right); +} +``` + +### Result + +As result, we see the tooltip placed on the right side. + +![Tooltip element]({{ site.baseurl }}/common/images/fdg/tooltip-element-result.png) + ## Embedded documentation {#docs} The detailed information about the Magento UI library is embedded in the code repository: From 081d3a9494f1e897c7cc6e4409d733743f218506 Mon Sep 17 00:00:00 2001 From: Burlacu Vasilii Date: Mon, 30 Mar 2020 14:41:16 +0300 Subject: [PATCH 33/46] set the correct argument names to change store logo from layout xml --- src/guides/v2.3/frontend-dev-guide/themes/theme-create.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/guides/v2.3/frontend-dev-guide/themes/theme-create.md b/src/guides/v2.3/frontend-dev-guide/themes/theme-create.md index 90ee8b708f5..ae2f7563c2a 100644 --- a/src/guides/v2.3/frontend-dev-guide/themes/theme-create.md +++ b/src/guides/v2.3/frontend-dev-guide/themes/theme-create.md @@ -246,9 +246,10 @@ For example, if your logo file is `my_logo.png` sized 300x300px, you need to dec - images/my_logo.png - 300 - 300 + images/my_logo.png + 300 + 300 + Logo name From 8863326d55d3f1b3a6eb5aab8e6dfb25d46746dc Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Mon, 30 Mar 2020 08:22:07 -0500 Subject: [PATCH 34/46] Grammar fix --- src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md b/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md index 7e3e16e4f4f..f385f2992e1 100644 --- a/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md +++ b/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md @@ -182,7 +182,7 @@ To set navigation using breakpoints, see the following example: ## Tooltip element -To create a tooltip element, you may use the `.lib-tooltip()` mixin. +To create a tooltip element, use the `.lib-tooltip()` mixin. | Option | Default | | --- | --- | @@ -205,7 +205,7 @@ To create a tooltip element, you may use the `.lib-tooltip()` mixin. ### Result -As result, we see the tooltip placed on the right side. +As result, the tooltip placed on the right side. ![Tooltip element]({{ site.baseurl }}/common/images/fdg/tooltip-element-result.png) From f39821ebd87949d446a09c7272ed66957a63f75c Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Mon, 30 Mar 2020 09:32:09 -0500 Subject: [PATCH 35/46] whatsnew for 3/30/20 --- src/_data/whats-new.yml | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/_data/whats-new.yml b/src/_data/whats-new.yml index 98f0e2784cd..338639e6315 100644 --- a/src/_data/whats-new.yml +++ b/src/_data/whats-new.yml @@ -4,7 +4,42 @@ description: | We exclude from this list proofreading, spelling checks, and all minor updates. link: /whats-new.html thread: /whatsnew-feed.xml -updated: Mon Mar 23 12:42:59 2020 +updated: Mon Mar 30 08:59:14 2020 +entries: +- description: Added a section for the Tooltip Element to the [Magento UI library](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.html) + topic. + versions: 2.3.x + type: Major Update + date: March 30, 2020 + link: https://github.com/magento/devdocs/pull/6947 +- description: "Added a 'ignoreTmpls property' section to [Template Literals + in UI Components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.html) + page." + versions: 2.3.x + type: Major Update + date: March 25, 2020 + link: https://github.com/magento/devdocs/pull/6873 +- description: Available now! Amazon Sales Channel 4.0 introduces a new [Amazon Sales + Channel](https://docs.magento.com/m2/ce/user_guide/sales-channels/asc/amazon-sales-channel-home.html) + home page, a new [store dashboard](https://docs.magento.com/m2/ce/user_guide/sales-channels/asc/amazon-store-dashboard.html), + a streamlined [onboarding process](https://docs.magento.com/m2/ce/user_guide/sales-channels/asc/amazon-onboarding-home.html), + and new [default store settings](https://docs.magento.com/m2/ee/user_guide/sales-channels/asc/default-store-settings.html). + versions: 2.3.x + type: Major Update + date: March 24, 2020 + link: https://github.com/magento/devdocs/pull/6915 +- description: Magento has released a hot fix on March 24, 2020 for Magento 2.3.x. + See the following release notes for additional information:https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-4-open-source.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-4-commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-3-open-source.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-3-commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.html
--> + versions: 2.3.x + type: Major Update + date: March 24, 2020 + link: https://github.com/magento/devdocs/pull/6913 +- description: Added a 'Declaring the new custom no-route processor' section to the + [Routing](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/routing.html). + versions: 2.3.x + type: Major Update + date: March 23, 2020 + link: https://github.com/magento/devdocs/pull/6868 entries: - description: Added a 'Declaring the new custom no-route processor' section to the [Routing](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/routing.html) topic. @@ -18,7 +53,7 @@ entries: type: New topic date: March 23, 2020 link: https://github.com/magento/devdocs/pull/6876 -- description: Added a new topic for the [`Container ui-component`](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-form.html). +- description: Added a new topic for the [`Container ui-component`](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-container.html). versions: 2.3.x type: New topic date: March 19, 2020 @@ -34,7 +69,7 @@ entries: type: Major update date: March 16, 2020 link: https://github.com/magento/devdocs/pull/6863 -- description: Added topic for [ColumnsResize UI](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-columns-resize.html). +- description: Added topic for [ColumnsResize UI Compnent](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-columns-resize.html). versions: 2.3.x type: New topic date: March 12, 2020 From bcdcc27ab070338bac78a627df5ccdb2378f033f Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Mon, 30 Mar 2020 10:35:06 -0500 Subject: [PATCH 36/46] Small tweak --- src/_data/whats-new.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/_data/whats-new.yml b/src/_data/whats-new.yml index 338639e6315..f41048beff7 100644 --- a/src/_data/whats-new.yml +++ b/src/_data/whats-new.yml @@ -29,7 +29,7 @@ entries: date: March 24, 2020 link: https://github.com/magento/devdocs/pull/6915 - description: Magento has released a hot fix on March 24, 2020 for Magento 2.3.x. - See the following release notes for additional information:https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-4-open-source.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-4-commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-3-open-source.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-3-commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.html
--> + See the following release notes for additional information:https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-4-open-source.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-4-commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-3-open-source.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-3-commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.html versions: 2.3.x type: Major Update date: March 24, 2020 @@ -5246,4 +5246,4 @@ entries: - description: 'How to programmatically create a category with custom attributes' versions: 2.x type: New - date: Oct 7 2016 \ No newline at end of file + date: Oct 7 2016 From bdf83cb0612d705058af62d4fa2387f99699818a Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Mon, 30 Mar 2020 11:09:41 -0500 Subject: [PATCH 37/46] Update src/_data/whats-new.yml Co-Authored-By: Margaret Eker --- src/_data/whats-new.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/_data/whats-new.yml b/src/_data/whats-new.yml index f41048beff7..e8ad7386989 100644 --- a/src/_data/whats-new.yml +++ b/src/_data/whats-new.yml @@ -12,9 +12,9 @@ entries: type: Major Update date: March 30, 2020 link: https://github.com/magento/devdocs/pull/6947 -- description: "Added a 'ignoreTmpls property' section to [Template Literals +- description: "Added an 'ignoreTmpls property' section to the [Template Literals in UI Components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.html) - page." + topic." versions: 2.3.x type: Major Update date: March 25, 2020 From 19d1a70ec9541e45222524f4388152ce2927a109 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Mon, 30 Mar 2020 11:14:07 -0500 Subject: [PATCH 38/46] Fix formatting --- src/_data/whats-new.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/_data/whats-new.yml b/src/_data/whats-new.yml index 338639e6315..3c6d9eff33c 100644 --- a/src/_data/whats-new.yml +++ b/src/_data/whats-new.yml @@ -28,8 +28,17 @@ entries: type: Major Update date: March 24, 2020 link: https://github.com/magento/devdocs/pull/6915 -- description: Magento has released a hot fix on March 24, 2020 for Magento 2.3.x. - See the following release notes for additional information:https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-4-open-source.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-4-commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-3-open-source.html
https://devdocs.magento.com/guides/v2.3/release-notes/release-notes-2-3-3-commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.html
https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.html
--> +- description: Magento has released a hot fix on March 24, 2020 for Magento 2.3.x.
+ [Magento Open Source 2.3.4 Release Notes](https://devdocs.magento.com/release-notes/release-notes-2-3-4-open-source.html)
+ [Magento Commerce 2.3.4 Release Notes](https://devdocs.magento.com/release-notes/release-notes-2-3-4-commerce.html)
+ [Magento Open Source 2.3.3 Release Notes](https://devdocs.magento.com/release-notes/release-notes-2-3-3-open-source.html)
+ [Magento Commerce 2.3.3 Release Notes](https://devdocs.magento.com/release-notes/release-notes-2-3-3-commerce.html)
+ [Magento Open Source 2.3.2 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.2OpenSource.html)
+ [Magento Commerce 2.3.2 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.2Commerce.html)
+ [Magento Open Source 2.3.1 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.1OpenSource.html)
+ [Magento Commerce 2.3.1 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.1Commerce.html)
+ [Magento Open Source 2.3.0 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.0OpenSource.html)
+ [Magento Commerce 2.3.0 Release Notes](https://devdocs.magento.com/release-notes/ReleaseNotes2.3.0Commerce.html) versions: 2.3.x type: Major Update date: March 24, 2020 From 4d1aadb911a413b470cbf430d82809a86bc5e1f2 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Mon, 30 Mar 2020 11:44:14 -0500 Subject: [PATCH 39/46] Update src/_data/whats-new.yml Co-Authored-By: Margaret Eker --- src/_data/whats-new.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_data/whats-new.yml b/src/_data/whats-new.yml index 144ab0a313f..5a4e36e2dbc 100644 --- a/src/_data/whats-new.yml +++ b/src/_data/whats-new.yml @@ -44,7 +44,7 @@ entries: date: March 24, 2020 link: https://github.com/magento/devdocs/pull/6913 - description: Added a 'Declaring the new custom no-route processor' section to the - [Routing](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/routing.html). + [Routing](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/routing.html) topic. versions: 2.3.x type: Major Update date: March 23, 2020 From 61f1e76afff15bcd07e548557680e624c2e484e3 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Mon, 30 Mar 2020 11:44:23 -0500 Subject: [PATCH 40/46] Update src/_data/whats-new.yml Co-Authored-By: Margaret Eker --- src/_data/whats-new.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_data/whats-new.yml b/src/_data/whats-new.yml index 5a4e36e2dbc..a35b3bc6d46 100644 --- a/src/_data/whats-new.yml +++ b/src/_data/whats-new.yml @@ -78,7 +78,7 @@ entries: type: Major update date: March 16, 2020 link: https://github.com/magento/devdocs/pull/6863 -- description: Added topic for [ColumnsResize UI Compnent](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-columns-resize.html). +- description: Added topic for the [ColumnsResize UI Compnent](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-columns-resize.html). versions: 2.3.x type: New topic date: March 12, 2020 From e2d59be4af3a019355e7781070e754e0ac12b798 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Mon, 30 Mar 2020 11:44:35 -0500 Subject: [PATCH 41/46] Update src/_data/whats-new.yml Co-Authored-By: Margaret Eker --- src/_data/whats-new.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_data/whats-new.yml b/src/_data/whats-new.yml index a35b3bc6d46..c3f13a06e6d 100644 --- a/src/_data/whats-new.yml +++ b/src/_data/whats-new.yml @@ -62,7 +62,7 @@ entries: type: New topic date: March 23, 2020 link: https://github.com/magento/devdocs/pull/6876 -- description: Added a new topic for the [`Container ui-component`](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-container.html). +- description: Added a topic for the [`Container ui-component`](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-container.html). versions: 2.3.x type: New topic date: March 19, 2020 From 9ed62809888f5fd9f99ef55686fb00614d57f8a7 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Mon, 30 Mar 2020 12:10:54 -0500 Subject: [PATCH 42/46] Small grammar fix. --- src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md index 6e6e849012d..bc16e77f511 100644 --- a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md +++ b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md @@ -492,7 +492,7 @@ class Class implements \Magento\Framework\View\Element\Block\ArgumentInterface } ``` -Then, in the `cart/item/default.phtml` file get use of the viewModel +Then, in the `cart/item/default.phtml` file, use the viewModel: ```php /** @var \Vendor\CustomModule\ViewModel\Class $viewModel */ @@ -501,7 +501,8 @@ $viewModel = $block->getData('viewModel'); $viewModel->canShowAdditionalData(); ``` -{:.bs-callout-info} The name provided to the `$block->getData()` function should match the name of the view model provided in the `xml` file. +{:.bs-callout-info} +The name provided to the `$block->getData()` function should match the name of the view model provided in the `xml` file. ## Modify layout with plugins (interceptors) {#layout_markup_modify_with_plugins} From 833f27402c971210546b83c5179c6add8e803ad9 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Mon, 30 Mar 2020 14:51:36 -0500 Subject: [PATCH 43/46] Finessed the code samples. --- .../rest/tutorials/orders/order-add-items.md | 16 ++++++++-------- .../rest/tutorials/orders/order-admin-token.md | 2 +- .../tutorials/orders/order-create-customer.md | 4 ++-- .../tutorials/orders/order-create-invoice.md | 8 ++++---- .../rest/tutorials/orders/order-create-order.md | 8 ++++---- .../rest/tutorials/orders/order-create-quote.md | 6 +++--- .../tutorials/orders/order-create-shipment.md | 4 ++-- .../rest/tutorials/orders/order-issue-refund.md | 4 ++-- .../tutorials/orders/order-prepare-checkout.md | 8 ++++---- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/guides/v2.3/rest/tutorials/orders/order-add-items.md b/src/guides/v2.3/rest/tutorials/orders/order-add-items.md index a887fd857d2..d83e091c944 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-add-items.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-add-items.md @@ -33,9 +33,9 @@ The following example adds an orange medium-sized Radiant women's t-shirt (`sku` **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer ` +`Authorization: Bearer ` **Payload:** @@ -75,9 +75,9 @@ The following example adds the downloadable product Advanced Pilates & Yoga (`sk **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer ` +`Authorization: Bearer ` **Payload:** @@ -145,9 +145,9 @@ We now know the values for `option_value` for `size` and `color` are `168` and ` **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer ` +`Authorization: Bearer ` **Payload:** @@ -327,9 +327,9 @@ For this example, we'll configure the Sprite Yoga Companion Kit as follows: **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer ` +`Authorization: Bearer ` **Payload:** diff --git a/src/guides/v2.3/rest/tutorials/orders/order-admin-token.md b/src/guides/v2.3/rest/tutorials/orders/order-admin-token.md index f9d08dad652..49b7bd5fce3 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-admin-token.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-admin-token.md @@ -58,7 +58,7 @@ See [Token-based authentication]({{ page.baseurl }}/get-started/authentication/g **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` **Payload:** diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-customer.md b/src/guides/v2.3/rest/tutorials/orders/order-create-customer.md index 61ec2b8fbde..faa64e1c0af 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-customer.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-customer.md @@ -35,7 +35,7 @@ This example shows a simplified way of creating a customer account. Typically, y **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` **Payload:** @@ -139,7 +139,7 @@ By default, a customer token is valid for 1 hour. To change this value, log in t **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` **Payload:** diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-invoice.md b/src/guides/v2.3/rest/tutorials/orders/order-create-invoice.md index 96767ab2754..1e3f480a65d 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-invoice.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-invoice.md @@ -30,9 +30,9 @@ where `3` is the `orderid` **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer` `` +`Authorization: Bearer` `` **Payload:** @@ -57,9 +57,9 @@ An invoice is structurally similar to an order, but an order contains more detai **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer` `` +`Authorization: Bearer ` **Payload:** diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-order.md b/src/guides/v2.3/rest/tutorials/orders/order-create-order.md index a8537b425ab..f0bc035b21b 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-order.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-order.md @@ -31,9 +31,9 @@ Use the `V1/guest-carts//payment-information` endpoint to set the paymen **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer ` +`Authorization: Bearer ` **Payload:** @@ -80,9 +80,9 @@ where `3` is the `orderid` **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer` `` +`Authorization: Bearer ` **Payload:** diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-quote.md b/src/guides/v2.3/rest/tutorials/orders/order-create-quote.md index a2c109ac8b9..e74079e53b4 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-quote.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-quote.md @@ -46,9 +46,9 @@ Use the `V1/guest-carts` endpoint to create a cart on behalf of a guest. Do not **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer ` +`Authorization: Bearer ` **Payload:** @@ -56,7 +56,7 @@ None **Response:** -The response is the `quoteId`: `4` +The response is the `quoteId: 4` {:.bs-callout-tip} Some calls refer to this parameter as the `cartId`. diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-shipment.md b/src/guides/v2.3/rest/tutorials/orders/order-create-shipment.md index b3d59734347..19acdadcf2c 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-create-shipment.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-create-shipment.md @@ -31,9 +31,9 @@ where `3` is the order id. **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer` `` +`Authorization: Bearer ` **Payload:** diff --git a/src/guides/v2.3/rest/tutorials/orders/order-issue-refund.md b/src/guides/v2.3/rest/tutorials/orders/order-issue-refund.md index 995526c163b..b27f9de14bd 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-issue-refund.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-issue-refund.md @@ -39,9 +39,9 @@ The `return_to_stock_items` array specifies which `order_item_id`s can be return **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer` `` +`Authorization: Bearer ` **Payload:** diff --git a/src/guides/v2.3/rest/tutorials/orders/order-prepare-checkout.md b/src/guides/v2.3/rest/tutorials/orders/order-prepare-checkout.md index fee4b3757df..74a9580d712 100644 --- a/src/guides/v2.3/rest/tutorials/orders/order-prepare-checkout.md +++ b/src/guides/v2.3/rest/tutorials/orders/order-prepare-checkout.md @@ -34,9 +34,9 @@ Use the `V1/guest-carts//estimate-shipping-methods` endpoint to estimate **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer ` +`Authorization: Bearer ` **Payload:** @@ -120,9 +120,9 @@ Use the `V1/guest-carts//shipping-information` endpoint to set the billi **Headers:** -`Content-Type`: `application/json` +`Content-Type: application/json` -`Authorization`: `Bearer ` +`Authorization: Bearer ` **Payload:** From 2570d8b53636a6acfcb74eefcb5b070158902d5c Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Tue, 31 Mar 2020 08:22:56 -0500 Subject: [PATCH 44/46] Update src/guides/v2.3/install-gde/prereq/install-rabbitmq.md Co-Authored-By: Kevin Harper --- src/guides/v2.3/install-gde/prereq/install-rabbitmq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md b/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md index 05c3526d8ef..3bd1253d3be 100644 --- a/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md +++ b/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md @@ -54,7 +54,7 @@ Refer to the [RabbitMQ/Erlang version matrix](https://www.rabbitmq.com/which-erl The RabbitMQ server is included on CentOS, but the version is often old. RabbitMQ recommends installing the package from their website. -Refer to the RabbitMQ install page to get the latest supported vesion. Magento 2.3 supports RabbitM 3.8.x. +Refer to the RabbitMQ install page to get the latest supported vesion. Magento 2.3 supports RabbitMQ 3.8.x. Refer to [Installing on RPM-based Linux](https://www.rabbitmq.com/install-rpm.html){:target="_blank"} for more information. From 981aa1b02b8c2ac081285a06bf8fb7ceef345b42 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Tue, 31 Mar 2020 08:33:12 -0500 Subject: [PATCH 45/46] Added period. --- src/guides/v2.3/install-gde/prereq/mysql.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/install-gde/prereq/mysql.md b/src/guides/v2.3/install-gde/prereq/mysql.md index c9b2ed7f2fc..a5406decd4b 100644 --- a/src/guides/v2.3/install-gde/prereq/mysql.md +++ b/src/guides/v2.3/install-gde/prereq/mysql.md @@ -412,7 +412,7 @@ To configure a MySQL database instance: * [MySQL 5.7](https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_explicit_defaults_for_timestamp) * [MariaDB](https://mariadb.com/kb/en/server-system-variables/#explicit_defaults_for_timestamp) - If this setting is not enabled, `setup:db:status` will always report that `Declarative Schema is not up to date` + If this setting is not enabled, `setup:db:status` will always report that `Declarative Schema is not up to date`. {:.ref-header} Related topics From eed1a631ea316b2a64607d7b8ae6d9ab035ccb6c Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Tue, 31 Mar 2020 08:58:09 -0500 Subject: [PATCH 46/46] Removed outdated sentence. --- src/guides/v2.3/install-gde/prereq/install-rabbitmq.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md b/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md index 3bd1253d3be..ae29ef02211 100644 --- a/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md +++ b/src/guides/v2.3/install-gde/prereq/install-rabbitmq.md @@ -13,8 +13,6 @@ RabbitMQ is an open source message broker that offers a reliable, highly availab Message queues provide an asynchronous communications mechanism in which the sender and the receiver of a message do not contact each other. Nor do they need to communicate with the message queue at the same time. When a sender places a messages onto a queue, it is stored until the recipient receives them. -{{site.data.var.ce}} uses RabbitMQ to manage these message queues. - The message queue system must be established before you install Magento. The basic sequence is 1. Install RabbitMQ and any prerequisites.