Etienne Roudeix
4e847bf5ae
fix model
2014-01-06 12:23:01 +01:00
Etienne Roudeix
6a64f827ce
fix conflicts
2014-01-06 12:14:56 +01:00
Etienne Roudeix
99038e688a
Revert "Revert "Merge branch 'cleanmaster' into modules""
...
This reverts commit b3ac365b45
2014-01-06 11:25:25 +01:00
gmorel
e038c330c7
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia :
update changelog
delete product on category removal. delete only when it's the default category. Fix issue #151
delete all sub categories on category removal, fix issue #150
session parameter is needed on TaxEngine::getInstance method
put at the beginning of changelog file the new features
start a new section in changelog file
uncomment needed loop for parent folder
add missing value in folder modification form
uncomment needed return statement
Use $parent instead of $folder_id in folders admin template
2014-01-05 20:20:11 +01:00
gmorel
b8c2c2d703
Coupon : Condition module : add tooltip on condition select
2014-01-05 20:17:30 +01:00
gmorel
db09e0b224
Coupon : Condition module fix unit tests
2014-01-05 19:02:19 +01:00
gmorel
716e26986f
Coupon : Condition module cleaning
2014-01-05 01:14:41 +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
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
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
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
15219b11f4
Coupon : Fix controller
2013-12-29 18:11:52 +01:00
Manuel Raynaud
29feda718b
uncomment needed return statement
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
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
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
Manuel Raynaud
f0116b31f1
update insert.sql with new release version
2013-12-20 15:26:29 +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
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
Etienne Roudeix
4cb8ba704b
refacto getTaxCountry which is actually getDeliveryCountry
2013-12-20 11:13:08 +01:00
Etienne Roudeix
63ba1ceeda
make it magic last stand
2013-12-20 11:12:03 +01:00
Franck Allimant
2979ca0092
Fixed template loop
2013-12-20 01:40:45 +01:00
Franck Allimant
3a2ad352cc
Refactored templates processing
2013-12-20 00:49:08 +01:00
Etienne Roudeix
f434924e48
fix getPosition folder test
2013-12-19 15:46:03 +01:00
Etienne Roudeix
8c121dd455
add coupon tests
2013-12-19 15:37:15 +01:00
Etienne Roudeix
5773922314
show coupon codes in back office
2013-12-19 14:50:45 +01:00
Etienne Roudeix
d7c1ecf09a
coupon management in order and cart process
2013-12-19 14:17:22 +01:00
Etienne Roudeix
c981102d3a
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
2013-12-18 17:47:23 +01:00
Etienne Roudeix
1ba60103f3
coupon in orders + model review : backquote use
2013-12-18 17:46:42 +01:00
Manuel Raynaud
a6a2c43345
don't remove session order before calling payment method
2013-12-18 17:04:48 +01:00
Manuel Raynaud
2f4158d1f6
fix cs
2013-12-18 10:04:13 +01:00
Manuel Raynaud
d0e5d189d2
change memory_limit value, 128 MB is enough
2013-12-18 09:39:23 +01:00
Manuel Raynaud
0c24a8afc0
Merge branch 'master' into modules
...
Conflicts:
templates/backOffice/default/product-edit.html
2013-12-17 10:48:59 +01:00
Manuel Raynaud
db2ad120b2
fix test suite reimplementing url updating trest
2013-12-16 17:29:25 +01:00
Manuel Raynaud
1a0d543990
fix missing id in folder-edit.html template
2013-12-16 17:06:15 +01:00
Manuel Raynaud
10ecec2fa1
setUrl was not call in seo event generation
2013-12-16 16:39:14 +01:00
Manuel Raynaud
b9192e551c
fix missing general form on seo form error
2013-12-16 16:22:14 +01:00
