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
b3ac365b45
Revert "Merge branch 'cleanmaster' into modules"
...
This reverts commit d0ff5260f767d0101dbe
2013-12-20 11:16:42 +01:00
Manuel Raynaud
2f4158d1f6
fix cs
2013-12-18 10:04:13 +01:00
Etienne Roudeix
32d0aa15a6
PaymentModuleInterface::pay method force $order parameter
2013-12-16 12:38:41 +01:00
Manuel Raynaud
6b0973a7ec
change request class in BaseModule
2013-11-07 16:53:49 +01:00
Manuel Raynaud
3945504387
fix use statement in BaseModuleInterface
2013-11-07 16:50:52 +01:00
Franck Allimant
528372855f
Refactired Modules classes and interface architecture
2013-11-07 15:08:01 +01:00
Manuel Raynaud
833472e6eb
complete french translation
2013-11-05 15:59:14 +01:00
Manuel Raynaud
2c030f910b
fix cs
2013-10-25 10:07:21 +02:00
Manuel Raynaud
28b7423443
end module removal
2013-10-21 11:30:19 +02:00
Manuel Raynaud
e602884ce0
end module activation
2013-10-18 10:06:42 +02:00
Manuel Raynaud
52ed89f1aa
fix cs
2013-10-18 09:28:17 +02:00
Manuel Raynaud
6d791f5bf7
process module toggle activation
2013-10-17 18:50:00 +02:00
Manuel Raynaud
1b0de7144a
end updating module list
2013-10-17 17:20:29 +02:00
Manuel Raynaud
1b865d71a3
crowl all module descriptor file for discovering new modules
2013-10-17 15:36:11 +02:00
Manuel Raynaud
a9d5554b7c
create method for validating module file descriptor
2013-10-17 15:06:13 +02:00
Manuel Raynaud
c9dbb610c1
start validating module.xml file
2013-10-17 11:32:29 +02:00
Manuel Raynaud
84ad1e6f95
start creating xsd module management
2013-10-16 17:39:32 +02:00
Manuel Raynaud
c65ec67bdf
fix cs
2013-09-30 10:35:34 +02:00
Etienne Roudeix
8541499302
order process
2013-09-20 16:25:46 +02:00
Etienne Roudeix
61fab3a62a
order creation
2013-09-19 15:11:54 +02:00
Etienne Roudeix
891ebcd491
fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar
2013-09-18 19:51:01 +02:00
Etienne Roudeix
16d0985718
payment modules
2013-09-18 17:06:08 +02:00
Etienne Roudeix
45106f24bd
module image
2013-09-18 15:58:58 +02:00
Etienne Roudeix
4e053d1a57
payment plugins
2013-09-18 09:20:03 +02:00
Etienne Roudeix
0d1c6cf8cb
postage + invoice step
2013-09-17 19:47:10 +02:00
Etienne Roudeix
d8b5df4162
delivery process
2013-09-16 15:24:08 +02:00
Etienne Roudeix
c7b3aea7f0
cart integration
2013-09-16 14:31:34 +02:00
Manuel Raynaud
70d93d1daa
fix cs
2013-09-11 08:27:40 +02:00
Manuel Raynaud
fa7d88f8dc
country id can be an argument for calculate method
2013-09-06 17:34:25 +02:00
Manuel Raynaud
2dee65727d
set good module delivery id in session
2013-09-06 16:12:57 +02:00
Manuel Raynaud
1686d6d87c
each module is available in the container with name module.ModuleName
2013-09-06 11:43:37 +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
Manuel Raynaud
078b1e0d57
apply cs-fixer
2013-08-14 09:29:04 +02:00
Manuel Raynaud
945a97ae78
initialize module part
2013-07-11 10:28:58 +02:00
