TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
789 Commits 1 Branch 0 Tags
5bd501315d6d3eaa71a2c19f67a38289dd9c0093
Commit Graph

60 Commits

Author SHA1 Message Date
gmorel
6ee99b6cad Working 
- implementation Coupon Read page
 2013-09-03 11:02:02 +02:00
gmorel
33b8ceb24e Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (2) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Completed mailing templates management
  change symfony/icu version for compatibility
  add file reset_install.sh

Conflicts:
	composer.json
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Model/Map/CouponI18nTableMap.php
	install/thelia.sql
	local/config/schema.xml
	reset_install.sh
 2013-09-02 17:25:25 +02:00
gmorel
4b1de5fe93 WIP 
- Coupon Controller
 2013-09-02 17:08:47 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +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
gmorel
eef57ba30a WIP 
- Coupon controller
 2013-09-02 09:17:47 +02:00
franck
e1cc7162ae Added get/setLangId() method in session 2013-09-02 02:04:36 +02:00
franck
beab17a18d Refactored VariableXxxxx.php as ConfigXxxx.php 2013-09-02 01:37:12 +02:00
franck
1558f6af5f Added name duplication check when creating a variable 2013-09-02 01:25:11 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +02:00
franck
6d5d0f6606 Fixed getUrl() 2013-08-31 15:52:42 +02:00
franck
6aa2f80444 Intriducec BaseI18nLoop, started variable config management 2013-08-31 11:38:00 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
gmorel
180302e7cc Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Factorized ModelCriterialTools calls in loops

Conflicts:
	templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
	templates/admin/default/assets/css/admin.less
 2013-08-30 15:43:43 +02:00
gmorel
fd63115c97 WIP 
- Update Coupon Controller/Form/Event - create()
 2013-08-30 12:23:49 +02:00
gmorel
71fa04a193 WIP 
- Update Coupon Controller/Form/Event - create()
- Rule serialization/unserialization managed in Model/Coupon now
 2013-08-30 11:06:33 +02:00
franck
cce270fdcc Factorized ModelCriterialTools calls in loops 2013-08-28 19:47:31 +02:00
gmorel
1d87708d3b Working 
- Update Coupon BackOffice routing
 2013-08-28 19:21:48 +02:00
gmorel
71a91ff60f Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Etienne Roudeix (4) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Removed InternalEvent, simplified SecurityContext
  rewriting tables
  rewriting tables
  rewriting tables
  rewriting tables

Conflicts:
	composer.lock
	local/config/schema.xml
 2013-08-28 18:19:38 +02:00
gmorel
84a2314108 WIP 
- Add Coupon BackOffice controller
- Add Coupon BackOffice template skeleton
- Add Coupon BackOffice routes
 2013-08-28 18:06:22 +02:00
franck
0361cd1ff2 Removed InternalEvent, simplified SecurityContext 2013-08-28 17:52:32 +02:00
gmorel
8b6cbb0621 WIP 
- Beginning BackOffice Coupon implementation
 2013-08-28 14:37:29 +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
0397f5fdf8 create customer login controller 2013-08-16 14:24:00 +02:00
Manuel Raynaud
4f31627301 refactor action customer 2013-08-16 14:04:44 +02:00
Manuel Raynaud
ab5e845ad3 start refactoring customer update process 2013-08-16 12:09:08 +02:00
Manuel Raynaud
115a7dd893 update schema.xml file 2013-08-16 11:21:57 +02:00
Manuel Raynaud
bc57e884ad add some phpdoc 2013-08-16 11:08:48 +02:00
Manuel Raynaud
382fbe230e update customer process creation 2013-08-16 11:01:32 +02:00
Manuel Raynaud
44249859ef create new customerEvent class 2013-08-16 10:35:46 +02:00
Manuel Raynaud
1db41a36ab /bin/bash: q : commande introuvable 2013-08-14 16:24:22 +02:00
Manuel Raynaud
ecb42e906b refactor update item eventListener 2013-08-14 15:55:06 +02:00
Manuel Raynaud
7918ce9723 refactor deleteArticle eventListener 2013-08-14 15:30:44 +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
Manuel Raynaud
078b1e0d57 apply cs-fixer 2013-08-14 09:29:04 +02:00
Manuel Raynaud
d53f1289c3 allow to declare new router in modules 2013-08-13 12:09:10 +02:00
Manuel Raynaud
5fce2186f9 refactor some phpdoc 2013-08-13 11:07:03 +02:00
Manuel Raynaud
6371deb4cb cs fixer 2013-08-13 11:02:29 +02:00
Manuel Raynaud
a9ecf01216 complete cart controller 2013-08-13 10:40:04 +02:00
Manuel Raynaud
b9bc56a748 fix constant action name 2013-08-13 10:13:37 +02:00
Manuel Raynaud
3bf7e79960 change action name for change item article 2013-08-13 10:12:04 +02:00
Manuel Raynaud
cf5ccdc7ae refactor modify Article action 2013-08-13 10:09:12 +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
be5d1e9ddb refactor cart and cartEvent process 2013-08-12 17:48:48 +02:00
Manuel Raynaud
086f73aeca change class controller inheritance 2013-08-12 16:59:15 +02:00
Manuel Raynaud
071a4c17bc create specific controller for front and back office 2013-08-12 16:56:18 +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