TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
556 Commits 1 Branch 0 Tags
77334ee2ce059708e0fa0d7ff4fbae8b4f08d21e
Commit Graph

468 Commits

Author SHA1 Message Date
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
Etienne Roudeix
aac1533e65 change faker 2013-08-02 15:35:06 +02:00
Etienne Roudeix
8874404e4d remove link from folder 2013-08-02 15:25:29 +02:00
Etienne Roudeix
ab1598e50c bug fix in loops 2013-08-02 14:59:52 +02:00
franck
3a99023c1d Fixed empty loop wich execute contents problem 2013-08-02 13:58:59 +02:00
franck
0482b8c1bd Merge branch 'master' of https://github.com/thelia/thelia 2013-08-02 13:49:26 +02:00
Etienne Roudeix
e8a6d9c900 detailed loop error 2013-08-02 13:39:05 +02:00
Manuel Raynaud
fe850718cc update schema, changin some relations between tables 2013-08-02 12:40:51 +02:00
Etienne Roudeix
866c29adb4 Merge branch 'cart' into loops 2013-08-02 11:50:46 +02:00
Etienne Roudeix
96bf685b39 change default product loop order value 
add tests
 2013-08-02 10:11:54 +02:00
franck
1705e11b88 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Loop/Product.php
 2013-08-01 10:56:54 +02:00
franck
4ad94059e7 Product loop adjustements 2013-08-01 10:53:35 +02:00
Manuel Raynaud
14bc1663bf Merge branch 'cart' 
Conflicts:
	composer.lock
	core/lib/Thelia/Model/Base/Attribute.php
	core/lib/Thelia/Model/Base/AttributeAv.php
	core/lib/Thelia/Model/Base/AttributeCombination.php
	core/lib/Thelia/Model/Base/AttributeCombinationQuery.php
	core/lib/Thelia/Model/Base/Cart.php
	core/lib/Thelia/Model/Base/CartItem.php
	core/lib/Thelia/Model/Base/CartItemQuery.php
	core/lib/Thelia/Model/Base/Currency.php
	core/lib/Thelia/Model/Base/CurrencyQuery.php
	core/lib/Thelia/Model/Base/Product.php
	core/lib/Thelia/Model/Base/ProductPrice.php
	core/lib/Thelia/Model/Base/ProductPriceQuery.php
	core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php
	core/lib/Thelia/Model/Map/CartItemTableMap.php
	core/lib/Thelia/Model/Map/CurrencyTableMap.php
	core/lib/Thelia/Model/Map/ProductPriceTableMap.php
	core/lib/Thelia/Model/Map/ProductTableMap.php
	install/thelia.sql
	local/config/schema.xml
 2013-08-01 10:52:17 +02:00
Manuel Raynaud
f69b2cfc11 update model removing increase property 2013-08-01 10:40:27 +02:00
Etienne Roudeix
24dfd35182 Merge branch 'master' into loops 2013-07-31 14:03:09 +02:00
Etienne Roudeix
18dd7c1fbf testing loop title 2013-07-31 14:02:59 +02:00
Etienne Roudeix
338ec5fce6 Merge branch 'loops' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-07-31 13:56:05 +02:00
Etienne Roudeix
c01607d432 change table name feature_prod 
new loops
 2013-07-31 13:52:11 +02:00
Manuel Raynaud
542a83e22c remove references to stock table 2013-07-30 17:25:16 +02:00
Manuel Raynaud
acb05f81dc change stock table name 2013-07-30 17:06:29 +02:00