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

20 Commits

Author SHA1 Message Date
gmorel
f8ac32a4a0 Refactor : Coupon effect inputs are now more customisable 
Adding effect to be stored as serialised in JSON
 2013-12-29 01:23:50 +01:00
gmorel
dde8501790 WIP : coupon refactor + fix 2013-09-26 18:18:45 +02:00
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
8e308d21e9 Working : Coupon : fix update effect (becomes type), update max usage 2013-09-19 23:25:01 +02:00
gmorel
6118a68370 WIP : Coupon fix coupon creation issue 2013-09-13 18:03:08 +02:00
gmorel
8be785e9b3 WIP 
- Coupon Add/Edit/Delete rule AJAX
 2013-09-10 20:00:43 +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
23a4ff26c8 Working 
- Base create/update coupon in backoffice
 2013-09-04 19:22:20 +02:00
gmorel
6cba95f4ee Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (32 commits)
  refactor name for updating actions
  choose UPDATE word for name actions
  add update address action and create tests
  404 not found management
  Working Fix unset namespace
  modify travis script
  test rewriting exception
  Fixed minor bug in Currencies
  Finished currency edition
  Added route methods
  address action implementation
  hot fix
  rewriting
  add address create controller and event
  Added AdminUtilities Smarty plugin, optimized templates
  update customer model createOrUpdate method
  update address model
  fix redirect process in viewListener
  refactor reset_install script
  refactor install process, database management in dedicated class
  ...

Conflicts:
	local/config/schema.xml
	reset_install.sh
 2013-09-04 15:42:38 +02:00
gmorel
eef57ba30a WIP 
- Coupon controller
 2013-09-02 09:17:47 +02:00
gmorel
71fa04a193 WIP 
- Update Coupon Controller/Form/Event - create()
- Rule serialization/unserialization managed in Model/Coupon now
 2013-08-30 11:06:33 +02:00
Etienne Roudeix
a02ac99360 set x right to 7 2013-07-09 11:59:37 +02:00
Manuel Raynaud
5fda702b8d migrte propel to propel 2 2013-07-04 19:31:09 +02:00
Etienne Roudeix
ad47ab7cac set execution right // no more troubles 
change composer required PHP version from 5.4 to 5.3
 2013-06-20 15:21:16 +02:00
Manuel Raynaud
c72c13551c add Propel generated files 2013-01-16 10:58:36 +01:00
Manuel Raynaud
8279cc37b4 remove notnorm gen model 2013-01-15 10:39:16 +01:00
Manuel Raynaud
c3c7102f7b move Base model to Base directory 2012-12-27 11:37:32 +01:00
Manuel Raynaud
6ba59276e1 delete propel auto generated files 2012-12-20 17:59:30 +01:00
Manuel Raynaud
481ac07994 integrate propel generate model 2012-12-17 16:40:47 +01:00