Skip to content

Commit

Permalink
Merge remote-tracking branch 'corp/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@victor-v-rad
victor-v-rad committed Jul 8, 2016
2 parents 53aee57 + e2b55d8 commit f18a9cd
Show file tree
Hide file tree
Showing 206 changed files with 28,361 additions and 1,099 deletions.
17 changes: 0 additions & 17 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,6 @@ atlassian*
/.idea
/.gitattributes
/node_modules
/etc/ce-1.9.1/deltalog.xml
/etc/ce-1.9.1/config.xml
/etc/ce-1.9.1/eav-document-groups.xml
/etc/ce-1.9.1/log-document-groups.xml
/etc/ce-1.9.1/map-eav.xml
/etc/ce-1.9.1/map.xml
/etc/ce-1.9.1/map-log.xml
/etc/ce-1.9.1/settings.xml
/etc/ee-1.14.1/deltalog.xml
/etc/ee-1.14.1/config.xml
/etc/ee-1.14.1/eav-document-groups.xml
/etc/ee-1.14.1/log-document-groups.xml
/etc/ee-1.14.1/map.xml
/etc/ee-1.14.1/map-eav.xml
/etc/ee-1.14.1/map-log.xml
/etc/ee-1.14.1/map-sales.xml
/etc/ee-1.14.1/settings.xml

/tests/unit/tmp
/tests/unit/phpunit.xml
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
2.1.0
=============
* Added support for migration of Magento 1 CE stores upgraded to 1.6 and later versions from versions earlier than 1.6 version
* Added support for migration for the following versions:

* Magento CE v. 1.9.2.4, v. 2.1.0
* Magento EE v. 1.14.2.4, v.2.1.0

