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

193 Commits

Author SHA1 Message Date
Manuel Raynaud
b9338a7717 Merge branch 'master' of github.com:thelia/thelia 2013-09-12 15:44:29 +02:00
Manuel Raynaud
d6e1f99b35 Merge branch 'template' 
Conflicts:
	templates/admin/default/customer-edit.html
 2013-09-12 15:44:23 +02:00
franck
8ad0dc7b21 AttributesAv management 2013-09-12 15:43:37 +02:00
franck
83f4e8b356 Using "update" instead of "change" 2013-09-12 14:20:23 +02:00
franck
3f82421879 Finished admin controllers refactoriing 2013-09-12 13:39:47 +02:00
franck
14e0eff0f5 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/admin-layout.tpl
 2013-09-12 13:04:12 +02:00
franck
c85ec2a9e3 Created AbstractCrudController, and refactored existing controllers 2013-09-12 13:02:40 +02:00
franck
0671c2ce7d Continuer attributes management 2013-09-12 13:01:04 +02:00
mespeche
eeee25d6f5 Change script file declaration order for bootstrap-editable fix 2013-09-12 12:52:13 +02:00
mespeche
024866a445 Delete form on the orders view 2013-09-12 12:49:11 +02:00
mespeche
2163121a1a Merge branch 'master' of https://github.com/thelia/thelia 2013-09-12 12:41:30 +02:00
mespeche
c64b987e9b - Creation of order-edit view 2013-09-12 12:40:46 +02:00
Manuel Raynaud
9856528a94 valid customer removal 2013-09-12 12:40:14 +02:00
Manuel Raynaud
5d87e48ba0 update customer general info 2013-09-12 11:24:24 +02:00
Manuel Raynaud
4b643a7a9e remove not needed flag in customer part 2013-09-12 10:12:22 +02:00
Manuel Raynaud
9304624708 fix title name in insert.sql file 2013-09-12 08:12:44 +02:00
Manuel Raynaud
10f97a7348 update faker, insert plenty of customers 2013-09-11 20:43:44 +02:00
Manuel Raynaud
591f952287 Merge branch 'template' 2013-09-11 17:26:34 +02:00
gmorel
41cf74ccac Working 
- add ajax loader
 2013-09-11 17:22:31 +02:00
gmorel
90f4db6aa4 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (8) and others
* 'master' of https://github.com/thelia/thelia: (47 commits)
  tax engine
  tax engine
  - Add orders view route - Add view & action for orders index
  Removed a redondant "use"
  Add tooltip
  - Add creation address form - Add addresses list - Add update address form
  Added process_assets config variable
  Change breadcrumb separator color
  Add breadcrumb to customers view
  - Change boolean type to integer type for update_logged_in_user field - Create view for customer modification
  syntax
  use ROUTER::ABSOLUTE_URL by default
  PSE loop todo
  currency management in PSE loop
  Add customer view finish
  Add modal for create/delete customer
  Update body background
  fixed typo
  searching route return relative path
  pse loop currency
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
	core/lib/Thelia/Core/Event/TheliaEvents.php
	web/index_dev.php
 2013-09-11 17:12:47 +02:00
Manuel Raynaud
b03eb969ca add logo for beta version 2013-09-11 16:18:58 +02:00
gmorel
c8b5b9e9fa Working 
- add tests casper JS
 2013-09-11 15:35:25 +02:00
Manuel Raynaud
91f5cb12cd Merge branch 'master' into template 2013-09-11 15:28:38 +02:00
mespeche
59e1981e9f - Add orders view route 
- Add view & action for orders index
 2013-09-11 15:23:04 +02:00
Manuel Raynaud
ec24586232 add some information in propelcollector 2013-09-11 15:04:47 +02:00
gmorel
a9dae509c7 WIP 
- Coupon Add/Edit/Delete rule AJAX
- add tests casper JS
 2013-09-11 14:40:55 +02:00
mespeche
e02ed4d654 Add tooltip 2013-09-11 14:36:32 +02:00
mespeche
d21e4532c9 - Add creation address form 
- Add addresses list
- Add update address form
 2013-09-11 13:32:21 +02:00
mespeche
f50d41b32c Change breadcrumb separator color 2013-09-11 11:46:50 +02:00
mespeche
abb501af29 Add breadcrumb to customers view 2013-09-11 11:43:49 +02:00
mespeche
953bf005a1 - Change boolean type to integer type for update_logged_in_user field 
- Create view for customer modification
 2013-09-11 11:39:33 +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
gmorel
7e2f57e618 Working 
- Coupon Add/Edit/Delete rule AJAX
 2013-09-11 09:48:33 +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
gmorel
8be785e9b3 WIP 
- Coupon Add/Edit/Delete rule AJAX
 2013-09-10 20:00:43 +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