TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
507 Commits 1 Branch 0 Tags
14bc1663bfb7b866659c8d70d55a9e62f2a54d31
Commit Graph

435 Commits

Author SHA1 Message Date
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
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
Etienne Roudeix
799e4ad5df rename feature_prod feature_product 2013-07-30 11:32:04 +02:00
Etienne Roudeix
96239e4af4 tables update 2013-07-30 11:12:55 +02:00
Etienne Roudeix
a1662c9731 feature loop 2013-07-30 10:02:13 +02:00
Manuel Raynaud
651f191314 manu le bossu's backup 2013-07-30 09:04:41 +02:00
Manuel Raynaud
85007b54c5 add more validation constraints 2013-07-29 16:25:18 +02:00
Etienne Roudeix
2478ddbd24 in progress : feature loop 2013-07-29 16:04:05 +02:00
Manuel Raynaud
fd15934b65 update smarty 2013-07-29 15:47:05 +02:00
Manuel Raynaud
0738104f52 remove combination_id in stock table 2013-07-29 15:26:33 +02:00
Manuel Raynaud
b0622c1fae update thelia model 2013-07-29 14:08:09 +02:00
Etienne Roudeix
dbe06a3057 country loop 2013-07-29 11:46:23 +02:00
Etienne Roudeix
37a66694c7 country loop 
coutryI18n data
 2013-07-29 11:10:16 +02:00
Manuel Raynaud
dc73e34f0f add method checking if stock needed is valid or not 2013-07-29 11:07:03 +02:00
Manuel Raynaud
67d38c0619 create form for adding product in cart 2013-07-29 11:06:46 +02:00
Manuel Raynaud
9657f6e013 create CombinationNotFoundException 2013-07-29 11:06:18 +02:00
Manuel Raynaud
98f3365e33 create exception for action part 2013-07-29 10:00:05 +02:00
Etienne Roudeix
b448ae21ae Merge branch 'loops' 2013-07-26 16:58:02 +02:00
Etienne Roudeix
1e6d433338 country loop 2013-07-26 16:57:37 +02:00
Manuel Raynaud
8c2eb5987c Merge branch 'cart' 
Conflicts:
	core/lib/Thelia/Core/HttpFoundation/Session/Session.php
 2013-07-26 15:59:32 +02:00
Manuel Raynaud
a1a3b73d9c add some phpdoc 2013-07-26 15:57:22 +02:00
Etienne Roudeix
ee6a2a645f Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-07-26 15:45:26 +02:00
Etienne Roudeix
caf3a91ac6 address loop 
title loop
 2013-07-26 15:41:46 +02:00
Manuel Raynaud
9f4a2778e3 fix endlife cookie cart 2013-07-26 15:40:05 +02:00
Manuel Raynaud
74fb217cb4 finish session test for cart part 2013-07-26 11:58:59 +02:00
Manuel Raynaud
747012dd35 start test for session class 2013-07-26 11:48:01 +02:00
Manuel Raynaud
4b1e7ce5b0 change visibility for property in cart test 2013-07-26 11:37:39 +02:00
Manuel Raynaud
5f8e935a40 finis test for cart creation 2013-07-26 11:29:26 +02:00
Manuel Raynaud
02c89c0795 remove use statementnot needed 2013-07-26 11:12:10 +02:00
Manuel Raynaud
fab90bade9 complete cart test 2013-07-26 11:06:26 +02:00
Manuel Raynaud
202d2dae99 initialize cart test 2013-07-26 10:50:03 +02:00
Manuel Raynaud
69bb513fbd refacto cart process 2013-07-26 10:43:17 +02:00
Etienne Roudeix
9e663145b0 customer loop 2013-07-26 10:04:35 +02:00
franck
c6366c69bd Merge branch 'master' of https://github.com/thelia/thelia 2013-07-25 23:01:00 +02:00
franck
f7a635dbf7 Added DataAccess plugin, admin header completed 2013-07-25 22:59:46 +02:00
Etienne Roudeix
54d79dd9ae Merge branch 'loops' 2013-07-25 11:15:40 +02:00
Etienne Roudeix
6c046417cb is_default in address table 2013-07-25 11:15:04 +02:00
Manuel Raynaud
69059ea6b9 Session::getCart return a Thelia\Model\Cart instance or null if cart is 
not valid
 2013-07-25 11:14:51 +02:00
Manuel Raynaud
12f78f999e create InvalidCartException 2013-07-25 11:08:18 +02:00
Manuel Raynaud
08dc47fdd8 add some phpdoc 2013-07-25 10:35:04 +02:00
Manuel Raynaud
652ce6a6fc allow to create new cart 2013-07-25 10:06:11 +02:00
Manuel Raynaud
72e9c13967 put getCart into action classes 2013-07-25 09:38:18 +02:00
franck
0a89a21897 Fixed form names 2013-07-24 20:11:28 +02:00
franck
182b13ceca In an Action, errored forms are propagated via the ActionEvent 2013-07-24 20:08:00 +02:00
Manuel Raynaud
fc088fcbd6 start to implement cart creation process 2013-07-24 17:48:10 +02:00
franck
94ee77f4f8 Merge branch 'master' of https://github.com/thelia/thelia 2013-07-24 17:38:54 +02:00