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

1926 Commits

Author SHA1 Message Date
gmorel
f8ac32a4a0 Refactor : Coupon effect inputs are now more customisable 
Adding effect to be stored as serialised in JSON
 2013-12-29 01:23:50 +01:00
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
Manuel Raynaud
f0116b31f1 update insert.sql with new release version 2013-12-20 15:26:29 +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
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
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
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
0c24a8afc0 Merge branch 'master' into modules 
Conflicts:
	templates/backOffice/default/product-edit.html
 2013-12-17 10:48:59 +01:00
Manuel Raynaud
db2ad120b2 fix test suite reimplementing url updating trest 2013-12-16 17:29:25 +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
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
Manuel Raynaud
d6ba2b3d65 Merge branch 'master' into frontend 2013-12-16 15:45:04 +01:00
Etienne Roudeix
65f43b5eff Merge branch 'cleanmaster' into modules 2013-12-16 14:33:15 +01:00
Etienne Roudeix
315ed1fb09 fix #144 2013-12-16 14:31:51 +01:00
Etienne Roudeix
32d0aa15a6 PaymentModuleInterface::pay method force $order parameter 2013-12-16 12:38:41 +01:00
Etienne Roudeix
029c97c47f new checking in folder tests 2013-12-16 11:38:57 +01:00
Etienne Roudeix
977bbb55fa Merge branch 'cleanmaster' into modules 2013-12-16 11:32:54 +01:00
Etienne Roudeix
86f1e06e42 document repositioning after delation 2013-12-16 11:32:05 +01:00
Etienne Roudeix
c5e69ebbb9 Merge branch 'cleanmaster' into modules 2013-12-16 10:56:40 +01:00
Etienne Roudeix
583cbe95b6 document positioning 2013-12-16 10:55:18 +01:00
Etienne Roudeix
536c88b4f8 Merge branch 'cleanmaster' into modules 
Conflicts:
	core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
 2013-12-16 09:57:35 +01:00
Manuel Raynaud
f4c5f23d00 Change AdminLog logging request behavior, fixing issue #145 2013-12-14 14:16:45 +01:00
Etienne Roudeix
76cd704f80 review tests 2013-12-12 15:56:13 +01:00
Etienne Roudeix
162f364df6 reveiw test 2013-12-12 15:55:52 +01:00
Etienne Roudeix
d1a1e14c0a fix test 2013-12-12 15:54:52 +01:00
Etienne Roudeix
297f197fed Merge branch 'cleanmaster' into modules 2013-12-12 15:45:45 +01:00
Etienne Roudeix
c9e052188c images are positionable 2013-12-12 15:41:35 +01:00
Etienne Roudeix
93537b8d71 in progress : reorder image 2013-12-12 15:30:10 +01:00
touffies
681ac83334 Add try catch for urlRewrite 2013-12-11 21:03:31 +01:00
touffies
c0ee124d17 Remove constraint NotBlank 2013-12-11 20:58:57 +01:00