Commit Graph

111 Commits

Author SHA1 Message Date
franck
f6530f0bfc Finished product feature values 2013-09-20 23:10:31 +02:00
franck
e27b3cfbae Working catalog branch 2013-09-20 15:54:50 +02:00
Etienne Roudeix
61fab3a62a order creation 2013-09-19 15:11:54 +02:00
Etienne Roudeix
9b37bbb862 module image 2013-09-18 11:20:29 +02:00
franck
d02f13f021 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php
2013-09-18 00:35:48 +02:00
franck
de4767ef56 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Model/Product.php
2013-09-17 23:51:31 +02:00
Manuel Raynaud
e1e383707b template is not mandatory in product table. 2013-09-17 19:19:52 +02:00
franck
a9009b7e52 Started product management 2013-09-17 17:15:15 +02:00
Etienne Roudeix
8d20316217 no-return-functions block 2013-09-17 14:59:40 +02:00
Etienne Roudeix
c4fd65e6ea delivery process 2013-09-17 12:38:23 +02:00
Etienne Roudeix
692badb06b delivery form 2013-09-17 11:05:29 +02:00
Etienne Roudeix
d8b5df4162 delivery process 2013-09-16 15:24:08 +02:00
Manuel Raynaud
365d90b4a8 Merge branch 'master' into template
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
2013-09-16 10:19:40 +02:00
Manuel Raynaud
5e3c10cd4f add promo column in cart_item 2013-09-16 10:16:54 +02:00
franck
71c1cee66d Implemented "Remember Me" feature on admin. Started template management 2013-09-16 09:23:44 +02:00
Manuel Raynaud
0d0d542d8b create cache for config entity 2013-09-16 08:56:44 +02:00
Manuel Raynaud
c9e455e3ea update cart model 2013-09-12 15:40:49 +02:00
Etienne Roudeix
d5004071c9 pse ref 2013-09-12 11:56:00 +02:00
Etienne Roudeix
e8a4e56324 tax engine 2013-09-11 16:21:51 +02:00
Etienne Roudeix
8570251b88 product price 2013-09-10 12:04:33 +02:00
Etienne Roudeix
519678a543 Merge branch 'tax' 2013-09-09 16:28:32 +02:00
Etienne Roudeix
ca9ec3b089 tax engine model 2013-09-09 11:01:31 +02:00
Etienne Roudeix
0a5281c1e6 tax engine model 2013-09-09 10:48:41 +02:00
gmorel
c1a79028a1 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (37 commits)
  add PropelDataCollector to debugbar, still missing some informations
  remove unused class
  integrate debugbar module
  remove htmlpurifier
  modify insert.sql including debugBar module
  add new event and new tag
  Started category modification
  Factorized modal dialogs javascript
  Factorized creation and confirmation modal dialogs
  create controller adding delivery module in session
  create Delivery loop
  Working :
  Continuing categories administration...
  Working :
  create base loop for delivery and payment entities
  remove htmlpurifier dependency
  country id can be an argument for calculate method
  Working :
  Working :
  fix typo
  ...

Conflicts:
	composer.lock
	core/lib/Thelia/Controller/Admin/CategoryController.php
	templates/admin/default/assets/less/thelia/variables.less
2013-09-08 00:08:02 +02:00
gmorel
86d6a0fa05 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia: (39 commits)
  Working :
  Working :
  Working :
  Working :
  Fixed minor visual glitches
  Working : Resize countries flag + Add bootstrap-switch
  fix test suite
  clear asset cache in cache:cler command
  Added a 'development mode' to assetic smarty plugin
  rewriting router
  use good Request object
  Added Tools\URL test case, and a test case superclass for initializing Tools\URL
  remove unused UrlWritin controller
  create router for rewriting matching
  customer substitutions
  fix typo in front id
  Working : For attributes on labels
  Working : For attributes on labels
  add label_attr attribute to form smarty plugin
  start refactorin rewriting routing
  ...

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/less/thelia/bootstrap-editable.less
	templates/admin/default/categories.html
2013-09-06 19:36:52 +02:00
Manuel Raynaud
b067ef7dcc create Delivery loop 2013-09-06 18:41:44 +02:00
Manuel Raynaud
43a2c0ac7b refactor Lang table 2013-09-05 08:30:15 +02:00
gmorel
6cba95f4ee Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (32 commits)
  refactor name for updating actions
  choose UPDATE word for name actions
  add update address action and create tests
  404 not found management
  Working Fix unset namespace
  modify travis script
  test rewriting exception
  Fixed minor bug in Currencies
  Finished currency edition
  Added route methods
  address action implementation
  hot fix
  rewriting
  add address create controller and event
  Added AdminUtilities Smarty plugin, optimized templates
  update customer model createOrUpdate method
  update address model
  fix redirect process in viewListener
  refactor reset_install script
  refactor install process, database management in dedicated class
  ...

Conflicts:
	local/config/schema.xml
	reset_install.sh
2013-09-04 15:42:38 +02:00
Manuel Raynaud
483710afd2 update address model 2013-09-03 14:01:07 +02:00
gmorel
19ea6d25df WIP
Merge on master
2013-09-03 11:02:36 +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
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +02:00
Etienne Roudeix
75b4564297 rewriting tables 2013-08-29 09:20:58 +02:00
Etienne Roudeix
696b871acd start rewriting 2013-08-29 08:49: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
Etienne Roudeix
253a0b76d8 rewriting tables 2013-08-28 15:55:38 +02:00
Etienne Roudeix
1de0e9f8a4 rewriting tables 2013-08-28 15:47:47 +02:00
Etienne Roudeix
61e13c416c rewriting tables 2013-08-28 15:35:10 +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
eae86cd797 WIP Coupon
Refactor
2013-08-23 20:00:32 +02:00
gmorel
73677b7c1a WIP Coupon
Update Coupon Model + SQL
Implementattion Fixtures for Coupon and CouponFactory
2013-08-22 20:02:03 +02:00
Etienne Roudeix
7ef0339784 associated content for categories and products tables 2013-08-22 17:54:19 +02:00
gmorel
fab9d2f39a WIP Coupon
Update Propel2 schema.xml
2013-08-22 14:25:03 +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
115a7dd893 update schema.xml file 2013-08-16 11:21:57 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
franck
7bd14d5aab Re-added database.yml.sample 2013-08-15 11:52:02 +02:00
franck
47bc545019 Added image processing actgion and loop 2013-08-15 11:44:46 +02:00