Benjamin Perche
994eaed7e1
Finish export handle
...
modifié: core/lib/Thelia/Controller/Admin/ImportExportController.php
modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
2014-08-01 12:48:03 +02:00
Benjamin Perche
4d5461bd08
Refactor images and document export interfaces, and implement it
...
modifié: core/lib/Thelia/Controller/Admin/ImportExportController.php
renommé: core/lib/Thelia/ImportExport/DocumentsAwareInterface.php -> core/lib/Thelia/ImportExport/DocumentsExportInterface.php
renommé: core/lib/Thelia/ImportExport/ImagesAwareInterface.php -> core/lib/Thelia/ImportExport/ImagesExportInterface.php
2014-08-01 12:48:03 +02:00
Benjamin Perche
44de50c805
Fix form
...
modifié: core/lib/Thelia/Controller/Admin/ImportExportController.php
modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
modifié: core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php
modifié: core/lib/Thelia/Form/ExportForm.php
modifié: templates/backOffice/default/ajax/export-modal.html
modifié: templates/backOffice/default/export-page.html
2014-08-01 12:48:03 +02:00
lovenunu
8d93a3c7ab
Create interfaces for documents and images exports
...
modified: core/lib/Thelia/Controller/Admin/ImportExportController.php
new file: core/lib/Thelia/ImportExport/DocumentsAwareInterface.php
modified: core/lib/Thelia/ImportExport/ExportHandler.php
new file: core/lib/Thelia/ImportExport/ImagesAwareInterface.php
2014-08-01 12:48:03 +02:00
Benjamin Perche
7e995e38d5
Fix form hidden fields and begin export controller
...
modifié: core/lib/Thelia/Controller/Admin/ImportExportController.php
modifié: core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
modifié: templates/backOffice/default/ajax/export-modal.html
modifié: templates/backOffice/default/export-page.html
2014-08-01 12:48:03 +02:00
Benjamin Perche
b6937ab421
Finish export forms
...
modifié: core/lib/Thelia/Config/Resources/config.xml
modifié: core/lib/Thelia/Config/Resources/form.xml
modifié: core/lib/Thelia/Controller/Admin/ExportController.php
modifié: core/lib/Thelia/Controller/Admin/ImportExportController.php
modifié: core/lib/Thelia/Core/Template/Loop/Formatter.php
modifié: core/lib/Thelia/Core/Template/Loop/ImportExportType.php
modifié: core/lib/Thelia/Form/ExportForm.php
modifié: core/lib/Thelia/ImportExport/Both/NewsletterImportExport.php
modifié: core/lib/Thelia/ImportExport/Export/MailingExport.php
renommé: core/lib/Thelia/ImportExport/ExportHandlerInterface.php -> core/lib/Thelia/ImportExport/ExportHandler.php
modifié: core/lib/Thelia/Model/Export.php
modifié: core/lib/Thelia/Model/Import.php
nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php
nouveau fichier: templates/backOffice/default/ajax/export-modal.html
modifié: templates/backOffice/default/export-page.html
modifié: templates/backOffice/default/export.html
2014-08-01 12:48:02 +02:00
Benjamin Perche
33695a7886
Implement export types
...
modifié: core/lib/Thelia/Controller/Admin/ImportExportController.php
modifié: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/JsonFormatter.php
modifié: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
modifié: core/lib/Thelia/Core/Template/Loop/Formatter.php
modifié: core/lib/Thelia/ImportExport/Export/MailingExport.php
modifié: core/lib/Thelia/Model/Export.php
modifié: templates/backOffice/default/export-page.html
modifié: templates/backOffice/default/includes/export-form-definition.html
2014-08-01 12:48:02 +02:00
Benjamin Perche
6bc3ed214b
Finish Import / Export categories management
...
modifié: core/lib/Thelia/Config/Resources/routing/admin.xml
modifié: core/lib/Thelia/Controller/Admin/ExportController.php
modifié: core/lib/Thelia/Controller/Admin/ImportExportController.php
modifié: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/JsonFormatter.php
modifié: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
modifié: core/lib/Thelia/Core/FileFormat/Formatting/FormatterInterface.php
modifié: core/lib/Thelia/Core/Template/Loop/Export.php
modifié: core/lib/Thelia/Core/Template/Loop/Formatter.php
nouveau fichier: core/lib/Thelia/ImportExport/Both/NewsletterImportExport.php
nouveau fichier: core/lib/Thelia/ImportExport/Export/ExportType.php
nouveau fichier: core/lib/Thelia/ImportExport/Export/MailingExport.php
modifié: core/lib/Thelia/ImportExport/ExportHandlerInterface.php
modifié: core/lib/Thelia/Model/Export.php
modifié: core/lib/Thelia/Model/ExportCategory.php
modifié: core/lib/Thelia/Model/ImportCategory.php
modifié: templates/backOffice/default/export-page.html
modifié: templates/backOffice/default/export.html
modifié: templates/backOffice/default/import.html
modifié: templates/backOffice/default/includes/export-form-definition.html
2014-08-01 12:48:02 +02:00
Benjamin Perche
fa7b02c9c9
Export positions
...
modifié: core/lib/Thelia/Config/Resources/routing/admin.xml
modifié: core/lib/Thelia/Controller/Admin/ExportController.php
modifié: core/lib/Thelia/Controller/Admin/ImportExportController.php
modifié: core/lib/Thelia/Core/Template/Loop/ImportExportType.php
modifié: core/lib/Thelia/Model/Export.php
nouveau fichier: templates/backOffice/default/export-page.html
modifié: templates/backOffice/default/export.html
nouveau fichier: templates/backOffice/default/import-page.html
2014-08-01 12:48:02 +02:00
Benjamin Perche
658c848171
Split import export management in two
...
modifié: core/lib/Thelia/Config/Resources/config.xml
modifié: core/lib/Thelia/Config/Resources/loop.xml
modifié: core/lib/Thelia/Config/Resources/routing/admin.xml
nouveau fichier: core/lib/Thelia/Controller/Admin/ImportExportController.php
nouveau fichier: core/lib/Thelia/Core/Template/Loop/Export.php
nouveau fichier: core/lib/Thelia/Core/Template/Loop/ExportCategory.php
nouveau fichier: core/lib/Thelia/Core/Template/Loop/Import.php
nouveau fichier: core/lib/Thelia/Core/Template/Loop/ImportCategory.php
modifié: core/lib/Thelia/Core/Template/Loop/ImportExportCategory.php
modifié: core/lib/Thelia/Core/Template/Loop/ImportExportType.php
nouveau fichier: core/lib/Thelia/Model/Base/Export.php
nouveau fichier: core/lib/Thelia/Model/Base/ExportCategory.php
nouveau fichier: core/lib/Thelia/Model/Base/ExportCategoryI18n.php
nouveau fichier: core/lib/Thelia/Model/Base/ExportCategoryI18nQuery.php
nouveau fichier: core/lib/Thelia/Model/Base/ExportCategoryQuery.php
nouveau fichier: core/lib/Thelia/Model/Base/ExportI18n.php
nouveau fichier: core/lib/Thelia/Model/Base/ExportI18nQuery.php
nouveau fichier: core/lib/Thelia/Model/Base/ExportQuery.php
renommé: core/lib/Thelia/Model/Base/ImportExportType.php -> core/lib/Thelia/Model/Base/Import.php
renommé: core/lib/Thelia/Model/Base/ImportExportCategory.php -> core/lib/Thelia/Model/Base/ImportCategory.php
renommé: core/lib/Thelia/Model/Base/ImportExportCategoryI18n.php -> core/lib/Thelia/Model/Base/ImportCategoryI18n.php
renommé: core/lib/Thelia/Model/Base/ImportExportCategoryI18nQuery.php -> core/lib/Thelia/Model/Base/ImportCategoryI18nQuery.php
renommé: core/lib/Thelia/Model/Base/ImportExportCategoryQuery.php -> core/lib/Thelia/Model/Base/ImportCategoryQuery.php
renommé: core/lib/Thelia/Model/Base/ImportExportTypeI18n.php -> core/lib/Thelia/Model/Base/ImportI18n.php
renommé: core/lib/Thelia/Model/Base/ImportExportTypeI18nQuery.php -> core/lib/Thelia/Model/Base/ImportI18nQuery.php
renommé: core/lib/Thelia/Model/Base/ImportExportTypeQuery.php -> core/lib/Thelia/Model/Base/ImportQuery.php
nouveau fichier: core/lib/Thelia/Model/Export.php
nouveau fichier: core/lib/Thelia/Model/ExportCategory.php
nouveau fichier: core/lib/Thelia/Model/ExportCategoryI18n.php
renommé: core/lib/Thelia/Model/ImportExportCategoryQuery.php -> core/lib/Thelia/Model/ExportCategoryI18nQuery.php
renommé: core/lib/Thelia/Model/ImportExportTypeQuery.php -> core/lib/Thelia/Model/ExportCategoryQuery.php
nouveau fichier: core/lib/Thelia/Model/ExportI18n.php
renommé: core/lib/Thelia/Model/ImportExportTypeI18nQuery.php -> core/lib/Thelia/Model/ExportI18nQuery.php
renommé: core/lib/Thelia/Model/ImportExportCategoryI18nQuery.php -> core/lib/Thelia/Model/ExportQuery.php
nouveau fichier: core/lib/Thelia/Model/Import.php
nouveau fichier: core/lib/Thelia/Model/ImportCategory.php
nouveau fichier: core/lib/Thelia/Model/ImportCategoryI18n.php
nouveau fichier: core/lib/Thelia/Model/ImportCategoryI18nQuery.php
nouveau fichier: core/lib/Thelia/Model/ImportCategoryQuery.php
supprimé: core/lib/Thelia/Model/ImportExportCategory.php
supprimé: core/lib/Thelia/Model/ImportExportCategoryI18n.php
supprimé: core/lib/Thelia/Model/ImportExportType.php
supprimé: core/lib/Thelia/Model/ImportExportTypeI18n.php
nouveau fichier: core/lib/Thelia/Model/ImportI18n.php
nouveau fichier: core/lib/Thelia/Model/ImportI18nQuery.php
nouveau fichier: core/lib/Thelia/Model/ImportQuery.php
nouveau fichier: core/lib/Thelia/Model/Map/ExportCategoryI18nTableMap.php
nouveau fichier: core/lib/Thelia/Model/Map/ExportCategoryTableMap.php
nouveau fichier: core/lib/Thelia/Model/Map/ExportI18nTableMap.php
nouveau fichier: core/lib/Thelia/Model/Map/ExportTableMap.php
renommé: core/lib/Thelia/Model/Map/ImportExportCategoryI18nTableMap.php -> core/lib/Thelia/Model/Map/ImportCategoryI18nTableMap.php
renommé: core/lib/Thelia/Model/Map/ImportExportCategoryTableMap.php -> core/lib/Thelia/Model/Map/ImportCategoryTableMap.php
renommé: core/lib/Thelia/Model/Map/ImportExportTypeI18nTableMap.php -> core/lib/Thelia/Model/Map/ImportI18nTableMap.php
renommé: core/lib/Thelia/Model/Map/ImportExportTypeTableMap.php -> core/lib/Thelia/Model/Map/ImportTableMap.php
modifié: local/config/schema.xml
modifié: setup/thelia.sql
modifié: templates/backOffice/default/export.html
2014-08-01 12:48:02 +02:00
Benjamin Perche
d1f5087d00
Begin import export management
...
modifié: core/lib/Thelia/Config/Resources/config.xml
modifié: core/lib/Thelia/Config/Resources/form.xml
modifié: core/lib/Thelia/Config/Resources/loop.xml
modifié: core/lib/Thelia/Config/Resources/routing/admin.xml
renommé: core/lib/Thelia/Form/ImportExport/BaseExportForm.php -> core/lib/Thelia/Controller/Admin/CustomerExportController.php
modifié: core/lib/Thelia/Controller/Admin/ExportController.php
modifié: core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterArchiveBuilderPass.php
modifié: core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterFormatterPass.php
nouveau fichier: core/lib/Thelia/Core/Template/Loop/ArchiveBuilder.php
nouveau fichier: core/lib/Thelia/Core/Template/Loop/Formatter.php
nouveau fichier: core/lib/Thelia/Model/Base/ImportExportCategory.php
nouveau fichier: core/lib/Thelia/Model/Base/ImportExportCategoryI18n.php
nouveau fichier: core/lib/Thelia/Model/Base/ImportExportCategoryI18nQuery.php
nouveau fichier: core/lib/Thelia/Model/Base/ImportExportCategoryQuery.php
nouveau fichier: core/lib/Thelia/Model/Base/ImportExportType.php
nouveau fichier: core/lib/Thelia/Model/Base/ImportExportTypeI18n.php
nouveau fichier: core/lib/Thelia/Model/Base/ImportExportTypeI18nQuery.php
nouveau fichier: core/lib/Thelia/Model/Base/ImportExportTypeQuery.php
nouveau fichier: core/lib/Thelia/Model/ImportExportCategory.php
nouveau fichier: core/lib/Thelia/Model/ImportExportCategoryI18n.php
nouveau fichier: core/lib/Thelia/Model/ImportExportCategoryI18nQuery.php
nouveau fichier: core/lib/Thelia/Model/ImportExportCategoryQuery.php
nouveau fichier: core/lib/Thelia/Model/ImportExportType.php
nouveau fichier: core/lib/Thelia/Model/ImportExportTypeI18n.php
nouveau fichier: core/lib/Thelia/Model/ImportExportTypeI18nQuery.php
nouveau fichier: core/lib/Thelia/Model/ImportExportTypeQuery.php
nouveau fichier: core/lib/Thelia/Model/Map/ImportExportCategoryI18nTableMap.php
nouveau fichier: core/lib/Thelia/Model/Map/ImportExportCategoryTableMap.php
nouveau fichier: core/lib/Thelia/Model/Map/ImportExportTypeI18nTableMap.php
nouveau fichier: core/lib/Thelia/Model/Map/ImportExportTypeTableMap.php
modifié: local/config/schema.xml
modifié: setup/thelia.sql
modifié: templates/backOffice/default/export.html
nouveau fichier: templates/backOffice/default/includes/export-form-definition.html
2014-08-01 12:48:01 +02:00
Julien
f7c5e96e2e
Merge pull request #503 from mespeche/mespeche
...
Added store_description
2014-07-08 15:21:33 +02:00
Franck Allimant
6ebf2c7e42
Fixed "with the close or save and close button you get an exception"
2014-07-07 22:44:39 +02:00
Franck Allimant
811e89f740
PHP-CS fixer pass
2014-07-01 01:07:56 +02:00
Franck Allimant
a0aa0bd1c2
Added brand logo image selection
2014-06-27 21:07:51 +02:00
Franck Allimant
f279131fe6
Added brand storage in product table
2014-06-27 20:12:55 +02:00
Franck Allimant
d969f84ae0
Restoired file events compatibility, factorised code
2014-06-26 20:18:06 +02:00
Franck Allimant
ca862b07e4
Merge branch 'master' into brands
...
Conflicts:
core/lib/Thelia/Tools/FileManager.php
setup/update/2.0.3.sql
2014-06-26 16:35:08 +02:00
Michaël Espeche
202969fde9
Add store_description field for SEO
2014-06-26 14:25:04 +02:00
Franck Allimant
0dde8b888a
Added brands management
2014-06-26 10:52:13 +02:00
Franck Allimant
114a55c1e8
Refactoring of images and documents management
2014-06-26 10:36:12 +02:00
Manuel Raynaud
84c2432507
remove unused variable
2014-06-24 10:38:43 +02:00
Manuel Raynaud
77a4c45aa4
remove commented code
2014-06-24 10:30:46 +02:00
Manuel Raynaud
a00a23e495
remove unused use statement
2014-06-24 10:29:17 +02:00
Manuel Raynaud
d14a2d24f2
fix cs
2014-06-18 10:06:10 +02:00
Manuel Raynaud
101197c0de
various fixes from insight
2014-06-18 09:33:32 +02:00
Manuel Raynaud
476bda3d4a
implement new breadcrumb on image and document edition in the catalog
2014-06-11 14:50:19 +02:00
Franck Allimant
a1eeddc51b
The coupon type is now passed to te template
2014-06-11 09:43:22 +02:00
Franck Allimant
87837224f7
PHP-CS fixer
2014-06-11 09:43:13 +02:00
Franck Allimant
919e0ac09b
Checked coupon type before trying to get the service.
2014-06-11 09:43:11 +02:00
Franck Allimant
0683d20d2c
Improved and simplified coupon form management
2014-06-11 09:43:09 +02:00
Guillaume Barral
2a7ea88d13
As the customerController, the method performAdditionalUpdateAction is useless as long as we have an <input type="hidden" name="page" /> AND a well configured successUrl :)
2014-06-04 09:02:55 +02:00
Guillaume Barral
a0eb7603ce
correction of the method performAdditionalUpdateAction
2014-06-04 08:40:17 +02:00
Guillaume Barral
eb895bc544
Add pagination to the product list (backOffice)
2014-06-03 12:35:52 +02:00
Manuel Raynaud
fe620a5a3b
force default locale when uploading new document. Fix #403
2014-05-30 16:43:26 +02:00
Manuel Raynaud
8370158f9d
fix saves & close action on document and images. Fix #402
2014-05-30 11:49:03 +02:00
Franck Allimant
ab060486d0
Fixed Thelia\Model\Base uses.
2014-05-18 20:19:48 +02:00
Franck Allimant
ef142ca077
Applied php-cs-fixer
2014-05-17 10:56:28 +02:00
Franck Allimant
f8ccea1899
Added per-user coupon maximum usage count
2014-05-17 10:56:19 +02:00
Franck Allimant
392abff271
Free shipping for selected countries and/or shipping methods
2014-05-15 20:25:22 +02:00
Manuel Raynaud
85d80d1d77
fix minor bug
2014-05-09 10:55:50 +02:00
Manuel Raynaud
4cd2ea6316
complete lang form including money format
2014-05-06 10:53:16 +02:00
Franck Allimant
621c17c97d
Fixed form error management
2014-05-02 20:08:38 +02:00
Franck Allimant
23a74999e8
Fixed date manipulation²
2014-05-02 18:24:15 +02:00
Franck Allimant
7996c866d3
Merge branch 'coupons' of https://github.com/roadster31/thelia into coupons
...
Conflicts:
core/lib/Thelia/Controller/Admin/CouponController.php
templates/backOffice/default/coupon/form.html
2014-05-02 17:16:39 +02:00
Franck Allimant
8ce6cdbae0
Fixed date input format and conversion
2014-05-02 17:10:27 +02:00
Franck Allimant
aa48a73343
Removed the useless coupon read function
2014-05-02 17:10:25 +02:00
Franck Allimant
6b020fda13
Fixed labels, using templates for HTML fragments
2014-05-02 17:10:22 +02:00
Franck Allimant
70671c6949
Normalized coupon list appearance, added sorting
2014-05-02 17:10:19 +02:00
Franck Allimant
7c1c3541b0
Removed the useless coupon read function
2014-05-02 12:24:11 +02:00
