Commit Graph

487 Commits

Author SHA1 Message Date
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
Manuel Raynaud
f727fe4203 set error message to form in addArticle action 2013-08-06 16:37:08 +02:00
Manuel Raynaud
b0c3112d71 fix default successUrl on addArticle action 2013-08-06 16:31:39 +02:00
Manuel Raynaud
75929e1d4f create new method allowing to add paramter to the current query string 2013-08-06 16:13:34 +02:00
Manuel Raynaud
86161f0320 set dispatcher to cartItem on adding new item on cart 2013-08-06 13:00:08 +02:00
Manuel Raynaud
7343e7ee02 initialize cart item add 2013-08-06 12:32:22 +02:00
Manuel Raynaud
ea81889aea create method for retriving last item added to cart 2013-08-06 12:08:12 +02:00
Manuel Raynaud
b18a09b94b allow token to be null in cart table 2013-08-06 11:53:30 +02:00
Manuel Raynaud
e0be762236 check if we have to verify stock on duplicate cart 2013-08-06 11:23:52 +02:00
Manuel Raynaud
1d1bd65a94 add new price if priceis not valid anymore in cart 2013-08-06 11:15:01 +02:00
Manuel Raynaud
89e15c9bc4 check if price is already valid on duplicate cart 2013-08-06 10:37:51 +02:00
Manuel Raynaud
c97f0e462a regenerate modeland sql fixing typo in CartItem table 2013-08-06 09:57:14 +02:00
Manuel Raynaud
3262d01791 update model 2013-08-06 09:52:41 +02:00
Manuel Raynaud
dcfb4edda3 allow possibility to fix cookie end of life 2013-08-06 09:50:19 +02:00
Manuel Raynaud
17daf2821f add some phpdoc 2013-08-06 09:14:13 +02:00
Etienne Roudeix
c8fe340eb4 Merge branch 'loops' 2013-08-02 16:54:32 +02:00
Etienne Roudeix
3507cde1f8 content and folder loops tests 2013-08-02 16:20:52 +02:00
Etienne Roudeix
fd82907209 folder and content fake
folder and content loops
2013-08-02 16:18:45 +02:00
Manuel Raynaud
0b2bdd196f fix broken tests 2013-08-02 16:16:04 +02:00
Manuel Raynaud
265a6bb2a8 change event class for customer actions 2013-08-02 16:10:26 +02:00
Manuel Raynaud
9995daa158 dispatch event when cart is duplicated 2013-08-02 16:01:21 +02:00
Etienne Roudeix
a117750ca8 Merge branch 'cart' into loops 2013-08-02 15:37:44 +02:00