Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 3ba327f

Browse files
doboothdobooth
authored
Merge pull request #2609 from magento-commerce/10-22_integration
10 22 integration
2 parents ecd524f + af6b003 commit 3ba327f

File tree

9 files changed

+177
-17
lines changed

9 files changed

+177
-17
lines changed

‎src/_data/toc/migration-guide.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ pages:
6464
url: https://support.magento.com/hc/en-us/articles/360033020451
6565

6666
- label: Changelog
67-
url: https://github.com/magento/data-migration-tool/blob/2.3/CHANGELOG.md
67+
url: https://github.com/magento/data-migration-tool/blob/2.4/CHANGELOG.md

‎src/_includes/install/sampledata/sample-data-clone-24.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ To clone the Magento sample data GitHub repository using the SSH protocol:
6666

6767
If you used the `2.4-develop` branch of the Magento 2 repository, the Sample Data branch should be `2.4-develop`.
6868

69-
If you used the `2.4.1` branch of the Magento 2 repository, the Sample Data branch should be `2.4.1`.
69+
If you used the `2.4.3` branch of the Magento 2 repository, the Sample Data branch should be `2.4.3`.
7070

71-
To checkout the correct branch, run the following command from the sample data repository's root directory (assuming you need the `2.4.1` branch):
71+
To checkout the correct branch, run the following command from the sample data repository's root directory (assuming you need the `2.4.3` branch):
7272

7373
```bash
74-
git checkout 2.4.1
74+
git checkout 2.4.3
7575
```
7676

7777
1. Change to `<magento_root>`.
@@ -122,12 +122,12 @@ To clone the Magento sample data GitHub repository using the HTTPS protocol:
122122

123123
If you used the `2.4-develop` branch of the Magento 2 repository, the Sample Data branch should be `2.4-develop`.
124124

125-
If you used the `2.4.1` branch of the Magento 2 repository, the Sample Data branch should be `2.4.1`.
125+
If you used the `2.4.3` branch of the Magento 2 repository, the Sample Data branch should be `2.4.3`.
126126

127-
To checkout the correct branch, run the following command from the sample data repository's root directory (assuming you need the `2.4.1` branch):
127+
To checkout the correct branch, run the following command from the sample data repository's root directory (assuming you need the `2.4.3` branch):
128128

129129
```bash
130-
git checkout 2.4.1
130+
git checkout 2.4.3
131131
```
132132

133133
1. Change to `<magento_root>`.

‎src/_includes/install/system-requirements-table.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
| AWS S3 | | | | | | | | | | | ✔️ | ✔️ | | |
1717
| AWS MQ | | | | | | | | | | | | 3.8.11 | | |
1818
| AWS ElastiCache | | | | | | | | | | | | Redis 6.x | | |
19-
| AWS ElasticSearch | | | | | | | | | | | | 7.09 | | |
19+
| AWS ElasticSearch | | | | | | | | | | | | 7.9 | | |
2020

