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

70 Commits

Author SHA1 Message Date
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
5a6ede991b Add timestampable behavior in import_export_type 
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
 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
Benjamin Perche
c39e6bcf85 Add foreign key constraints for order_address 
modifié:         core/lib/Thelia/Model/Base/Country.php
	modifié:         core/lib/Thelia/Model/Base/CountryQuery.php
	modifié:         core/lib/Thelia/Model/Base/CustomerTitle.php
	modifié:         core/lib/Thelia/Model/Base/CustomerTitleQuery.php
	modifié:         core/lib/Thelia/Model/Base/OrderAddress.php
	modifié:         core/lib/Thelia/Model/Base/OrderAddressQuery.php
	modifié:         core/lib/Thelia/Model/Map/CountryTableMap.php
	modifié:         core/lib/Thelia/Model/Map/CustomerTitleTableMap.php
	modifié:         core/lib/Thelia/Model/Map/OrderAddressTableMap.php
	modifié:         local/config/schema.xml
	modifié:         setup/thelia.sql
	modifié:         setup/update/2.0.3.sql
 2014-07-29 14:14:46 +02:00
Franck Allimant
79b0e20523 Added missing coupon_customer_count table 2014-07-24 16:26:30 +02:00
Franck Allimant
a3c8fee6e0 Added missing columns to coupon_version table 2014-07-24 09:10:35 +02:00
jodeq
c027bd2f57 With the change of page configuration/variables which display title message of variables, here the French translations to insert when creating a new shop. 
2.0.3 update script is also modified.
 2014-07-18 16:22:10 +02:00
Julien Chanséaume
e9bfe42070 fixed sql update script for brands 2014-07-16 18:39:10 +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
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
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
lovenunu
b42ff568e0 Define firewall model 
new file:   core/lib/Thelia/Model/Base/FormFirewall.php
	new file:   core/lib/Thelia/Model/Base/FormFirewallQuery.php
	new file:   core/lib/Thelia/Model/FormFirewall.php
	new file:   core/lib/Thelia/Model/FormFirewallQuery.php
	new file:   core/lib/Thelia/Model/Map/FormFirewallTableMap.php
	modified:   local/config/schema.xml
	modified:   setup/thelia.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
Michaël Espeche
368e8cd6cf Add new entry : store_description 2014-07-01 10:26:51 +02:00
Franck Allimant
b4f3e3b60a Fixed wrong fk in product table 2014-07-01 02:36:46 +02:00
Franck Allimant
ceb5b595a8 Generated more brands 2014-07-01 02:09:39 +02:00
Franck Allimant
53b58515e0 Added html_output_trim_level variable 2014-07-01 01:08:27 +02:00
Franck Allimant
189ad9f782 Added html_output_trim_level config var, fix for #490 2014-07-01 00:57:41 +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
Franck Allimant
65dd2fb129 Changed product_brand fk 2014-06-26 15:50:00 +02:00
Franck Allimant
13e57e332a Added brand creation 2014-06-26 15:49:46 +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
Guillaume Barral
2a6d99e36b Automatic versionning of all existing orders during the update 2.0.3 2014-06-19 15:24:14 +02:00
Guillaume Barral
15e2ff5fc3 Automatic creation of all orders in order_version during the 2.0.3 update 2014-06-19 15:22:06 +02:00
Guillaume Barral
adcbc13ada Add a default version to all order in Thelia for the 2.0.3 update 2014-06-19 15:13:02 +02:00
Franck Allimant
dc6b231301 Fixed coupon table versionning 2014-06-19 15:10:21 +02:00
Guillaume Barral
270d8da5e3 Merge branch 'master' of https://github.com/lovenunu/thelia into yochima-branch 2014-06-19 09:27:56 +02:00
Benjamin Perche
7d4d1857fc Fix colissimo and cheque id retrieving 
modifié:         setup/faker.php
 2014-06-18 15:00:29 +02:00
Guillaume Barral
243e44f571 Target thelia_release_version changed to 3 2014-06-18 14:34:24 +02:00
Guillaume Barral
6e9412f3ac Add the table order_version to Thelia 2014-06-18 14:22:15 +02:00
Benjamin Perche
b688ee86f0 fix cs 
modifié:         setup/faker.php
 2014-06-18 13:30:45 +02:00
Benjamin Perche
da6244d220 Add clear order table and use propel random selection 
modifié:         setup/faker.php
 2014-06-18 13:29:30 +02:00
Benjamin Perche
c5fa984e6e Fix cs 2014-06-18 12:35:24 +02:00
Benjamin Perche
087f9e46a1 Add line return 
modifié:         setup/faker.php
 2014-06-18 12:33:53 +02:00
Benjamin Perche
2fcec08e50 Insert fake orders with faker 
modifié:         setup/faker.php
 2014-06-18 12:31:36 +02:00
Manuel Raynaud
3434010b54 prepare release 2.0.2 2014-06-11 16:05:08 +02:00
Franck Allimant
de5a2025cd Fixed coupon input field name 2014-06-11 09:43:10 +02:00
etienne roudeix
507a52a20f Update 2.0.2.sql 2014-05-28 14:56:46 +02:00
etienne roudeix
5395c76bf3 Update insert.sql 2014-05-28 14:56:04 +02:00
etienne
88a7164e96 add Hong Kong to country list 2014-05-27 15:38:11 +02:00
Franck Allimant
b3b16e1fb1 Added vendor block to schema 2014-05-18 20:34:58 +02:00
Franck Allimant
612898d3b3 ENGINE=InnoDB; -> ENGINE=InnoDB CHARACTER SET='utf8'; 2014-05-18 20:30:14 +02:00
Franck Allimant
f8ccea1899 Added per-user coupon maximum usage count 2014-05-17 10:56:19 +02:00
Franck Allimant
90947bcda9 Free shipping restricitions based on Countries and Shipping module 2014-05-16 10:30:15 +02:00
Franck Allimant
9c0cc178b4 Added coupon_country and coupon_module tables 2014-05-14 16:35:16 +02:00
Franck Allimant
ae5e88f90c Created file. Removes some ununsed indexes 2014-05-14 15:33:32 +02:00
Franck Allimant
c671a1ff5e Changed coupon condition parameter variables name 2014-05-10 01:30:22 +02:00