Commit Graph

2850 Commits

Author SHA1 Message Date
Julien
9d1dfcb61c Merge pull request #556 from lovenunu/fix-database
Add foreign key constraints for order_address
2014-07-30 10:29:15 +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
Benjamin Perche
b4eb12f12a Fix method that prevents orders to be set as Paid in the BO
modifié:         core/lib/Thelia/Model/Order.php
2014-07-29 11:34:57 +02:00
Guillaume Barral
a0b78502d6 Block the smarty interpretation in the elseloop 2014-07-25 16:14:14 +02:00
Guillaume Barral
1b2cbe6746 Respect of the good standards 2014-07-25 16:14:14 +02:00
Guillaume Barral
fdb68d6b95 Use now the dispatcher to delete feature_product when we change the template of a product 2014-07-25 16:14:14 +02:00
Franck Allimant
2268180786 Removed unused variable 2014-07-22 19:43:39 +02:00
Franck Allimant
94257eeb86 The request object is \Thelia\Core\HttpFoundation\Request 2014-07-22 19:01:18 +02:00
Franck Allimant
bfd9a6ac7d Added isInUse() method to the CouponInterface 2014-07-22 18:59:58 +02:00
Franck Allimant
bc57c879c0 Added in_use parameter to the loop 2014-07-22 18:59:19 +02:00
Franck Allimant
6273179986 Added a default value for getConsumedCoupons() 2014-07-22 18:58:55 +02:00
Julien Chanséaume
a1c1f1fb0e Fixed URL::absoluteUrl when an URL contains a target and parameters is not empty 2014-07-16 18:39:10 +02:00
Julien Chanséaume
9900acef84 added ATTRIBUTE_ID and ATTRIBUTE_AVAILABILITY_ID to attribute_combination loop 2014-07-16 18:39:10 +02:00
Julien Chanséaume
3745de8f57 fixed position tests on brands 2014-07-16 18:39:10 +02:00
Julien Chanséaume
4aec6f4b3d Fixed method to display options in the current local and not en_US. 2014-07-16 18:39:09 +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
660624f609 Add tests
nouveau fichier: core/lib/Thelia/Tests/Form/FirewallTest.php
2014-07-16 14:58:18 +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
b424fb2750 Add translation
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
2014-07-16 11:09:35 +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
ee11915feb Add french and english translation
modified:   core/lib/Thelia/Config/I18n/en_US.php
	modified:   core/lib/Thelia/Config/I18n/fr_FR.php
2014-07-16 08:28:53 +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
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
zzuutt
2e9b42053b change min_quantity & max_quantity
change :

min_quantity by quantity
max_quantity by quantity_reverse
2014-07-15 13:09:13 +02:00
zzuutt
a6a6269742 Add in loop ProductSaleElements the order argument
add order arguments 'min_quantity' and 'max_quantity'
2014-07-10 17:21:01 +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
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
77a94d06a0 Fixed "you can not delete an image or a document" 2014-07-07 22:43:37 +02:00
Benjamin Perche
7a0399b303 End fix #511
modifié:         core/lib/Thelia/Action/Customer.php
2014-07-07 14:41:38 +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
Julien
924fef8047 Merge pull request #510 from bibich/improvements
fixed new issue on rewriting test due to blank titles on some locale
2014-07-04 15:39:16 +02:00
Franck Allimant
7580d5c869 Template fragments are now in a subdirectory 2014-07-04 15:27:56 +02:00
Franck Allimant
3708fb317b Typo 2014-07-04 15:27:14 +02:00
Julien Chanséaume
ff8350352f small improvement 2014-07-04 15:25:09 +02:00
Julien Chanséaume
c8a4cbcb8a optimization 2014-07-04 14:57:10 +02:00
Franck Allimant
a57d668e3c Improved brand form declarations 2014-07-04 11:54:02 +02:00
Julien Chanséaume
71f4380dff added title for all available langages 2014-07-04 11:27:44 +02:00
Julien Chanséaume
5dae84f0fd fixed new issue on rewriting test due to blank titles on some locale 2014-07-04 10:34:00 +02:00