Commit Graph

12 Commits

Author SHA1 Message Date
Franck Allimant
96ebcf1880 Added the COUPON_CLEAR_ALL event, and a route to trigger it. 2014-06-12 16:39:27 +02:00
Franck Allimant
392abff271 Free shipping for selected countries and/or shipping methods 2014-05-15 20:25:22 +02:00
Franck Allimant
683664cb07 Added Model\Module::getModuleInstance() method 2014-05-15 16:50:34 +02:00
Franck Allimant
e02d9c1611 Fix for #308 2014-04-18 00:09:26 +02:00
Franck Allimant
784ab68ca5 Restored previous version 2014-04-18 00:06:49 +02:00
Franck Allimant
12c21b1239 Fixes #308 2014-04-17 19:46:21 +02:00
Manuel Raynaud
4391e6334b fix modules cs 2014-03-11 15:43:48 +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
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