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

937 Commits

Author SHA1 Message Date
gmorel
d2851b1c93 WIP : Coupon implementation in front : Coupon : Fixing unit tests 2013-10-17 01:38:13 +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
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
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
da81575a61 Remove novalidate on the form element 2013-10-16 10:57:02 +02:00
touffies
d091359299 Fix HTML5 autofocus 
- Focus Email if error of if value is null (Page load)
- Otherwise Focus password
 2013-10-16 10:38:29 +02:00
badsuricate
8d15d161fb Creation of "include/mini-cart.html" 2013-10-16 09:51:48 +02:00
badsuricate
04bd135c94 Static content to dynamic content 2013-10-16 09:51:08 +02:00
badsuricate
6ffeb2053c Include "include/mini-cart.html" 2013-10-16 09:45:53 +02:00
touffies
1610ffab65 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-16 09:33:42 +02:00
gmorel
36dd7add79 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (38 commits)
  add propel connection in transactions
  remove area to area_delivery_module
  add an area to a delivery module
  create shipping zone area form
  update readme
  start shipping zone management
  complete admin log message
  allow to create a new area
  delete area
  add pre/post methods in Area model
  display error message
  update area postage
  add missinf files
  remove country from area and start creating postage management
  add country to as area
  start area configuration tempalte
  choices access through smarty
  tax rule creation
  downgrade smarty version
  create all area events
  ...
 2013-10-15 22:51:27 +02:00
Manuel Raynaud
4f83c7f078 display module list 2013-10-15 11:07:58 +02:00
touffies
ca1587c6e7 Merge with Master 2013-10-15 11:05:05 +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
badsuricate
ec4bf3d7bd Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-14 14:36:17 +02:00
badsuricate
d1d234919b Modification of Product for display good informations about the product 2013-10-14 14:35:11 +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
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
998e1369a5 display error message 2013-10-14 11:15:08 +02:00
Manuel Raynaud
52b68df4bc update area postage 2013-10-14 11:12:17 +02:00
Manuel Raynaud
b371f5c54c remove country from area and start creating postage management 2013-10-14 11:03:13 +02:00
Manuel Raynaud
dfee7e87a6 add country to as area 2013-10-14 10:04:08 +02:00
Manuel Raynaud
97ce036cbe start area configuration tempalte 2013-10-11 17:23:40 +02:00
Manuel Raynaud
4aed59693a complete AreaController 2013-10-11 16:48:15 +02:00
Etienne Roudeix
c84e451a12 tax rule creation 2013-10-11 13:51:30 +02:00
badsuricate
b5f57a4819 Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-11 13:13:07 +02:00
badsuricate
7602ddc962 Rename category-toolbar to toolbar 2013-10-11 13:12:38 +02:00
badsuricate
6d5768c16f Add search page 2013-10-11 13:08:15 +02:00
Etienne Roudeix
2c88471ef3 Merge branch 'master' into tax 2013-10-11 11:13:41 +02:00
Etienne Roudeix
763026700d tax rule edition 2013-10-11 11:09:23 +02:00
gmorel
55c60ed89e Working : Coupon : add WYSIWYG 2013-10-10 23:00:36 +02:00
Kahn
7f59c8a954 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia:
  fix issue concerning absoluteUrl
  do not display some information about template file
  escape view parameter
 2013-10-10 22:12:42 +02:00
touffies
d58f63990a Remove path.less in thelia's folder 2013-10-10 16:41:50 +02:00
touffies
3092c260b1 Remove alert 2013-10-10 16:40:44 +02:00