Commit Graph

7 Commits

Author SHA1 Message Date
Benjamin Perche
78fdce8aee Refactor addI18nCondition method, place it in I18n tool
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductTaxedPricesExport.php
	modifié:         core/lib/Thelia/Tools/I18n.php
2014-08-04 08:52:03 +02:00
Manuel Raynaud
5e65bf0b8a change license header 2014-04-18 09:36:41 +02:00
Manuel Raynaud
c65ec67bdf fix cs 2013-09-30 10:35:34 +02:00
Etienne Roudeix
8541499302 order process 2013-09-20 16:25:46 +02:00
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
gmorel
62c1a59f68 WIP
- Coupon create
2013-09-04 15:43:05 +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