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

388 Commits

Author SHA1 Message Date
root
f5318df219 Add the reseller field in the customer form 2014-08-05 11:40:49 +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
eaad1afdff Added possibility to change the main product reference 2014-08-04 19:26:21 +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
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
a6f008fde2 Refactor and fix CS 
modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Core/Event/ImportExport/Export.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	renommé:         core/lib/Thelia/ImportExport/Export/ExportType.php -> core/lib/Thelia/Core/FileFormat/FormatType.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/FileFormat/Formatting/FormatterManager.php
	modifié:         core/lib/Thelia/Core/Template/Loop/Formatter.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ImportExportCategory.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
	modifié:         core/lib/Thelia/Form/ImportForm.php
	renommé:         core/lib/Thelia/ImportExport/ExportHandler.php -> core/lib/Thelia/ImportExport/AbstractHandler.php
	nouveau fichier: core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/MailingExport.php
	renommé:         core/lib/Thelia/ImportExport/ImportHandler.php -> core/lib/Thelia/ImportExport/Import/ImportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Import/ProductStockImport.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/Import.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php
	modifié:         core/lib/Thelia/Tools/URL.php
	modifié:         templates/backOffice/default/ajax/import-modal.html
 2014-08-01 12:48:03 +02:00
Benjamin Perche
af5d355e19 Add import form and templates 
modifié:         core/lib/Thelia/Config/Resources/form.xml
	nouveau fichier: core/lib/Thelia/Form/ImportForm.php
	nouveau fichier: templates/backOffice/default/ajax/import-modal.html
	modifié:         templates/backOffice/default/import-page.html
	modifié:         templates/backOffice/default/import.html
 2014-08-01 12:48:03 +02:00
Benjamin Perche
7a312e9093 Add XML export and export_category definition and Fix CS 
nouveau fichier: core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Controller/Admin/CustomerExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterArchiveBuilderPass.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterFormatterPass.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/schema/dic/config/thelia-1.0.xsd
	modifié:         core/lib/Thelia/Core/Event/ImportExport/Export.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.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/FormatterData.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/Template/Loop/Export.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ExportCategory.php
	modifié:         core/lib/Thelia/Core/Template/Loop/Formatter.php
	modifié:         core/lib/Thelia/Core/Template/Loop/Import.php
	modifié:         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
	modifié:         core/lib/Thelia/Exception/FileNotFoundException.php
	modifié:         core/lib/Thelia/Exception/FileNotReadableException.php
	modifié:         core/lib/Thelia/Exception/HttpUrlException.php
	modifié:         core/lib/Thelia/Form/ExportForm.php
	modifié:         core/lib/Thelia/ImportExport/Export/MailingExport.php
	modifié:         core/lib/Thelia/Model/Base/Export.php
	modifié:         core/lib/Thelia/Model/Base/ExportCategory.php
	modifié:         core/lib/Thelia/Model/Base/ExportCategoryQuery.php
	modifié:         core/lib/Thelia/Model/Base/ExportQuery.php
	modifié:         core/lib/Thelia/Model/Base/Import.php
	modifié:         core/lib/Thelia/Model/Base/ImportCategory.php
	modifié:         core/lib/Thelia/Model/Base/ImportCategoryQuery.php
	modifié:         core/lib/Thelia/Model/Base/ImportQuery.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/ExportCategory.php
	modifié:         core/lib/Thelia/Model/ExportCategoryI18nQuery.php
	modifié:         core/lib/Thelia/Model/ExportCategoryQuery.php
	modifié:         core/lib/Thelia/Model/ExportI18nQuery.php
	modifié:         core/lib/Thelia/Model/ExportQuery.php
	modifié:         core/lib/Thelia/Model/ImportCategoryI18nQuery.php
	modifié:         core/lib/Thelia/Model/ImportCategoryQuery.php
	modifié:         core/lib/Thelia/Model/ImportI18nQuery.php
	modifié:         core/lib/Thelia/Model/ImportQuery.php
	modifié:         core/lib/Thelia/Model/Map/ExportCategoryTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ExportTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ImportCategoryTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ImportTableMap.php
	modifié:         core/lib/Thelia/Model/Tax.php
	modifié:         local/config/schema.xml
	modifié:         setup/thelia.sql
	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
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
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
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
47e2198936 Remove useless variable 
modifié:         core/lib/Thelia/Form/FirewallForm.php
 2014-07-16 15:41:28 +02:00
Benjamin Perche
59bab34513 Add auto delete to keep the table small 
modifié:         core/lib/Thelia/Form/FirewallForm.php
	modifié:         core/lib/Thelia/Tests/Form/FirewallTest.php
 2014-07-16 15:28:10 +02:00
Benjamin Perche
dd00af72cb Fix cs 
modifié:         core/lib/Thelia/Form/BruteforceForm.php
	modifié:         core/lib/Thelia/Tests/Form/FirewallTest.php
 2014-07-16 14:59:38 +02:00
Benjamin Perche
6208b12942 Fix waiting time text 
modifié:         core/lib/Thelia/Form/FirewallForm.php
 2014-07-16 14:57:46 +02:00
