Manuel Raynaud
d4cc662fe6
Merge branch 'optim'
...
Conflicts:
core/lib/Thelia/Action/Order.php
2014-02-04 09:11:56 +01:00
Franck Allimant
b18718293f
Fixed a wrong CacheEvent instanciation.
2014-02-04 00:20:45 +01:00
Franck Allimant
aa993b0cf9
Using protected $container instead of (missing) getContainer() method
2014-02-03 15:31:34 +01:00
Franck Allimant
1a72594dac
Using protected member $securityContext instez of a protected getter
2014-02-03 15:30:03 +01:00
Manuel Raynaud
31dc5238de
change container interface, using good one
2014-02-03 14:07:23 +01:00
Franck Allimant
3fd8f5adbb
Removes container from all Thelia actions, but Modules ( #198 )
2014-02-03 13:59:33 +01:00
Franck Allimant
779c33ac79
Fixed wrong namespace
2014-02-03 13:56:30 +01:00
Franck Allimant
a28e50c7e2
Added a way to create orders outside of the front-office context.
2014-02-03 13:56:05 +01:00
Manuel Raynaud
1548194a1c
fix send mail order
2014-02-03 13:55:13 +01:00
Manuel Raynaud
bc61ca3d19
fix send mail order
2014-02-03 13:41:40 +01:00
Manuel Raynaud
c18718254c
test area listener ( #198 ]
2014-02-03 11:40:12 +01:00
Franck Allimant
1e4eaf1093
Fixed wrong namespace
2014-02-01 19:07:02 +01:00
Franck Allimant
89653f452b
Removes container from all Thelia actions, but Modules ( #198 )
2014-01-31 20:06:42 +01:00
Franck Allimant
dfd34bad49
Fixed wrong namespace
2014-01-31 16:03:02 +01:00
Franck Allimant
f8e3553924
Removed unused container dependency from the FileManager class
2014-01-31 15:55:21 +01:00
Franck Allimant
b7c076445c
Merge branch 'optim' of https://github.com/thelia/thelia into optim
...
Conflicts:
core/lib/Thelia/Action/Order.php
core/lib/Thelia/Core/Template/Element/BaseLoop.php
2014-01-31 15:49:59 +01:00
Manuel Raynaud
58ae3bb619
remove container from administrator listener and create test for this
...
event. #198
2014-01-31 12:02:45 +01:00
Manuel Raynaud
bf49aa24dd
Remove container from Adress listenet. #198
2014-01-31 11:28:06 +01:00
Manuel Raynaud
3fb0dfe1db
Remove container in Customer listener. #198
2014-01-31 11:03:53 +01:00
Franck Allimant
c5cc6aae76
Added administrator preferred locale (see issue #183 )
2014-01-27 14:29:37 +01:00
Franck Allimant
3e3ecc8edf
Fixed undefined $search
2014-01-24 23:07:37 +01:00
Franck Allimant
24ffc81b36
Fixed typo
2014-01-24 15:27:56 +01:00
Franck Allimant
edbc63bb53
Fixed Customer namespace problem
2014-01-24 15:18:50 +01:00
Franck Allimant
3c16cac486
Implemented order creation outside front-offcie context
2014-01-23 19:54:16 +01:00
Franck Allimant
f8460901b3
Added a way to create orders outside of the front-office context.
2014-01-23 19:49:36 +01:00
Manuel Raynaud
a1e137128a
remove Iterator for deleting folders
2014-01-23 11:52:33 +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
Manuel Raynaud
d573ff54c2
put correct error messages in Document loop
2014-01-21 11:27:15 +01:00
Manuel Raynaud
4e1521775f
alloow possibility to specify a ref for a customer
2014-01-17 11:15:55 +01:00
Franck Allimant
30b8277975
Fixed internationalisation of exceptions
2014-01-16 12:20:17 +01:00
Franck Allimant
435e195a53
Delete a module when module directory is missing is now possible.
2014-01-16 12:13:29 +01:00
Franck Allimant
8f06c8050b
Delete module request contains now "data data" flag
2014-01-16 12:01:05 +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
75007cc6c5
don't save order untill it's not the payment method
2014-01-10 10:34:57 +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
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
Etienne Roudeix
932445344b
set cartItem in cart add and update events
2013-12-24 11:28:30 +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
8c121dd455
add coupon tests
2013-12-19 15:37:15 +01:00
Etienne Roudeix
5773922314
show coupon codes in back office
2013-12-19 14:50:45 +01:00
Etienne Roudeix
d7c1ecf09a
coupon management in order and cart process
2013-12-19 14:17:22 +01:00
