Commit Graph

4275 Commits

Author SHA1 Message Date
Benjamin Perche
f73703c578 Add customer export
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/ImportExport/AbstractHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
c5c8b4c9e4 Refactor ExportHandler to allow queries override
modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/MailingExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductSEOExportTest.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
9dfff70838 Fix Product SEO export
modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductSEOExportTest.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
44e07f1940 Fix cs
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
77db0d7408 Add export order for CSV
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
	modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
f4f3a54e9c Fix join to get translation in export
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ProductSEOExportTest.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
32450117c2 Change getRewrittenUrlViewName signature to public, to allow export to do a single query.
modifié:         core/lib/Thelia/Model/Brand.php
	modifié:         core/lib/Thelia/Model/Category.php
	modifié:         core/lib/Thelia/Model/Content.php
	modifié:         core/lib/Thelia/Model/Folder.php
	modifié:         core/lib/Thelia/Model/Product.php
	modifié:         core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
a5a62b40e0 Fix typo, method called markRewritenUrlObsolete instead of markRewrittenUrlObsolete
modifié:         core/lib/Thelia/Model/Brand.php
	modifié:         core/lib/Thelia/Model/Category.php
	modifié:         core/lib/Thelia/Model/Content.php
	modifié:         core/lib/Thelia/Model/Folder.php
	modifié:         core/lib/Thelia/Model/Product.php
	modifié:         core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
2b01453f50 Begin SEO Export
modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
e98b733fc8 Refactor i18n export methods
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/MailingExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
496d0bb851 Fix SQL escape method
modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
f4891745a3 Remove column name translation
modifié:         core/lib/Thelia/ImportExport/Export/Type/MailingExport.php
2014-08-01 12:48:06 +02:00
Benjamin Perche
749d55102c Add import description
modifié:         core/lib/Thelia/Config/Resources/import.xml
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/ajax/import-modal.html
	modifié:         templates/backOffice/default/export-page.html
	modifié:         templates/backOffice/default/export.html
	modifié:         templates/backOffice/default/import-page.html
	modifié:         templates/backOffice/default/import.html
2014-08-01 12:48:06 +02:00
Benjamin Perche
8a39b1215e Change names to allow import and export prices with taxes
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Config/Resources/import.xml
2014-08-01 12:48:06 +02:00
Benjamin Perche
1270cf6954 Add promo import and export in prices
modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductPricesImport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductPricesImportTest.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
db876e4e81 Fix cs
modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Form/ImportForm.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
dc97b65590 Fix bugs and add ProductPricesExport tests
modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/MailingExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
94c44ea003 Add attribute combinasions in export
modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
ad3c1ce387 Fix export controller and add ean in export prices
modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
abde3799d5 Fix columns diff finding
modifié:         core/lib/Thelia/ImportExport/Import/ImportHandler.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
2a56864f94 Add mandatory columns for imports
modifié:         core/lib/Thelia/ImportExport/Import/ImportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductPricesImport.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
df98ce2de4 Add the possibility to set a null lang
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
6c8411f0c0 Add language in import and export form, with handle by FormatterData
modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	modifié:         core/lib/Thelia/Form/ExportForm.php
	modifié:         core/lib/Thelia/Form/ImportForm.php
	modifié:         templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/ajax/import-modal.html
	modifié:         templates/backOffice/default/export-page.html
	modifié:         templates/backOffice/default/import-page.html
2014-08-01 12:48:05 +02:00
Benjamin Perche
f83251d31d Fix tests and rename one
renommé:         core/lib/Thelia/Tests/ImportExport/Import/ProductPriceImportTest.php -> core/lib/Thelia/Tests/ImportExport/Import/ProductPricesImportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
8afbcd322b Fix cs and bug with positions
modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/Import.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
a54ce50eb1 Refactor ProductPriceImport -> ProductPricesImport
modifié:         core/lib/Thelia/Config/Resources/import.xml
	renommé:         core/lib/Thelia/ImportExport/Import/Type/ProductPriceImport.php -> core/lib/Thelia/ImportExport/Import/Type/ProductPricesImport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductPriceImportTest.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
0e3ae84cb8 Fix bugs and add Product prices export
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/schema/dic/config/thelia-1.0.xsd
	nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportControllerTest.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
5e00367757 Fix cs
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductPriceImport.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
79a8390817 Fix bugs and add import count handle
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
	modifié:         core/lib/Thelia/ImportExport/Import/ImportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/CSVFormatterTest.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
