Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 9ca7a4c

Browse files
keharperkeharper
authored
Merge branch 'master' into nuzil-amqp-store-patch-remove
2 parents 73177b5 + c327bf3 commit 9ca7a4c

File tree

14 files changed

+158
-24
lines changed

14 files changed

+158
-24
lines changed

‎.github/CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
5555
## Enforcement
5656

5757
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at DL-Magento-Doc-Feedback@magento.com. All
58+
reported by contacting the project team in [Slack](https://magentocommeng.slack.com/messages/CAN932A3H). All
5959
complaints will be reviewed and investigated and will result in a response that
6060
is deemed necessary and appropriate to the circumstances. The project team is
6161
obligated to maintain confidentiality with regard to the reporter of an incident.

‎.github/CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,5 @@ Have a question? Need help? Magento DevDocs, Maintainers, and other Contributors
151151

152152
- [Slack](https://magentocommeng.slack.com/messages/CAN932A3H) ([Join us](http://tinyurl.com/engcom-slack))
153153
- [Twitter @MagentoDevDocs](https://twitter.com/MagentoDevDocs)
154-
- [E-mail](mailto:[email protected])
155154

156155
Thank you for contributing your brilliance to Magento DevDocs!!

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,3 @@ If you have questions, open an issue and ask us. We're looking forward to hearin
169169
170170
- [Visit our wiki](https://github.com/magento/devdocs/wiki)
171171
- <a href="https://twitter.com/MagentoDevDocs" class="twitter-follow-button" data-show-count="false">Follow @MagentoDevDocs</a>
172-
- [E-mail us](mailto:[email protected])

‎src/_data/toc/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ pages:
99
url: /release/policy
1010
versionless: true
1111

12+
- label: Lifecycle policy
13+
url: /release/lifecycle-policy.html
14+
versionless: true
15+
1216
- label: Availability
1317
url: /release/availability.html
1418
versionless: true

‎src/_data/toc/rest-api.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ pages:
4040
children:
4141

4242
- label: Admin REST endpoints
43-
url: https://magento.redoc.ly/2.4-admin/
43+
url: https://magento.redoc.ly/2.4.0-admin/
4444
include_versions: ["2.4"]
4545

4646
- label: Customer REST endpoints
47-
url: https://magento.redoc.ly/2.4-customer/
47+
url: https://magento.redoc.ly/2.4.0-customer/
4848
include_versions: ["2.4"]
4949

5050
- label: Guest REST endpoints
51-
url: https://magento.redoc.ly/2.4-guest/
51+
url: https://magento.redoc.ly/2.4.0-guest/
5252
include_versions: ["2.4"]
5353

5454
- label: Generate a local API reference

‎src/cloud/docker/docker-config.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,33 @@ To skip the interactive mode, use the `-n, --no-interaction` option.
4646
{:.bs-callout-info}
4747
The mode option for the `ece-docker build:compose` command does not affect the Magento mode. It determines the {{site.data.var.ece}} file system installation and read-only or read-write behavior.
4848

49+
## Set the environment variables
50+
51+
You can launch a Cloud Docker environment with predefined environment variables by adding the `--env-vars` option to the `ece-docker build:compose` command.
52+
53+
For example, the following command sets values for the `LOCK_PROVIDER` and `CRON_CONSUMERS_RUNNER` environment variables.
54+
55+
```bash
56+
bin/ece-docker build:compose --env-vars="{\"MAGENTO_CLOUD_VARIABLES\":{\"LOCK_PROVIDER\":\"db\",\"CRON_CONSUMERS_RUNNER\":{\"cron_run\":\"true\",\"max_messages\":5000,\"consumers\":[\"test\"]}}}"
57+
```
58+
59+
You must escape special characters when specifying the value for the `--env-vars` option. Use the following PHP script to generate the escaped value. Update the example with the values required for your Cloud Docker environment configuration.
60+
61+
```php
62+
<?php
63+
64+
echo addslashes(json_encode([
65+
'MAGENTO_CLOUD_VARIABLES' => [
66+
'LOCK_PROVIDER' => 'db',
67+
'CRON_CONSUMERS_RUNNER' => [
68+
'cron_run' => 'true',
69+
'max_messages' => 5000,
70+
'consumers' => ['test'],
71+
],
72+
]
73+
]));
74+
```
75+
4976
## Stop and start containers
5077

5178
You can stop containers and restore them afterwards using the following methods.

‎src/guides/v2.3/bk-get-started-magento.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ by creating pull requests, or open a discussion by creating an issue.
2929

3030
For more information, see our [Contributors Guide](https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md).
3131

32-
## Contact us {#contact-us}
33-
34-
Feel free to contact the documentation team directly at
35-
[[email protected]](mailto:[email protected])
36-
3732
{:.ref-header}
3833
Related topics
3934

‎src/guides/v2.3/ext-best-practices/tutorials/dynamic-row-system-config.md

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,71 @@ class TaxColumn extends Select
171171

172172
This block sets values for the drop-down option.
173173

174-
## Step 4: Clean cache
174+
## Step 4: Set default values - OPTIONAL
175+
176+
It is possible to set defaults for a dynamic row configuration, this is done by adding additional XML to the defaults block in the `config.xml` file for the module.
177+
178+
Add a block to the `<default>` section of the `config.xml` file and do not include any values:
179+
180+
```xml
181+
<system>
182+
<general>
183+
<ranges></ranges>
184+
</general>
185+
</system>
186+
```
187+
188+
For each complete line of configuration, create an XML block with a repeating node that has a different value to all the others and contains XML tags for each sub-option and value.
189+
For example, you can use `<item1>, <item2>`.
190+
191+
The sub-options are the columns defined in the `_prepareToRender()` method as described in [Step 2](#step-2-create-the-block-class-to-describe-custom-field-columns).
192+
193+
In the following excerpt, a single row for `item1` contains 4 sub-options:
194+
195+
```xml
196+
<item1>
197+
<from_qty>5</from_qty>
198+
<to_qty>6</to_qty>
199+
<price>10.00</price>
200+
<tax>1</tax>
201+
</item1>
202+
```
203+
204+
Continue building the default block by adding 3 items to the `ranges` configuration option in the `config.xml` file:
205+
206+
```xml
207+
<system>
208+
<general>
209+
<ranges>
210+
<item1>
211+
<from_qty>1</from_qty>
212+
<to_qty>5</to_qty>
213+
<price>10.00</price>
214+
<tax>1</tax>
215+
</item1>
216+
<item2>
217+
<from_qty>6</from_qty>
218+
<to_qty>10</to_qty>
219+
<price>20.00</price>
220+
<tax>1</tax>
221+
</item2>
222+
<item3>
223+
<from_qty>11</from_qty>
224+
<to_qty>15</to_qty>
225+
<price>30.00</price>
226+
<tax>0</tax>
227+
</item3>
228+
</ranges>
229+
</general>
230+
</system>
231+
```
232+
233+
To verify the default values for the configuration are correct, do the following :
234+
235+
- Ensure that this configuration option has no entry in the database.
236+
- Continue with Step 5
237+
238+
## Step 5: Clean cache
175239

176240
Clean the Magento cache with the following command:
177241

@@ -186,7 +250,7 @@ bin/magento cache:clean config
186250

187251
## Result
188252

189-
The result is a new dynamic system row field in the Admin panel.
253+
The result is a new dynamic system row field in the Admin panel. If you have set optional default values, these should also appear.
190254

191255
![Dynamic Rows System Config]({{ site.baseurl }}/common/images/ext-best-practices/dynamic-rows-config-result.png)
192256

‎src/guides/v2.3/frontend-dev-guide/layouts/layout-practice.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ The Luma theme [moves]({{ page.baseurl }}/frontend-dev-guide/layouts/xml-instruc
9797

9898
```xml
9999
<referenceBlock name="header.links">
100-
<block class="Magento\Customer\Block\Account\Customer" name="customer" template="account/customer.phtml" before="-"/>
100+
<block class="Magento\Customer\Block\Account\Customer" name="customer" template="Magento_Customer::account/customer.phtml" before="-"/>
101101
...
102102
</referenceBlock>
103103
...
@@ -198,8 +198,8 @@ To move the links to the `header.links` block, OrangeCo adds an extending layout
198198
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
199199
<body>
200200
<referenceBlock name="header.links">
201-
<block class="Magento\Customer\Block\Account\Customer" name="customer" template="account/customer.phtml" before="-"/>
202-
<block class="Magento\Customer\Block\Account\AuthorizationLink" name="authorization-link-login" template="account/link/authorization.phtml"/>
201+
<block class="Magento\Customer\Block\Account\Customer" name="customer" template="Magento_Customer::account/customer.phtml" before="-"/>
202+
<block class="Magento\Customer\Block\Account\AuthorizationLink" name="authorization-link-login" template="Magento_Customer::account/link/authorization.phtml"/>
203203
</referenceBlock>
204204
<move element="register-link" destination="header.links"/>
205205
<move element="top.links" destination="customer"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ We recommend always adding a `name` to blocks. Otherwise, it is given a random n
6565
| `name` | Name that can be used to address the block to which this attribute is assigned. The name must be unique per generated page. If not specified, an automatic name will be assigned in the format <code>ANONYMOUS_<em>n</em></code> | 0-9, A-Z, a-z, underscore (_), period (.), dash (-). Should start with a letter. Case-sensitive. | no |
6666
| `before` | Used to position the block before an element under the same parent. The element name or alias name is specified in the value. Use dash (-) to position the block before all other elements of its level of nesting. See [before and after attributes](#fedg_xml-instrux_before-after) for details. | Element name or dash (-) | no |
6767
| `after` | Used to position the block after an element under the same parent. The element name or alias name is specified in the value. Use dash (-) to position the block after all other elements of its level of nesting. See [before and after attributes](#fedg_xml-instrux_before-after) for details. | Element name or dash (-) | no |
68-
| `template` | A template that represents the functionality of the block to which this attribute is assigned. | `Vendor_Module::path/to/template.phtml` (Scope is already in the `templates` directory of the module) | no |
68+
| `template` | A template that represents the functionality of the block to which this attribute is assigned. If the attribute is omitted, the block will not render any output. | `Vendor_Module::path/to/template.phtml` (Scope is already in the `templates` directory of the module) | no |
6969
| `as` | An alias name that serves as identifier in the scope of the parent element. | 0-9, A-Z, a-z, underscore (_), period (.), dash (-). Case-sensitive. | no |
7070
| `cacheable` | Defines whether a block element is cacheable. This can be used for development purposes and to make needed elements of the page dynamic. | `true` or `false`. Defaults to `true`. | no |
7171
| `ifconfig` | Makes the block's visibility dependent on a system configuration field. | XPath to the system configuration field. E.g. `contact/contact/enabled` | no |
@@ -90,7 +90,7 @@ We recommend always adding a `name` to containers. Otherwise, it is given a rand
9090

9191
| Attribute | Description | Values | Required? |
9292
|:------- |:------ |:------ |:------ |
93-
| `name` | A name that can be used to address the container in which this attribute is assigned. The name must be unique per generated page. If not specified, it will be autogenerated. | A-Z, a-z, 0-9, underscore (_), period (.), dash (-). Should start with a letter. Case-sensitive. | No |
93+
| `name` | A name that can be used to address the container in which this attribute is assigned. The name must be unique per generated page. If not specified, it will be auto-generated. | A-Z, a-z, 0-9, underscore (_), period (.), dash (-). Should start with a letter. Case-sensitive. | No |
9494
| `label` | Describes the purpose of the container. | Any | No |
9595
| `before` | Used to position the container before an element under the same parent. The element name or alias name is specified in the value. Use dash (-) to position the block before all other elements of its level of nesting. See [before and after attributes](#fedg_xml-instrux_before-after) for details. | Element name or dash (`-`) | No |
9696
| `after` | Used to position the container after an element under the same parent. The element name or alias name is specified in the value. Use dash (-) to position the block after all other elements of its level of nesting. See [before and after attributes](#fedg_xml-instrux_before-after) for details. | Element name or dash (-). | No |

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Blocks are created (declared) using the `<block>` instruction.
230230
Example: add a block with a product [SKU](https://glossary.magento.com/sku) information.
231231

232232
```xml
233-
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="product/view/attribute.phtml" after="product.info.type">
233+
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="Magento_Catalog::product/view/attribute.phtml" after="product.info.type">
234234
<arguments>
235235
<argument name="at_call" xsi:type="string">getSku</argument>
236236
<argument name="at_code" xsi:type="string">sku</argument>
@@ -239,6 +239,9 @@ Example: add a block with a product [SKU](https://glossary.magento.com/sku) info
239239
</block>
240240
```
241241

242+
{:.bs-callout-info}
243+
Declare the `template` attribute with the name of the module it belongs to: `template="<VendorName>_<ModuleName>::path-to-template.phtml"`. Following this approach avoids failures with template rendering and makes it easier for the developer to find and navigate to the template file.
244+
242245
## Set body attributes {#layout_body_attributes}
243246

244247
To set attributes for the HTML `body` tag use the `<attribute>` instruction.

‎src/guides/v2.3/install-gde/install/cli/install-cli-subcommands-maint.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ functional_areas:
1111
- Setup
1212
---
1313

14-
Magento uses [maintenance mode]({{ page.baseurl }}/config-guide/bootstrap/magento-modes.html#maintenance-mode) to disable bootstrapping; for example, while you're maintaining, upgrading, or reconfiguring your site.
14+
The following guide refers to a standard Magento maintenance mode page. If you need to use a custom maintenance page, see [Create the custom maintenance page]({{ page.baseurl }}/comp-mgr/trouble/cman/maint-mode.html#compman-trouble-maint-create).
15+
16+
Magento uses [maintenance mode]({{ page.baseurl }}/config-guide/bootstrap/magento-modes.html#maintenance-mode) to disable bootstrapping. For example, while you are maintaining, upgrading, or reconfiguring your site.
1517

1618
Magento detects maintenance mode as follows:
1719

@@ -50,8 +52,8 @@ where
5052

5153
`--ip=<ip address>` is an IP address to exempt from maintenance mode (for example, developers doing the maintenance). To exempt more than one IP address in the same command, use the option multiple times.
5254

53-
{:.bs-callout-info}
54-
Using `--ip=<ip address>` with `magento maintenance:disable` means only that you're saving the list of IPs for later use. To clear the list of exempt IPs, you can use `magento maintenance:enable --ip=none` or see [Maintain the list of exempt IP addresses](#instgde-cli-maint-exempt).
55+
{:.bs-callout-info}
56+
Using `--ip=<ip address>` with `magento maintenance:disable` saves the list of IPs for later use. To clear the list of exempt IPs, use `magento maintenance:enable --ip=none` or see [Maintain the list of exempt IP addresses](#instgde-cli-maint-exempt).
5557

5658
`magento maintenance:status` displays the current status of maintenance mode.
5759

@@ -67,8 +69,7 @@ To enable maintenance mode for all clients except 192.0.2.10 and 192.0.2.11:
6769
bin/magento maintenance:enable --ip=192.0.2.10 --ip=192.0.2.11
6870
```
6971

70-
{:.bs-callout-info}
71-
After you place Magento in maintenance mode, you must stop all message queue consumer processes. One way to find these processes is to run the `ps -ef | grep queue:consumers:start` command. Then run the `kill <process_id>` command for each consumer. In a multiple node environment, be sure to repeat this task on each node.
72+
After you place Magento in maintenance mode, you must stop all message queue consumer processes. One way to find these processes is to run the `ps -ef | grep queue:consumers:start` command. Then run the `kill <process_id>` command for each consumer. In a multiple node environment, be sure to repeat this task on each node.
7273

7374
## Maintain the list of exempt IP addresses {#instgde-cli-maint-exempt}
7475

‎src/quality-patches/release-notes.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,21 @@ The [Magento Quality Patches](https://github.com/magento/quality-patches) packag
1818
{:.bs-callout-info}
1919
See [Apply patches]({{ site.baseurl }}/guides/v2.4/comp-mgr/patching.html) for instructions on applying patches to your Magento projects.
2020

21+
## v1.0.5
22+
23+
- **MDVA-30841** _(for Magento `>=2.3.4 <2.3.6 || 2.4.0`)_—Fixes the issue with layered navigation, where the 'No' value for boolean type product attributes was not included in layered navigation if Elasticsearch was used as a search engine.
24+
- **MDVA-28191** _(for Magento `>=2.3.3 <2.4.2`)_—Fixes the issue where no payment methods are loaded during order creation via Magento Admin panel.
25+
- **MDVA-29959** _(for Magento B2B `>=1.1.0 <=1.1.3-p1`)_—Fixes the issue where restricted admin user with 'Companies' permissions is not allowed to delete company account.
26+
- **MDVA-30265** _(for Magento `>=2.3.3 <2.4.2`)_—Fixes the issue where shipment tracking link stops working after Invoice creation.
27+
- **MDVA-28409** _(for Magento `>=2.3.4 <2.3.6 || 2.4.0`)_—Fixes the issue where the "sales_clean_quotes" cron job fails with out-of-memory error when the number of expired quotes in the database is huge.
28+
- **MDVA-30593** _(for Magento `>=2.3.0 <2.3.4`)_—Fixes the issue where quotes, that expired according to the Quote Lifetime setting, are not cleaned up.
29+
- **MDVA-30107** _(for Magento `>=2.3.0 <2.3.6`)_—Fixes the issue where store switcher doesn't work as expected if different base URLs are used for store views.
30+
- **MDVA-28763** _(for Magento `>=2.3.2 <2.3.4`)_—Fixes the issue where product image is getting duplicated after updating product information using REST API more than once.
31+
- **MDVA-30284** _(for Magento `>=2.3.0 <2.4.2`)_—Fixes the issue where Catalog Search indexer fails due to the following Elasticsearch error: limit of total fields in index has been exceeded.
32+
- **MDVA-29042** _(for Magento B2B `>=1.1.3 <=1.1.4-p2`)_—Fixes the issue where Catalog permissions were changed to Allow automatically after new product was added to the shared catalog.
33+
- **MDVA-30428** _(for Magento `>=2.3.3 <2.4.2`)_—Fixes the issue where customers cannot add a product to wishlist if this product is assigned to a custom inventory source.
34+
- **MDVA-28661** _(for Magento B2B `>=1.1.0 <1.2.2`)_—Fixes the issue where an error is thrown in the Company Users company account section after company admin is changed.
35+
2136
## v1.0.4
2237

2338
- **MDVA-30195** _(for Magento `2.3.1 - 2.3.4-p2`)_—Fixes the issue where cron jobs fail if database name is too long, resulting in categories not being updated on the frontend.

0 commit comments

Comments
 (0)