Commit Graph

191 Commits

Author SHA1 Message Date
gmorel
45fabcfdd6 WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 16:47:01 +02:00
gmorel
b7851b2d54 WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 16:36:14 +02:00
gmorel
d6172f23cf WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 14:51:42 +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
2de820f576 order tests 2013-09-23 15:00:13 +02:00
Etienne Roudeix
5bbf693e0f action order tests 2013-09-23 14:44:52 +02:00
Etienne Roudeix
194073fa42 order action test 2013-09-23 11:12:41 +02:00
Etienne Roudeix
8541499302 order process 2013-09-20 16:25:46 +02:00
gmorel
8e308d21e9 Working : Coupon : fix update effect (becomes type), update max usage 2013-09-19 23:25:01 +02:00
Manuel Raynaud
65558e74e3 clean code in test suites 2013-09-19 15:50:47 +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
Etienne Roudeix
891ebcd491 fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar 2013-09-18 19:51:01 +02:00
Etienne Roudeix
45106f24bd module image 2013-09-18 15:58:58 +02:00
Manuel Raynaud
8e8b55a208 refactor product rewriting test case 2013-09-18 14:33:54 +02:00
Manuel Raynaud
7c53eeea2f create base class for testing rewriting method on each object 2013-09-18 14:32:49 +02:00
Manuel Raynaud
fd74703658 create test rewritten url for category 2013-09-18 12:24:36 +02:00
Manuel Raynaud
e638a927c0 add more test for rewriten url 2013-09-18 12:03:02 +02:00
Etienne Roudeix
bb246b3205 fix test 2013-09-18 08:55:12 +02:00
franck
48e2be57c6 Fixed some unit tests 2013-09-18 01:24:37 +02:00
gmorel
3aa9c71e34 Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon
* 'coupon' of https://github.com/thelia/thelia:

# By Etienne Roudeix (17) and others
# Via Etienne Roudeix (9) and others
* 'master' of https://github.com/thelia/thelia: (52 commits)
  fix content faker
  fix typo and remove url generation in postInsert model
  add covers annotation in ProductRewriteTest
  create test for UrlRewritingTrait
  payment loop
  fix postage display
  postage + invoice step
  template is not mandatory in product table.
  refactor rewrriten method name
  Changed getDefaultCategory in getDefaultCategoryId
  remove old model classes:
  Working : Content : fix loop giving no elements
  Working : Content : fix loop giving no elements
  Added missing files...
  Started product management
  Working : Content : fix loop giving no elements
  Working : Product : fix loop giving no elements
  cart billing integration
  empty cart or delivery exception
  remove isntall routing and template
  ...
2013-09-17 22:55:29 +02:00
Manuel Raynaud
f068539e79 add covers annotation in ProductRewriteTest 2013-09-17 20:16:51 +02:00
Manuel Raynaud
da7f9e07c4 create test for UrlRewritingTrait 2013-09-17 20:15:28 +02:00
gmorel
3b249dc21c Working : Coupon : Unit testing 2013-09-17 11:41:09 +02:00
franck
d097851522 Added documents action and loop 2013-09-17 01:07:42 +02:00
gmorel
a7ef4300aa WIP : Coupon : unit tests on Rules 2013-09-16 23:56:31 +02:00
gmorel
ad48823b48 WIP : Coupon : unit tests on Rules 2013-09-16 23:51:47 +02:00
gmorel
73c0a96979 WIP : Coupon : unit tests on Operator 2013-09-16 23:05:46 +02:00
gmorel
c49bfa4b25 Working : Coupon : Fix unit tests @todo refactor 2013-09-16 11:26:37 +02:00
gmorel
970d6b6ff7 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By franck (6) and others
# Via franck (3) and others
* 'master' of https://github.com/thelia/thelia:
  Implemented "Remember Me" feature on admin. Started template management
  Added Templates events
  First version of installation wizard
  tax engine retriever
  allow address removal from front
  Insert pagination inside tfoot
  allow update customer address in front tempalte
  allow to create a new address
  allow to make an address as default on update action
  Finished attributes management
  Fixed action column alignment
  Fixed duplication parameter check regexp
  absoluteUrl prevetn duplicate parameters in generated URL
2013-09-16 10:01:34 +02:00
Etienne Roudeix
ac40705c80 Merge branch 'master' into tax 2013-09-13 14:02:39 +02:00
Etienne Roudeix
ecc419fbdf tax engine retriever 2013-09-13 13:59:16 +02:00
gmorel
58ef39769c Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Etienne Roudeix (1) and Manuel Raynaud (1)
# Via Manuel Raynaud (2) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  fix test suite
  fix current url bug + fix empty loop pagination exception
2013-09-12 17:55:16 +02:00
Manuel Raynaud
bad8a0439d fix test suite 2013-09-12 17:28:02 +02:00
gmorel
2e7e31285e WIP : Coupon event dispatcher + action 2013-09-12 17:21:49 +02:00
Manuel Raynaud
d6e1f99b35 Merge branch 'template'
Conflicts:
	templates/admin/default/customer-edit.html
2013-09-12 15:44:23 +02:00
Etienne Roudeix
b698d1aada loop tests 2013-09-12 11:35:27 +02:00
Etienne Roudeix
f75b6e876c test product loop limit 2013-09-12 11:28:32 +02:00
Etienne Roudeix
e81b894816 fix tests 2013-09-12 10:58:12 +02:00
Etienne Roudeix
d61f3a6a1e product loop test 2013-09-12 10:48:27 +02:00
Manuel Raynaud
6b9db1a162 create test for customer creation 2013-09-12 09:23:50 +02:00
Etienne Roudeix
c35de47f10 fix taxengine tests 2013-09-11 20:18:34 +02:00
Etienne Roudeix
25756ef9dd tax engine 2013-09-11 16:56:16 +02:00
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
Etienne Roudeix
b365443c22 fix tests 2013-09-09 18:49:21 +02:00
gmorel
c0b7e41e91 Merge branch 'coupon' of https://github.com/thelia/thelia
* 'coupon' of https://github.com/thelia/thelia:
  WIP - Coupon : ajax add
  WIP - Coupon - unit test : no more fatal but some skipped/incomplete
  WIP - Coupon - unit test : no more fatal but some fails
  WIP - Coupon - add rule AJAX
2013-09-09 17:48:15 +02:00
Etienne Roudeix
2f4442bdb9 Merge branch 'tax' 2013-09-09 17:44:26 +02:00
Etienne Roudeix
04d8990990 unit testing for tax engine calculator 2013-09-09 17:43:58 +02:00
gmorel
0fb331a5cb WIP
- Coupon - unit test : no more fatal but some skipped/incomplete
2013-09-09 16:59:53 +02:00
gmorel
e839c92549 WIP
- Coupon - unit test : no more fatal but some fails
2013-09-09 16:46:22 +02:00
gmorel
b778898d92 WIP
- Coupon - add rule AJAX
2013-09-09 16:40:53 +02:00