Commit Graph

2012 Commits

Author SHA1 Message Date
Etienne Roudeix
81fa5a291c fix tax rules issue 2013-11-28 15:31:09 +01:00
touffies
a571db9a43 Hydrate SeoForm under SEO Tab 2013-11-28 12:12:24 +01:00
touffies
dc28ce2d30 Move URL to SeoForm (SEO tab) 2013-11-28 12:11:45 +01:00
touffies
6418914a6d Add Action + Event to manage SEO information 2013-11-28 12:10:10 +01:00
touffies
ad10b984f3 Add new route to save the product SEO information 2013-11-28 12:07:03 +01:00
touffies
186b338f48 Add new SEO form 2013-11-28 12:03:32 +01:00
Etienne Roudeix
bc9da10d8c change asset origin param name by source 2013-11-28 12:02:53 +01:00
touffies
a3beb4c6f4 Add new fields (meta_title, meta_description and meta_keyword) under I18N Product 2013-11-28 12:02:25 +01:00
Etienne Roudeix
247ed6aa2a Merge branch 'master' into modules
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
2013-11-28 10:34:57 +01:00
gmorel
94e2d7881d Merge branch 'master' of git://github.com/thelia/thelia into french_translation
* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email
2013-11-27 22:22:26 +01:00
Franck Allimant
33e0a854f2 Implemented mail messages templates and layouts 2013-11-27 21:21:07 +01:00
gmorel
e7038c9369 Spelling rewritten with 2 t 2013-11-27 20:37:40 +01:00
gmorel
612bd1adae Translation : Fix bug preventing to see error message 2013-11-27 20:11:54 +01:00
gmorel
59932078fc Merge branch 'master' of git://github.com/thelia/thelia into french_translation
* 'master' of git://github.com/thelia/thelia:
  add REF to product_sale_element loop and fix product tempalte
  Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
  Add correct url(subdiretory included) in config page
  Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
  Check if store_country has a value
  Fixed double '/' in generated assets URLs
  Add validation for Store configuration
  Use Store contact information
  Call the wrong AdminResources in saveAction
  Action buttons smaller
  Replace company_name and contact_email by store_name & store_email
  Add a new admin page to manage the basic store configurations
  Add routing for Store Configuration
  Add argument Title on Content Loop & Folder Loop
2013-11-27 19:16:17 +01:00
Manuel Raynaud
b3d3d61602 add REF to product_sale_element loop and fix product tempalte 2013-11-27 10:07:58 +01:00
gmorel
ef818c19ce Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 23:04:29 +01:00
gmorel
d0ccfc732a Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 22:58:19 +01:00
gmorel
67a38bca20 Merge branch 'master' of git://github.com/thelia/thelia
* 'master' of git://github.com/thelia/thelia:
  Check if store_country has a value
  Fixed double '/' in generated assets URLs
  Add validation for Store configuration
  Use Store contact information
  Call the wrong AdminResources in saveAction
  Action buttons smaller
  Replace company_name and contact_email by store_name & store_email
  Add a new admin page to manage the basic store configurations
  Add routing for Store Configuration
  Add argument Title on Content Loop & Folder Loop
2013-11-25 22:43:04 +01:00
gmorel
e2db36e23b Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 22:42:16 +01:00
gmorel
2a926e5211 Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 22:09:40 +01:00
gmorel
4c3b1c5e22 Coupon : Add unit test for coupon removing X Amount & X Percent 2013-11-25 21:35:35 +01:00
Manuel Raynaud
31ec431673 Merge pull request #111 from thelia/frontend
Frontend
2013-11-25 03:04:31 -08:00
Etienne Roudeix
7fd7458a2d assets 2013-11-25 11:41:59 +01:00
Franck Allimant
c587cc3813 Fixed double '/' in generated assets URLs 2013-11-25 11:37:52 +01:00
touffies
a33a4cc963 Add validation for Store configuration 2013-11-25 11:22:38 +01:00
touffies
fd0301022d Merge branch 'backoffice' into frontend 2013-11-25 10:24:29 +01:00
touffies
743f894a4c Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-11-25 10:20:15 +01:00
Etienne Roudeix
b9790efeee Merge branch 'master' into modules 2013-11-25 10:05:01 +01:00
Etienne Roudeix
2bc1bbed64 asset tests 2013-11-25 10:03:48 +01:00
gmorel
19aa1c798d Coupon : Fix namespace issues 2013-11-24 22:27:26 +01:00
gmorel
ffbd53fceb Coupon : Fix namespace issues 2013-11-24 22:05:58 +01:00
gmorel
c71cba93e2 Coupon : Adding unit tests 2013-11-24 21:44:51 +01:00
gmorel
b738bde56f Coupon : Adding unit tests 2013-11-24 17:55:06 +01:00
gmorel
2caa9ea7bd Coupon : Adding unit tests 2013-11-24 01:07:49 +01:00
gmorel
469a07cdb3 Coupon : Adding unit tests 2013-11-24 00:26:16 +01:00
gmorel
25934b80b9 Coupon : buildCouponFromModel becomes public 2013-11-23 23:56:06 +01:00
gmorel
69a72cd555 Coupon : Add ability to know usage left after decremental 2013-11-23 23:23:58 +01:00
gmorel
20e004b9f5 Coupon : Bug fix when coupon max usage was not correctly decremented 2013-11-23 23:06:32 +01:00
gmorel
2884b0a3b7 Coupon : spelling 2013-11-23 22:33:30 +01:00
gmorel
bcad9b5da1 Coupon : rename 2013-11-23 22:31:18 +01:00
gmorel
4447dbcd9a Coupon : Fix the error if a given coupon leads to an unknown service id 2013-11-23 22:29:15 +01:00
gmorel
f40476e3ea Coupon not found by the factory now just return false 2013-11-23 22:15:45 +01:00
gmorel
23b294dcc9 Fix generated unit test stub files 2013-11-23 20:21:52 +01:00
gmorel
90b5fbde05 Refactor removing Manager notion 2013-11-23 20:18:04 +01:00
gmorel
8ce1030178 Refactor rule => condition
adapter => facade
2013-11-23 18:35:21 +01:00
gmorel
59a04f6a09 Fix Condition comment 2013-11-23 17:51:59 +01:00
gmorel
d276d5aa52 Fix Coupon/Condition utf8 issue 2013-11-23 17:37:48 +01:00
gmorel
95c4113ca8 Merge branch 'master' of git://github.com/thelia/thelia
* 'master' of git://github.com/thelia/thelia:
  undo removing Response::prepare call
  HttpCache can not be activated as default
  remove specific code testing esi integration
  create smarty tag for smarty renderer
  remove Thelia ResponseListener
  add new route for testing esi tag
  tweak httpFoundation cache part for compatibility with Thelia\HttpFoundation part
  add httpcache into index_dev.php file
  start using symfony 2 reverse proxy
  update wiki url in composer file
  create smarty tag for smarty renderer
  remove Thelia ResponseListener
  add new route for testing esi tag
  Added some translations in the Customer Creation Form
  tweak httpFoundation cache part for compatibility with Thelia\HttpFoundation part
  add httpcache into index_dev.php file
  start using symfony 2 reverse proxy
2013-11-23 01:36:12 +01:00
touffies
4ef7bd4c38 Call the wrong AdminResources in saveAction 2013-11-22 17:42:09 +01:00
touffies
85d9c112d3 Replace company_name and contact_email by store_name & store_email 2013-11-22 17:40:04 +01:00