Commit Graph

9 Commits

Author SHA1 Message Date
gmorel
cee49c908d Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon
* 'coupon' of https://github.com/thelia/thelia:

# By Manuel Raynaud (10) and others
# Via Manuel Raynaud (3) and others
* 'master' of https://github.com/thelia/thelia: (27 commits)
  AttributesAv management
  update cart model
  Using "update" instead of "change"
  Finished admin controllers refactoriing
  Created AbstractCrudController, and refactored existing controllers
  Continuer attributes management
  Change script file declaration order for bootstrap-editable fix
  Delete form on the orders view
  translate error message
  - Creation of order-edit view
  valid customer removal
  pse ref in faker
  pse ref
  loop tests
  test product loop limit
  update customer general info
  fix tests
  product loop test
  remove not needed flag in customer part
  change method to retrieve data in customer create process
  ...
2013-09-12 15:54:32 +02:00
Manuel Raynaud
d6e1f99b35 Merge branch 'template'
Conflicts:
	templates/admin/default/customer-edit.html
2013-09-12 15:44:23 +02:00
gmorel
8668bf93bd Working
- Coupon Add/Edit/Delete rule AJAX
2013-09-12 14:10:36 +02:00
gmorel
d16f3c28e5 Working
- CasperJS : coupon rule
2013-09-11 19:39:10 +02:00
Manuel Raynaud
3e301a9fc1 creating account page 2013-09-11 18:57:49 +02:00
gmorel
d846d10832 Working
- CasperJS : coupon rule
2013-09-11 17:47:52 +02:00
gmorel
33d6c85052 WIP
- add tests casper JS on coupon
2013-09-11 17:10:36 +02:00
gmorel
8d71bfecc5 WIP
- add tests casper JS on coupon
2013-09-11 17:06:04 +02:00
gmorel
c8b5b9e9fa Working
- add tests casper JS
2013-09-11 15:35:25 +02:00