gmorel
775fd09d7c
WIP : Coupon fix coupon creation issue
2013-09-16 10:01:02 +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
gmorel
ed4809bac4
Working : Coupon : fix links and errors display
2013-09-13 12:42:33 +02:00
gmorel
530c3d1102
Working : Default lang in US, asset not processed by default
2013-09-13 09:33:15 +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
gmorel
34609b19c2
WIP : Coupon Adapter methods implementation
2013-09-12 15:53:52 +02:00
gmorel
927b27d04a
WIP : Coupon event dispatcher + action
2013-09-12 15:53:16 +02:00
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
Manuel Raynaud
7dbfb052f1
Merge branch 'master' of github.com:thelia/thelia
2013-09-12 15:41:04 +02:00
Manuel Raynaud
c9e455e3ea
update cart model
2013-09-12 15:40:49 +02:00
franck
83f4e8b356
Using "update" instead of "change"
2013-09-12 14:20:23 +02:00
gmorel
173d0ad743
Working
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-12 14:12:43 +02:00
gmorel
8668bf93bd
Working
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-12 14:10:36 +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
Manuel Raynaud
485e6dc29b
translate error message
2013-09-12 12:43:44 +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
Etienne Roudeix
3115ee006d
pse ref in faker
2013-09-12 11:59:45 +02:00
Etienne Roudeix
d5004071c9
pse ref
2013-09-12 11:56:00 +02:00
Etienne Roudeix
b698d1aada
loop tests
2013-09-12 11:35:27 +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
Etienne Roudeix
e81b894816
fix tests
2013-09-12 10:58:12 +02:00
Etienne Roudeix
d61f3a6a1e
product loop test
2013-09-12 10:48:27 +02:00
Manuel Raynaud
4b643a7a9e
remove not needed flag in customer part
2013-09-12 10:12:22 +02:00
Manuel Raynaud
6fea7ef441
change method to retrieve data in customer create process
2013-09-12 09:48:24 +02:00
