Commit Graph

510 Commits

Author SHA1 Message Date
franck
ae786f2139 Added process_assets config variable 2013-09-11 12:14:39 +02:00
franck
77d7587fb7 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 11:05:52 +02:00
Etienne Roudeix
c11821153c PSE loop todo 2013-09-11 11:00:55 +02:00
Etienne Roudeix
3d31090344 currency management in PSE loop 2013-09-11 10:51:44 +02:00
franck
f1e2455315 fixed typo 2013-09-11 09:50:47 +02:00
Etienne Roudeix
70f6ee6a52 Merge branch 'master' into tax 2013-09-11 09:21:28 +02:00
Etienne Roudeix
d6136c56d4 pse loop currency 2013-09-11 09:20:58 +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
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
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
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
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
7d4003741c Working
- Fix #category-rule replaced by parser when writing jawascript
2013-09-09 15:35:21 +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
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
gmorel
c1875564cd Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Etienne Roudeix (1) and others
# Via Etienne Roudeix (2) and Manuel Raynaud (2)
* 'master' of https://github.com/thelia/thelia:
  clean some code
  fix phpdoc
  Added windows version of reset_install script
2013-09-09 10:04:57 +02:00
Manuel Raynaud
99f40cbc80 Merge branch 'master' of github.com:thelia/thelia 2013-09-09 09:03:02 +02:00
Manuel Raynaud
f2a80e4b6a clean some code 2013-09-09 09:02:50 +02:00
Etienne Roudeix
928cc3ee4f Merge branch 'master' of github.com:thelia/thelia 2013-09-09 08:06:08 +02:00
Etienne Roudeix
1ec386ff79 Merge branch 'rewrite' 2013-09-09 08:05:57 +02:00
Etienne Roudeix
b637ad79f4 fix phpdoc 2013-09-09 08:05:43 +02:00
gmorel
c1a79028a1 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (37 commits)
  add PropelDataCollector to debugbar, still missing some informations
  remove unused class
  integrate debugbar module
  remove htmlpurifier
  modify insert.sql including debugBar module
  add new event and new tag
  Started category modification
  Factorized modal dialogs javascript
  Factorized creation and confirmation modal dialogs
  create controller adding delivery module in session
  create Delivery loop
  Working :
  Continuing categories administration...
  Working :
  create base loop for delivery and payment entities
  remove htmlpurifier dependency
  country id can be an argument for calculate method
  Working :
  Working :
  fix typo
  ...

Conflicts:
	composer.lock
	core/lib/Thelia/Controller/Admin/CategoryController.php
	templates/admin/default/assets/less/thelia/variables.less
2013-09-08 00:08:02 +02:00