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

167 Commits

Author SHA1 Message Date
gmorel
cf78c7c5d5 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia:
  theliatype in form : types now extends bastype which implement typeinterface basetype provides verifiyForm method wich can be call in Callback constraint
  restart thelia form type
  thelia type constraints
  tax management
  fix menu when child > 0
  taxes management
  tax rule edition
 2013-10-17 01:38:35 +02:00
gmorel
d2851b1c93 WIP : Coupon implementation in front : Coupon : Fixing unit tests 2013-10-17 01:38:13 +02:00
Manuel Raynaud
b3c761798b fix menu when child > 0 2013-10-16 11:45:18 +02:00
Manuel Raynaud
d866ffaaf5 escape view parameter 2013-10-09 09:05:48 +02:00
Manuel Raynaud
a7a663ebb8 select default country in front register form 2013-10-08 10:56:22 +02:00
Manuel Raynaud
666b19a6ff update address process 2013-10-04 17:33:48 +02:00
Manuel Raynaud
d37e28af19 rename order* file template 2013-09-30 11:12:15 +02:00
Manuel Raynaud
7bf5ee31c9 Merge branch 'refactor_action' 
Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php
 2013-09-30 10:26:59 +02:00
Etienne Roudeix
f9bffe9025 fix template 2013-09-27 15:23:35 +02:00
Etienne Roudeix
f60670c412 translations intl 2013-09-27 11:04:14 +02:00
Manuel Raynaud
a8a8ecb38c refactor product events, moving to Prduct folder 2013-09-25 17:50:29 +02:00
Manuel Raynaud
9c80120383 fix missing } in password template 2013-09-25 08:01:27 +02:00
Manuel Raynaud
bf11fa1958 re-add home link in menu 2013-09-20 16:56:23 +02:00
Manuel Raynaud
defaadcd62 Merge branch 'master' of github.com:thelia/thelia 2013-09-20 16:50:03 +02:00
Manuel Raynaud
44d6bbdb4a comment dev menu in layout 2013-09-20 16:48:37 +02:00
Etienne Roudeix
c05496af53 Merge branch 'master' into template 2013-09-20 16:32:42 +02:00
Manuel Raynaud
1a962d701d translate some missing string 2013-09-20 16:31:25 +02:00
Etienne Roudeix
61191b9d32 fixes order integration 2013-09-20 16:31:19 +02:00
Etienne Roudeix
8541499302 order process 2013-09-20 16:25:46 +02:00
Manuel Raynaud
4e6aac8917 Merge branch 'integration' 2013-09-20 14:39:00 +02:00
Manuel Raynaud
30d02799b2 Merge branch 'master' of github.com:thelia/thelia 2013-09-20 14:38:46 +02:00
Manuel Raynaud
2cf71f99a9 change some informations in layou 2013-09-20 14:38:11 +02:00
Manuel Raynaud
bb40086e2a allow to order products on category page 2013-09-20 13:59:51 +02:00
Manuel Raynaud
16de9bbcc9 allow displaying how much product wanted in category page 2013-09-20 09:19:12 +02:00
Manuel Raynaud
c255548d9b create dedicated file for menu 2013-09-20 08:45:38 +02:00
Manuel Raynaud
acffa60e50 awesome menu created in front office 2013-09-20 08:05:44 +02:00
Manuel Raynaud
24f17bcb0f fix count child on folder and category folder. Doubitch 2013-09-19 20:24:33 +02:00
Manuel Raynaud
e1353a63a7 complete meta tag for product part 2013-09-19 19:05:56 +02:00
Manuel Raynaud
a7a755fab5 add isbn meta tag 2013-09-19 18:58:43 +02:00
Manuel Raynaud
a540626fff fix product import 2013-09-19 18:47:12 +02:00
Manuel Raynaud
1f5cd1da62 create category template 2013-09-19 17:48:01 +02:00
Manuel Raynaud
af532ea271 change link to home page in front template 2013-09-19 16:45:38 +02:00
Manuel Raynaud
cb20f5e38b add block more info in product template 2013-09-19 16:33:34 +02:00
Etienne Roudeix
4ac9a0afad Merge branch 'master' of github.com:thelia/thelia 2013-09-19 16:24:05 +02:00
Manuel Raynaud
41bd8a7cec icomplete product page 2013-09-19 15:39:36 +02:00
Etienne Roudeix
3c02a9d23c Merge branch 'master' of github.com:thelia/thelia 2013-09-19 15:12:37 +02:00
Etienne Roudeix
61fab3a62a order creation 2013-09-19 15:11:54 +02:00
Manuel Raynaud
5a79c6c016 force_return as default value tue in Image loop 2013-09-19 12:45:02 +02:00
Manuel Raynaud
96ffe88938 fix loop image argument 2013-09-19 12:30:35 +02:00
Manuel Raynaud
f2acbed9d6 Merge branch 'master' of github.com:thelia/thelia 2013-09-18 21:12:12 +02:00
Manuel Raynaud
f3367aed45 finish import 2013-09-18 19:33:29 +02:00
Etienne Roudeix
b8c2bdc8df cheque module 2013-09-18 16:23:10 +02:00
Etienne Roudeix
03375a65b3 payment loop 2013-09-17 20:07:50 +02:00
Etienne Roudeix
347e5e5089 fix postage display 2013-09-17 19:52:20 +02:00
Etienne Roudeix
0d1c6cf8cb postage + invoice step 2013-09-17 19:47:10 +02:00
Etienne Roudeix
4a6adf532a cart billing integration 2013-09-17 16:53:20 +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