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

1419 Commits

Author SHA1 Message Date
Etienne Roudeix
f564db2a8b WIP : admin profiles 2013-10-21 11:44:33 +02:00
Etienne Roudeix
c63c509f2f Merge branch 'master' into tax 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	templates/admin/default/configuration.html
 2013-10-21 08:13:18 +02:00
Etienne Roudeix
0300470f7d new model 2013-10-21 08:10:55 +02:00
Manuel Raynaud
d6e26e428e Merge branch 'master' into frontend 
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	templates/admin/default/tax-rule-edit.html
	templates/admin/default/taxes-rules.html
 2013-10-18 16:41:39 +02:00
Manuel Raynaud
b24546a12c fix product visibility comparaison parameter 2013-10-18 15:45:11 +02:00
touffies
d204a32c09 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-18 12:43:27 +02:00
Manuel Raynaud
392d8a3559 decode url before searching if it's a rewritten url 2013-10-18 11:24:19 +02:00
badsuricate
4b65675bef add page View All 2013-10-18 11:04:10 +02:00
badsuricate
dea93ccb50 Fix bug in Content Loop with "current_folder" params 2013-10-18 10:52:40 +02:00
touffies
f413688dc4 Change path : 
/customer/update into /account/update
 /password into /account/password
 2013-10-18 10:00:06 +02:00
touffies
59cfe8da8b CustomerUpdateForm - Extend CustomerCreation 2013-10-18 09:49:14 +02:00
touffies
9b617755ca Update profile - new method [Not finished yet] 2013-10-18 09:47:11 +02:00
touffies
871bc217a4 Add new form customer.update 
Add new form thelia.customer.update
 2013-10-18 09:44:01 +02:00
Etienne Roudeix
dc2de702e8 tax rule set default in back office 2013-10-17 15:31:09 +02:00
Etienne Roudeix
dad2591a57 end tax edition 2013-10-17 11:53:26 +02:00
Etienne Roudeix
a2048bec24 theliatype in form : types now extends bastype which implement typeinterface 
basetype provides verifiyForm method wich can be call in Callback constraint
 2013-10-16 17:10:53 +02:00
Etienne Roudeix
60fd54d5c3 restart thelia form type 2013-10-16 16:20:21 +02:00
touffies
fbebadaff0 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-16 12:47:52 +02:00
touffies
1960447a45 Remove method renderFormFieldCheckBox 2013-10-16 12:47:02 +02:00
touffies
3f214291d7 - Add agreements checkbox 2013-10-16 12:38:44 +02:00
Etienne Roudeix
dde7f15f42 Merge branch 'tax' 2013-10-16 12:03:31 +02:00
Etienne Roudeix
c6dbb76ebb thelia type constraints 2013-10-16 12:02:59 +02:00
Etienne Roudeix
9365e9ee38 tax management 2013-10-16 11:46:30 +02:00
Manuel Raynaud
b3c761798b fix menu when child > 0 2013-10-16 11:45:18 +02:00
touffies
1a8dfa46f4 Redirect new customer with valid email to the registration page. 2013-10-16 10:55:23 +02:00
touffies
2c47e8cf72 Allow smarty to pass the required value 2013-10-16 10:36:04 +02:00
touffies
0fd024201e Add violation to password if it's existing user 2013-10-16 10:34:07 +02:00
badsuricate
b9da3fedb7 Add "PRODUCT_SALE_ELEMENTS_ID" on loop output 2013-10-16 09:44:24 +02:00
touffies
88ed4191ef Fix conflict 2013-10-16 09:36:19 +02:00
touffies
1610ffab65 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-16 09:33:42 +02:00
Manuel Raynaud
08776e5fc5 clean code 2013-10-15 21:52:35 +02:00
Manuel Raynaud
fb4d44545d POC : add violation to password field 2013-10-15 21:45:46 +02:00
touffies
ca1587c6e7 Merge with Master 2013-10-15 11:05:05 +02:00
Manuel Raynaud
b7c0e040b3 add propel connection in transactions 2013-10-15 10:39:50 +02:00
Manuel Raynaud
b94de977a1 Merge branch 'country' 2013-10-14 17:47:29 +02:00
Manuel Raynaud
1aea868785 remove area to area_delivery_module 2013-10-14 17:45:23 +02:00
Etienne Roudeix
085c2fa75c taxes management 2013-10-14 17:28:31 +02:00
Manuel Raynaud
3c94c9c513 add an area to a delivery module 2013-10-14 17:23:20 +02:00
Manuel Raynaud
9ea86be123 create shipping zone area form 2013-10-14 16:20:16 +02:00
Etienne Roudeix
0ae9c562e4 tax rule edition 2013-10-14 14:58:08 +02:00
Manuel Raynaud
9c4c63a564 start shipping zone management 2013-10-14 14:08:50 +02:00
touffies
94bcf9a191 Merge conflict 2013-10-14 12:53:01 +02:00
Manuel Raynaud
75bc86d43e complete admin log message 2013-10-14 12:40:09 +02:00
Manuel Raynaud
97887f1d54 allow to create a new area 2013-10-14 12:28:30 +02:00
touffies
4441fc8190 Change path to the register page 2013-10-14 12:25:46 +02:00
touffies
7695c19b40 Login action : 
* Add account
* If user has checked "I'm a new customer", we must verify if it's a new email address.
 2013-10-14 12:25:12 +02:00
Manuel Raynaud
4671132964 delete area 2013-10-14 11:40:37 +02:00
Manuel Raynaud
820a92c9c1 add pre/post methods in Area model 2013-10-14 11:26:13 +02:00
Manuel Raynaud
52b68df4bc update area postage 2013-10-14 11:12:17 +02:00
Manuel Raynaud
8d4fa3b29b add missinf files 2013-10-14 11:03:44 +02:00