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

22 Commits

Author SHA1 Message Date
gmorel
73fde64f5b WIP : coupon refactor + fix 2013-09-26 17:47:41 +02:00
gmorel
9ceddf4870 WIP : Condition : refactor name 2013-09-26 14:12:53 +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
ed4809bac4 Working : Coupon : fix links and errors display 2013-09-13 12:42:33 +02:00
gmorel
964355e60d Working : Coupon - update loop 2013-09-12 21:34:50 +02:00
gmorel
d16f3c28e5 Working 
- CasperJS : coupon rule
 2013-09-11 19:39:10 +02:00
gmorel
8be785e9b3 WIP 
- Coupon Add/Edit/Delete rule AJAX
 2013-09-10 20:00:43 +02:00
gmorel
f481da7a2f WIP 
- Coupon Add/Edit/Delete rule AJAX
 2013-09-10 15:41:23 +02:00
gmorel
0fe443f53d WIP 
- Coupon Add/Edit/Delete rule AJAX
 2013-09-09 21:43:58 +02:00
gmorel
413e77fa97 WIP 
- Coupon : ajax add
 2013-09-09 17:46:01 +02:00
gmorel
b778898d92 WIP 
- Coupon - add rule AJAX
 2013-09-09 16:40:53 +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
a9b0f53334 Merge remote-tracking branch 'origin/coupon' into coupon 
Conflicts:
	templates/admin/default/coupon/form.html
 2013-09-04 19:25:57 +02:00
gmorel
23a4ff26c8 Working 
- Base create/update coupon in backoffice
 2013-09-04 19:22:20 +02:00
mespeche
910477f371 Working : Migration form to bootstrap3 2013-09-04 18:08:13 +02:00
gmorel
b9577e87e3 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less
 2013-09-04 16:23:16 +02:00
gmorel
7b0f2ee4bc Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less
 2013-09-04 16:12:22 +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
dc271db577 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (8) and franck (2)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  en_EN -> en_UK, the "en_EN" locale does not exists.
  Smarty inheritance in admin template.
  fix typo in phpdoc
  complete test for foramt_number smarty function
  test foramt_date without datetime object
  create foramt_number smarty function
  remove sqlmap file
  add some phpdoc
  complete test for format_date smarty function
  create new smarty function for displaying date in expected format

Conflicts:
	reset_install.sh
 2013-09-04 12:01:12 +02:00