Etienne Roudeix
e8a4e56324
tax engine
2013-09-11 16:21:51 +02:00
Manuel Raynaud
70d93d1daa
fix cs
2013-09-11 08:27:40 +02:00
Etienne Roudeix
519678a543
Merge branch 'tax'
2013-09-09 16:28:32 +02:00
Etienne Roudeix
0ddf88e46e
tax engine
2013-09-09 14:24:50 +02:00
Etienne Roudeix
0a5281c1e6
tax engine model
2013-09-09 10:48:41 +02:00
gmorel
6cba95f4ee
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia : (32 commits)
refactor name for updating actions
choose UPDATE word for name actions
add update address action and create tests
404 not found management
Working Fix unset namespace
modify travis script
test rewriting exception
Fixed minor bug in Currencies
Finished currency edition
Added route methods
address action implementation
hot fix
rewriting
add address create controller and event
Added AdminUtilities Smarty plugin, optimized templates
update customer model createOrUpdate method
update address model
fix redirect process in viewListener
refactor reset_install script
refactor install process, database management in dedicated class
...
Conflicts:
local/config/schema.xml
reset_install.sh
2013-09-04 15:42:38 +02:00
Etienne Roudeix
43ff0b7297
rewriting
2013-09-03 16:51:41 +02:00
Etienne Roudeix
3de03dc876
SID : rewriting
2013-09-03 10:09:51 +02:00
gmorel
47106f562d
Merge branch 'coupon' of https://github.com/thelia/thelia into coupon
...
Conflicts:
core/lib/Thelia/Model/Base/Coupon.php
core/lib/Thelia/Model/Base/CouponI18n.php
core/lib/Thelia/Model/Base/CouponQuery.php
core/lib/Thelia/Model/Base/CouponVersion.php
core/lib/Thelia/Model/Base/CouponVersionQuery.php
core/lib/Thelia/Model/Base/ProductAssociatedContent.php
core/lib/Thelia/Model/Map/CouponTableMap.php
core/lib/Thelia/Model/Map/CouponVersionTableMap.php
install/faker.php
install/thelia.sql
local/config/schema.xml
2013-08-28 10:11:57 +02:00
gmorel
e971179a60
WIP Coupon
...
Default Implementation + Unit test in order to validate the chain
- effect
- application field
- condition
2013-08-27 13:28:57 +02:00
gmorel
eae86cd797
WIP Coupon
...
Refactor
2013-08-23 20:00:32 +02:00
gmorel
c02e286d09
WIP Coupon
...
Implementation CouponInterface 1st class : RemoveXAmount
Implementation CouponRuleInterface 1st class : AvailableForTotalAmount
2013-08-21 20:03:03 +02:00
Etienne Roudeix
86b11096ba
Merge branch 'master' into loops
...
Conflicts:
core/lib/Thelia/Core/Template/Loop/Category.php
core/lib/Thelia/Core/Template/Loop/FeatureValue.php
core/lib/Thelia/Core/Template/Loop/Folder.php
core/lib/Thelia/Core/Template/Loop/Product.php
core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
install/faker.php
2013-08-21 09:19:56 +02:00
gmorel
2113e7a457
WIP Coupon
...
RemoveXPercent and RemoveXAmount implementation
2013-08-19 20:02:53 +02:00
franck
d61eeef0d6
Finalized images action and loop
2013-08-15 20:47:05 +02:00
franck
a56e05b36b
Added image action and loop
2013-08-15 11:46:46 +02:00
Manuel Raynaud
078b1e0d57
apply cs-fixer
2013-08-14 09:29:04 +02:00
Manuel Raynaud
12f78f999e
create InvalidCartException
2013-07-25 11:08:18 +02:00
franck
3d5caa2341
Fix source header alignment
2013-07-17 15:06:53 +02:00
Etienne Roudeix
ad47ab7cac
set execution right // no more troubles
...
change composer required PHP version from 5.4 to 5.3
2013-06-20 15:21:16 +02:00
Manuel Raynaud
c5bed85462
create first method for CRUD
2013-01-09 17:23:46 +01:00
