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

326 Commits

Author SHA1 Message Date
gmorel
d6172f23cf WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 14:51:42 +02:00
gmorel
d0f20cca1d Working : coupon creation : add default rule (thelia.constraint.rule.available_for_everyone) 2013-09-23 23:04:00 +02:00
gmorel
e4658d2fa2 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (68) and others
# Via Manuel Raynaud (12) and others
* 'master' of https://github.com/thelia/thelia: (119 commits)
  order tests
  action order tests
  cache dataccessfunctions
  order action test
  fire event on insert content in createmethod
  fix issue, default foler is set on content creation
  allow to create new content
  update default param of content model
  create content listener for crud management
  dispatch event in pre/post crud method for content model
  display content modification page
  create contentUpdateEvent
  create contentCreateEvent
  create ContentEvent
  create contentModificationForm
  create content controller
  change folder_id parm by parent in list folder view
  use placeholder in folder update route
  implement process for changing folder position
  allow possibility to change folder visibility
  ...

Conflicts:
	core/lib/Thelia/Coupon/CouponBaseAdapter.php
	templates/admin/default/coupon-list.html
	templates/admin/default/coupon-read.html
 2013-09-23 21:03:26 +02:00
Etienne Roudeix
5bbf693e0f action order tests 2013-09-23 14:44:52 +02:00
Manuel Raynaud
ac435b8f87 fire event on insert content in createmethod 2013-09-21 17:04:05 +02:00
Manuel Raynaud
04e0da56e7 fix issue, default foler is set on content creation 2013-09-21 16:58:38 +02:00
Manuel Raynaud
4e3768e0e9 allow to create new content 2013-09-21 16:38:22 +02:00
Manuel Raynaud
1da66ece29 update default param of content model 2013-09-21 16:07:25 +02:00
Manuel Raynaud
7680fb42cc dispatch event in pre/post crud method for content model 2013-09-21 15:24:44 +02:00
Manuel Raynaud
849c7dd20b display content modification page 2013-09-21 15:20:06 +02:00
Manuel Raynaud
aa39d6300c add dispatcher before/after for folder crud management 2013-09-20 19:57:25 +02:00
Etienne Roudeix
b7af3ebaa3 push model 2013-09-20 17:02:19 +02:00
Etienne Roudeix
c05496af53 Merge branch 'master' into template 2013-09-20 16:32:42 +02:00
Etienne Roudeix
d74fc0e1d3 Merge branch 'master' of github.com:thelia/thelia 2013-09-20 16:32:32 +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
1649e4d76b fix query in Thelia\Model\Folder::countAllContents 2013-09-20 14:26:36 +02:00
Etienne Roudeix
17548e3526 order tax tables 2013-09-20 08:23:02 +02:00
gmorel
8e308d21e9 Working : Coupon : fix update effect (becomes type), update max usage 2013-09-19 23:25:01 +02:00
Manuel Raynaud
24f17bcb0f fix count child on folder and category folder. Doubitch 2013-09-19 20:24:33 +02:00
Etienne Roudeix
6a990bf625 Merge branch 'template' 2013-09-19 20:07:57 +02:00
Etienne Roudeix
6e9af59403 order creation 2013-09-19 19:56:59 +02:00
Etienne Roudeix
1d969e38ec order tables 2013-09-19 18:30:13 +02:00
franck
e672677748 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/admin/default/category-edit.html
 2013-09-19 17:27:46 +02:00
Etienne Roudeix
198bd9bec8 add abstract getDispatcher method to use CartTrai 2013-09-19 16:06:42 +02:00
Etienne Roudeix
ec7d4471dc payment process 2013-09-19 15:59:16 +02:00
Etienne Roudeix
61fab3a62a order creation 2013-09-19 15:11:54 +02:00
Etienne Roudeix
66536d0b31 Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Product.php
 2013-09-18 20:03:13 +02:00
Manuel Raynaud
84813ced1e dispatch event when generate new url 2013-09-18 13:15:36 +02:00
Manuel Raynaud
fd74703658 create test rewritten url for category 2013-09-18 12:24:36 +02:00
Manuel Raynaud
4eaf7288ba create helper for retrieving passed url view 2013-09-18 12:10:56 +02:00
Manuel Raynaud
e638a927c0 add more test for rewriten url 2013-09-18 12:03:02 +02:00
Etienne Roudeix
9b37bbb862 module image 2013-09-18 11:20:29 +02:00
Manuel Raynaud
6483813a35 rtrime rewritten url 2013-09-18 11:07:15 +02:00
Manuel Raynaud
41f7b817c6 remove unused classes 2013-09-18 10:54:22 +02:00
Manuel Raynaud
e7fa896866 remove unused classes 2013-09-18 10:52:07 +02:00
Manuel Raynaud
a041273b80 remove unused classes 2013-09-18 10:34:31 +02:00
Manuel Raynaud
826ad83584 Merge branch 'master' of github.com:thelia/thelia 2013-09-18 08:11:08 +02:00
franck
d02f13f021 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php
 2013-09-18 00:35:48 +02:00
franck
de4767ef56 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Model/Product.php
 2013-09-17 23:51:31 +02:00
Manuel Raynaud
5a64654ce5 move url generation to I18n entity 2013-09-17 20:45:29 +02:00
Manuel Raynaud
7c340303f6 Merge branch 'master' of github.com:thelia/thelia 2013-09-17 20:29:47 +02:00
Manuel Raynaud
e4b36098c7 fix typo and remove url generation in postInsert model 2013-09-17 20:29:09 +02:00
franck
1e15142283 Added product creation 2013-09-17 20:18:53 +02:00
Etienne Roudeix
9bce1cbabb Merge branch 'master' into template 2013-09-17 20:16:48 +02:00
Manuel Raynaud
da7f9e07c4 create test for UrlRewritingTrait 2013-09-17 20:15:28 +02:00
Etienne Roudeix
5ffb737c50 Merge branch 'master' into template 2013-09-17 20:14:17 +02:00
Etienne Roudeix
0d1c6cf8cb postage + invoice step 2013-09-17 19:47:10 +02:00
Manuel Raynaud
e1e383707b template is not mandatory in product table. 2013-09-17 19:19:52 +02:00
Manuel Raynaud
9020de5b9a Merge branch 'master' of github.com:thelia/thelia 2013-09-17 19:12:14 +02:00