gmorel
eef57ba30a
WIP
...
- Coupon controller
2013-09-02 09:17:47 +02:00
gmorel
180302e7cc
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia :
Factorized ModelCriterialTools calls in loops
Conflicts:
templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
templates/admin/default/assets/css/admin.less
2013-08-30 15:43:43 +02:00
gmorel
fd63115c97
WIP
...
- Update Coupon Controller/Form/Event - create()
2013-08-30 12:23:49 +02:00
gmorel
71fa04a193
WIP
...
- Update Coupon Controller/Form/Event - create()
- Rule serialization/unserialization managed in Model/Coupon now
2013-08-30 11:06:33 +02:00
franck
cce270fdcc
Factorized ModelCriterialTools calls in loops
2013-08-28 19:47:31 +02:00
gmorel
1d87708d3b
Working
...
- Update Coupon BackOffice routing
2013-08-28 19:21:48 +02:00
gmorel
71a91ff60f
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
# By Etienne Roudeix (4) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia :
Removed InternalEvent, simplified SecurityContext
rewriting tables
rewriting tables
rewriting tables
rewriting tables
Conflicts:
composer.lock
local/config/schema.xml
2013-08-28 18:19:38 +02:00
gmorel
84a2314108
WIP
...
- Add Coupon BackOffice controller
- Add Coupon BackOffice template skeleton
- Add Coupon BackOffice routes
2013-08-28 18:06:22 +02:00
franck
0361cd1ff2
Removed InternalEvent, simplified SecurityContext
2013-08-28 17:52:32 +02:00
gmorel
8b6cbb0621
WIP
...
- Beginning BackOffice Coupon implementation
2013-08-28 14:37:29 +02:00
Etienne Roudeix
86b11096ba
Merge branch 'master' into loops
...
Conflicts:
core/lib/Thelia/Core/Template/Loop/Category.php
core/lib/Thelia/Core/Template/Loop/FeatureValue.php
core/lib/Thelia/Core/Template/Loop/Folder.php
core/lib/Thelia/Core/Template/Loop/Product.php
core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
install/faker.php
2013-08-21 09:19:56 +02:00
Manuel Raynaud
6371deb4cb
cs fixer
2013-08-13 11:02:29 +02:00
Manuel Raynaud
086f73aeca
change class controller inheritance
2013-08-12 16:59:15 +02:00
Manuel Raynaud
071a4c17bc
create specific controller for front and back office
2013-08-12 16:56:18 +02:00
Manuel Raynaud
7c6763ea59
create controller for front office
2013-08-12 15:27:19 +02:00
