Commit Graph

22 Commits

Author SHA1 Message Date
gmorel
dde8501790 WIP : coupon refactor + fix 2013-09-26 18:18:45 +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
198bd9bec8 add abstract getDispatcher method to use CartTrai 2013-09-19 16:06:42 +02:00
gmorel
3b249dc21c Working : Coupon : Unit testing 2013-09-17 11:41:09 +02:00
gmorel
2e7e31285e WIP : Coupon event dispatcher + action 2013-09-12 17:21:49 +02:00
gmorel
34609b19c2 WIP : Coupon Adapter methods implementation 2013-09-12 15:53:52 +02:00
gmorel
b778898d92 WIP
- Coupon - add rule AJAX
2013-09-09 16:40:53 +02:00
gmorel
e78ba1f670 WIP
- Refactor Coupon : is Customer matching Coupon rules
2013-09-08 17:36:21 +02:00
gmorel
49be95a2e7 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia: (39 commits)
  Working :
  Working :
  Working :
  Working :
  Fixed minor visual glitches
  Working : Resize countries flag + Add bootstrap-switch
  fix test suite
  clear asset cache in cache:cler command
  Added a 'development mode' to assetic smarty plugin
  rewriting router
  use good Request object
  Added Tools\URL test case, and a test case superclass for initializing Tools\URL
  remove unused UrlWritin controller
  create router for rewriting matching
  customer substitutions
  fix typo in front id
  Working : For attributes on labels
  Working : For attributes on labels
  add label_attr attribute to form smarty plugin
  start refactorin rewriting routing
  ...

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/less/thelia/bootstrap-editable.less
	templates/admin/default/categories.html
2013-09-06 19:38:08 +02:00
gmorel
8a5e12f814 WIP
- Add Coupon, Rules, CouponManager, Adapter as Services
- Refactor Coupon to use these services
2013-09-06 11:47:00 +02:00
gmorel
eea29cba06 WIP
- Add Coupon, Rules, CouponManager, Adapter as Services
- Refactor Coupon to use these services
2013-09-05 20:07:17 +02:00
gmorel
50d50d3b91 WIP Coupon
Refactor : creating dedicated reusable module for Constraints
Adding ConstraintManager
Secured :
- Effects : RemoveXPercent + RemoveXAmount
- Validators : all  except ModelParam (need CustomerModelParam, AreaModelParam, CountryModelParam ?)
- Conditions : AvailableForTotalAmount
2013-08-28 09:33:33 +02:00
gmorel
c24e82758f WIP Coupon
Refactor : creating dedicated reusable module for Constraints
Adding ConstraintManager
Secured :
- Effects : RemoveXPercent + RemoveXAmount
- Validators : all  except ModelParam (need CustomerModelParam, AreaModelParam, CountryModelParam ?)
- Conditions : AvailableForTotalAmount
2013-08-27 18:53:18 +02:00
gmorel
e971179a60 WIP Coupon
Default Implementation + Unit test in order to validate the chain
- effect
- application field
- condition
2013-08-27 13:28:57 +02:00
gmorel
eae86cd797 WIP Coupon
Refactor
2013-08-23 20:00:32 +02:00
gmorel
73677b7c1a WIP Coupon
Update Coupon Model + SQL
Implementattion Fixtures for Coupon and CouponFactory
2013-08-22 20:02:03 +02:00
gmorel
c02e286d09 WIP Coupon
Implementation CouponInterface 1st class : RemoveXAmount
Implementation CouponRuleInterface 1st class : AvailableForTotalAmount
2013-08-21 20:03:03 +02:00
gmorel
df08158cff WIP Coupon
Implementation Comparable Parameters
2013-08-20 19:05:41 +02:00
gmorel
2113e7a457 WIP Coupon
RemoveXPercent and RemoveXAmount implementation
2013-08-19 20:02:53 +02:00
gmorel
4e40555313 Init Coupon module design 2013-08-19 18:50:45 +02:00