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

872 Commits

Author SHA1 Message Date
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
Manuel Raynaud
557940c5cf searching route return relative path 2013-09-11 09:48:41 +02:00
Manuel Raynaud
9002484814 change find method on some request 2013-09-11 09:13:42 +02:00
Manuel Raynaud
06bb1d0a39 change some getters 2013-09-11 08:57:59 +02:00
Etienne Roudeix
2f07e01b06 fix test 2013-09-11 08:37:18 +02:00
Etienne Roudeix
0050d01278 Merge branch 'tax' 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
 2013-09-11 08:35:23 +02:00
Etienne Roudeix
a3bb124424 fix tests 2013-09-11 08:33:25 +02:00
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
Manuel Raynaud
8fa3ed287b Merge branch 'master' of github.com:thelia/thelia 2013-09-11 08:16:39 +02:00
Manuel Raynaud
08a6b0d195 activate propel prepare caching 2013-09-10 22:37:29 +02:00
Manuel Raynaud
c4bc273ad5 save duration and memory in debugBar 2013-09-10 21:03:48 +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
f70cecbbe9 bug fix 2013-09-10 19:13:28 +02:00
Etienne Roudeix
8b209291d3 use_tax_free_amounts binary config variable + ConfigQuery::useTaxFreeAmounts() helper method 2013-09-10 19:03:46 +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
66d6f86b9a replace <i> tag by <span> for displaying icons 2013-09-10 17:07:20 +02:00
Manuel Raynaud
04d517208f remove preThelia smarty filter 2013-09-10 16:57:12 +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
eb7bc62964 integrate new customer creation form 2013-09-10 16:13:53 +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
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
Etienne Roudeix
affc6805c5 Merge branch 'master' into tax 2013-09-10 12:29:08 +02:00
Etienne Roudeix
1971240fca currency in product loop 2013-09-10 12:22:58 +02:00
Manuel Raynaud
7eb3ec41fe complete login form 2013-09-10 12:16:19 +02:00
Etienne Roudeix
8570251b88 product price 2013-09-10 12:04:33 +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
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
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
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
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
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