TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,440 Commits 1 Branch 0 Tags
0965a846a5fafb536d0d038049d0bb519d3ffd23
Commit Graph

40 Commits

Author SHA1 Message Date
Franck Allimant
833cebb248 Using taxed cart total instead of untaxed price 2014-07-30 16:57:58 +02:00
Franck Allimant
cbf2eae842 Written coupons unit tests 2014-06-17 19:58:56 +02:00
Franck Allimant
df9b19cb91 Typo 2014-05-10 02:57:02 +02:00
Franck Allimant
a581a6ca0f Fixed criteria lablels 2014-05-10 02:47:23 +02:00
Franck Allimant
2aa8d804b0 Changed condition parameter name 2014-05-10 01:36:11 +02:00
Franck Allimant
617f2900e0 Fixed test 2014-05-02 20:21:33 +02:00
Manuel Raynaud
5e65bf0b8a change license header 2014-04-18 09:36:41 +02:00
Manuel Raynaud
c52ec3dbaf create currency test suite 2014-02-05 12:44:11 +01:00
Franck Allimant
89653f452b Removes container from all Thelia actions, but Modules (#198) 2014-01-31 20:06:42 +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
gmorel
db09e0b224 Coupon : Condition module fix unit tests 2014-01-05 19:02:19 +01:00
gmorel
e606a6f8ce Coupon : Condition module refactor 
Less crappy unmaintainable javascript
More logic in extendable php
 2014-01-05 00:00:15 +01:00
gmorel
cfbc579022 Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 
Remove submodule
 2013-12-30 21:37:26 +01:00
gmorel
3e12ace045 Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 2013-12-30 00:50:04 +01:00
gmorel
9a22bdafa1 Coupon : Fix unit test 2013-12-29 14:47:51 +01:00
gmorel
69d255f782 new branch coupon 2013-12-25 14:12:54 +01:00
gmorel
d0ccfc732a Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 22:58:19 +01:00
gmorel
2a926e5211 Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 22:09:40 +01:00
gmorel
90b5fbde05 Refactor removing Manager notion 2013-11-23 20:18:04 +01:00
gmorel
8ce1030178 Refactor rule => condition 
adapter => facade
 2013-11-23 18:35:21 +01:00
gmorel
59a04f6a09 Fix Condition comment 2013-11-23 17:51:59 +01:00
gmorel
d276d5aa52 Fix Coupon/Condition utf8 issue 2013-11-23 17:37:48 +01:00
gmorel
968bddbcf9 Fix Coupon/Condition refactor 2013-11-19 13:15:23 +01:00
gmorel
a2b97707cf Adding/Refactoring unit test 2013-11-17 19:59:29 +01:00
gmorel
274e667103 Adding/Refactoring unit test for MatchForEveryoneManager|MatchForTotalAmountManager|MatchForXArticlesManager 2013-11-17 18:46:22 +01:00
gmorel
ed1670a61b Adding/Refactoring unit test for MatchForEveryoneManager|MatchForTotalAmountManager|MatchForXArticlesManager 2013-11-17 18:10:13 +01:00
gmorel
219ffdec99 Adding/Refactoring unit test for MatchForEveryoneManager|MatchForTotalAmountManager|MatchForXArticlesManager 2013-11-17 17:30:34 +01:00
gmorel
93c004bce2 Adding/Refactoring unit test for MatchForEveryOneManager 2013-11-17 00:27:21 +01:00
gmorel
a574a176bc Adding/Refactoring unit test for ConditionFactory/ConditionManagerAbstract 2013-11-17 00:12:13 +01:00
gmorel
5679f54ec0 Adding/Refactoring unit test for ConditionFactory/ConditionManagerAbstract 2013-11-16 23:58:49 +01:00
gmorel
3a4bff634e Adding/Refactoring unit test for ConditionEvaluator 2013-11-16 21:30:45 +01:00
gmorel
9c7c4e851e Working cleaning 2013-10-21 23:09:04 +02:00
gmorel
c5cd35f85e Working : Coupon : Fixing unit tests 2013-10-14 22:42:12 +02:00
gmorel
5a6f6483b1 Working : Refactor adapter into facade 2013-10-10 22:29:53 +02:00
Manuel Raynaud
c65ec67bdf fix cs 2013-09-30 10:35:34 +02:00
gmorel
4d3335f589 WIP : Condition : Fix unit text 2013-09-25 18:15:48 +02:00
gmorel
965a505864 WIP : Condition : Fix unit text 2013-09-25 17:47:42 +02:00
gmorel
0da90c4a99 WIP : Condition : Fix unit text 2013-09-25 17:22:36 +02:00
gmorel
45fabcfdd6 WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 16:47:01 +02:00
gmorel
b7851b2d54 WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 16:36:14 +02:00