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

372 Commits

Author SHA1 Message Date
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
a1526620f4 Add import link in tools 
modifié:         templates/backOffice/default/tools.html
 2014-08-01 12:48:02 +02:00
Benjamin Perche
bd1b64c311 delete html form 
modifié:         templates/backOffice/default/export.html
 2014-08-01 12:48:02 +02:00
Benjamin Perche
7bd741edd1 Remove export form in the exports list 
modifié:         templates/backOffice/default/export.html
 2014-08-01 12:48:02 +02:00
Benjamin Perche
ae468d71b6 Fix import loop and a resource 
modifié:         core/lib/Thelia/Core/Security/Resource/AdminResources.php
	modifié:         core/lib/Thelia/Core/Template/Loop/Import.php
	nouveau fichier: templates/backOffice/default/import.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
0cb0e89382 Continue import export management 
modifié:         core/lib/Thelia/Config/Resources/loop.xml
	nouveau fichier: core/lib/Thelia/Core/Template/Loop/ImportExportCategory.php
	nouveau fichier: core/lib/Thelia/Core/Template/Loop/ImportExportType.php
	nouveau fichier: core/lib/Thelia/Form/ExportForm.php
	modifié:         core/lib/Thelia/Model/Base/ImportExportType.php
	modifié:         core/lib/Thelia/Model/Base/ImportExportTypeQuery.php
	modifié:         core/lib/Thelia/Model/Map/ImportExportTypeTableMap.php
	modifié:         local/config/schema.xml
	modifié:         setup/thelia.sql
	modifié:         templates/backOffice/default/export.html
 2014-08-01 12:48:01 +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
alexian dugour
91161ab695 Add pagination to customer-edit 
modified:   templates/backOffice/default/customer-edit.html
 2014-07-24 12:47:27 +02:00
Franck Allimant
b74d5d9a34 Added ID in language list. 2014-07-22 16:31:16 +02:00
Alban Baixas
8d109ed34c fix redirect current_tab 2014-07-18 12:35:39 +02:00
Julien Chanséaume
800a1c3f5d Added product reference in the title of the product edit page 2014-07-16 18:39:11 +02:00
Julien Chanséaume
1d541c0dc2 Fixed issue on sort order on catalog page. Added price in the product list 2014-07-16 18:39:10 +02:00
Julien Chanséaume
0a99b29015 added toolbar 2014-07-16 18:39:10 +02:00
Julien Chanséaume
12e84afdf8 Fixed wrong calculated price when comma is used instead of dot. 2014-07-16 18:39:10 +02:00
Julien Chanséaume
0310dce719 Revert "Fixed wrong calculated price when comma is used instead of dot." 
This reverts commit 1a3542ada2dd63f59adeafc0d1f434057d5da927.
 2014-07-16 18:39:10 +02:00
Julien Chanséaume
97559fe8c2 Fixed wrong calculated price when comma is used instead of dot. 2014-07-16 18:39:10 +02:00
Julien Chanséaume
a72b6e5ca7 Added direct link to the customer page on order detail. 2014-07-16 18:39:09 +02:00
Julien Chanséaume
43517c629a Fixed order edit. When a product was deleted, the title was blank. Now we use the order_product title. 2014-07-16 18:39:09 +02:00
Benjamin Perche
98ed617aab Fix brand auth loop name 2014-07-10 14:26:28 +02:00
Julien
f7c5e96e2e Merge pull request #503 from mespeche/mespeche 
Added store_description
 2014-07-08 15:21:33 +02:00
Franck Allimant
c520f1e581 Fixed wrong "alt" attribute 2014-07-07 23:24:03 +02:00
Franck Allimant
f651a267c5 Fixed wrong escapin of "required" attribute 2014-07-07 23:23:16 +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
082a1905f6 Fixed "it doesn't save anything when you want to edit textarea" 2014-07-07 22:42:44 +02:00
Franck Allimant
b7d98d8648 Fixed typos 2014-07-04 16:10:39 +02:00
Franck Allimant
7580d5c869 Template fragments are now in a subdirectory 2014-07-04 15:27:56 +02:00
Franck Allimant
a57d668e3c Improved brand form declarations 2014-07-04 11:54:02 +02:00
Franck Allimant
f46168f518 Fixed some typos 2014-07-03 19:19:21 +02:00
Franck Allimant
7576b9990b Fixed minor typos, improved field attributes generation 2014-07-03 16:54:42 +02:00
Franck Allimant
c70a296ff2 Refined the form fields html bindings 2014-07-03 16:26:37 +02:00
Michaël Espeche
eed0b357aa Add code editor on textarea 2014-07-03 08:57:14 +02:00
Franck Allimant
a06b0a57e3 Fixed "save & close" 2014-06-30 19:15:07 +02:00
Franck Allimant
1458d2ff69 Brand related translations 2014-06-30 14:50:15 +02:00
Franck Allimant
a0aa0bd1c2 Added brand logo image selection 2014-06-27 21:07:51 +02:00
Franck Allimant
15f60ad22b Added product's brand selection in the general tab. 2014-06-27 19:51:41 +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
ce3ed19b67 Introduced the automatic form fields binding. 2014-06-26 10:41:26 +02:00
Franck Allimant
0d8f9f3c6e Fixed minor typos 2014-06-19 01:51:39 +02:00
Manuel Raynaud
588be42e0f Merge pull request #473 from roadster31/coupon-end 
Major coupon types refactoring.
 2014-06-17 21:11:14 +02:00
Guillaume Barral
8196690458 Add link in template-edit to go to Attributes and features edition (this is more intuitive) 2014-06-17 11:48:35 +02:00
Guillaume Barral
816a9b81ca Allow to search a customer in the default template if $search is not null 2014-06-17 11:19:16 +02:00
Franck Allimant
63f00d82b9 Using 0 as default value if some loop parameters are not defined 2014-06-17 00:39:00 +02:00
Franck Allimant
e3dc87dd6a Updated translations after finishing coupons 2014-06-17 00:37:06 +02:00
alexian dugour
7bf2d8ec58 Mise à jours lien fiche produit sur template order-edit dans le back-office 2014-06-13 08:57:28 +02:00
Franck Allimant
e9a0661938 Pushed forward the refactoring, using traits 2014-06-12 17:00:17 +02:00