Commit Graph

11 Commits

Author SHA1 Message Date
Franck Allimant
26d45dd90b Added orderFailed() method 2014-04-11 02:24:33 +02:00
Manuel Raynaud
4391e6334b fix modules cs 2014-03-11 15:43:48 +01:00
Michaël Espeche
03a62575ec Add Translator on all controllers & forms text strings 2014-02-21 12:05:27 +01:00
Manuel Raynaud
a6f0a38a7b allow possibility for payment module to return a response 2014-02-06 12:24:52 +01:00
Franck Allimant
73680d3d01 Fixed TaxEngine usage. 2014-01-23 12:06:14 +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
22efc21bfe dynamic delivery modules on delivery front template 2013-12-20 12:14:20 +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
d7c1ecf09a coupon management in order and cart process 2013-12-19 14:17:22 +01:00
OpenStudio
89e0bf8867 move front controller classes to Front module 2013-11-18 10:51:46 +01:00