Commit Graph

84 Commits

Author SHA1 Message Date
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
touffies
9b617755ca Update profile - new method [Not finished yet] 2013-10-18 09:47:11 +02:00
gmorel
d2851b1c93 WIP : Coupon implementation in front : Coupon : Fixing unit tests 2013-10-17 01:38:13 +02:00
touffies
1a8dfa46f4 Redirect new customer with valid email to the registration page. 2013-10-16 10:55:23 +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
c65ec67bdf fix cs 2013-09-30 10:35:34 +02:00
Manuel Raynaud
43b5a129f7 refactor order and image events 2013-09-30 10:34:08 +02:00
Manuel Raynaud
1c2532fe6a refactor cart events 2013-09-30 10:15:22 +02:00
Manuel Raynaud
0ce4b25e72 refactor customer events 2013-09-30 10:07:01 +02:00
Manuel Raynaud
b023c33cc7 refactor address and attribute events 2013-09-30 10:03:14 +02:00
Etienne Roudeix
8541499302 order process 2013-09-20 16:25:46 +02:00
Etienne Roudeix
6e9af59403 order creation 2013-09-19 19:56:59 +02:00
Etienne Roudeix
61fab3a62a order creation 2013-09-19 15:11:54 +02:00
Etienne Roudeix
0d1c6cf8cb postage + invoice step 2013-09-17 19:47:10 +02:00
Etienne Roudeix
acaa4a969e empty cart or delivery exception 2013-09-17 16:38:16 +02:00
Etienne Roudeix
8d20316217 no-return-functions block 2013-09-17 14:59:40 +02:00
Etienne Roudeix
c4fd65e6ea delivery process 2013-09-17 12:38:23 +02:00
Etienne Roudeix
692badb06b delivery form 2013-09-17 11:05:29 +02:00
Etienne Roudeix
afa9a46abf order delivery form 2013-09-16 18:55:29 +02:00
Manuel Raynaud
ea1ee4932d Merge branch 'master' into template
Conflicts:
	core/lib/Thelia/Controller/Front/AddressController.php
2013-09-13 12:36:56 +02:00
Manuel Raynaud
8367863b48 allow address removal from front 2013-09-13 12:33:13 +02:00
Manuel Raynaud
ddf175f361 allow update customer address in front tempalte 2013-09-13 11:31:12 +02:00
Manuel Raynaud
275b20ac77 allow to make an address as default on update action 2013-09-13 10:17:45 +02:00
Manuel Raynaud
1daa96a57d call display403 method 2013-09-12 17:13:52 +02:00
Manuel Raynaud
0ca5af597a add accessDenied method 2013-09-12 16:50:13 +02:00
Manuel Raynaud
2bf6ee51e1 add helper checkXmlHttpRequest 2013-09-12 16:45:32 +02:00
Manuel Raynaud
5d87e48ba0 update customer general info 2013-09-12 11:24:24 +02:00
Manuel Raynaud
6fea7ef441 change method to retrieve data in customer create process 2013-09-12 09:48:24 +02:00
Manuel Raynaud
6b9db1a162 create test for customer creation 2013-09-12 09:23:50 +02:00
Manuel Raynaud
9cc3162696 finishing creating lost password template 2013-09-11 17:22:23 +02:00
Manuel Raynaud
858cc7f4f2 validate customer creation form 2013-09-11 14:32:57 +02:00
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
Manuel Raynaud
7eb3ec41fe complete login form 2013-09-10 12:16:19 +02:00
Manuel Raynaud
0aad4baf26 create controller adding delivery module in session 2013-09-06 19:29:19 +02:00
Manuel Raynaud
2dee65727d set good module delivery id in session 2013-09-06 16:12:57 +02:00
Etienne Roudeix
b95218295d rewriting router 2013-09-06 08:59:06 +02:00
Manuel Raynaud
e82a49d326 remove unused UrlWritin controller 2013-09-05 20:53:03 +02:00
Manuel Raynaud
86892f7af6 fix issue for retrieving default view in defaultController 2013-09-05 09:10:53 +02:00
Manuel Raynaud
3f405d1ce9 Merge branch 'master' of github.com:thelia/thelia
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
2013-09-04 17:57:41 +02:00
Manuel Raynaud
ceb02841e1 validate create and update address in front context 2013-09-04 17:52:58 +02:00
franck
6387182026 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Config.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Tools/URL.php
2013-09-04 17:34:23 +02:00
Manuel Raynaud
3cb4e6ff2e create Address::update method in controller 2013-09-04 11:42:18 +02:00
Manuel Raynaud
8b2007f94d Merge branch 'actions'
Conflicts:
	core/lib/Thelia/Action/Currency.php
	core/lib/Thelia/Core/Event/TheliaEvents.php
2013-09-04 10:53:32 +02:00
Manuel Raynaud
0efe393e3c Merge branch 'master' of github.com:thelia/thelia
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
2013-09-04 10:50:13 +02:00
Manuel Raynaud
d23190303c refactor name for updating actions 2013-09-04 10:48:59 +02:00
franck
ec32aa9eb5 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
2013-09-03 19:03:27 +02:00
Manuel Raynaud
deee59244d address action implementation 2013-09-03 17:11:11 +02:00
Etienne Roudeix
a47ef40996 hot fix 2013-09-03 16:57:31 +02:00
Etienne Roudeix
43ff0b7297 rewriting 2013-09-03 16:51:41 +02:00
Manuel Raynaud
5c3ac1561d add address create controller and event 2013-09-03 16:13:17 +02:00