Manuel Raynaud
1545987d51
update insert script
2013-10-21 09:29:52 +02:00
Manuel Raynaud
9d794e229d
Merge branch 'master' into module_management
...
Conflicts:
core/lib/Thelia/Core/Template/Loop/TaxRuleCountry.php
core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
2013-10-21 09:19:08 +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
gmorel
f276ccfa37
WIP : Implement coupon check on ordering tunnel
...
@todo CSS
@todo List coupon used and detailed effects
2013-10-20 23:01:12 +02:00
gmorel
8c4ca21615
Working : Missing type inference
2013-10-20 22:46:00 +02:00
gmorel
ad69c45e4f
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia: (87 commits)
Missing ajax-loader icon
don't use alternative Logger in debugbar if debug is disabled
Remove debug bar
Move temporarily fontawesome's font into the web folder
Add loader css
fix product visibility comparaison parameter
Change this page on public page
Bug : Remove close tag </a>
decode url before searching if it's a rewritten url
Modification font-size of price elements
add page View All
Add button "add product to cart"
Footer : Static to dynamic content
Add order on attribute_combination loop
Fix bug in Content Loop with "current_folder" params
Creation of Content page
Change path /customer/account into /account
Change path : /customer/update into /account/update /password into /account/password
CustomerUpdateForm - Extend CustomerCreation
Update profile - new method [Not finished yet]
...
2013-10-20 21:11:58 +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
Franck Allimant
ada32660fe
Impelmented form collections
2013-10-18 16:35:49 +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
Manuel Raynaud
0e5b902752
hardcode utf8 parameters
2013-10-18 13:57:24 +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
Manuel Raynaud
e602884ce0
end module activation
2013-10-18 10:06:42 +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
Manuel Raynaud
52ed89f1aa
fix cs
2013-10-18 09:28:17 +02:00
touffies
adc473a595
Change path to /account page
2013-10-18 09:19:47 +02:00
Manuel Raynaud
12b5a81364
display error on ajax module activation
2013-10-18 09:17:08 +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
Manuel Raynaud
3a4fb6f2d2
clear cache after each activatin or deactivation
2013-10-18 08:33:46 +02:00
Manuel Raynaud
2ecd1caac6
dispatching event for clearing cache
2013-10-18 08:25:42 +02:00
Manuel Raynaud
6d791f5bf7
process module toggle activation
2013-10-17 18:50:00 +02:00
Manuel Raynaud
d25ad53d5a
create module event and eventListener
2013-10-17 18:26:23 +02:00
Manuel Raynaud
1b0de7144a
end updating module list
2013-10-17 17:20:29 +02:00
