Commit Graph

1231 Commits

Author SHA1 Message Date
mespeche
5e8749e054 - Edit country view creation
- Delete and edit modalbox creation
- Countries routes management
2013-09-16 12:55:34 +02:00
mespeche
76dc9609b6 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
2013-09-16 11:01:00 +02:00
mespeche
15d9b55284 Countries view and routing creation 2013-09-16 10:59:30 +02:00
franck
657456109b Merge branch 'master' of https://github.com/thelia/thelia 2013-09-16 10:41:22 +02:00
franck
2cf1c62b06 Finished Features management 2013-09-16 10:40:52 +02:00
Manuel Raynaud
2468db3a00 Merge branch 'master' of github.com:thelia/thelia 2013-09-16 10:17:35 +02:00
Manuel Raynaud
5e3c10cd4f add promo column in cart_item 2013-09-16 10:16:54 +02:00
gmorel
d4d876c783 Working : .gitignore phpmyadmin (vm) 2013-09-16 10:09:34 +02:00
gmorel
18f5f698e3 Merge branch 'coupon' of https://github.com/thelia/thelia
* 'coupon' of https://github.com/thelia/thelia:
  WIP : Coupon fix coupon creation issue
  WIP : Coupon fix coupon creation issue
  Working : bootstrap datepicker commented out to keep style for jquery.datepicker (Mika)
  Working : Coupon : fix links and errors display
  Working : Default lang in US, asset not processed by default
  Working : Coupon - update loop
  Working : Coupon Controller refactor
  Working : Coupon Controller refactor
  Working : Base controller now get type inference of Thelia2 Session component
  WIP : Coupon event dispatcher + action
  Working : Adding type inference to the Thelia2 Request->getSession()
  WIP : Coupon Adapter methods implementation
  WIP : Coupon event dispatcher + action
  Working - Coupon Add/Edit/Delete rule AJAX
  Working - Coupon Add/Edit/Delete rule AJAX
  WIP - Coupon Add/Edit/Delete rule AJAX
  Working - CasperJS : coupon rule
2013-09-16 10:04:56 +02:00
gmorel
5dcecb90f2 Merge branch 'master' of https://github.com/thelia/thelia
# By Manuel Raynaud (18) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (45 commits)
  Implemented "Remember Me" feature on admin. Started template management
  Added Templates events
  First version of installation wizard
  tax engine retriever
  allow address removal from front
  Insert pagination inside tfoot
  allow update customer address in front tempalte
  allow to create a new address
  allow to make an address as default on update action
  Finished attributes management
  Fixed action column alignment
  Fixed duplication parameter check regexp
  absoluteUrl prevetn duplicate parameters in generated URL
  fix test suite
  fix current url bug + fix empty loop pagination exception
  add accessDenied method
  add helper checkXmlHttpRequest
  don't delete address if this is address is a default one
  AttributesAv management
  update cart model
  ...
2013-09-16 10:04:03 +02:00
gmorel
970d6b6ff7 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By franck (6) and others
# Via franck (3) and others
* 'master' of https://github.com/thelia/thelia:
  Implemented "Remember Me" feature on admin. Started template management
  Added Templates events
  First version of installation wizard
  tax engine retriever
  allow address removal from front
  Insert pagination inside tfoot
  allow update customer address in front tempalte
  allow to create a new address
  allow to make an address as default on update action
  Finished attributes management
  Fixed action column alignment
  Fixed duplication parameter check regexp
  absoluteUrl prevetn duplicate parameters in generated URL
2013-09-16 10:01:34 +02:00
gmorel
775fd09d7c WIP : Coupon fix coupon creation issue 2013-09-16 10:01:02 +02:00
franck
71c1cee66d Implemented "Remember Me" feature on admin. Started template management 2013-09-16 09:23:44 +02:00
franck
9cdf1a0376 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-13 20:22:03 +02:00
franck
a0f09057c4 Added Templates events 2013-09-13 20:21:47 +02:00
mespeche
8b0c8bd760 First version of installation wizard 2013-09-13 18:03:45 +02:00
gmorel
6118a68370 WIP : Coupon fix coupon creation issue 2013-09-13 18:03:08 +02:00
gmorel
d829835d51 Working : bootstrap datepicker commented out to keep style for jquery.datepicker (Mika) 2013-09-13 15:36:15 +02:00
Etienne Roudeix
ac40705c80 Merge branch 'master' into tax 2013-09-13 14:02:39 +02:00
Etienne Roudeix
ecc419fbdf tax engine retriever 2013-09-13 13:59:16 +02:00
gmorel
ed4809bac4 Working : Coupon : fix links and errors display 2013-09-13 12:42:33 +02:00
Manuel Raynaud
d45ee047c2 Merge branch 'master' of github.com:thelia/thelia 2013-09-13 12:33:47 +02:00
Manuel Raynaud
8367863b48 allow address removal from front 2013-09-13 12:33:13 +02:00
mespeche
9fdf3d35de Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	templates/admin/default/customers.html
2013-09-13 11:59:21 +02:00
mespeche
bb896b56ab Insert pagination inside tfoot 2013-09-13 11:57:49 +02:00
Manuel Raynaud
ddf175f361 allow update customer address in front tempalte 2013-09-13 11:31:12 +02:00
Manuel Raynaud
2d8656e45b allow to create a new address 2013-09-13 10:55:45 +02:00
Manuel Raynaud
275b20ac77 allow to make an address as default on update action 2013-09-13 10:17:45 +02:00
gmorel
530c3d1102 Working : Default lang in US, asset not processed by default 2013-09-13 09:33:15 +02:00
franck
ca7d1f7c85 Finished attributes management 2013-09-13 00:19:53 +02:00
franck
316043d93a Fixed action column alignment 2013-09-13 00:18:19 +02:00
franck
7cd44c3867 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-13 00:16:56 +02:00
franck
6a66a3f99a Fixed duplication parameter check regexp 2013-09-13 00:16:29 +02:00
franck
d1d9892ae8 absoluteUrl prevetn duplicate parameters in generated URL 2013-09-12 22:10:51 +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
gmorel
855d90c81c Working : Coupon Controller refactor 2013-09-12 17:55:03 +02:00
gmorel
a56447fef5 Working : Coupon Controller refactor 2013-09-12 17:39:51 +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
972cdcd7fb Working : Base controller now get type inference of Thelia2 Session component 2013-09-12 17:27:31 +02:00
gmorel
93766c56e9 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia:
  add accessDenied method
  add helper checkXmlHttpRequest
  don't delete address if this is address is a default one
2013-09-12 17:22: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
Manuel Raynaud
0ca5af597a add accessDenied method 2013-09-12 16:50:13 +02:00
Manuel Raynaud
2bf6ee51e1 add helper checkXmlHttpRequest 2013-09-12 16:45:32 +02:00
gmorel
6d914c5676 Working : Adding type inference to the Thelia2 Request->getSession() 2013-09-12 16:23:21 +02:00
Manuel Raynaud
22f42c8d9c don't delete address if this is address is a default one 2013-09-12 16:21:01 +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