Commit Graph

160 Commits

Author SHA1 Message Date
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
Manuel Raynaud
65a20381d9 Merge branch 'master' into template 2013-09-11 08:47:26 +02:00
Manuel Raynaud
990ab0e094 change debugbar render tag in templates 2013-09-11 08:19:37 +02:00
Manuel Raynaud
a050b0c362 remove # for smarty variable delimiter 2013-09-10 19:21:56 +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
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
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
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
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
gmorel
0fe443f53d WIP
- Coupon Add/Edit/Delete rule AJAX
2013-09-09 21:43:58 +02:00
gmorel
413e77fa97 WIP
- Coupon : ajax add
2013-09-09 17:46:01 +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
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
Manuel Raynaud
66454ef3f0 finish simple list customer page in backoffice 2013-09-09 16:03:38 +02:00
Manuel Raynaud
d4ec36e920 mock getTotalAmoutn in order class 2013-09-09 14:29:11 +02:00
Manuel Raynaud
8e77e4b530 create admin customer view and add output info in customer loop 2013-09-09 11:07:51 +02:00
gmorel
2d6787e588 WIP
- Coupon : add rule input ajax controller
2013-09-09 10:03:00 +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
Manuel Raynaud
525e449fb2 Merge branch 'master' of github.com:thelia/thelia 2013-09-07 16:40:14 +02:00
Manuel Raynaud
ed468ccb67 Merge branch 'master' into debugbar 2013-09-07 16:31:29 +02:00
Manuel Raynaud
5315e13ce9 add new event and new tag 2013-09-07 16:31:15 +02:00
franck
3bd3a4d943 Started category modification 2013-09-07 10:59:43 +02:00
franck
f304caa88f Factorized modal dialogs javascript 2013-09-06 20:26:29 +02:00
franck
e8d96937e7 Factorized creation and confirmation modal dialogs 2013-09-06 20:00:02 +02:00
gmorel
86d6a0fa05 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia: (39 commits)
  Working :
  Working :
  Working :
  Working :
  Fixed minor visual glitches
  Working : Resize countries flag + Add bootstrap-switch
  fix test suite
  clear asset cache in cache:cler command
  Added a 'development mode' to assetic smarty plugin
  rewriting router
  use good Request object
  Added Tools\URL test case, and a test case superclass for initializing Tools\URL
  remove unused UrlWritin controller
  create router for rewriting matching
  customer substitutions
  fix typo in front id
  Working : For attributes on labels
  Working : For attributes on labels
  add label_attr attribute to form smarty plugin
  start refactorin rewriting routing
  ...

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/less/thelia/bootstrap-editable.less
	templates/admin/default/categories.html
2013-09-06 19:36:52 +02:00
franck
c6612a0246 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-06 17:51:10 +02:00
mespeche
ae667d33ee Working :
- Nice construct of search form
2013-09-06 17:50:19 +02:00
franck
d11906eca5 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
2013-09-06 17:48:12 +02:00
franck
c68f282fe8 Continuing categories administration... 2013-09-06 17:46:40 +02:00
mespeche
0adbb9a997 Working :
- Replacing the search form who had disappeared
2013-09-06 17:45:22 +02:00
franck
8b82f58a5b Merge branch 'master' of https://github.com/thelia/thelia 2013-09-06 17:24:05 +02:00
mespeche
771d9e6322 Working :
- Add product attributes edit routing
- Add product attributes edit action
2013-09-06 17:23:06 +02:00
mespeche
eebe1d4f58 Working :
- Rename file for best practices regard
2013-09-06 16:47:21 +02:00
mespeche
c5f1e5288c Working :
- Create product_attributes view for loop intergration
2013-09-06 16:32:27 +02:00
franck
8bd7a6413d Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	templates/admin/default/categories.html
	templates/admin/default/includes/add-category-dialog.html
	templates/admin/default/includes/delete-category-dialog.html
2013-09-06 16:18:54 +02:00