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

83 Commits

Author SHA1 Message Date
Franck Allimant
b34f1c35c7 Fixed the checking of maximum coupon usage count 2014-06-12 16:42:00 +02:00
Franck Allimant
95841809c4 Refactored coupons to reduce code duplication 2014-06-12 13:14:46 +02:00
Franck Allimant
db29505fee Added Attribute value related coupons 2014-06-12 13:14:07 +02:00
Franck Allimant
71ea9e9671 php-cs fixes. 2014-06-11 09:43:27 +02:00
Franck Allimant
441764cf94 Added new coupon types 2014-06-11 09:43:26 +02:00
Franck Allimant
a1ba63d5d5 Order total may be calculated with or without discounted items 2014-06-11 09:43:24 +02:00
Franck Allimant
80653fee0b Order total may be calculated with or without discounted items 2014-06-11 09:43:23 +02:00
Franck Allimant
87837224f7 PHP-CS fixer 2014-06-11 09:43:13 +02:00
Franck Allimant
0683d20d2c Improved and simplified coupon form management 2014-06-11 09:43:09 +02:00
Franck Allimant
567fee839c Added RemoveAmountOnCategories coupon type 2014-05-28 12:02:56 +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
Franck Allimant
06d7eb4fc1 Implemented getDeliveryAddress() 2014-05-10 01:29:54 +02:00
Manuel Raynaud
85d80d1d77 fix minor bug 2014-05-09 10:55:50 +02:00
Franck Allimant
4673a14b76 Typo 2014-05-05 10:04:38 +02:00
Franck Allimant
f9e4c33875 No % or money symbol in HTML generated by CouponAbstract 2014-05-05 09:52:27 +02:00
Franck Allimant
091e7f9f64 Re-added the html generatrion code in drawBackOfficeInputs() 2014-05-04 19:31:41 +02:00
Franck Allimant
d42e5cd557 drawBackOfficeInputs is no longer abstract 2014-05-03 12:23:48 +02:00
Franck Allimant
8c044303f2 drawBackOfficeInputs() is now abstract 2014-05-02 20:54:53 +02:00
Franck Allimant
500a945f98 HTML fragments in templates instead of hardcoded 2014-05-02 20:52:59 +02:00
Franck Allimant
8bf94517f2 No longer used 2014-05-02 18:25:31 +02:00
Franck Allimant
9d3dd8687a Added the transformer 2014-05-02 17:10:28 +02:00
Franck Allimant
bbe7634ad4 Using templates for conditions HTML fragments 2014-05-02 17:10:22 +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
a5cfcf91ca update changelog and fix cs 2014-02-22 19:01:37 +01:00
Manuel Raynaud
3ab022e99d fix test suite 2014-02-20 11:44:09 +01:00
Manuel Raynaud
dafce9e070 Do not allow to cumulate the coupon many times. Fix #217 2014-02-19 16:56:58 +01:00
Benjamin Perche
32b59f8189 Fix Coupon RemoveXPercent missing round 
modified:   core/lib/Thelia/Coupon/Type/RemoveXPercent.php
 2014-02-12 09:11:28 +01:00
Franck Allimant
89653f452b Removes container from all Thelia actions, but Modules (#198) 2014-01-31 20:06:42 +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
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
ff2b1b6376 Refactor : Thelia2 can now deduce extended effect parameters 2013-12-29 04:27:55 +01:00
gmorel
f8ac32a4a0 Refactor : Coupon effect inputs are now more customisable 
Adding effect to be stored as serialised in JSON
 2013-12-29 01:23:50 +01:00
gmorel
e18298bbba Refactor : Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too (Event are used for custom inputs) 2013-12-26 23:47:07 +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
25934b80b9 Coupon : buildCouponFromModel becomes public 2013-11-23 23:56:06 +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
bcad9b5da1 Coupon : rename 2013-11-23 22:31:18 +01:00
gmorel
4447dbcd9a Coupon : Fix the error if a given coupon leads to an unknown service id 2013-11-23 22:29:15 +01:00