Benjamin Perche
28e027bca4 Change firewall time from hours to minutes 
nouveau fichier: core/lib/Thelia/Form/BruteforceForm.php
	modifié:         core/lib/Thelia/Form/FirewallForm.php
	modifié:         setup/insert.sql
	modifié:         setup/update/2.0.3.sql
 2014-07-16 14:22:32 +02:00
Benjamin Perche
cc4a22b1ed Change error message 
modifié:         core/lib/Thelia/Controller/BaseController.php
	modifié:         core/lib/Thelia/Form/FirewallForm.php
 2014-07-16 11:04:20 +02:00
Benjamin Perche
081a70ef9d Complete sql files and apply special rule from login forms 
modifié:         core/lib/Thelia/Form/AdminLogin.php
	modifié:         core/lib/Thelia/Form/CustomerLogin.php
	modifié:         setup/insert.sql
	modifié:         setup/update/2.0.3.sql
 2014-07-16 09:14:31 +02:00
Benjamin Perche
3469a56c17 Add new sql table in update file 
modifié:         core/lib/Thelia/Form/FirewallForm.php
	modifié:         setup/insert.sql
	modifié:         setup/update/2.0.3.sql
 2014-07-16 08:50:50 +02:00
lovenunu
c3ef1ab6b7 Fix logicial error on counting attempts 
modified:   core/lib/Thelia/Form/FirewallForm.php
	modified:   core/lib/Thelia/Model/FormFirewall.php
 2014-07-16 08:28:53 +02:00
lovenunu
b926f27711 Add firewall on login forms 
modified:   core/lib/Thelia/Form/AdminLogin.php
	modified:   core/lib/Thelia/Form/CustomerLogin.php
 2014-07-16 08:28:53 +02:00
lovenunu
13cb3dbbdc Fix cs and refactor FormFirewall raw values usage 
modified:   core/lib/Thelia/Form/FirewallForm.php
	modified:   core/lib/Thelia/Model/FormFirewallQuery.php
	modified:   core/lib/Thelia/Model/Tax.php
 2014-07-16 08:28:53 +02:00
lovenunu
5f6871154c Apply firewall on sensitive forms 
modified:   core/lib/Thelia/Form/ContactForm.php
	modified:   core/lib/Thelia/Form/CustomerLostPasswordForm.php
	modified:   core/lib/Thelia/Form/OrderPayment.php
 2014-07-16 08:28:53 +02:00
lovenunu
978f15357c Apply firewall security on BaseForm::validateForm 
modified:   core/lib/Thelia/Controller/BaseController.php
	modified:   core/lib/Thelia/Form/AddressCreateForm.php
	new file:   core/lib/Thelia/Form/FirewallForm.php
	modified:   core/lib/Thelia/Model/FormFirewall.php
	modified:   setup/insert.sql
 2014-07-16 08:28:53 +02:00
Julien
f7c5e96e2e Merge pull request #503 from mespeche/mespeche 
Added store_description
 2014-07-08 15:21:33 +02:00
Julien
f06854ce48 Merge pull request #505 from roadster31/brands 
- Brands implementation
- image + documents refactoring
- new smarty functions for form generation.
- lots of code enhancements
 2014-07-08 11:45:44 +02:00
Franck Allimant
6c1e45276b PHP-CS fixer passed 2014-07-08 10:33:47 +02:00
Franck Allimant
ab484973e1 Fixed "success_url" appearing twice in forms 2014-07-07 23:24:39 +02:00
Benjamin Perche
6da2e2a183 Fix issue #511 
When the user is registred in the session, the method "eraseCredentials" is cal$
( Thelia\Core\Security\SecurityContext::setCustomerUser ).
The form checks if the customer user of the session has the password given,
or, in the session, the password is null, so it doesn't work.

        modifié:         core/lib/Thelia/Form/CustomerPasswordUpdateForm.php
 2014-07-07 14:05:27 +02:00
Franck Allimant
3708fb317b Typo 2014-07-04 15:27:14 +02:00
Franck Allimant
a57d668e3c Improved brand form declarations 2014-07-04 11:54:02 +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
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
0b3de508b4 Introduced automatic form fields binding 2014-06-26 10:42:16 +02:00
Franck Allimant
ce3ed19b67 Introduced the automatic form fields binding. 2014-06-26 10:41:26 +02:00
Franck Allimant
114a55c1e8 Refactoring of images and documents management 2014-06-26 10:36:12 +02:00
Franck Allimant
0683d20d2c Improved and simplified coupon form management 2014-06-11 09:43:09 +02:00
Manuel Raynaud
86c34f589c fix payment and delivery form. Fix #434 2014-06-05 17:21:37 +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
9cdac6d50e Fixes french translation. 2014-05-16 11:12:24 +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
fa71c8c4d5 integration of russian translation 2014-05-06 11:01:32 +02:00
Manuel Raynaud
4cd2ea6316 complete lang form including money format 2014-05-06 10:53:16 +02:00