TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,056 Commits 1 Branch 0 Tags
cf48db12615d767b6ea5e8ac00a9301afdfadde7
Commit Graph

46 Commits

Author SHA1 Message Date
Manuel Raynaud
9d0121f321 fix cs 2014-01-10 11:41:55 +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
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
2508ee3230 Coupon : Fix unit test 2013-12-29 15:45:42 +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
ef818c19ce Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 23:04:29 +01:00
gmorel
d0ccfc732a Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 22:58:19 +01:00
gmorel
e2db36e23b Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 22:42:16 +01:00
gmorel
2a926e5211 Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 22:09:40 +01:00
gmorel
4c3b1c5e22 Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 21:35:35 +01:00
gmorel
c71cba93e2 Coupon : Adding unit tests 2013-11-24 21:44:51 +01:00
gmorel
b738bde56f Coupon : Adding unit tests 2013-11-24 17:55:06 +01:00
gmorel
2caa9ea7bd Coupon : Adding unit tests 2013-11-24 01:07:49 +01:00
gmorel
469a07cdb3 Coupon : Adding unit tests 2013-11-24 00:26:16 +01:00
gmorel
2884b0a3b7 Coupon : spelling 2013-11-23 22:33:30 +01:00
gmorel
bcad9b5da1 Coupon : rename 2013-11-23 22:31:18 +01:00
gmorel
f40476e3ea Coupon not found by the factory now just return false 2013-11-23 22:15:45 +01:00
gmorel
23b294dcc9 Fix generated unit test stub files 2013-11-23 20:21:52 +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
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
Manuel Raynaud
2c030f910b fix cs 2013-10-25 10:07:21 +02:00
gmorel
9c7c4e851e Working cleaning 2013-10-21 23:09:04 +02:00
gmorel
5a6f6483b1 Working : Refactor adapter into facade 2013-10-10 22:29:53 +02:00
gmorel
dde8501790 WIP : coupon refactor + fix 2013-09-26 18:18:45 +02:00
gmorel
b7851b2d54 WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 16:36:14 +02:00
gmorel
d6172f23cf WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 14:51:42 +02:00
gmorel
8e308d21e9 Working : Coupon : fix update effect (becomes type), update max usage 2013-09-19 23:25:01 +02:00
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
gmorel
0fb331a5cb WIP 
- Coupon - unit test : no more fatal but some skipped/incomplete
 2013-09-09 16:59:53 +02:00
gmorel
e839c92549 WIP 
- Coupon - unit test : no more fatal but some fails
 2013-09-09 16:46:22 +02:00
gmorel
b778898d92 WIP 
- Coupon - add rule AJAX
 2013-09-09 16:40:53 +02:00
gmorel
eea29cba06 WIP 
- Add Coupon, Rules, CouponManager, Adapter as Services
- Refactor Coupon to use these services
 2013-09-05 20:07:17 +02:00
gmorel
50d50d3b91 WIP Coupon 
Refactor : creating dedicated reusable module for Constraints
Adding ConstraintManager
Secured :
- Effects : RemoveXPercent + RemoveXAmount
- Validators : all  except ModelParam (need CustomerModelParam, AreaModelParam, CountryModelParam ?)
- Conditions : AvailableForTotalAmount
 2013-08-28 09:33:33 +02:00
gmorel
c24e82758f WIP Coupon 
Refactor : creating dedicated reusable module for Constraints
Adding ConstraintManager
Secured :
- Effects : RemoveXPercent + RemoveXAmount
- Validators : all  except ModelParam (need CustomerModelParam, AreaModelParam, CountryModelParam ?)
- Conditions : AvailableForTotalAmount
 2013-08-27 18:53:18 +02:00
gmorel
e971179a60 WIP Coupon 
Default Implementation + Unit test in order to validate the chain
- effect
- application field
- condition
 2013-08-27 13:28:57 +02:00
gmorel
eae86cd797 WIP Coupon 
Refactor
 2013-08-23 20:00:32 +02:00
gmorel
73677b7c1a WIP Coupon 
Update Coupon Model + SQL
Implementattion Fixtures for Coupon and CouponFactory
 2013-08-22 20:02:03 +02:00
gmorel
c02e286d09 WIP Coupon 
Implementation CouponInterface 1st class : RemoveXAmount
Implementation CouponRuleInterface 1st class : AvailableForTotalAmount
 2013-08-21 20:03:03 +02:00
gmorel
df08158cff WIP Coupon 
Implementation Comparable Parameters
 2013-08-20 19:05:41 +02:00
gmorel
2113e7a457 WIP Coupon 
RemoveXPercent and RemoveXAmount implementation
 2013-08-19 20:02:53 +02:00
gmorel
4e40555313 Init Coupon module design 2013-08-19 18:50:45 +02:00