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

330 Commits

Author SHA1 Message Date
Etienne Roudeix
e8a4e56324 tax engine 2013-09-11 16:21:51 +02:00
Etienne Roudeix
551c132b76 syntax 2013-09-11 11:14:54 +02:00
Etienne Roudeix
d24316feeb Merge branch 'master' into tax 2013-09-11 11:01:37 +02:00
Etienne Roudeix
3d31090344 currency management in PSE loop 2013-09-11 10:51:44 +02:00
mespeche
e4362ba414 Add customer view finish 2013-09-11 10:47:31 +02:00
mespeche
2f351fd4d9 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/Admin/CustomerController.php
	templates/admin/default/customers.html
 2013-09-11 10:26:56 +02:00
mespeche
40a87d50ce Add modal for create/delete customer 2013-09-11 10:21:07 +02:00
mespeche
a6ada57b34 Update body background 2013-09-11 10:20:31 +02:00
Etienne Roudeix
d6136c56d4 pse loop currency 2013-09-11 09:20:58 +02:00
Manuel Raynaud
3582ae4cf9 save register template 2013-09-11 08:51:34 +02:00
Manuel Raynaud
65a20381d9 Merge branch 'master' into template 2013-09-11 08:47:26 +02:00
Etienne Roudeix
a3bb124424 fix tests 2013-09-11 08:33:25 +02:00
Manuel Raynaud
990ab0e094 change debugbar render tag in templates 2013-09-11 08:19:37 +02:00
Manuel Raynaud
8fa3ed287b Merge branch 'master' of github.com:thelia/thelia 2013-09-11 08:16:39 +02:00
Manuel Raynaud
fe8680ed76 refactor debugBar plugin 2013-09-10 22:15:55 +02:00
Manuel Raynaud
f7666c1edf Merge branch 'master' of github.com:thelia/thelia 2013-09-10 19:22:23 +02:00
Manuel Raynaud
a050b0c362 remove # for smarty variable delimiter 2013-09-10 19:21:56 +02:00
Etienne Roudeix
3b433a0c8d Merge branch 'master' into tax 
Conflicts:
	templates/default_save/product.html
 2013-09-10 19:15:15 +02:00
Etienne Roudeix
6187dbae22 thelia loop with currency - TODO : best price whin in AND max args 2013-09-10 18:58:21 +02:00
Manuel Raynaud
672b489418 Merge branch 'master' into template 
Conflicts:
	templates/admin/default/customers.html
	templates/default/register.html
 2013-09-10 17:09:22 +02:00
Manuel Raynaud
66d6f86b9a replace <i> tag by <span> for displaying icons 2013-09-10 17:07:20 +02:00
Manuel Raynaud
5ab3d4fb88 replace smarty variable identifier by $ 2013-09-10 16:54:13 +02:00
mespeche
7952e69eb4 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Form/CustomerCreation.php
	templates/admin/default/customers.html
 2013-09-10 16:44:24 +02:00
mespeche
a485456431 Add route and view for customer creation 2013-09-10 16:35:34 +02:00
Manuel Raynaud
0f46e9d23a Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	templates/admin/default/coupon-read.html
 2013-09-10 16:18:15 +02:00
Manuel Raynaud
5aa49d62fe replace smarty variable identifier by $ 2013-09-10 16:14:49 +02:00
franck
a51ffb7a67 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/admin/default/admin-layout.tpl
 2013-09-10 15:46:51 +02:00
Manuel Raynaud
3c67903bd7 add part of customer form in customer admin template 2013-09-10 15:46:19 +02:00
franck
281ec337aa Started product attributes management 2013-09-10 15:45:29 +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
c7544faf65 change variable identifier in customer template 2013-09-10 15:17:55 +02:00
Manuel Raynaud
88bb6001ac Merge branch 'master' into template 2013-09-10 15:07:42 +02:00
mespeche
615f61bdc4 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-10 14:58:36 +02:00
Manuel Raynaud
f8c907d79e update customer loop in template customer 2013-09-10 14:57:56 +02:00
Manuel Raynaud
79e40013e2 updating customer form 2013-09-10 14:50:51 +02:00
mespeche
7350acc437 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	.gitignore
 2013-09-10 14:38:26 +02:00
mespeche
6353b8670c Saving current status 2013-09-10 14:36:06 +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
413e77fa97 WIP 
- Coupon : ajax add
 2013-09-09 17:46:01 +02:00
Manuel Raynaud
02d758ae9a start integration default template 2013-09-09 17:30:18 +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