TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,463 Commits 1 Branch 0 Tags
c0dd42dd11e5cf0576c8381f9bc240a2508d3a87
Commit Graph

4463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Chanséaume
fa134bb9a3 Fixed translations for coupon 2014-08-04 19:26:21 +02:00
Julien Chanséaume
c1c47ced52 renamed template in gabarit for french translation in back office 2014-08-04 19:26:21 +02:00
Julien
00df3636c3 Merge pull request #509 from lovenunu/export 
Exports and Imports
 2014-08-04 19:15:06 +02:00
Benjamin Perche
7ba2295799 Fix url parameter accessing 
modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
 2014-08-04 16:40:35 +02:00
Benjamin Perche
573a21e643 Clear Container usage in position action and fix slashes adding in CSV formatter 
modifié:         core/lib/Thelia/Action/Export.php
	modifié:         core/lib/Thelia/Action/Import.php
	modifié:         core/lib/Thelia/Config/Resources/action.xml
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
 2014-08-04 16:37:29 +02:00
Benjamin Perche
60b599f8c1 Add order date 
modifié:         core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
 2014-08-04 14:56:07 +02:00
Benjamin Perche
83db209adf Add document tests and use left join instead of inner join for documents 
modifié:         core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
 2014-08-04 11:40:16 +02:00
Benjamin Perche
018ddb642b remove buggy left join on document join 
modifié:         core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
 2014-08-04 10:13:41 +02:00
Benjamin Perche
5f4e7f74fa Fix sql query for ContentExport document 
modifié:         core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
 2014-08-04 09:22:58 +02:00
Benjamin Perche
78fdce8aee Refactor addI18nCondition method, place it in I18n tool 
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductTaxedPricesExport.php
	modifié:         core/lib/Thelia/Tools/I18n.php
 2014-08-04 08:52:03 +02:00
Benjamin Perche
df27aff534 Fix usage 
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
 2014-08-01 16:30:06 +02:00
Benjamin Perche
81454c047d Fix bug if there's no row 
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
 2014-08-01 16:28:40 +02:00
Benjamin Perche
373840240b Add imports and exports on 2.0.3 
modifié:         CHANGELOG.md
	modifié:         setup/update/2.0.3.sql
 2014-08-01 14:50:16 +02:00
Benjamin Perche
c1dd11575a Add imports and exports in module skeleton 
modifié:         core/lib/Thelia/Command/Skeleton/Module/config.xml
 2014-08-01 14:20:09 +02:00
Benjamin Perche
5812c92752 Fix test 
modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
 2014-08-01 13:29:24 +02:00
Benjamin Perche
39267d8a83 Fix file loader 
modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
 2014-08-01 12:55:03 +02:00
Benjamin Perche
c6b72abd8f Fix cs 
modifié:         core/lib/Thelia/Action/Export.php
	modifié:         core/lib/Thelia/Action/Import.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/ExportCategory.php
	modifié:         core/lib/Thelia/Model/Import.php
	modifié:         core/lib/Thelia/Model/ImportCategory.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
396bafd7a9 Refactor position management with trait 
nouveau fichier: core/lib/Thelia/Action/Export.php
	nouveau fichier: core/lib/Thelia/Action/Import.php
	modifié:         core/lib/Thelia/Config/Resources/action.xml
	modifié:         core/lib/Thelia/Config/Resources/routing/admin.xml
	modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/Event/TheliaEvents.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductTaxedPricesExport.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/ExportCategory.php
	modifié:         core/lib/Thelia/Model/Import.php
	modifié:         core/lib/Thelia/Model/ImportCategory.php
	modifié:         templates/backOffice/default/export.html
 2014-08-01 12:48:07 +02:00
Benjamin Perche
0e7a1117b0 Add taxed prices export 
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/ProductTaxedPricesExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ProductTaxedPricesExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
9ff74bece8 Fix cs 
modifié:         core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
c85fe24d96 Add tests on OrderExport 
modifié:         core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
e8c8857cce Finish OrderExport 
modifié:         core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
806e2631aa Fix exports and imports parsing 
modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
f66dd43c55 Begin OrderExport 
nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
1aded1b6d6 Fix tests 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
bf9ffedefd Readd real_escape method for addI18nCondition 
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
0d37e3470b Fix escape usage 
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ContentExport.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/ContentExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
ae4fe387a7 Fix archive builders extensions 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
40605c1893 Add content export 
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
	nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
c208d8bb19 Fix export 
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
c461a5e92b Add image and document export helpers 
modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
b2588a8fca Fix cs 
modifié:         core/lib/Thelia/ImportExport/AbstractHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/DocumentsExportInterface.php
	modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/ImagesExportInterface.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/CustomerExport.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/ImportExport/Import/ImportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductPricesImport.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         core/lib/Thelia/Tests/ContainerAwareTestCase.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ExportHandlerTest.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
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductPricesImportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
 2014-08-01 12:48:06 +02:00
Benjamin Perche
f891d8b788 Add ContainerAwareTestCase and ExportHandlerTest 
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	nouveau fichier: core/lib/Thelia/Tests/ContainerAwareTestCase.php
	modifié:         core/lib/Thelia/Tests/Controller/ControllerTestBase.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ExportHandlerTest.php
 2014-08-01 12:48:06 +02:00
Benjamin Perche
f61006912d Fix bug 
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
 2014-08-01 12:48:06 +02:00
Benjamin Perche
7adc31514e Fix tests and bugs 
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportControllerTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php
 2014-08-01 12:48:06 +02:00
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