From 1ae14dbddd21a7e39471e5bfec5dcd559e6ed770 Mon Sep 17 00:00:00 2001 From: TR Date: Mon, 1 Aug 2016 19:55:55 +0200 Subject: [PATCH 1/5] added composer.json --- composer.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 composer.json diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..dfca03d --- /dev/null +++ b/composer.json @@ -0,0 +1,13 @@ +{ + "name":"sandfox/import_export_fix", + "type":"magento-module", + "description":"This module solves couple of ImportExport core bugs.", + "require":{ + "magento-hackathon/magento-composer-installer":"*" + }, + "extra":{ + "map": [ + ["src/app/", "app/"] + ] + } +} \ No newline at end of file From 2927fd6731989ac9efe85b466ebbb56337cb5b64 Mon Sep 17 00:00:00 2001 From: TR Date: Mon, 1 Aug 2016 19:59:56 +0200 Subject: [PATCH 2/5] moved files --- .../Sandfox/ImportExportFix/Model/Import/Entity/Customer.php | 0 .../Sandfox/ImportExportFix/Model/Import/Entity/Product.php | 0 .../app}/code/community/Sandfox/ImportExportFix/etc/config.xml | 0 {app => src/app}/etc/modules/Sandfox_ImportExportFix.xml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {app => src/app}/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Customer.php (100%) rename {app => src/app}/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php (100%) rename {app => src/app}/code/community/Sandfox/ImportExportFix/etc/config.xml (100%) rename {app => src/app}/etc/modules/Sandfox_ImportExportFix.xml (100%) diff --git a/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Customer.php b/src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Customer.php similarity index 100% rename from app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Customer.php rename to src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Customer.php diff --git a/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php b/src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php similarity index 100% rename from app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php rename to src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php diff --git a/app/code/community/Sandfox/ImportExportFix/etc/config.xml b/src/app/code/community/Sandfox/ImportExportFix/etc/config.xml similarity index 100% rename from app/code/community/Sandfox/ImportExportFix/etc/config.xml rename to src/app/code/community/Sandfox/ImportExportFix/etc/config.xml diff --git a/app/etc/modules/Sandfox_ImportExportFix.xml b/src/app/etc/modules/Sandfox_ImportExportFix.xml similarity index 100% rename from app/etc/modules/Sandfox_ImportExportFix.xml rename to src/app/etc/modules/Sandfox_ImportExportFix.xml From 0625ecda08b1608926ce3ff069c170f72a1d32cc Mon Sep 17 00:00:00 2001 From: Henry Hayes Date: Sat, 12 Feb 2022 20:01:52 +0000 Subject: [PATCH 3/5] Update config.xml In app/code/community/Sandfox/ImportExportFix/etc/config.xml the import_entity_product node has to be moved into config/global/models/importexport/rewrite. --- .../code/community/Sandfox/ImportExportFix/etc/config.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/app/code/community/Sandfox/ImportExportFix/etc/config.xml b/src/app/code/community/Sandfox/ImportExportFix/etc/config.xml index 6342a7e..c68bff9 100644 --- a/src/app/code/community/Sandfox/ImportExportFix/etc/config.xml +++ b/src/app/code/community/Sandfox/ImportExportFix/etc/config.xml @@ -22,13 +22,9 @@ Sandfox_ImportExportFix_Model - - - Sandfox_ImportExportFix_Model_Import_Entity_Product - - + Sandfox_ImportExportFix_Model_Import_Entity_Product Sandfox_ImportExportFix_Model_Import_Entity_Customer From 9d6984185047e8ab307a71cb65ad70dbfd2724f5 Mon Sep 17 00:00:00 2001 From: Henry Hayes Date: Sat, 12 Feb 2022 20:02:53 +0000 Subject: [PATCH 4/5] Update Product.php In app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php parent class name has to be renamed from Enterprise_ImportExport_Model_Import_Entity_Product to Mage_ImportExport_Model_Import_Entity_Product. --- .../Sandfox/ImportExportFix/Model/Import/Entity/Product.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php b/src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php index d9b996e..e33af30 100644 --- a/src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php +++ b/src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php @@ -10,7 +10,7 @@ * @license http://opensource.org/licenses/MIT The MIT License */ -class Sandfox_ImportExportFix_Model_Import_Entity_Product extends Enterprise_ImportExport_Model_Import_Entity_Product +class Sandfox_ImportExportFix_Model_Import_Entity_Product extends Mage_ImportExport_Model_Import_Entity_Product { /** * Code of a primary attribute which identifies the entity group if import contains of multiple rows From 129ad0bab330da10b06f704708d42fc393aaac1f Mon Sep 17 00:00:00 2001 From: Henry Hayes Date: Sat, 12 Feb 2022 20:03:33 +0000 Subject: [PATCH 5/5] Update Sandfox_ImportExportFix.xml In app/etc/modules/Sandfox_ImportExportFix.xml change Enterprise_ImportExport dependency into Mage_ImportExport. --- src/app/etc/modules/Sandfox_ImportExportFix.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/etc/modules/Sandfox_ImportExportFix.xml b/src/app/etc/modules/Sandfox_ImportExportFix.xml index 6814924..a029056 100644 --- a/src/app/etc/modules/Sandfox_ImportExportFix.xml +++ b/src/app/etc/modules/Sandfox_ImportExportFix.xml @@ -17,7 +17,7 @@ true community - +