Manuel Raynaud
|
740042ee63
|
coupon code input is now required
|
2014-02-11 17:15:04 +01:00 |
|
stephaniepinet
|
b028d24fea
|
Update order-invoice.html
There was an "s" after the string {intl l="Billing address"} line 207
|
2014-02-11 16:20:11 +01:00 |
|
Manuel Raynaud
|
1974d3e3c3
|
fix psr
|
2014-01-22 12:52:36 +01:00 |
|
Etienne Roudeix
|
99038e688a
|
Revert "Revert "Merge branch 'cleanmaster' into modules""
This reverts commit b3ac365b45.
Conflicts:
Readme.md
core/lib/Thelia/Controller/Admin/AbstractCrudController.php
core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
core/lib/Thelia/Core/Template/TemplateDefinition.php
core/lib/Thelia/Model/Base/Coupon.php
core/lib/Thelia/Model/Base/CouponQuery.php
core/lib/Thelia/Model/Base/CouponVersion.php
core/lib/Thelia/Model/Base/CouponVersionQuery.php
core/lib/Thelia/Model/Base/OrderCouponQuery.php
|
2014-01-06 11:25:25 +01:00 |
|
Etienne Roudeix
|
b3ac365b45
|
Revert "Merge branch 'cleanmaster' into modules"
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
|
2013-12-20 11:16:42 +01:00 |
|
Etienne Roudeix
|
5773922314
|
show coupon codes in back office
|
2013-12-19 14:50:45 +01:00 |
|
Etienne Roudeix
|
d7c1ecf09a
|
coupon management in order and cart process
|
2013-12-19 14:17:22 +01:00 |
|
gmorel
|
dc648fef62
|
Merge master
|
2013-11-27 20:24:38 +01:00 |
|
Etienne Roudeix
|
25192cf366
|
change template subdirs
|
2013-11-13 10:24:14 +01:00 |
|