Commit Graph

39 Commits

Author SHA1 Message Date
Franck Allimant
8b74eae911 php-cs pass 2014-06-17 00:43:10 +02:00
Franck Allimant
6b6687c85c Added clear() method 2014-06-17 00:35:12 +02:00
Franck Allimant
ec26ebac32 php-cs fixer passed. 2014-06-12 17:10:38 +02:00
Franck Allimant
b34f1c35c7 Fixed the checking of maximum coupon usage count 2014-06-12 16:42:00 +02:00
Franck Allimant
ab060486d0 Fixed Thelia\Model\Base uses. 2014-05-18 20:19:48 +02:00
Franck Allimant
ef142ca077 Applied php-cs-fixer 2014-05-17 10:56:28 +02:00
Franck Allimant
f8ccea1899 Added per-user coupon maximum usage count 2014-05-17 10:56:19 +02:00
Franck Allimant
392abff271 Free shipping for selected countries and/or shipping methods 2014-05-15 20:25:22 +02:00
Franck Allimant
862d8ec913 Prevent Fatal error if current order coupon is deleted 2014-05-10 12:10:45 +02:00
Manuel Raynaud
5e65bf0b8a change license header 2014-04-18 09:36:41 +02:00
Manuel Raynaud
06539ad9bf coupons effect are recalculated after each product's cart modification. Fix #237 2014-03-03 17:40:54 +01:00
Manuel Raynaud
9d0121f321 fix cs 2014-01-10 11:41:55 +01:00
Manuel Raynaud
149a943a0e don't save the currentCoupons in a property. Retrieve them from the
session
2014-01-10 11:20:57 +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
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
69d255f782 new branch coupon 2013-12-25 14:12:54 +01:00
gmorel
ffbd53fceb Coupon : Fix namespace issues 2013-11-24 22:05:58 +01:00
gmorel
69a72cd555 Coupon : Add ability to know usage left after decremental 2013-11-23 23:23:58 +01:00
gmorel
20e004b9f5 Coupon : Bug fix when coupon max usage was not correctly decremented 2013-11-23 23:06:32 +01:00
gmorel
2884b0a3b7 Coupon : spelling 2013-11-23 22:33:30 +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
52e471ab1b Working adding decrementation when coupon is consumed 2013-10-22 23:04:08 +02:00
gmorel
9c7c4e851e Working cleaning 2013-10-21 23:09:04 +02:00
gmorel
f276ccfa37 WIP : Implement coupon check on ordering tunnel
@todo CSS
@todo List coupon used and detailed effects
2013-10-20 23:01:12 +02:00
gmorel
5a6f6483b1 Working : Refactor adapter into facade 2013-10-10 22:29:53 +02:00
gmorel
5abe350b65 WIP : Coupon : Fix condition selection JS + Dependency Injection register 2013-09-27 14:52:38 +02:00
gmorel
d6172f23cf WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 14:51:42 +02:00
gmorel
2e7e31285e WIP : Coupon event dispatcher + action 2013-09-12 17:21:49 +02:00
gmorel
b778898d92 WIP
- Coupon - add rule AJAX
2013-09-09 16:40:53 +02:00
gmorel
8a5e12f814 WIP
- Add Coupon, Rules, CouponManager, Adapter as Services
- Refactor Coupon to use these services
2013-09-06 11:47:00 +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
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
c02e286d09 WIP Coupon
Implementation CouponInterface 1st class : RemoveXAmount
Implementation CouponRuleInterface 1st class : AvailableForTotalAmount
2013-08-21 20:03:03 +02:00
gmorel
4e40555313 Init Coupon module design 2013-08-19 18:50:45 +02:00