Commit Graph

1045 Commits

Author SHA1 Message Date
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
gmorel
870612f51c WIP
- Coupon Add/Edit/Delete rule AJAX
- add tests casper JS
2013-09-11 14:43:09 +02:00
gmorel
a9dae509c7 WIP
- Coupon Add/Edit/Delete rule AJAX
- add tests casper JS
2013-09-11 14:40:55 +02:00
gmorel
7e2f57e618 Working
- Coupon Add/Edit/Delete rule AJAX
2013-09-11 09:48:33 +02:00
gmorel
8be785e9b3 WIP
- Coupon Add/Edit/Delete rule AJAX
2013-09-10 20:00:43 +02:00
gmorel
3ffc948d4b Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (9) and Etienne Roudeix (1)
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia:
  update customer loop in template customer
  strat regiter page
  complete login form
  change link for homepage
  start creating register and login pages
  display good currency in template
  defin currency at runtime
  creating index page
  fix tests
  start integration default template
2013-09-10 15:41:59 +02:00
gmorel
f481da7a2f WIP
- Coupon Add/Edit/Delete rule AJAX
2013-09-10 15:41:23 +02:00
Manuel Raynaud
f8c907d79e update customer loop in template customer 2013-09-10 14:57:56 +02:00
Manuel Raynaud
9ef1b17ea5 strat regiter page 2013-09-10 12:22:35 +02:00
Manuel Raynaud
7eb3ec41fe complete login form 2013-09-10 12:16:19 +02:00
Manuel Raynaud
71928ec879 change link for homepage 2013-09-10 08:14:07 +02:00
gmorel
0fe443f53d WIP
- Coupon Add/Edit/Delete rule AJAX
2013-09-09 21:43:58 +02:00
Manuel Raynaud
f5e7467c86 start creating register and login pages 2013-09-09 21:40:58 +02:00
Manuel Raynaud
1bf2d02477 display good currency in template 2013-09-09 21:17:01 +02:00
Manuel Raynaud
bf46a937c0 defin currency at runtime 2013-09-09 21:00:28 +02:00
Manuel Raynaud
f7abcf8756 Merge branch 'master' into template 2013-09-09 19:24:01 +02:00
Manuel Raynaud
82602622e3 creating index page 2013-09-09 19:23:35 +02:00
gmorel
6b6dc1c800 Working
- Allow to parse array and objects in Smarty Template
2013-09-09 19:22:07 +02:00
Etienne Roudeix
b365443c22 fix tests 2013-09-09 18:49:21 +02:00
gmorel
ffe6280213 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Etienne Roudeix
# Via Etienne Roudeix (2) and gmorel (2)
* 'master' of https://github.com/thelia/thelia:
  pass container to thelialoop smarty plugin then to baseloop
2013-09-09 18:19:46 +02:00
Etienne Roudeix
7fd6ea6943 Merge branch 'tax' 2013-09-09 18:16:28 +02:00
Etienne Roudeix
c5f30baba5 pass container to thelialoop smarty plugin then to baseloop 2013-09-09 18:15:49 +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
gmorel
1be89c9985 Merge branch 'master' of https://github.com/thelia/thelia
# By Manuel Raynaud (79) and others
# Via gmorel (21) and others
* 'master' of https://github.com/thelia/thelia: (268 commits)
  unit testing for tax engine calculator
  tax in loops
  remove test
  Working - Add Symfony2 routing ability to Thelia router
  finish simple list customer page in backoffice
  Working - Fix #category-rule replaced by parser when writing jawascript
  debug bar
  mock getTotalAmoutn in order class
  tax engine
  escae output only if it's not an object
  tax faker
  insert 19.6 tva
  create admin customer view and add output info in customer loop
  update format smarty plugin
  tax engine model
  tax engine model
  WIP - Coupon : add rule input ajax controller
  create customer admin controller and index controller
  clean some code
  fix phpdoc
  ...
2013-09-09 17:47:32 +02:00
gmorel
2d7380e068 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Etienne Roudeix
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
  unit testing for tax engine calculator
2013-09-09 17:46:14 +02:00
gmorel
413e77fa97 WIP
- Coupon : ajax add
2013-09-09 17:46:01 +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
Manuel Raynaud
02d758ae9a start integration default template 2013-09-09 17:30:18 +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
6443c32dc5 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Etienne Roudeix (7) and Manuel Raynaud (7)
# Via Etienne Roudeix (2) and Manuel Raynaud (1)
* 'master' of https://github.com/thelia/thelia:
  tax in loops
  remove test
  finish simple list customer page in backoffice
  debug bar
  mock getTotalAmoutn in order class
  tax engine
  escae output only if it's not an object
  tax faker
  insert 19.6 tva
  create admin customer view and add output info in customer loop
  update format smarty plugin
  tax engine model
  tax engine model
  create customer admin controller and index controller
2013-09-09 16:41:11 +02:00
gmorel
b778898d92 WIP
- Coupon - add rule AJAX
2013-09-09 16:40:53 +02:00
Etienne Roudeix
519678a543 Merge branch 'tax' 2013-09-09 16:28:32 +02:00
Etienne Roudeix
ca4df15910 tax in loops 2013-09-09 16:27:46 +02:00
Manuel Raynaud
8cc4afdb68 Merge branch 'customers' 2013-09-09 16:09:18 +02:00
Manuel Raynaud
3618199c05 remove test 2013-09-09 16:08:42 +02:00
gmorel
849520eff9 Working
- Add Symfony2 routing ability to Thelia router
2013-09-09 16:08:12 +02:00
Manuel Raynaud
66454ef3f0 finish simple list customer page in backoffice 2013-09-09 16:03:38 +02:00
gmorel
7d4003741c Working
- Fix #category-rule replaced by parser when writing jawascript
2013-09-09 15:35:21 +02:00
Etienne Roudeix
fa36b64f51 debug bar 2013-09-09 14:44:39 +02:00
Manuel Raynaud
d4ec36e920 mock getTotalAmoutn in order class 2013-09-09 14:29:11 +02:00
Etienne Roudeix
0ddf88e46e tax engine 2013-09-09 14:24:50 +02:00
Manuel Raynaud
77fc36fc91 escae output only if it's not an object 2013-09-09 12:46:27 +02:00
Etienne Roudeix
a178835f6b tax faker 2013-09-09 11:31:41 +02:00
Etienne Roudeix
2548fb9e3c insert 19.6 tva 2013-09-09 11:28:02 +02:00
Manuel Raynaud
8e77e4b530 create admin customer view and add output info in customer loop 2013-09-09 11:07:51 +02:00
Manuel Raynaud
54dd496f52 update format smarty plugin 2013-09-09 11:07:14 +02:00
Etienne Roudeix
ca9ec3b089 tax engine model 2013-09-09 11:01:31 +02:00