TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,478 Commits 1 Branch 0 Tags
main
Commit Graph

74 Commits

Author SHA1 Message Date
TheCoreDev
66ce4ee218 Inital commit 2020-11-19 15:36:28 +01:00
Manuel Raynaud
ec50b30ff6 Merge pull request #417 from Yochima/yochima-branch 
set the placedOrder in the createManual function
 2014-05-19 11:12:32 +02:00
Guillaume Barral
bcd817f9d9 initialize the order in the $event object in the createManual function. 
We need to initialize it because we have to  use the placedOrder instead
 2014-05-19 11:06:19 +02:00
Guillaume Barral
c4be881ab8 add the test of a non null order in the $event object in createManual function 2014-05-19 11:01:19 +02:00
Guillaume Barral
db94749dc0 set the placedOrder in the createManual function 2014-05-19 09:43:42 +02:00
Franck Allimant
392abff271 Free shipping for selected countries and/or shipping methods 2014-05-15 20:25:22 +02:00
Manuel Raynaud
85d80d1d77 fix minor bug 2014-05-09 10:55:50 +02:00
Manuel Raynaud
5e65bf0b8a change license header 2014-04-18 09:36:41 +02:00
Franck Allimant
68cbc986e1 Fix for #308 2014-04-17 23:44:19 +02:00
Franck Allimant
0bdac59881 Restored previous version 2014-04-17 23:41:12 +02:00
Franck Allimant
1603a89cff Fixed postage amount reset. 2014-04-17 20:50:35 +02:00
Franck Allimant
12c21b1239 Fixes #308 2014-04-17 19:46:21 +02:00
Franck Allimant
060df3ed61 Added heper methods to easyly get order status object 2014-04-12 02:36:17 +02:00
Manuel Raynaud
886320789a add cart item id on order product save event 2014-03-28 09:18:03 +01:00
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