Commit Graph

336 Commits

Author SHA1 Message Date
Franck Allimant
7781fe5f59 Minor syntax change. 2014-05-02 20:00:19 +02:00
Franck Allimant
5e3585766d Added a localized check to the expiration date 2014-05-02 18:23:36 +02:00
Franck Allimant
989a44591f Added date translator 2014-05-02 17:10:27 +02:00
Manuel Raynaud
a30181d09d seo title field is not mandatory anymore 2014-04-30 11:15:01 +02:00
Manuel Raynaud
158ebc7ead complete changelog and add missing translations 2014-04-29 11:42:10 +02:00
Manuel Raynaud
c4320f0ada add discount input on customer form 2014-04-29 10:56:07 +02:00
Franck Allimant
657af6e8f1 Ajout du vidage des caches assets, images et documents 2014-04-26 17:06:10 +02:00
Franck Allimant
5c6940b427 Uses new helper functions 2014-04-26 16:02:23 +02:00
Manuel Raynaud
0435478ae8 fix cs 2014-04-22 12:43:57 +02:00
Manuel Raynaud
5e65bf0b8a change license header 2014-04-18 09:36:41 +02:00
Franck Allimant
4b18c4ffba Fix comment 2014-04-18 00:03:27 +02:00
Manuel Raynaud
45adf23bd9 update OrderDelivery form 2014-04-16 08:45:56 +02:00
Franck Allimant
f4e561ef09 Fixed and improved shipping zones management 2014-04-15 22:56:31 +02:00
Franck Allimant
123280f4d4 Cleaned the mess of Shipping zones, which is Shipping configuration... 2014-04-15 20:11:33 +02:00
Manuel Raynaud
b60abb206b fix cs 2014-04-11 09:36:43 +02:00
Manuel Raynaud
5e9070097d allow to possibility to flush the cache from admin panel, Fix #249 2014-04-10 15:56:52 +02:00
Manuel Raynaud
0e21cb7b82 weight is not mandatory anymore 2014-03-14 11:19:23 +01:00
Manuel Raynaud
e4ba7d8d11 change the way product is created 2014-03-13 09:56:11 +01:00
Manuel Raynaud
d8e1f24fda weight and visibility on product are not mandatory anymore 2014-03-12 16:21:45 +01:00
Manuel Raynaud
14dd132220 add_to_all parameter feature create form can be blank 2014-03-10 15:20:00 +01:00
Manuel Raynaud
e415b747ea remove fixme comment when not needed anymore 2014-03-10 12:17:39 +01:00
Manuel Raynaud
d05e28dc43 verify if coupon code is existing 2014-03-04 10:06:47 +01:00
Manuel Raynaud
a5cfcf91ca update changelog and fix cs 2014-02-22 19:01:37 +01:00
Manuel Raynaud
b833b4a5b6 Merge pull request #236 from mespeche/master
Add Translator on all controllers & forms text strings
2014-02-22 17:52:11 +01:00
Manuel Raynaud
12741c7663 refactor validator translation in a listener 2014-02-21 17:53:49 +01:00
Manuel Raynaud
a2b116618c load translations in form validator 2014-02-21 15:32:12 +01:00
Michaël Espeche
03a62575ec Add Translator on all controllers & forms text strings 2014-02-21 12:05:27 +01:00
Michaël Espeche
809693fe5e Add Translator on all form text strings 2014-02-21 11:48:44 +01:00
Manuel Raynaud
ab79c4c6c6 description is not required anymore in coupon form. Fix #233 2014-02-20 16:35:29 +01:00
Manuel Raynaud
0af9f7d6fb add missing phone number on customer page. Fix #218 2014-02-18 17:06:50 +01:00
Manuel Raynaud
e4916e5198 allow intl for document object 2014-02-10 12:04:03 +01:00
Manuel Raynaud
b9575432fd allow intl for image object 2014-02-10 11:53:20 +01:00
Manuel Raynaud
d0ba2895da adding new attribute in all template is not mandatory anymore 2014-02-10 09:57:17 +01:00
Franck Allimant
89653f452b Removes container from all Thelia actions, but Modules (#198) 2014-01-31 20:06:42 +01:00
Franck Allimant
3363200607 Improved languages management, added many country flags. Fix #183 2014-01-27 23:22:02 +01:00
Franck Allimant
c5cc6aae76 Added administrator preferred locale (see issue #183) 2014-01-27 14:29:37 +01:00
Franck Allimant
af47399f09 Minor cosmetic changes 2014-01-24 15:19:16 +01:00
Franck Allimant
c8620ea63b Merge branch 'master' of https://github.com/thelia/thelia 2014-01-23 09:34:25 +01:00
Franck Allimant
54db55467b Fixed injection of TaxManager in TaxCreationForm instance 2014-01-23 09:33:09 +01:00
Manuel Raynaud
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Franck Allimant
5d92ea0bab TaxManager is now a service in the container. 2014-01-22 01:18:28 +01:00
Manuel Raynaud
2218b79e8d company field is not required 2014-01-20 14:04:52 +01:00
Manuel Raynaud
9d0121f321 fix cs 2014-01-10 11:41:55 +01:00
Etienne Roudeix
99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules""
This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.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/OrderCouponQuery.php
2014-01-06 11:25:25 +01:00
Manuel Raynaud
6057c69f95 session parameter is needed on TaxEngine::getInstance method 2014-01-02 10:07:51 +01:00
gmorel
cfbc579022 Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
Remove submodule
2013-12-30 21:37:26 +01:00
gmorel
3e12ace045 Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 2013-12-30 00:50:04 +01:00
gmorel
ae1a05eb85 Merge 2013-12-29 04:28:11 +01:00
gmorel
8f9b86ff6a Merge branch 'master' of https://github.com/thelia/thelia into coupon
* 'master' of https://github.com/thelia/thelia: (121 commits)
  set cartItem in cart add and update events
  need to unescape breadcrumb strings after been in array
  update readme file
  update insert.sql with new release version
  change changelog file format
  Prevent product and content création at catalog root
  dynamic delivery modules on delivery front template
  complete changelog
  Finished merging modules with master
  Revert "Merge branch 'cleanmaster' into modules"
  use TaxEngine::getDeliveryCountry in delivery loop
  refacto getTaxCountry which is actually getDeliveryCountry
  make it magic last stand
  change loop in shipping zone template using module insteadof delivery
  Fixed template loop
  Refactored templates processing
  complete readme file
  change email address of core contributors
  fix getPosition folder test
  add coupon tests
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
2013-12-25 14:14:20 +01:00
gmorel
69d255f782 new branch coupon 2013-12-25 14:12:54 +01:00