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

2831 Commits

Author SHA1 Message Date
Julien
1bbf34e8a2 Merge pull request #564 from bibich/thelia-203-beta 
Thelia 203 beta
 2014-08-05 08:36:30 +02:00
Benjamin Perche
967dbc15d4 Fix point usage in regex 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
 2014-08-05 08:26:56 +02:00
Benjamin Perche
b8a9518deb Add missing points in extensions 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
 2014-08-05 08:26:56 +02:00
Benjamin Perche
29c0aa0368 Remove MimeTypeTools tests 
supprimé:        core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:26:56 +02:00
Benjamin Perche
008f94fe66 Add translation 
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
 2014-08-05 08:26:56 +02:00
Benjamin Perche
b01a6d9871 Change extension checking method 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Controller/Admin/FileController.php
	supprimé:        core/lib/Thelia/Tools/MimeTypeTools.php
	supprimé:        local/config/mime.types
 2014-08-05 08:26:56 +02:00
Benjamin Perche
ddcaf9fbab Fix tests 
modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:26:17 +02:00
Benjamin Perche
b26c61be96 Refactor MimeTypeTools as a service 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Controller/Admin/FileController.php
	modifié:         core/lib/Thelia/Tools/MimeTypeTools.php
 2014-08-05 08:26:17 +02:00
Benjamin Perche
d541b56429 Fix tests 
modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:25:28 +02:00
Benjamin Perche
5d9f120c81 Fix tests and add translation 
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
	modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
	modifié:         core/lib/Thelia/Tools/MimeTypeTools.php
	modifié:         local/config/mime.types
 2014-08-05 08:25:28 +02:00
Benjamin Perche
172d7c06ca Fix URLTest namespace 
modifié:         core/lib/Thelia/Tests/Tools/URLTest.php
 2014-08-05 08:23:15 +02:00
Benjamin Perche
d1a9115626 Fix cs 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
	modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
	modifié:         core/lib/Thelia/Tools/MimeTypeTools.php
 2014-08-05 08:23:15 +02:00
Benjamin Perche
4b2ee0d357 Fix tests 
modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:23:15 +02:00
Benjamin Perche
d186ec4320 Fix security breaches 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
	nouveau fichier: core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
	nouveau fichier: core/lib/Thelia/Tools/MimeTypeTools.php
	nouveau fichier: local/config/mime.types
 2014-08-05 08:23:15 +02:00
Julien Chanseaume
b2cf836353 prepared release 2.0.3-beta 2014-08-04 22:17:00 +02:00
Julien Chanséaume
2b2a5690a7 php-cs-fixer 2014-08-04 20:31:27 +02:00
Julien Chanseaume
cab99af210 Added output var to product loop to get the number of PSE for a product 2014-08-04 19:26:22 +02:00
Julien Chanseaume
0076a63cf2 fixed issue to remove the summary, description or conclusion on an image or a document 2014-08-04 19:26:22 +02:00
Julien Chanséaume
160ccaa4ff Moved Terms aggrement from account to order, display terms and conditions 2014-08-04 19:26:22 +02:00
Julien Chanséaume
00baae6da0 Fixed brand substitution issue. 2014-08-04 19:26:21 +02:00
Julien Chanséaume
628170086a Fixed typo 2014-08-04 19:26:21 +02:00
Julien Chanséaume
eaad1afdff Added possibility to change the main product reference 2014-08-04 19:26:21 +02:00
Julien Chanséaume
f37625e5cf Added missing translation 2014-08-04 19:26:21 +02:00
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
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
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