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
5d92ea0bab
TaxManager is now a service in the container.
2014-01-22 01:18:28 +01:00
Franck Allimant
66d6d03770
Fixed depracation of rewritten URL
2014-01-20 23:38:14 +01:00
Franck Allimant
c60bb02da7
Fixed imporper use of Thelia\Model\Base\LangQuery
2014-01-17 14:42:41 +01:00
Manuel Raynaud
4e1521775f
alloow possibility to specify a ref for a customer
2014-01-17 11:15:55 +01:00
Manuel Raynaud
7ec7fcfa5e
check if pbject exists before deleting it
2014-01-10 09:40:33 +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
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
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
9a22bdafa1
Coupon : Fix unit test
2013-12-29 14:47:51 +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
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
Franck Allimant
3a2ad352cc
Refactored templates processing
2013-12-20 00:49:08 +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
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
30eab4f416
fix object identifier presence
2013-12-16 15:53:02 +01:00
Manuel Raynaud
d6ba2b3d65
Merge branch 'master' into frontend
2013-12-16 15:45:04 +01:00
Etienne Roudeix
977bbb55fa
Merge branch 'cleanmaster' into modules
2013-12-16 11:32:54 +01:00
Etienne Roudeix
86f1e06e42
document repositioning after delation
2013-12-16 11:32:05 +01:00
Etienne Roudeix
c5e69ebbb9
Merge branch 'cleanmaster' into modules
2013-12-16 10:56:40 +01:00
Etienne Roudeix
583cbe95b6
document positioning
2013-12-16 10:55:18 +01:00
Etienne Roudeix
536c88b4f8
Merge branch 'cleanmaster' into modules
...
Conflicts:
core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
2013-12-16 09:57:35 +01:00
Manuel Raynaud
f4c5f23d00
Change AdminLog logging request behavior, fixing issue #145
2013-12-14 14:16:45 +01:00
Etienne Roudeix
297f197fed
Merge branch 'cleanmaster' into modules
2013-12-12 15:45:45 +01:00
Etienne Roudeix
c9e052188c
images are positionable
2013-12-12 15:41:35 +01:00
Etienne Roudeix
93537b8d71
in progress : reorder image
2013-12-12 15:30:10 +01:00
Etienne Roudeix
02b9d2e509
Merge branch 'cleanmaster' into modules
2013-12-10 15:57:37 +01:00
touffies
0684ec2b42
Rename meta_keyword to meta_keywords
...
Add SEO to folder
2013-12-09 14:52:46 +01:00
Etienne Roudeix
cc4fce9add
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
2013-12-09 10:29:49 +01:00
Franck Allimant
8c864021f5
Added sorting and position ùmanagement to modules.
2013-12-06 18:59:46 +01:00
Franck Allimant
e96088080d
Merge branch 'master' into modules
2013-12-06 17:16:14 +01:00
Etienne Roudeix
14e7181d06
rewritten url update
2013-12-06 16:35:14 +01:00
Franck Allimant
0fcbb409e3
Factorized URL desactivation in UrlRewritingTrait::markRewritenUrlObsolete()
2013-12-06 12:26:39 +01:00
Etienne Roudeix
926ff410d1
fix #128
2013-12-06 11:50:29 +01:00
Franck Allimant
5857c07ef0
Fixed issue 118
2013-12-05 15:57:56 +01:00
Franck Allimant
de0542b33c
Changed direct accesses to verifyStok by calls to checkAvailableStock
2013-12-05 13:02:13 +01:00
Franck Allimant
0a7b8f05d0
Added checkAvailableStock(), changed getPassedUrlView() to
...
getObsoleteRewrittenUrlView()
2013-12-05 13:01:09 +01:00