2121
<style>
2222
.comparison-table {

‎src/guides/v2.3/architecture/archi_perspectives/service_layer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ This directory contains:
4444

4545
* Service interfaces in the `/Api` [namespace](https://glossary.magento.com/namespace) of the module ([Catalog API][catalog-api]).
4646

47-
* Data (or *entity*) interfaces in the `Api/Data` directory ([Catalog API/Data][catalog-api-data][]).
47+
* Data (or *entity*) interfaces in the `Api/Data` directory ([Catalog API/Data][catalog-api-data]).
4848
Data entities* are data structures passed to and returned from service interfaces.
4949

5050
Files in the data directory contain `get()` and `set()` methods for entries in the entity table and extension attributes.

‎src/guides/v2.3/inventory/inventory-cli-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ These commands include:
3232
- Refund order or issue a credit memo (compensation reservation)
3333
- Order cancellation (compensation reservation)
3434

35-
Reservation inconsistencies may occur when {{site.data.var.im}} loses the initial reservation and enters too many reservation compensations (overcompensating and leading to inconsistent amounts), or correctly places the initial reservation but loses compensational reservations.
35+
Reservation inconsistencies may occur when {{site.data.var.im}} loses the initial reservation and enters too many reservation compensations (overcompensating and leading to inconsistent amounts), or correctly places the initial reservation but loses compensational reservations. Reservations can be manually reviewed and checked in the `inventory_reservation` table.
3636

3737
The following configurations and events can cause reservation inconsistencies:
3838

‎src/guides/v2.4/config-guide/prod/config-reference-envphp.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ The `env.php` file contains the following sections:
1212
| Name | Description |
1313
|-------------------------------|-----------------------------------------------------------------|
1414
| `backend` | Settings for the Admin area |
15+
| `cache` | Configure redis page and default cache |
1516
| `cache_types` | Cache storage settings |
1617
| `consumers_wait_for_messages` | Configure how consumers process messages from the message queue |
1718
| `cron` | Enable or disable the cron jobs |
@@ -25,6 +26,7 @@ The `env.php` file contains the following sections:
2526
| `queue` | [Message queues][message-queues] settings |
2627
| `resource` | Mapping of resource name to a connection |
2728
| `session` | Session storage data |
29+
| `system` | Disables the field for editing in the admin |
2830
| `x-frame-options` | Setting for [x-frame-options][x-frame-options] |
2931

3032
## backend
@@ -37,6 +39,36 @@ Configure the **frontName** for the Magento admin url using the `backend` node i
3739
]
3840
```
3941

42+
## cache
43+
44+
Configure redis page and default caching by using `cache` node in env.php.
45+
46+
```conf
47+
'cache' => [
48+
'frontend' => [
49+
'default' => [
50+
'backend' => 'Magento\\Framework\\Cache\\Backend\\Redis',
51+
'backend_options' => [
52+
'server' => '127.0.0.1',
53+
'database' => '0',
54+
'port' => '6379'
55+
],
56+
],
57+
'page_cache' => [
58+
'backend' => 'Magento\\Framework\\Cache\\Backend\\Redis',
59+
'backend_options' => [
60+
'server' => '127.0.0.1',
61+
'port' => '6379',
62+
'database' => '1',
63+
'compress_data' => '0'
64+
]
65+
]
66+
]
67+
]
68+
```
69+
70+
Learn more in [Redis Configuration][redis-config].
71+
4072
## cache_types
4173

4274
All the Magento cache types configuration are available from this node.
@@ -227,6 +259,23 @@ x-frame-options header can be configured using this node.
227259

228260
Learn more about session in [x-frame-options][x-frame-options].
229261

262+
## system
263+
264+
Using this node, Magento locks the configuration values in `env.php` and then disables the field in the admin.
265+
266+
```conf
267+
'system' => [
268+
'default' => [
269+
'web' => [
270+
'secure' => [
271+
'base_url' => 'https://magento.test/'
272+
]
273+
]
274+
]
275+
```
276+
277+
Learn more in [env-php-config-set][env-php-config-set].
278+
230279
<!-- Link definitions -->
231280
[lock-provider-config]: {{ page.baseurl }}/install-gde/install/cli/install-cli-subcommands-lock.html
232281
[encryption-key]: https://docs.magento.com/m2/ce/user_guide/system/encryption-key.html
@@ -240,3 +289,5 @@ Learn more about session in [x-frame-options][x-frame-options].
240289
[downloadable-domains]: {{ page.baseurl }}/reference/cli/magento.html#downloadabledomainsadd
241290
[change-docroot-to-pub]: {{ page.baseurl }}/install-gde/tutorials/change-docroot-to-pub.html
242291
[crons]: {{ page.baseurl }}/config-guide/cli/config-cli-subcommands-cron.html
292+
[env-php-config-set]: {{ page.baseurl }}/config-guide/cli/config-cli-subcommands-config-mgmt-set.html
293+
[redis-config]: {{ page.baseurl }}/config-guide/redis/redis-pg-cache.html

‎src/guides/v2.4/extension-dev-guide/variable-pool/index.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/guides/v2.4/extension-dev-guide/variable-pool/index.md

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
---
2+
group: php-developer-guide
3+
title: Variable Pool
4+
---
5+
6+
The variable pool contains pre-defined values you can use inside CMS content.
7+
These values are defined in [`di.xml`] files or created through the Admin interface.
8+
9+
## Configuration variables
10+
11+
Configuration variables are values that are set in the Admin area under the **Stores > Settings > Configuration** section.
12+
13+
The default list of variable paths available to the Variable Insertion Dialog is defined in the `di.xml` file in the [Variable module].
14+
This list can be extended by adding more entries to the `configPaths` argument for the `Magento\Variable\Model\Source\Variables` class in your module's `di.xml` file.
15+
16+
**Example:** di.xml file for the Variable module
17+
18+
```xml
19+
<?xml version="1.0"?>
20+
<!--
21+
/**
22+
* Copyright © Magento, Inc. All rights reserved.
23+
* See COPYING.txt for license details.
24+
*/
25+
-->
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
27+
<type name="Magento\Variable\Model\Config\Structure\AvailableVariables">
28+
<arguments>
29+
<argument name="configPaths" xsi:type="array">
30+
<item name="web" xsi:type="array">
31+
<item name="web/unsecure/base_url" xsi:type="string">1</item>
32+
<item name="web/secure/base_url" xsi:type="string">1</item>
33+
</item>
34+
<item name="trans_email/ident_general" xsi:type="array">
35+
<item name="trans_email/ident_general/name" xsi:type="string">1</item>
36+
<item name="trans_email/ident_general/email" xsi:type="string">1</item>
37+
</item>
38+
<item name="trans_email/ident_sales" xsi:type="array">
39+
<item name="trans_email/ident_sales/name" xsi:type="string">1</item>
40+
<item name="trans_email/ident_sales/email" xsi:type="string">1</item>
41+
</item>
42+
<item name="trans_email/ident_support" xsi:type="array">
43+
<item name="trans_email/ident_support/name" xsi:type="string">1</item>
44+
<item name="trans_email/ident_support/email" xsi:type="string">1</item>
45+
</item>
46+
<item name="trans_email/ident_custom1" xsi:type="array">
47+
<item name="trans_email/ident_custom1/name" xsi:type="string">1</item>
48+
<item name="trans_email/ident_custom1/email" xsi:type="string">1</item>
49+
</item>
50+
<item name="trans_email/ident_custom2" xsi:type="array">
51+
<item name="trans_email/ident_custom2/name" xsi:type="string">1</item>
52+
<item name="trans_email/ident_custom2/email" xsi:type="string">1</item>
53+
</item>
54+
<item name="general/store_information" xsi:type="array">
55+
<item name="general/store_information/name" xsi:type="string">1</item>
56+
<item name="general/store_information/phone" xsi:type="string">1</item>
57+
<item name="general/store_information/hours" xsi:type="string">1</item>
58+
<item name="general/store_information/country_id" xsi:type="string">1</item>
59+
<item name="general/store_information/region_id" xsi:type="string">1</item>
60+
<item name="general/store_information/postcode" xsi:type="string">1</item>
61+
<item name="general/store_information/city" xsi:type="string">1</item>
62+
<item name="general/store_information/street_line1" xsi:type="string">1</item>
63+
<item name="general/store_information/street_line2" xsi:type="string">1</item>
64+
<item name="general/store_information/merchant_vat_number" xsi:type="string">1</item>
65+
</item>
66+
</argument>
67+
</arguments>
68+
</type>
69+
<type name="Magento\Variable\Model\Source\Variables">
70+
<arguments>
71+
<argument name="configStructure" xsi:type="object">Magento\Variable\Model\Config\StructureVirtual</argument>
72+
</arguments>
73+
</type>
74+
<virtualType name="Magento\Variable\Model\Config\Structure\ReaderVirtual" type="Magento\Config\Model\Config\Structure\Reader">
75+
<arguments>
76+
<argument name="domDocumentClass" xsi:type="string">Magento\Variable\Model\Config\Structure\Dom</argument>
77+
</arguments>
78+
</virtualType>
79+
<virtualType name="Magento\Variable\Model\Config\StructureDataVirtual" type="Magento\Config\Model\Config\Structure\Data">
80+
<arguments>
81+
<argument name="cacheId" xsi:type="string">variable_system_configuration_structure</argument>
82+
<argument name="reader" xsi:type="object">Magento\Variable\Model\Config\Structure\ReaderVirtual</argument>
83+
</arguments>
84+
</virtualType>
85+
<virtualType name="Magento\Variable\Model\Config\StructureVirtual" type="Magento\Config\Model\Config\StructureLazy">
86+
<arguments>
87+
<argument name="structureData" xsi:type="object">Magento\Variable\Model\Config\StructureDataVirtual</argument>
88+
</arguments>
89+
</virtualType>
90+
</config>
91+
```
92+
93+
## Custom variables
94+
95+
Custom variables are values created in the Admin area under **System > Other Settings > Custom Variables**.
96+
These variables have a store view scope level and have all the features available to configuration values.
97+
98+
Custom Variable entities can also be created in your module's `DataInstall` or `DataUpgrade` classes.
99+
See [Module Lifecycle] for more information.
100+
101+
[Variable module]: https://github.com/magento/magento2/tree/{{page.guide_version}}/app/code/Magento/Variable/etc
102+
[Module Lifecycle]: {{page.baseurl }}/extension-dev-guide/prepare/lifecycle.html
103+
[`di.xml`]: {{page.baseurl }}/extension-dev-guide/build/di-xml-file.html

‎src/guides/v2.4/frontend-dev-guide/templates/template-email-migration.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,20 @@ This `order_data` object is passed to the view page as a `DataObject` and is ref
5555
```php
5656
public function send(Invoice $invoice, $forceSyncMode = false)
5757
{
58+
$this->identityContainer->setStore($invoice->getStore());
5859
$invoice->setSendEmail($this->identityContainer->isEnabled());
5960
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
6061
$order = $invoice->getOrder();
61-
$this->identityContainer->setStore($order->getStore());
62+
if ($this->checkIfPartialInvoice($order, $invoice)) {
63+
$order->setBaseSubtotal((float) $invoice->getBaseSubtotal());
64+
$order->setBaseTaxAmount((float) $invoice->getBaseTaxAmount());
65+
$order->setBaseShippingAmount((float) $invoice->getBaseShippingAmount());
66+
}
6267
$transport = [
6368
'order' => $order,
69+
'order_id' => $order->getId(),
6470
'invoice' => $invoice,
71+
'invoice_id' => $invoice->getId(),
6572
'comment' => $invoice->getCustomerNoteNotify() ? $invoice->getCustomerNote() : '',
6673
'billing' => $order->getBillingAddress(),
6774
'payment_html' => $this->getPaymentHtml($order),

‎src/guides/v2.4/install-gde/install/cli/install-cli.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ You must install Magento from its `bin` subdirectory.
4747

4848
You can run the installer multiple times with different options to complete installation tasks like the following:
4949

50-
* Install in phases—For example, after you configure your web server for Secure Sockets Layer (SSL), you can run the installer again to set SSL options.
50+
* Install in phases — For example, after you configure your web server for Secure Sockets Layer (SSL), you can run the installer again to set SSL options.
5151

5252
* Correct mistakes in previous installations.
5353

@@ -66,9 +66,9 @@ You can run the following commands to find values for some required arguments:
6666

6767
| Installer argument | Command |
6868
| ------------------ | ------------------------------- |
69-
| Language | magento info:language:list |
70-
| Currency | magento info:currency:list |
71-
| Time zone | php magento info:timezone:list |
69+
| Language | bin/magento info:language:list |
70+
| Currency | bin/magento info:currency:list |
71+
| Time zone | bin/magento info:timezone:list |
7272

7373
{:.bs-callout-info}
7474
If an error displays when you run these commands, verify that you updated installation dependencies as discussed in [Update installation dependencies]({{ page.baseurl }}/install-gde/install/prepare-install.html).
@@ -78,7 +78,7 @@ If an error displays when you run these commands, verify that you updated instal
7878
The install command uses the following format:
7979

8080
```bash
81-
magento setup:install --<option>=<value> ... --<option>=<value>
81+
bin/magento setup:install --<option>=<value> ... --<option>=<value>
8282
```
8383

8484
The following tables describe the installation option names and values. For example installation commands. see [Sample localhost installations](#install-cli-example).

0 commit comments

Comments
 (0)