Franck Allimant
c5cc6aae76
Added administrator preferred locale (see issue #183 )
2014-01-27 14:29:37 +01:00
Manuel Raynaud
6070d74ac3
update propel version
2014-01-08 12:05:56 +01:00
Etienne Roudeix
26aae5adfc
remove cache behavior from product table
2014-01-06 14:20:12 +01:00
Etienne Roudeix
4e847bf5ae
fix model
2014-01-06 12:23:01 +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
3e12ace045
Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
2013-12-30 00:50:04 +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
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
Etienne Roudeix
b3ac365b45
Revert "Merge branch 'cleanmaster' into modules"
...
This reverts commit d0ff5260f767d0101dbe
2013-12-20 11:16:42 +01:00
Etienne Roudeix
8c121dd455
add coupon tests
2013-12-19 15:37:15 +01:00
Etienne Roudeix
1ba60103f3
coupon in orders + model review : backquote use
2013-12-18 17:46:42 +01:00
touffies
0684ec2b42
Rename meta_keyword to meta_keywords
...
Add SEO to folder
2013-12-09 14:52:46 +01:00
Franck Allimant
33e0a854f2
Implemented mail messages templates and layouts
2013-11-27 21:21:07 +01:00
Etienne Roudeix
082f9aff8d
admin logs
2013-10-29 12:22:34 +01:00
Franck Allimant
db6d5692eb
Merge branch 'catalog'
...
Conflicts:
local/config/schema.xml
2013-10-24 16:47:53 +02:00
Franck Allimant
b9410bba59
Implemented prices conversion management
2013-10-24 12:34:44 +02:00
Etienne Roudeix
fb4e15ae77
fix issue #47
2013-10-24 10:36:06 +02:00
Franck Allimant
5bf51dd47e
Merge branch 'catalog'
...
Conflicts:
core/lib/Thelia/Config/Resources/config.xml
core/lib/Thelia/Config/Resources/routing/admin.xml
core/lib/Thelia/Core/Template/Loop/Country.php
core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
core/lib/Thelia/Model/Country.php
core/lib/Thelia/Model/Profile.php
core/lib/Thelia/Model/ProfileQuery.php
install/insert.sql
install/thelia.sql
local/config/schema.xml
2013-10-24 00:16:33 +02:00
Franck Allimant
7ca2399573
Worked on catalog
2013-10-23 23:47:44 +02:00
Franck Allimant
0bd57b0a5a
Worked on catalog
2013-10-23 23:41:39 +02:00
Etienne Roudeix
44a5909c81
permission resource
2013-10-22 19:51:01 +02:00
Manuel Raynaud
f4c4cea32b
create newsletter entity
2013-10-22 09:36:52 +02:00
Etienne Roudeix
9a7708451a
permission cleanup
2013-10-21 17:44:17 +02:00
Etienne Roudeix
f564db2a8b
WIP : admin profiles
2013-10-21 11:44:33 +02:00
Etienne Roudeix
0300470f7d
new model
2013-10-21 08:10:55 +02:00
Manuel Raynaud
65d23db854
validate country creation
2013-10-07 12:46:40 +02:00
Manuel Raynaud
19e5758150
start testing folder crud
2013-10-01 11:29:47 +02:00
Etienne Roudeix
622e1ca3b6
Merge branch 'master' into tax
...
Conflicts:
core/lib/Thelia/Core/Template/Loop/FeatureValue.php
core/lib/Thelia/Model/Base/AttributeTemplate.php
core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
install/thelia.sql
local/config/schema.xml
2013-09-27 10:29:51 +02:00
Etienne Roudeix
5e0f9cedf5
fix tests
2013-09-26 10:43:09 +02:00
Etienne Roudeix
7bd511c420
order admin
2013-09-24 17:04:32 +02:00
franck
e3644cd6cc
Aded feature_template and category_template position management
2013-09-21 11:46:09 +02:00
franck
f6530f0bfc
Finished product feature values
2013-09-20 23:10:31 +02:00
Etienne Roudeix
b7af3ebaa3
push model
2013-09-20 17:02:19 +02:00
franck
5622a246b2
Added missing files
2013-09-20 15:59:19 +02:00
franck
e27b3cfbae
Working catalog branch
2013-09-20 15:54:50 +02:00
Etienne Roudeix
17548e3526
order tax tables
2013-09-20 08:23:02 +02:00
Etienne Roudeix
6e9af59403
order creation
2013-09-19 19:56:59 +02:00
Etienne Roudeix
1d969e38ec
order tables
2013-09-19 18:30:13 +02:00
Etienne Roudeix
198bd9bec8
add abstract getDispatcher method to use CartTrai
2013-09-19 16:06:42 +02:00
Etienne Roudeix
61fab3a62a
order creation
2013-09-19 15:11:54 +02:00
Etienne Roudeix
66536d0b31
Merge branch 'master' into template
...
Conflicts:
core/lib/Thelia/Core/Template/Loop/Product.php
2013-09-18 20:03:13 +02:00
Etienne Roudeix
9b37bbb862
module image
2013-09-18 11:20:29 +02:00
Manuel Raynaud
e7fa896866
remove unused classes
2013-09-18 10:52:07 +02:00
franck
d02f13f021
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
core/lib/Thelia/Controller/Admin/ProductController.php
core/lib/Thelia/Model/Product.php
2013-09-18 00:35:48 +02:00
franck
de4767ef56
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
core/lib/Thelia/Model/Product.php
2013-09-17 23:51:31 +02:00
Manuel Raynaud
e1e383707b
template is not mandatory in product table.
2013-09-17 19:19:52 +02:00
Etienne Roudeix
c4fd65e6ea
delivery process
2013-09-17 12:38:23 +02:00
