Commit Graph

75 Commits

Author SHA1 Message Date
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
gmorel
dc271db577 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (8) and franck (2)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  en_EN -> en_UK, the "en_EN" locale does not exists.
  Smarty inheritance in admin template.
  fix typo in phpdoc
  complete test for foramt_number smarty function
  test foramt_date without datetime object
  create foramt_number smarty function
  remove sqlmap file
  add some phpdoc
  complete test for format_date smarty function
  create new smarty function for displaying date in expected format

Conflicts:
	reset_install.sh
2013-09-04 12:01:12 +02:00
Manuel Raynaud
0efe393e3c Merge branch 'master' of github.com:thelia/thelia
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
2013-09-04 10:50:13 +02:00
franck
26da884dae Fixed minor bug in Currencies 2013-09-03 19:32:57 +02:00
franck
ec32aa9eb5 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
2013-09-03 19:03:27 +02:00
Manuel Raynaud
5c3ac1561d add address create controller and event 2013-09-03 16:13:17 +02:00
franck
e4c23adba6 Smarty inheritance in admin template. 2013-09-03 11:26:03 +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
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
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
928bf7b638 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-02 00:18:29 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +02:00
Manuel Raynaud
ef8e98d415 add some phpdoc 2013-09-01 11:32:05 +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
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
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
7c6763ea59 create controller for front office 2013-08-12 15:27:19 +02:00
franck
c46a708346 Categories ordrering in the catalog 2013-08-09 10:18:08 +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
542a83e22c remove references to stock table 2013-07-30 17:25:16 +02:00
Manuel Raynaud
651f191314 manu le bossu's backup 2013-07-30 09:04:41 +02:00
Manuel Raynaud
85007b54c5 add more validation constraints 2013-07-29 16:25:18 +02:00
Manuel Raynaud
fd15934b65 update smarty 2013-07-29 15:47:05 +02:00
Manuel Raynaud
0738104f52 remove combination_id in stock table 2013-07-29 15:26:33 +02:00
Manuel Raynaud
67d38c0619 create form for adding product in cart 2013-07-29 11:06:46 +02:00
franck
0a89a21897 Fixed form names 2013-07-24 20:11:28 +02:00
franck
182b13ceca In an Action, errored forms are propagated via the ActionEvent 2013-07-24 20:08:00 +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
franck
8296051937 Implemented front-office login 2013-07-17 18:49:23 +02:00
franck
4842d0c006 Added the success_url parameter to BaseForm, so that all forms will hace
this parameter.
2013-07-17 15:26:51 +02:00
franck
3d5caa2341 Fix source header alignment 2013-07-17 15:06:53 +02:00
franck
e8bf47b929 Refactored Form system to get simple error handling and a clearer
interface
2013-07-16 16:34:47 +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
a02ac99360 set x right to 7 2013-07-09 11:59:37 +02:00
Manuel Raynaud
3f1547a1f3 remove unused "use" namespaces 2013-07-09 09:52:13 +02:00
franck
abdff9bc1a Merge branch 'admin'
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
2013-07-08 11:27:37 +02:00
franck
162084140e Merge remote-tracking branch 'origin/master' into admin
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
2013-07-06 10:34:09 +02:00
Etienne Roudeix
ddc6d02f80 Merge branch 'loops' 2013-07-05 17:16:10 +02:00
Manuel Raynaud
85bb7594ee change compatibility for propel2 2013-07-05 15:59:41 +02:00
Etienne Roudeix
55a309c00a Merge branch 'master' into loops
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html
2013-07-05 11:16:55 +02:00
Manuel Raynaud
0d1e0c6a2c fiw typo in schema model 2013-07-03 15:05:08 +02:00