Commit Graph

539 Commits

Author SHA1 Message Date
gmorel
ed4809bac4 Working : Coupon : fix links and errors display 2013-09-13 12:42:33 +02:00
gmorel
964355e60d Working : Coupon - update loop 2013-09-12 21:34:50 +02:00
gmorel
58ef39769c Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Etienne Roudeix (1) and Manuel Raynaud (1)
# Via Manuel Raynaud (2) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  fix test suite
  fix current url bug + fix empty loop pagination exception
2013-09-12 17:55:16 +02:00
Manuel Raynaud
a241c4d587 Merge branch 'master' of github.com:thelia/thelia 2013-09-12 17:28:20 +02:00
Manuel Raynaud
bad8a0439d fix test suite 2013-09-12 17:28:02 +02:00
gmorel
2e7e31285e WIP : Coupon event dispatcher + action 2013-09-12 17:21:49 +02:00
Etienne Roudeix
e7368fa9f0 Merge branch 'master' into loops 2013-09-12 17:21:13 +02:00
Etienne Roudeix
a73c9e1de4 fix current url bug + fix empty loop pagination exception 2013-09-12 17:20:33 +02:00
gmorel
6d914c5676 Working : Adding type inference to the Thelia2 Request->getSession() 2013-09-12 16:23:21 +02:00
gmorel
cee49c908d Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon
* 'coupon' of https://github.com/thelia/thelia:

# By Manuel Raynaud (10) and others
# Via Manuel Raynaud (3) and others
* 'master' of https://github.com/thelia/thelia: (27 commits)
  AttributesAv management
  update cart model
  Using "update" instead of "change"
  Finished admin controllers refactoriing
  Created AbstractCrudController, and refactored existing controllers
  Continuer attributes management
  Change script file declaration order for bootstrap-editable fix
  Delete form on the orders view
  translate error message
  - Creation of order-edit view
  valid customer removal
  pse ref in faker
  pse ref
  loop tests
  test product loop limit
  update customer general info
  fix tests
  product loop test
  remove not needed flag in customer part
  change method to retrieve data in customer create process
  ...
2013-09-12 15:54:32 +02:00
gmorel
927b27d04a WIP : Coupon event dispatcher + action 2013-09-12 15:53:16 +02:00
Manuel Raynaud
d6e1f99b35 Merge branch 'template'
Conflicts:
	templates/admin/default/customer-edit.html
2013-09-12 15:44:23 +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
Manuel Raynaud
9856528a94 valid customer removal 2013-09-12 12:40:14 +02:00
Etienne Roudeix
f75b6e876c test product loop limit 2013-09-12 11:28:32 +02:00
Manuel Raynaud
5d87e48ba0 update customer general info 2013-09-12 11:24:24 +02:00
Manuel Raynaud
6b9db1a162 create test for customer creation 2013-09-12 09:23:50 +02:00
Manuel Raynaud
9304624708 fix title name in insert.sql file 2013-09-12 08:12:44 +02:00
Manuel Raynaud
591f952287 Merge branch 'template' 2013-09-11 17:26:34 +02:00
Manuel Raynaud
bb5946457a add missing files 2013-09-11 17:24:26 +02:00
Manuel Raynaud
9cc3162696 finishing creating lost password template 2013-09-11 17:22:23 +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
Etienne Roudeix
642376a6b3 Merge branch 'master' into tax
Conflicts:
	install/insert.sql
2013-09-11 16:57:45 +02:00
franck
ae786f2139 Added process_assets config variable 2013-09-11 12:14:39 +02:00
Etienne Roudeix
551c132b76 syntax 2013-09-11 11:14:54 +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
gmorel
8be785e9b3 WIP
- Coupon Add/Edit/Delete rule AJAX
2013-09-10 20:00:43 +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