Skip to content

Commit 61446b6

Browse files
committed
Merge remote-tracking branch 'commerce/main' into story-427-configuation-propagation
2 parents b9f27e2 + 9049847 commit 61446b6

File tree

92 files changed

+2826
-6525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2826
-6525
lines changed

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ As a result, after the component installation,
88
a merchant will notice new indexers in the corresponding admin menu,
99
where each indexer represents a data feed.
1010

11+
### Code generation
12+
Magento_CatalogExportApi module contains DTOs that are automatically generated on every run of setup:upgrade and setup:di:compile.
13+
1114
## Requirements and Dependencies
1215
The export component is a set Magento modules and requires Magento 2.3 and higher.
1316

app/code/Magento/CatalogDataExporter/etc/di.xml

+3
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,9 @@
249249
<argument name="feedIdentity" xsi:type="string">productId</argument>
250250
<argument name="sourceTableName" xsi:type="string">catalog_product_entity</argument>
251251
<argument name="sourceTableField" xsi:type="string">entity_id</argument>
252+
<argument name="scopeTableName" xsi:type="string">catalog_product_website</argument>
253+
<argument name="scopeTableField" xsi:type="string">product_id</argument>
254+
<argument name="scopeCode" xsi:type="string">website_id</argument>
252255
<argument name="feedTableName" xsi:type="string">catalog_data_exporter_products</argument>
253256
<argument name="feedTableField" xsi:type="string">id</argument>
254257
<argument name="feedTableMutableColumns" xsi:type="array">

app/code/Magento/CatalogDataExporter/etc/et_schema.xml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<using field="id" />
2121
</field>
2222
</record>
23+
2324
<!-- TODO: delete deprecated "ImageDeprecated" type. use "Image" instead -->
2425
<record name="ImageDeprecated">
2526
<field name="url" type="String"/>

app/code/Magento/CatalogExport/Console/Command/GenerateDTOFiles.php

-369
This file was deleted.

0 commit comments

Comments
 (0)