TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,786 Commits 1 Branch 0 Tags
e18298bbbaea3aa703f34bca88ff154066a097aa
Commit Graph

2786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gmorel
e18298bbba Refactor : Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too (Event are used for custom inputs) 2013-12-26 23:47:07 +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
Etienne Roudeix
932445344b set cartItem in cart add and update events 2013-12-24 11:28:30 +01:00
Etienne Roudeix
dba4505e2c Merge branch 'master' of github.com:thelia/thelia 2013-12-23 12:26:15 +01:00
Etienne Roudeix
39c1b43249 need to unescape breadcrumb strings after been in array 2013-12-23 12:25:15 +01:00
Manuel Raynaud
1b8735f580 update readme file 2013-12-20 16:41:37 +01:00
Manuel Raynaud
f0116b31f1 update insert.sql with new release version 2013-12-20 15:26:29 +01:00
Manuel Raynaud
897bc892db change changelog file format 2013-12-20 15:09:58 +01:00
Manuel Raynaud
f94b968874 Merge branch 'modules' 2013-12-20 14:57:14 +01:00
Franck Allimant
eaae979b70 Prevent product and content création at catalog root 2013-12-20 14:51:47 +01:00
Franck Allimant
9ff72f119f Merge branch 'modules' of https://github.com/thelia/thelia into modules 2013-12-20 14:31:06 +01:00
Franck Allimant
afea985549 Merge branch 'modules' of https://github.com/thelia/thelia into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/CartItem.php
	core/lib/Thelia/Model/Base/CartItemQuery.php
	core/lib/Thelia/Model/Base/CouponOrder.php
	core/lib/Thelia/Model/Base/Order.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
	core/lib/Thelia/Model/Base/OrderQuery.php
 2013-12-20 14:30:50 +01:00
Etienne Roudeix
22efc21bfe dynamic delivery modules on delivery front template 2013-12-20 12:14:20 +01:00
Manuel Raynaud
26909cf7aa complete changelog 2013-12-20 12:06:06 +01:00
Franck Allimant
882cf554d1 Finished merging modules with master 2013-12-20 11:47:34 +01:00
Franck Allimant
9092e39296 Merge branch 'master' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php
 2013-12-20 11:32:01 +01:00
Etienne Roudeix
b3ac365b45 Revert "Merge branch 'cleanmaster' into modules" 
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
 2013-12-20 11:16:42 +01:00
Etienne Roudeix
d0ff5260f7 Merge branch 'cleanmaster' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php
 2013-12-20 11:16:35 +01:00
Etienne Roudeix
67d0101dbe use TaxEngine::getDeliveryCountry in delivery loop 2013-12-20 11:14:04 +01:00
Etienne Roudeix
4cb8ba704b refacto getTaxCountry which is actually getDeliveryCountry 2013-12-20 11:13:08 +01:00
Etienne Roudeix
63ba1ceeda make it magic last stand 2013-12-20 11:12:03 +01:00
Manuel Raynaud
5f8a6a1a5e change loop in shipping zone template using module insteadof delivery 2013-12-20 09:25:37 +01:00
Franck Allimant
2979ca0092 Fixed template loop 2013-12-20 01:40:45 +01:00
Franck Allimant
3a2ad352cc Refactored templates processing 2013-12-20 00:49:08 +01:00
Manuel Raynaud
4610128134 complete readme file 2013-12-19 16:31:50 +01:00
Manuel Raynaud
e2d7d44798 Merge branch 'master' of github.com:thelia/thelia 2013-12-19 16:04:10 +01:00
Manuel Raynaud
bd1bac1f0d change email address of core contributors 2013-12-19 16:03:39 +01:00
Etienne Roudeix
f434924e48 fix getPosition folder test 2013-12-19 15:46:03 +01:00
Etienne Roudeix
8c121dd455 add coupon tests 2013-12-19 15:37:15 +01:00
Etienne Roudeix
5773922314 show coupon codes in back office 2013-12-19 14:50:45 +01:00
Etienne Roudeix
d7c1ecf09a coupon management in order and cart process 2013-12-19 14:17:22 +01:00
Etienne Roudeix
c981102d3a Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-18 17:47:23 +01:00
Etienne Roudeix
1ba60103f3 coupon in orders + model review : backquote use 2013-12-18 17:46:42 +01:00
Manuel Raynaud
a6a2c43345 don't remove session order before calling payment method 2013-12-18 17:04:48 +01:00
Manuel Raynaud
2f4158d1f6 fix cs 2013-12-18 10:04:13 +01:00
Manuel Raynaud
d0e5d189d2 change memory_limit value, 128 MB is enough 2013-12-18 09:39:23 +01:00
Manuel Raynaud
e7a564b2df use composer create-project instead of git 2013-12-17 14:47:31 +01:00
Manuel Raynaud
ade8ac6f2a add documentation URL in readme 2013-12-17 14:46:36 +01:00
Manuel Raynaud
0c24a8afc0 Merge branch 'master' into modules 
Conflicts:
	templates/backOffice/default/product-edit.html
 2013-12-17 10:48:59 +01:00
Manuel Raynaud
e5576864cd Merge branch 'frontend' 2013-12-17 10:22:17 +01:00
Manuel Raynaud
d6b524e39a add a new entry point in each pages in bo for js include 2013-12-17 10:21:18 +01:00
Manuel Raynaud
c39492d6ce Merge pull request #139 from thelia/frontend 
SEO - META TITLE / DESCRIPTION AND KEYWORDS
 2013-12-17 00:36:01 -08:00
Manuel Raynaud
db2ad120b2 fix test suite reimplementing url updating trest 2013-12-16 17:29:25 +01:00
Manuel Raynaud
0e9ac181e5 fix missing current_id parameter in content-edit.html template 2013-12-16 17:09:48 +01:00
Manuel Raynaud
1a0d543990 fix missing id in folder-edit.html template 2013-12-16 17:06:15 +01:00
Manuel Raynaud
10ecec2fa1 setUrl was not call in seo event generation 2013-12-16 16:39:14 +01:00
Manuel Raynaud
49c6b5b05a remove novalidate paramter on seo form 2013-12-16 16:26:26 +01:00
Manuel Raynaud
b9192e551c fix missing general form on seo form error 2013-12-16 16:22:14 +01:00
Manuel Raynaud
30eab4f416 fix object identifier presence 2013-12-16 15:53:02 +01:00