Manuel Raynaud
c671b3f93b
update changelog
2014-01-02 13:05:58 +01:00
Manuel Raynaud
cf255a6a9c
delete product on category removal. delete only when it's the default
...
category. Fix issue #151
2014-01-02 13:02:11 +01:00
Manuel Raynaud
b992cc8488
delete all sub categories on category removal, fix issue #150
2014-01-02 10:30:24 +01:00
Manuel Raynaud
6057c69f95
session parameter is needed on TaxEngine::getInstance method
2014-01-02 10:07:51 +01:00
Manuel Raynaud
fbeeda93d4
Merge pull request #157 from gmorel/coupon
...
Coupon : Fix bug preventing to update Coupon
2014-01-02 00:19:48 -08:00
Manuel Raynaud
49782765b4
put at the beginning of changelog file the new features
2014-01-01 16:26:49 +01:00
gmorel
46c68ae4c2
Coupon : Fix bug preventing to update coupon
...
Use $parent instead of $folder_id in folders admin template
uncomment needed return statement
add missing value in folder modification form
uncomment needed loop for parent folder
start a new section in changelog file
2014-01-01 16:20:34 +01:00
Manuel Raynaud
a06dd9916c
put at the beginning of changelog file the new features
2013-12-31 09:22:30 +01:00
Manuel Raynaud
652b1e02d1
start a new section in changelog file
2013-12-31 09:15:21 +01:00
Manuel Raynaud
465bdf76ac
Merge pull request #156 from gmorel/coupon
...
Coupon - Refactor the way parameters are stored
2013-12-31 00:00:40 -08: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
67b89dbecd
Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
...
Remove submodule
2013-12-30 01:13:36 +01:00
gmorel
8574e1b36e
Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
2013-12-30 00:58:43 +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
15219b11f4
Coupon : Fix controller
2013-12-29 18:11:52 +01:00
gmorel
039b439ffb
Coupon : remove .gitmodule
2013-12-29 18:09:43 +01:00
Manuel Raynaud
c47d0d0276
uncomment needed loop for parent folder
2013-12-29 17:18:52 +01:00
Manuel Raynaud
fda7002418
add missing value in folder modification form
2013-12-29 17:18:52 +01:00
Manuel Raynaud
29feda718b
uncomment needed return statement
2013-12-29 17:18:52 +01:00
Manuel Raynaud
b3b414cb70
Use $parent instead of $folder_id in folders admin template
2013-12-29 17:18:52 +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
ae1a05eb85
Merge
2013-12-29 04:28:11 +01:00
gmorel
ff2b1b6376
Refactor : Thelia2 can now deduce extended effect parameters
2013-12-29 04:27:55 +01:00
gmorel
b41d7c69cc
Update changelog
2013-12-29 01:26:33 +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
Manuel Raynaud
b257b16285
uncomment needed loop for parent folder
2013-12-28 11:05:42 +01:00
Manuel Raynaud
39f35c89f1
add missing value in folder modification form
2013-12-28 10:47:41 +01:00
Manuel Raynaud
f939e30fb7
uncomment needed return statement
2013-12-28 10:27:18 +01:00
Manuel Raynaud
d6fb101a47
Use $parent instead of $folder_id in folders admin template
2013-12-28 10:06:55 +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
8f9b86ff6a
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia : (121 commits)
set cartItem in cart add and update events
need to unescape breadcrumb strings after been in array
update readme file
update insert.sql with new release version
change changelog file format
Prevent product and content création at catalog root
dynamic delivery modules on delivery front template
complete changelog
Finished merging modules with master
Revert "Merge branch 'cleanmaster' into modules"
use TaxEngine::getDeliveryCountry in delivery loop
refacto getTaxCountry which is actually getDeliveryCountry
make it magic last stand
change loop in shipping zone template using module insteadof delivery
Fixed template loop
Refactored templates processing
complete readme file
change email address of core contributors
fix getPosition folder test
add coupon tests
...
Conflicts:
core/lib/Thelia/Controller/Admin/ProductController.php
2013-12-25 14:14:20 +01:00
gmorel
69d255f782
new branch coupon
2013-12-25 14:12:54 +01:00
Etienne Roudeix
932445344b
set cartItem in cart add and update events
2013-12-24 11:28:30 +01:00
Etienne Roudeix
dba4505e2c
Merge branch 'master' of github.com:thelia/thelia
2013-12-23 12:26:15 +01:00
Etienne Roudeix
39c1b43249
need to unescape breadcrumb strings after been in array
2013-12-23 12:25:15 +01:00
Manuel Raynaud
1b8735f580
update readme file
2013-12-20 16:41:37 +01:00
Manuel Raynaud
f0116b31f1
update insert.sql with new release version
2013-12-20 15:26:29 +01:00
Manuel Raynaud
897bc892db
change changelog file format
2013-12-20 15:09:58 +01:00
Manuel Raynaud
f94b968874
Merge branch 'modules'
2013-12-20 14:57:14 +01:00
Franck Allimant
eaae979b70
Prevent product and content création at catalog root
2013-12-20 14:51:47 +01:00
Franck Allimant
9ff72f119f
Merge branch 'modules' of https://github.com/thelia/thelia into modules
2013-12-20 14:31:06 +01:00
Franck Allimant
afea985549
Merge branch 'modules' of https://github.com/thelia/thelia into modules
...
Conflicts:
core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
core/lib/Thelia/Core/Template/Loop/Template.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
core/lib/Thelia/Core/Template/TemplateDefinition.php
core/lib/Thelia/Model/Base/CartItem.php
core/lib/Thelia/Model/Base/CartItemQuery.php
core/lib/Thelia/Model/Base/CouponOrder.php
core/lib/Thelia/Model/Base/Order.php
core/lib/Thelia/Model/Base/OrderCouponQuery.php
core/lib/Thelia/Model/Base/OrderQuery.php
2013-12-20 14:30:50 +01:00
Etienne Roudeix
22efc21bfe
dynamic delivery modules on delivery front template
2013-12-20 12:14:20 +01:00
Manuel Raynaud
26909cf7aa
complete changelog
2013-12-20 12:06:06 +01:00
Franck Allimant
882cf554d1
Finished merging modules with master
2013-12-20 11:47:34 +01:00
Franck Allimant
9092e39296
Merge branch 'master' into modules
...
Conflicts:
core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
core/lib/Thelia/Core/Template/Loop/Template.php
core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
core/lib/Thelia/Core/Template/TemplateDefinition.php
core/lib/Thelia/Core/Template/TemplateHelper.php
core/lib/Thelia/Core/Thelia.php
2013-12-20 11:32:01 +01:00
Etienne Roudeix
b3ac365b45
Revert "Merge branch 'cleanmaster' into modules"
...
This reverts commit d0ff5260f767d0101dbe
2013-12-20 11:16:42 +01:00
Etienne Roudeix
d0ff5260f7
Merge branch 'cleanmaster' into modules
...
Conflicts:
core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
core/lib/Thelia/Core/Template/Loop/Template.php
core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
core/lib/Thelia/Core/Template/TemplateDefinition.php
core/lib/Thelia/Core/Template/TemplateHelper.php
core/lib/Thelia/Core/Thelia.php
2013-12-20 11:16:35 +01:00
Etienne Roudeix
67d0101dbe
use TaxEngine::getDeliveryCountry in delivery loop
2013-12-20 11:14:04 +01:00
