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

259 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
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
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
Etienne Roudeix
2478ddbd24 in progress : feature loop 2013-07-29 16:04:05 +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
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
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
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
f7a635dbf7 Added DataAccess plugin, admin header completed 2013-07-25 22:59:46 +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
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
franck
182b13ceca In an Action, errored forms are propagated via the ActionEvent 2013-07-24 20:08:00 +02:00
franck
94ee77f4f8 Merge branch 'master' of https://github.com/thelia/thelia 2013-07-24 17:38:54 +02:00
franck
fabeab1822 An errorred form is now passed to the Form smarty plugin through the parser context instead of the 
session
 2013-07-24 17:31:20 +02:00
Etienne Roudeix
f05331da1a category link last stand 2013-07-24 14:51:36 +02:00
Etienne Roudeix
a1d5e275dd Merge branch 'master' into loops 2013-07-24 11:33:38 +02:00
Etienne Roudeix
cf0d8b6f4e loop fixe 2013-07-24 11:32:32 +02:00
Manuel Raynaud
7498c97f49 missing use statement 2013-07-23 16:18:02 +02:00
Etienne Roudeix
59f5b102c6 Merge branch 'master' into loops 2013-07-23 10:44:41 +02:00
Etienne Roudeix
0e9d918b84 product loop : given id exception 2013-07-22 09:36:06 +02:00
Etienne Roudeix
87dd416a1e accessory loop 2013-07-19 14:12:13 +02:00
Etienne Roudeix
c28ac536aa accessory loop 
product loop
order fix
 2013-07-19 13:59:25 +02:00
franck
9a1ee565de changed role names to XXXX instead of ROLE_XXXX 2013-07-18 13:01:33 +02:00
franck
2c52df1034 Added title_id column in customer table 2013-07-18 09:40:21 +02:00
franck
b177367893 Capitalized template variables (index_page -> INDEX_PAGE) 2013-07-18 09:32:50 +02:00
franck
8296051937 Implemented front-office login 2013-07-17 18:49:23 +02:00
franck
3d5caa2341 Fix source header alignment 2013-07-17 15:06:53 +02:00
franck
466b402246 Merge branch 'master' of https://github.com/thelia/thelia 2013-07-17 11:37:01 +02:00
franck
21068f4c1f Added UrlGenerator smarty plugin, to allow templates and url 
manipulation in templates.
 2013-07-17 11:36:28 +02:00
franck
0dfee8331b Added an output filter to remove blank lines from generated HTML 2013-07-17 11:34:48 +02:00
Manuel Raynaud
a84e63e457 verify if file template really exists 2013-07-17 10:35:16 +02:00
Etienne Roudeix
56719a4c46 product loop : feature_values param + fix feature_av 2013-07-16 16:57:33 +02:00
franck
e8bf47b929 Refactored Form system to get simple error handling and a clearer 
interface
 2013-07-16 16:34:47 +02:00
Etienne Roudeix
4ddc7f12b1 loops 2013-07-15 11:21:25 +02:00
franck
f6cb119616 Initiated translation system 2013-07-12 14:24:55 +02:00
franck
75573b3652 Merge branch 'master' of https://github.com/thelia/thelia 2013-07-12 14:22:58 +02:00
franck
385a83f896 Finalized admin security 2013-07-12 14:22:08 +02:00
Etienne Roudeix
028a5d124e unit tests 2013-07-11 16:25:03 +02:00
Etienne Roudeix
ba373e3fa1 Merge branch 'master' into loops 2013-07-11 11:27:21 +02:00
Etienne Roudeix
26b1806156 x right to 7 
feature filter in product loop
 2013-07-11 11:25:47 +02:00