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
|
07a2944618
|
Merge branch 'frontend' of github.com:thelia/thelia into frontend
|
2013-10-18 16:51:50 +02:00 |
|
touffies
|
bba7b9bb76
|
Missing ajax-loader icon
|
2013-10-18 16:48:38 +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 |
|
touffies
|
1ee45e0cb2
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-10-18 16:00:14 +02:00 |
|
Manuel Raynaud
|
d354ed96ad
|
don't use alternative Logger in debugbar if debug is disabled
|
2013-10-18 15:59:49 +02:00 |
|
touffies
|
b21f7efc73
|
Remove debug bar
|
2013-10-18 15:59:08 +02:00 |
|
touffies
|
77e789e964
|
Move temporarily fontawesome's font into the web folder
|
2013-10-18 15:50:42 +02:00 |
|
touffies
|
268e5355aa
|
Add loader css
|
2013-10-18 15:46:32 +02:00 |
|
Manuel Raynaud
|
b24546a12c
|
fix product visibility comparaison parameter
|
2013-10-18 15:45:11 +02:00 |
|
badsuricate
|
2257623c3b
|
Change this page on public page
|
2013-10-18 14:49:47 +02:00 |
|
touffies
|
d204a32c09
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-10-18 12:43:27 +02:00 |
|
touffies
|
3fe1716bc4
|
Bug : Remove close tag </a>
|
2013-10-18 12:40:08 +02:00 |
|
Manuel Raynaud
|
392d8a3559
|
decode url before searching if it's a rewritten url
|
2013-10-18 11:24:19 +02:00 |
|
badsuricate
|
e80b2157b1
|
Modification font-size of price elements
|
2013-10-18 11:04:42 +02:00 |
|
badsuricate
|
4b65675bef
|
add page View All
|
2013-10-18 11:04:10 +02:00 |
|
badsuricate
|
cab914bb64
|
Add button "add product to cart"
|
2013-10-18 10:55:47 +02:00 |
|
badsuricate
|
67ca9bfeec
|
Footer :
Static to dynamic content
|
2013-10-18 10:54:34 +02:00 |
|
badsuricate
|
85e9a26cb6
|
Add order on attribute_combination loop
|
2013-10-18 10:53:36 +02:00 |
|
badsuricate
|
dea93ccb50
|
Fix bug in Content Loop with "current_folder" params
|
2013-10-18 10:52:40 +02:00 |
|
badsuricate
|
3db29c9d1d
|
Creation of Content page
|
2013-10-18 10:51:52 +02:00 |
|
touffies
|
19b1537cdc
|
Change path /customer/account into /account
|
2013-10-18 10:00:39 +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 |
|
touffies
|
27d8646be0
|
Update profil page
|
2013-10-18 09:42:26 +02:00 |
|
touffies
|
4f8d43b569
|
Remove trailing slash
|
2013-10-18 09:40:31 +02:00 |
|
touffies
|
adc473a595
|
Change path to /account page
|
2013-10-18 09:19:47 +02:00 |
|
touffies
|
0375c2ec1d
|
Add .group-newsletter
|
2013-10-18 09:15:45 +02:00 |
|
touffies
|
0875a491ce
|
Warning message if the cart is empty
|
2013-10-18 09:14:11 +02:00 |
|
touffies
|
09f5fe8af7
|
Add a message if the cart is empty
|
2013-10-18 09:13:42 +02:00 |
|
touffies
|
dca2b37739
|
Change path. No need to add the customer Id in the path, we must use the customer id in the session.
|
2013-10-18 09:12:41 +02:00 |
|
touffies
|
2f033e1ffa
|
Change path to /account
|
2013-10-18 09:08:35 +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 |
|
touffies
|
c939d14e22
|
Display warning message if the user has no order
|
2013-10-16 16:57:25 +02:00 |
|
Etienne Roudeix
|
60fd54d5c3
|
restart thelia form type
|
2013-10-16 16:20:21 +02:00 |
|
touffies
|
9d23ce87ac
|
add nocache fot the mini-cart and login/logout
|
2013-10-16 15:14:23 +02:00 |
|
touffies
|
5fdebe4d2e
|
Empty cart + Intl
|
2013-10-16 15:13:04 +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 |
|
touffies
|
9469c1a0ec
|
- Redirect to /customer/account on success
- Agreements are mandatory
|
2013-10-16 12:36:17 +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 |
|