Franck Allimant
c8620ea63b
Merge branch 'master' of https://github.com/thelia/thelia
2014-01-23 09:34:25 +01:00
Franck Allimant
54db55467b
Fixed injection of TaxManager in TaxCreationForm instance
2014-01-23 09:33:09 +01:00
Manuel Raynaud
1b2c1d53ac
remove some unused variables
2014-01-22 15:50:40 +01:00
Manuel Raynaud
1974d3e3c3
fix psr
2014-01-22 12:52:36 +01:00
Franck Allimant
9d1c1e3979
Fixed buggy test
2014-01-22 01:48:35 +01:00
Franck Allimant
5d92ea0bab
TaxManager is now a service in the container.
2014-01-22 01:18:28 +01:00
Franck Allimant
c9c489a76b
Added a quick and dirty way to guess in an inactive module has a config
...
route
2014-01-21 23:56:47 +01:00
Franck Allimant
9ca9739ad0
Merge branch 'master' of https://github.com/thelia/thelia
2014-01-21 14:51:43 +01:00
Franck Allimant
ef5f20ff09
Added fluidity to setters ;-)
2014-01-21 14:40:22 +01:00
Manuel Raynaud
c41e161736
Merge pull request #191 from lunika/186-back-office-impossible-to-delete-related-content
...
This PR was merged into thelia:master branch.
Discussion
----------
Fix associations with category, product and content
+---------------+------+
| Q | A |
| --- | --- |
| Bug fix? | y |
| New feature? | n |
| BC breaks? | n |
| Deprecations? | n |
| Tests pass? | y |
| Fixed tickets | #186 |
| License | GPL |
| Doc PR | |
+---------------+------+
Commits
-------
502b149d3287bc1a83aa91cf069313d573ff54c2ce0fbb11a1
2014-01-21 05:15:10 -08:00
Franck Allimant
2effb52f2b
Removed useless 'parent' attribute.
2014-01-21 12:31:20 +01:00
Manuel Raynaud
d573ff54c2
put correct error messages in Document loop
2014-01-21 11:27:15 +01:00
Manuel Raynaud
91cf069313
fix associations tab in product modification page
2014-01-21 11:27:15 +01:00
Manuel Raynaud
502b149d32
change good content id for category associated content
2014-01-21 11:27:15 +01:00
Franck Allimant
6a9900a909
Added CONTENT_ID output variable
2014-01-21 02:00:40 +01:00
Franck Allimant
f5cc6869cd
Type on template not found exception
2014-01-17 19:06:24 +01:00
Manuel Raynaud
4e1521775f
alloow possibility to specify a ref for a customer
2014-01-17 11:15:55 +01:00
Manuel Raynaud
c25fdd7e42
fix exception not thrown correctly
2014-01-17 10:37:52 +01:00
Franck Allimant
e0ef07bb1e
Delete module request contains now "data data" flag
2014-01-16 12:02:08 +01:00
Etienne Roudeix
98a21c72c5
fix empty argument in loop issue
2014-01-15 12:26:46 +01:00
Manuel Raynaud
d73eaad981
move tinymce to resources folder
2014-01-14 10:36:37 +01:00
Etienne Roudeix
f732bbed5e
Merge branch 'master' of github.com:thelia/thelia
2014-01-10 16:29:27 +01:00
Etienne Roudeix
a293cb3a76
remove useless code in auth loop
2014-01-10 16:28:29 +01:00
Manuel Raynaud
3121fc4f5f
clear order and consumed coupon in session after processing order. Fix #162
2014-01-10 14:55:52 +01:00
Manuel Raynaud
9d0121f321
fix cs
2014-01-10 11:41:55 +01:00
Manuel Raynaud
f1ce5a3f70
increase thelia version
2014-01-08 15:47:49 +01:00
Manuel Raynaud
6a9fd30a53
create new entry in config menu and not needed update page
2014-01-08 12:16:25 +01:00
Manuel Raynaud
b72fab5212
start update process
2014-01-08 12:16:25 +01:00
Etienne Roudeix
678aa0c5a0
fix the mess
2014-01-07 10:04:30 +01:00
Etienne Roudeix
d517c9a4ff
fix parser
2014-01-06 15:58:19 +01:00
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
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
ae1a05eb85
Merge
2013-12-29 04:28:11 +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
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
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
