Commit Graph

508 Commits

Author SHA1 Message Date
Manuel Raynaud
3d94a89899 rename ContainerAware in ContainerAwareAdmin 2013-08-12 10:11:23 +02:00
Manuel Raynaud
88f8e22408 creating new ContainerAware class fixing context on it 2013-08-12 10:07:37 +02:00
Manuel Raynaud
8d1cd1019b remove doc 2013-08-09 16:47:49 +02:00
Manuel Raynaud
d213278fe3 Merge branch 'master' into actions
Conflicts:
	core/lib/Thelia/Action/BaseAction.php
	core/lib/Thelia/Action/Category.php
	core/lib/Thelia/Action/Customer.php
2013-08-09 16:46:56 +02:00
franck
d365146231 Beautified cart test 2013-08-09 10:54:28 +02:00
franck
8eaa2de960 Fixed cart tests 2013-08-09 10:53:38 +02:00
Manuel Raynaud
31743fd987 apply php-cs-fiwer on Action directory 2013-08-09 10:38:58 +02:00
Manuel Raynaud
7071ffc686 remove CustomerRefEvent class 2013-08-09 10:29:30 +02:00
Manuel Raynaud
12f3609cf5 remove changeRef event 2013-08-09 10:25:19 +02:00
franck
00100945f6 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Action/Category.php
	core/lib/Thelia/Action/Customer.php
2013-08-09 10:25:03 +02:00
Manuel Raynaud
5cd2584cbc continue refactoring dispatching event on model modification 2013-08-09 10:24:38 +02:00
Manuel Raynaud
654220882a move dispatch during customer creation process in post/preInsert methods 2013-08-09 10:19:36 +02:00
franck
c46a708346 Categories ordrering in the catalog 2013-08-09 10:18:08 +02:00
Manuel Raynaud
52ea82ae1b change Request namespace in ActionEvent 2013-08-09 09:57:43 +02:00
Manuel Raynaud
3b0a596aa5 modify some phpdoc 2013-08-09 09:55:50 +02:00
Manuel Raynaud
9d22fdd0f7 write full namespace when using Tlog 2013-08-09 09:37:31 +02:00
Manuel Raynaud
7926d64352 add use missing statement 2013-08-09 09:35:42 +02:00
Manuel Raynaud
48f3b9f5eb remove unused use statement 2013-08-09 09:23:30 +02:00
Manuel Raynaud
727c5e57ad modify phpdoc 2013-08-09 09:20:49 +02:00
Manuel Raynaud
17ede00236 add use missing statement 2013-08-09 09:20:00 +02:00
Manuel Raynaud
cdf28e66cf fix typo in method name 2013-08-09 09:14:25 +02:00
Manuel Raynaud
376471db04 Merge branch 'cart'
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
2013-08-08 18:03:23 +02:00
Manuel Raynaud
2e1627398c start to implement cart loop 2013-08-08 17:56:30 +02:00
Manuel Raynaud
8b00676139 create Trait for cart management part 2013-08-08 17:14:10 +02:00
Manuel Raynaud
d63168d5ba Merge branch 'cart' 2013-08-08 14:49:03 +02:00
Manuel Raynaud
df371355b9 change phpdoc api generator to phpdoc 2013-08-08 13:26:49 +02:00
franck
81a5664653 Using now BaseAction methods in Cartp.php 2013-08-08 11:43:27 +02:00
franck
4e83466bc0 Form processing is now factorized in BaseAction 2013-08-08 11:13:46 +02:00
Manuel Raynaud
a70ea40c3e remove unused variables 2013-08-08 10:34:53 +02:00
Manuel Raynaud
fa5b313924 implement modifyArticle method 2013-08-08 10:20:01 +02:00
franck
13bed6d3fc Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
2013-08-08 10:14:02 +02:00
franck
efa3eb2767 Category visibility toggle implementation 2013-08-08 10:12:14 +02:00
Manuel Raynaud
7e5c296fb2 Merge branch 'cart'
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
2013-08-08 10:11:22 +02:00
Manuel Raynaud
57b6cc10a0 implement modifyArticle method 2013-08-08 10:09:24 +02:00
franck
64031a1883 Added category creation and deletion 2013-08-08 02:39:42 +02:00
franck
eb93049897 Added a new loop argument type to pass either true (1), false (0) or
both (*). Useful for visible argument for example.
2013-08-07 22:41:57 +02:00
Manuel Raynaud
815ec1fe00 change new Quantity value in CartItem::addQuantity 2013-08-07 17:11:46 +02:00
Manuel Raynaud
de171e3a26 modify addQuantity method 2013-08-07 17:03:30 +02:00
Manuel Raynaud
02faa94cb4 apply treatment for append and newness when adding item to cart 2013-08-07 16:46:25 +02:00
Manuel Raynaud
80496641c6 try to test form 2013-08-07 14:55:27 +02:00
Manuel Raynaud
77334ee2ce initialize test on AddARticle action 2013-08-07 11:25:41 +02:00
Manuel Raynaud
69f80d29f5 create an abstract class for base action method 2013-08-07 10:42:19 +02:00
Manuel Raynaud
154d8e4d48 remove Redirect::unauthorize method, 401 Code is not a redirect code 2013-08-07 10:32:01 +02:00
Manuel Raynaud
9f20740dae remove old part of Tpex 2013-08-07 10:31:46 +02:00
Manuel Raynaud
3c87fa8bd0 Merge branch 'master' into cart
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	install/faker.php
2013-08-07 10:23:44 +02:00
Manuel Raynaud
3fbb72b36c complete INTALL-TODO 2013-08-07 10:20:04 +02:00
franck
81f142946d Merge branch 'master' of https://github.com/thelia/thelia 2013-08-07 10:17:53 +02:00
franck
90f5bdd453 Added first catalog page 2013-08-07 10:17:22 +02:00
Manuel Raynaud
14f12437fc fix argument call 2013-08-07 09:57:54 +02:00
Manuel Raynaud
2f2e88b9fc Merge branch 'master' into cart 2013-08-07 09:44:34 +02:00