TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,158 Commits 1 Branch 0 Tags
a5cfcf91ca27e36ae90e7e4b8f17a8df86508e13
Commit Graph

60 Commits

Author SHA1 Message Date
Manuel Raynaud
a5cfcf91ca update changelog and fix cs 2014-02-22 19:01:37 +01:00
Manuel Raynaud
5983e4447f create lang test suite 2014-02-11 11:32:24 +01:00
Manuel Raynaud
a6f0a38a7b allow possibility for payment module to return a response 2014-02-06 12:24:52 +01:00
Manuel Raynaud
c52ec3dbaf create currency test suite 2014-02-05 12:44:11 +01:00
Manuel Raynaud
f6d23d5911 fix test suite 2014-02-04 15:12:28 +01:00
Manuel Raynaud
d4cc662fe6 Merge branch 'optim' 
Conflicts:
	core/lib/Thelia/Action/Order.php
 2014-02-04 09:11:56 +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
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
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
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
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
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
Etienne Roudeix
99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules"" 
This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.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/OrderCouponQuery.php
 2014-01-06 11:25:25 +01:00
Etienne Roudeix
b3ac365b45 Revert "Merge branch 'cleanmaster' into modules" 
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
 2013-12-20 11:16:42 +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
Etienne Roudeix
c981102d3a Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-18 17:47:23 +01:00
Etienne Roudeix
1ba60103f3 coupon in orders + model review : backquote use 2013-12-18 17:46:42 +01:00
Manuel Raynaud
a6a2c43345 don't remove session order before calling payment method 2013-12-18 17:04:48 +01:00
Manuel Raynaud
2f4158d1f6 fix cs 2013-12-18 10:04:13 +01:00
Franck Allimant
33e0a854f2 Implemented mail messages templates and layouts 2013-11-27 21:21:07 +01:00
touffies
85d9c112d3 Replace company_name and contact_email by store_name & store_email 2013-11-22 17:40:04 +01:00
Etienne Roudeix
fa127ed4f0 colissimo module 2013-11-14 11:53:29 +01:00
Etienne Roudeix
48409c29a9 Colissimo in progress 2013-11-14 11:21:34 +01:00
Manuel Raynaud
e33ed5047f check if email contact eists before sending emails 2013-10-25 11:52:46 +02:00
Manuel Raynaud
dfbdce3f80 send order confirmation email 2013-10-24 21:24:14 +02:00
Etienne Roudeix
4065f338b9 Merge branch 'master' into tax 2013-10-24 10:37:05 +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
0bd57b0a5a Worked on catalog 2013-10-23 23:41:39 +02:00
Etienne Roudeix
b84e863033 fix tests 2013-10-07 14:36:20 +02:00
Manuel Raynaud
c65ec67bdf fix cs 2013-09-30 10:35:34 +02:00
Manuel Raynaud
43b5a129f7 refactor order and image events 2013-09-30 10:34:08 +02:00
Etienne Roudeix
97c461fa2c order address changes tests 2013-09-26 14:17:26 +02:00
Etienne Roudeix
34ef5cf524 edit order form 2013-09-26 13:07:51 +02:00
Etienne Roudeix
1ffcaa7dd4 order admin 2013-09-25 15:55:48 +02:00
Etienne Roudeix
d967242a59 order admin 2013-09-25 13:26:12 +02:00
Etienne Roudeix
7bd511c420 order admin 2013-09-24 17:04:32 +02:00