TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
713 Commits 1 Branch 0 Tags
059317c26667177ecc7f524fea2e249faf4f460e
Commit Graph

122 Commits

Author SHA1 Message Date
gmorel
086f813e15 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Etienne Roudeix
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
  load test
  url output in loops
  backend loop translation
  backend trasnlation in loops
 2013-08-28 15:46:56 +02:00
Etienne Roudeix
f54ff0f914 Merge branch 'master' into loops 2013-08-28 15:08:49 +02:00
gmorel
e085b162dd Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Added command for creating admin users on console
  Fixed typo
 2013-08-28 14:37:47 +02:00
gmorel
8b6cbb0621 WIP 
- Beginning BackOffice Coupon implementation
 2013-08-28 14:37:29 +02:00
franck
07849aa614 Added command for creating admin users on console 2013-08-28 14:23:50 +02:00
Etienne Roudeix
9174e5154e backend loop translation 2013-08-26 14:05:29 +02:00
Etienne Roudeix
fe4b77f7a8 associated content for categories and product tables + loop 2013-08-23 10:55:59 +02:00
Etienne Roudeix
9dbd8a283b pse and combi loops 2013-08-21 12:50:49 +02:00
Etienne Roudeix
86b11096ba Merge branch 'master' into loops 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
 2013-08-21 09:19:56 +02:00
Manuel Raynaud
a0b82879f5 create route for login action 2013-08-16 14:26:02 +02:00
Manuel Raynaud
ab5e845ad3 start refactoring customer update process 2013-08-16 12:09:08 +02:00
Manuel Raynaud
4ca78b97b5 Merge branch 'master' into actions 2013-08-16 10:36:00 +02:00
Manuel Raynaud
44249859ef create new customerEvent class 2013-08-16 10:35:46 +02:00
franck
f028d2b2db Added image-cache:clear console command 2013-08-15 21:18:16 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
Manuel Raynaud
ecb42e906b refactor update item eventListener 2013-08-14 15:55:06 +02:00
Manuel Raynaud
32e7b334dd move form exception in Form namespace 2013-08-14 15:23:59 +02:00
Manuel Raynaud
ab81b58e94 refactor cartAdd EventListener, removing Request references 2013-08-14 15:10:21 +02:00
Etienne Roudeix
70f483ad97 availability instead of available 2013-08-14 14:02:14 +02:00
Manuel Raynaud
bd865171d1 make more easy routin integration from modules 2013-08-14 11:23:51 +02:00
Manuel Raynaud
078b1e0d57 apply cs-fixer 2013-08-14 09:29:04 +02:00
Manuel Raynaud
b4d02fe63a allow possibility to use as many Router as we want 2013-08-14 08:22:08 +02:00
Manuel Raynaud
c284a756b6 allow possibility to add multiple files for touring 2013-08-13 16:04:28 +02:00
Manuel Raynaud
d53f1289c3 allow to declare new router in modules 2013-08-13 12:09:10 +02:00
Manuel Raynaud
a9ecf01216 complete cart controller 2013-08-13 10:40:04 +02:00
Manuel Raynaud
3bf7e79960 change action name for change item article 2013-08-13 10:12:04 +02:00
Manuel Raynaud
541fe7f75d fix issue on adding item action 2013-08-13 09:53:49 +02:00
Manuel Raynaud
7f83225645 fix test suite issue 2013-08-13 09:34:08 +02:00
Manuel Raynaud
b377ebe6e8 refactor action process to controller process 2013-08-12 16:42:23 +02:00
Manuel Raynaud
7c6763ea59 create controller for front office 2013-08-12 15:27:19 +02:00
Manuel Raynaud
b4c4898374 change context by Class and service context 2013-08-12 14:49:43 +02:00
franck
c46a708346 Categories ordrering in the catalog 2013-08-09 10:18:08 +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
franck
4e83466bc0 Form processing is now factorized in BaseAction 2013-08-08 11:13:46 +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
franck
64031a1883 Added category creation and deletion 2013-08-08 02:39:42 +02:00
Manuel Raynaud
80496641c6 try to test form 2013-08-07 14:55:27 +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
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
2f2e88b9fc Merge branch 'master' into cart 2013-08-07 09:44:34 +02:00
Etienne Roudeix
fd82907209 folder and content fake 
folder and content loops
 2013-08-02 16:18:45 +02:00
Manuel Raynaud
9995daa158 dispatch event when cart is duplicated 2013-08-02 16:01:21 +02:00
Etienne Roudeix
8874404e4d remove link from folder 2013-08-02 15:25:29 +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
Etienne Roudeix
338ec5fce6 Merge branch 'loops' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-07-31 13:56:05 +02:00
Etienne Roudeix
96239e4af4 tables update 2013-07-30 11:12:55 +02:00