4e29830bde Add CSV Formatter in services and fix bug on diplaying export and imports
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
27a32e64e6 Add ProductPriceImport test
modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductPriceImport.php
	modifié:         core/lib/Thelia/Tests/Controller/ControllerTestBase.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Import/ProductPriceImportTest.php
2014-08-01 12:48:05 +02:00
Benjamin Perche
853c74edb2 Refactor ImportExportControllerBase into a trait and finish ProductStockImportTest
modifié:         core/lib/Thelia/Tests/Controller/ImportControllerTest.php
	renommé:         core/lib/Thelia/Tests/Controller/ImportExportControllerTest.php -> core/lib/Thelia/Tests/Controller/ImportExportControllerTrait.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
14cf745a89 Add ImportController Tests and fix bugs
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Exception/FileNotFoundException.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportControllerTest.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportExportControllerTest.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
ae750866aa Define Import controller test
modifié:         core/lib/Thelia/Tests/Controller/ControllerTestBase.php
	nouveau fichier: core/lib/Thelia/Tests/Controller/ImportControllerTest.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportExportControllerTest.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
a731873ff3 Refactor tests to add abstract class for controller tests
modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	renommé:         core/lib/Thelia/Tests/ImportExport/Import/ImportTestBase.php -> core/lib/Thelia/Tests/Controller/ControllerTestBase.php
	nouveau fichier: core/lib/Thelia/Tests/Controller/ImportExportControllerTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
a03d15b5b9 Add special condition on test
modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/CSVFormatterTest.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
ce36b7b68e Add CSV formatter
nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/CSVFormatterTest.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
a34441f376 Add tests for ImportController::processImport and ProductStockImport
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/XMLFormatterTest.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Import/ImportTestBase.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
778a2b8ca0 Add isArchive method
modifié:         core/lib/Thelia/Core/Event/ImportExport.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
fac049ef8e Add ProductPrice import
modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductPriceImport.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
43ab7af583 Add ProductPrice import
modifié:         core/lib/Thelia/Config/Resources/import.xml
	modifié:         core/lib/Thelia/ImportExport/AbstractHandler.php
	nouveau fichier: core/lib/Thelia/ImportExport/Import/Type/ProductPriceImport.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
0723f30695 Fix cs
supprimé:        core/lib/Thelia/Controller/Admin/CustomerExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Core/Event/ImportExport.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManagerTrait.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Exception/BadFormattedStringException.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterManagerTrait.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ImportExportType.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/Import.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
4c165bc5d5 Refactor ImportController::import method
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
b6c9a7dab4 Delete exports and imports where the class is not valid
modifié:         core/lib/Thelia/Core/Template/Loop/ImportExportType.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/Import.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
00ba277daa Done XML formatter
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/XMLFormatterTest.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
32d8d2051d Finish basic import
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
cb75c13716 Working import stock
modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/Event/ImportExport.php
	modifié:         core/lib/Thelia/Core/Event/TheliaEvents.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/JsonFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         templates/backOffice/default/ajax/import-modal.html
	modifié:         templates/backOffice/default/import-page.html
2014-08-01 12:48:04 +02:00
Benjamin Perche
069d2a07d9 Refactor ImportExportController into two logical controllers
modifié:         core/lib/Thelia/Config/Resources/routing/admin.xml
	renommé:         core/lib/Thelia/Controller/Admin/ImportExportController.php -> core/lib/Thelia/Controller/Admin/ExportController.php
	nouveau fichier: core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManagerTrait.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatting/FormatterManagerTrait.php
2014-08-01 12:48:04 +02:00
Benjamin Perche
03f1eb97e0 Refactor ImportExportController::export
modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php
	renommé:         core/lib/Thelia/Core/Event/ImportExport/Export.php -> core/lib/Thelia/Core/Event/ImportExport.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php
	modifié:         core/lib/Thelia/Model/Import.php
	modifié:         templates/backOffice/default/ajax/import-modal.html
	modifié:         templates/backOffice/default/import-page.html
2014-08-01 12:48:04 +02:00
Benjamin Perche
a16b481059 Add accepted formats on import form and add delete not registred exports and imports
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Config/Resources/import.xml
	modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/Import.php
	modifié:         templates/backOffice/default/ajax/import-modal.html
	modifié:         templates/backOffice/default/import-page.html
2014-08-01 12:48:03 +02:00