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

39 Commits

Author SHA1 Message Date
Julien Chanséaume
2b2a5690a7 php-cs-fixer 2014-08-04 20:31:27 +02:00
Benjamin Perche
b4eb12f12a Fix method that prevents orders to be set as Paid in the BO 
modifié:         core/lib/Thelia/Model/Order.php
 2014-07-29 11:34:57 +02:00
Guillaume Barral
60124feb17 modification of model Order to not insert two times the order_version (when we insert for the first time an order object) 2014-06-19 12:02:58 +02:00
Franck Allimant
d576e62082 Removed uses of Base in core/lib/Thelia/Model 2014-05-19 09:50:18 +02:00
Franck Allimant
cae0db00eb Applied Windows version of php-cs script 2014-05-17 12:00:08 +02:00
Franck Allimant
32542efe28 $chosenDeliveryAddress and $chosenInvoiceAddress are now protected 2014-05-15 19:30:30 +02:00
Manuel Raynaud
66c5a3729c refactor customer and order ref 2014-04-22 09:59:23 +02:00
Manuel Raynaud
b60abb206b fix cs 2014-04-11 09:36:43 +02:00
Manuel Raynaud
8f988b3553 set invoiceDate to current date when order status is changed to paid 2014-04-11 08:52:22 +02:00
Manuel Raynaud
99eb5c01f4 add some phpdoc 2014-03-17 15:14:58 +01:00
Manuel Raynaud
a27e317245 update phpDoc and fix cs 2014-03-05 15:12:11 +01:00
Franck Allimant
defd66af27 Added status change helper methods (setPaid / isPaid, etc) 2014-03-01 22:02:56 +01:00
Manuel Raynaud
a5cfcf91ca update changelog and fix cs 2014-02-22 19:01:37 +01:00
Franck Allimant
89653f452b Removes container from all Thelia actions, but Modules (#198) 2014-01-31 20:06:42 +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
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
1ba60103f3 coupon in orders + model review : backquote use 2013-12-18 17:46:42 +01:00
Etienne Roudeix
969c077f81 admin home stats and information 2013-11-04 16:15:48 +01:00
Manuel Raynaud
43b5a129f7 refactor order and image events 2013-09-30 10:34:08 +02:00
Etienne Roudeix
7bd511c420 order admin 2013-09-24 17:04:32 +02:00
Etienne Roudeix
5bbf693e0f action order tests 2013-09-23 14:44:52 +02:00
Etienne Roudeix
8541499302 order process 2013-09-20 16:25:46 +02:00
Etienne Roudeix
6e9af59403 order creation 2013-09-19 19:56:59 +02:00
Etienne Roudeix
ec7d4471dc payment process 2013-09-19 15:59:16 +02:00
Etienne Roudeix
61fab3a62a order creation 2013-09-19 15:11:54 +02:00
Etienne Roudeix
0d1c6cf8cb postage + invoice step 2013-09-17 19:47:10 +02:00
Etienne Roudeix
692badb06b delivery form 2013-09-17 11:05:29 +02:00
Manuel Raynaud
d4ec36e920 mock getTotalAmoutn in order class 2013-09-09 14:29:11 +02:00
Manuel Raynaud
8e77e4b530 create admin customer view and add output info in customer loop 2013-09-09 11:07:51 +02:00
Etienne Roudeix
a02ac99360 set x right to 7 2013-07-09 11:59:37 +02:00
Manuel Raynaud
5fda702b8d migrte propel to propel 2 2013-07-04 19:31:09 +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
c72c13551c add Propel generated files 2013-01-16 10:58:36 +01:00
Manuel Raynaud
8279cc37b4 remove notnorm gen model 2013-01-15 10:39:16 +01:00
Manuel Raynaud
c3c7102f7b move Base model to Base directory 2012-12-27 11:37:32 +01:00
Manuel Raynaud
6ba59276e1 delete propel auto generated files 2012-12-20 17:59:30 +01:00
Manuel Raynaud
481ac07994 integrate propel generate model 2012-12-17 16:40:47 +01:00