Commit Graph

25 Commits

Author SHA1 Message Date
gmorel
4b1de5fe93 WIP
- Coupon Controller
2013-09-02 17:08:47 +02:00
gmorel
5a1d622284 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
2013-09-02 09:19:24 +02:00
franck
d9d8190fa6 Fixed URL::absoluteUrl() 2013-08-30 19:56:24 +02:00
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +02:00
Etienne Roudeix
4ba16dc290 sid : rewriting 2013-08-30 09:13:54 +02:00
Etienne Roudeix
696b871acd start rewriting 2013-08-29 08:49:48 +02:00
gmorel
47106f562d Merge branch 'coupon' of https://github.com/thelia/thelia into coupon
Conflicts:
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponI18n.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/ProductAssociatedContent.php
	core/lib/Thelia/Model/Map/CouponTableMap.php
	core/lib/Thelia/Model/Map/CouponVersionTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml
2013-08-28 10:11:57 +02:00
gmorel
e971179a60 WIP Coupon
Default Implementation + Unit test in order to validate the chain
- effect
- application field
- condition
2013-08-27 13:28:57 +02:00
gmorel
eae86cd797 WIP Coupon
Refactor
2013-08-23 20:00:32 +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
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
Manuel Raynaud
078b1e0d57 apply cs-fixer 2013-08-14 09:29:04 +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
154d8e4d48 remove Redirect::unauthorize method, 401 Code is not a redirect code 2013-08-07 10:32:01 +02:00
franck
4ad94059e7 Product loop adjustements 2013-08-01 10:53:35 +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
21068f4c1f Added UrlGenerator smarty plugin, to allow templates and url
manipulation in templates.
2013-07-17 11:36:28 +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
ad47ab7cac set execution right // no more troubles
change composer required PHP version from 5.4 to 5.3
2013-06-20 15:21:16 +02:00
Manuel Raynaud
ef49b58316 start implementing first baseParam, secure verifying if user is logged
for accessing resource
2013-02-20 19:07:50 +01:00
Manuel Raynaud
4e21c25867 fix some CS 2013-01-09 09:13:25 +01:00
Manuel Raynaud
911146255f put copyright text and add covers annotation in DIGeneratorTest 2012-12-28 12:00:47 +01:00
Manuel Raynaud
e1a756405d DI model generator 2012-12-21 15:03:26 +01:00