* Fixed bugs:
* Fixed an issue with RMA creation after migration
* Fixed an issue with URL Rewrite duplication for CMS Pages
* [Issue#59](https://github.com/magento/data-migration-tool/issues/59) Wrong URL addresses for products and categories
* [Issue#36](https://github.com/magento/data-migration-tool/issues/36) `Incorrect table name` error on products grid page

2.0.7
=============
* Added support for:
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ Also the following versions are already supported if you choose to migrate from
## Prerequisites
Before you start your migration, you must do all of the following:

* Set up a Magento 2.0 system that meets our <a href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">system requirements</a>.
* Set up a Magento 2 system that meets our <a href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">system requirements</a>.

Set up your system using a topology and design that at least matches your existing Magento 1.x system.

* Do not start Magento 2.0 cron jobs.
* Do not start Magento 2 cron jobs.

* Back up or <a href="https://dev.mysql.com/doc/refman/5.1/en/mysqldump.html">dump</a> your Magento 2 database as soon after installation as possible.

Expand All @@ -39,14 +39,14 @@ Before you start your migration, you must do all of the following:

* To provide redundancy in the event of unexpected issues, we advise you to replicate your Magento 1.x database.

* Migrate Magento 1.x extension and custom code to Magento 2.0.
* Migrate Magento 1.x extension and custom code to Magento 2.

Reach out to your extension providers to see if they have been ported yet.

## Install the Data Migration Tool
This section discusses how to install the Magento Data Migration Tool. You can install it from either repo.magento.com or from a GitHub repository.

**Note**: The versions of both the migration tool and the Magento 2 code must be identical (for example, 2.0.0). To find the version of either package, open `composer.json` and find the value of `"version"`.
**Note**: The versions of both the migration tool and the Magento 2 code must be identical (for example, 2.1.0). To find the version of either package, open `composer.json` and find the value of `"version"`.

### Install the tool from GitHub
To install the migration tool from GitHub, use the following steps:
Expand All @@ -58,7 +58,7 @@ To install the migration tool from GitHub, use the following steps:
composer config repositories.data-migration-tool git https://github.com/magento/data-migration-tool
composer require magento/data-migration-tool:<version>

where `<version>` is release version (e.g. 2.0.2)
where `<version>` is release version (e.g. 2.1.0)

3. Wait while dependencies are updated.

Expand Down Expand Up @@ -91,13 +91,13 @@ To update `composer.json`:

Exact version example:

composer require magento/data-migration-tool:2.0.0
composer require magento/data-migration-tool:2.1.0

Next significant release example:

composer require magento/data-migration-tool:~2.0.0
composer require magento/data-migration-tool:~2.0

9. Wait while dependencies are installed.

## For more details
See the <a href="http://devdocs.magento.com/guides/v2.0/migration/bk-migration-guide.html">Migration User Guide</a>.
See the <a href="http://devdocs.magento.com/guides/v2.1/migration/bk-migration-guide.html">Migration User Guide</a>.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "magento/data-migration-tool",
"description": "Migration Tool",
"version": "2.0.7",
"version": "2.1.0",
"require": {
"symfony/console": "~2.3",
"magento/framework": "~100.0.0",
"magento/framework": "~100.1",
"monolog/monolog": "~1.16.0"
},
"autoload": {
Expand Down
11 changes: 11 additions & 0 deletions etc/ce-to-ce/1.6.0.0/config.xml.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,20 @@
<data>Migration\Step\OrderGrids\Data</data>
<volume>Migration\Step\OrderGrids\Volume</volume>
</step>
<step title="Tier Price Step">
<integrity>Migration\Step\TierPrice\Integrity</integrity>
<data>Migration\Step\TierPrice\Data</data>
<volume>Migration\Step\TierPrice\Volume</volume>
</step>
<step title="SalesIncrement Step">
<integrity>Migration\Step\SalesIncrement\Integrity</integrity>
<data>Migration\Step\SalesIncrement\Data</data>
<volume>Migration\Step\SalesIncrement\Volume</volume>
</step>
<step title="PostProcessing Step">
<integrity>Migration\Step\PostProcessing\Integrity</integrity>
<data>Migration\Step\PostProcessing\Data</data>
</step>
</steps>
<steps mode="delta">
<step title="Customer Attributes Step">
Expand Down Expand Up @@ -123,6 +132,8 @@
<log_file>migration.log</log_file>
<progress_bar_format>%percent%% [%bar%] Remaining Time: %remaining%</progress_bar_format>
<upgrade_customer_password_hash>1</upgrade_customer_password_hash>
<edition_migrate>ce-to-ce</edition_migrate>
<edition_number>1.6.0.0</edition_number>
<crypt_key />
</options>
</config>
9 changes: 9 additions & 0 deletions etc/ce-to-ce/1.6.0.0/map-customer.xml.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,15 @@
<ignore>
<field>customer_address_entity.vat_request_success</field>
</ignore>
<ignore>
<field>customer_entity.failures_num</field>
</ignore>
<ignore>
<field>customer_entity.first_failure</field>
</ignore>
<ignore>
<field>customer_entity.lock_expires</field>
</ignore>
</field_rules>
</destination>
</map>
160 changes: 158 additions & 2 deletions etc/ce-to-ce/1.6.0.0/map.xml.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@
<ignore>
<document>catalog_product_flat_cl</document>
</ignore>
<ignore>
<document>cataloginventory_stock_status</document>
</ignore>
<ignore>
<document>cataloginventory_stock_status_idx</document>
</ignore>
Expand Down Expand Up @@ -821,13 +824,29 @@
<param name="attributeCode" value="page_layout"/>
</handler>
</transform>
<transform>
<field>catalog_category_entity_varchar.value</field>
<handler class="\Migration\Handler\TruncateSuffix">
<param name="suffixPath" value="catalog/seo/category_url_suffix"/>
<param name="attributeCodes" value="[url_path]"/>
<param name="entityTypeCode" value="catalog_category"/>
</handler>
</transform>
<transform>
<field>catalog_product_entity_varchar.value</field>
<handler class="\Migration\Handler\ConvertEavValue">
<param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]"/>
<param name="attributeCode" value="page_layout"/>
</handler>
</transform>
<transform>
<field>catalog_product_entity_varchar.value</field>
<handler class="\Migration\Handler\TruncateSuffix">
<param name="suffixPath" value="catalog/seo/product_url_suffix"/>
<param name="attributeCodes" value="[url_key,url_path]"/>
<param name="entityTypeCode" value="catalog_product"/>
</handler>
</transform>
<transform>
<field>cms_page.root_template</field>
<handler class="\Migration\Handler\Convert">
Expand Down Expand Up @@ -918,6 +937,10 @@
<field>catalog_product_entity_media_gallery.value_id</field>
<handler class="\Migration\Handler\Gallery\InsertValueToEntity"/>
</transform>
<transform>
<field>catalogsearch_query.synonym_for</field>
<handler class="\Migration\Handler\Synonym"/>
</transform>
<ignore>
<field>admin_rule.role_type</field>
</ignore>
Expand Down Expand Up @@ -1059,12 +1082,99 @@
<ignore>
<field>salesrule.website_ids</field>
</ignore>
<ignore>
<field>catalogsearch_query.synonym_for</field>
</ignore>
<ignore>
<field>sales_flat_invoice.customer_id</field>
</ignore>
<ignore>
<field>sales_flat_invoice.invoice_status_id</field>
</ignore>
<ignore>
<field>sales_flat_invoice.invoice_type</field>
</ignore>
<ignore>
<field>sales_flat_invoice.is_virtual</field>
</ignore>
<ignore>
<field>sales_flat_invoice.real_order_id</field>
</ignore>
<ignore>
<field>sales_flat_invoice.total_due</field>
</ignore>
<ignore>
<field>sales_flat_invoice.total_paid</field>
</ignore>
<ignore>
<field>sales_flat_invoice_item.shipment_id</field>
</ignore>
<ignore>
<field>sales_flat_order.base_custbalance_amount</field>
</ignore>
<ignore>
<field>sales_flat_order.currency_base_id</field>
</ignore>
<ignore>
<field>sales_flat_order.currency_code</field>
</ignore>
<ignore>
<field>sales_flat_order.currency_rate</field>
</ignore>
<ignore>
<field>sales_flat_order.custbalance_amount</field>
</ignore>
<ignore>
<field>sales_flat_order.is_hold</field>
</ignore>
<ignore>
<field>sales_flat_order.is_multi_payment</field>
</ignore>
<ignore>
<field>sales_flat_order.real_order_id</field>
</ignore>
<ignore>
<field>sales_flat_order.tax_percent</field>
</ignore>
<ignore>
<field>sales_flat_order.tracking_numbers</field>
</ignore>
<ignore>
<field>sales_flat_order_address.address_id</field>
</ignore>
<ignore>
<field>sales_flat_order_address.gift_message_id</field>
</ignore>
<ignore>
<field>sales_flat_order_address.tax_id</field>
</ignore>
<ignore>
<field>sales_flat_order_payment.amount</field>
</ignore>
<ignore>
<field>sales_flat_order_payment.cc_raw_request</field>
</ignore>
<ignore>
<field>sales_flat_order_payment.cc_raw_response</field>
</ignore>
<ignore>
<field>sales_flat_order_payment.customer_payment_id</field>
</ignore>
<ignore>
<datatype>sales_flat_quote_payment.cc_exp_month</datatype>
</ignore>
<ignore>
<datatype>weee_tax.state</datatype>
</ignore>
<ignore>
<datatype>oauth_consumer.callback_url</datatype>
</ignore>
<ignore>
<datatype>oauth_consumer.rejected_callback_url</datatype>
</ignore>
<ignore>
<datatype>oauth_token.callback_url</datatype>
</ignore>
</field_rules>
</source>
<destination>
Expand Down Expand Up @@ -1270,6 +1380,18 @@
<ignore>
<document>sequence_shipment*</document>
</ignore>
<ignore>
<document>sequence_rma_item_*</document>
</ignore>
<ignore>
<document>vault_payment_token</document>
</ignore>
<ignore>
<document>vault_payment_token_order_payment_link</document>
</ignore>
<ignore>
<document>search_synonyms</document>
</ignore>
<ignore>
<document>eav_attribute_option_swatch</document>
</ignore>
Expand Down Expand Up @@ -1378,9 +1500,18 @@
<ignore>
<document>customer_grid_flat</document>
</ignore>
<ignore>
<document>admin_user_session</document>
</ignore>
<ignore>
<document>password_reset_request_event</document>
</ignore>
<ignore>
<document>oauth_token_request_log</document>
</ignore>
<ignore>
<document>design_config_grid_flat</document>
</ignore>
</document_rules>
<field_rules>
<transform>
Expand All @@ -1391,11 +1522,21 @@
</transform>
<transform>
<field>cataloginventory_stock.website_id</field>
<handler class="\Migration\Handler\SetDefaultWebsiteId"/>
<handler class="\Migration\Handler\SetValue">
<param name="value" value="0" />
</handler>
</transform>
<transform>
<field>cataloginventory_stock_item.website_id</field>
<handler class="\Migration\Handler\SetDefaultWebsiteId"/>
<handler class="\Migration\Handler\SetValue">
<param name="value" value="0" />
</handler>
</transform>
<transform>
<field>cataloginventory_stock_status.website_id</field>
<handler class="\Migration\Handler\SetValue">
<param name="value" value="0" />
</handler>
</transform>
<transform>
<field>rating.is_active</field>
Expand Down Expand Up @@ -1646,12 +1787,27 @@
<ignore>
<field>checkout_agreement.mode</field>
</ignore>
<ignore>
<field>catalog_category_product.entity_id</field>
</ignore>
<ignore>
<field>cms_page.meta_title</field>
</ignore>
<ignore>
<datatype>quote_payment.cc_exp_month</datatype>
</ignore>
<ignore>
<datatype>weee_tax.state</datatype>
</ignore>
<ignore>
<datatype>oauth_consumer.callback_url</datatype>
</ignore>
<ignore>
<datatype>oauth_consumer.rejected_callback_url</datatype>
</ignore>
<ignore>
<datatype>oauth_token.callback_url</datatype>
</ignore>
</field_rules>
</destination>
</map>
Loading

0 comments on commit f18a9cd

Please sign in to comment.