Etienne Roudeix
99038e688a
Revert "Revert "Merge branch 'cleanmaster' into modules""
...
This reverts commit b3ac365b45
2014-01-06 11:25:25 +01:00
gmorel
db09e0b224
Coupon : Condition module fix unit tests
2014-01-05 19:02:19 +01:00
gmorel
e606a6f8ce
Coupon : Condition module refactor
...
Less crappy unmaintainable javascript
More logic in extendable php
2014-01-05 00:00:15 +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
2508ee3230
Coupon : Fix unit test
2013-12-29 15:45:42 +01:00
gmorel
9a22bdafa1
Coupon : Fix unit test
2013-12-29 14:47:51 +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
b3ac365b45
Revert "Merge branch 'cleanmaster' into modules"
...
This reverts commit d0ff5260f767d0101dbe
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
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
Manuel Raynaud
2f4158d1f6
fix cs
2013-12-18 10:04:13 +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
d6ba2b3d65
Merge branch 'master' into frontend
2013-12-16 15:45:04 +01:00
Etienne Roudeix
029c97c47f
new checking in folder tests
2013-12-16 11:38:57 +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
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
touffies
7eca83889a
Merge branch 'master' into frontend
2013-12-11 18:54:50 +01:00
Etienne Roudeix
ff828bf1ba
test rewritten url reassignment
2013-12-11 13:10:03 +01:00
Etienne Roudeix
6acb1924d8
test url reassignment
2013-12-11 13:07:02 +01:00
Etienne Roudeix
63f48b79da
fix rewrinting tests
2013-12-10 15:56:59 +01:00
Manuel Raynaud
462b2bec5e
Merge branch 'master' into frontend
...
Conflicts:
templates/backOffice/default/folder-edit.html
2013-12-09 16:15:58 +01:00
touffies
f34a4a066d
Remove RewrittenUrlTestTrait from content
2013-12-09 15:40:23 +01:00
Etienne Roudeix
95d327f976
fix tests
2013-12-09 15:31:27 +01:00
touffies
50d638bb23
Remove test setURL
2013-12-09 15:30:04 +01:00
Etienne Roudeix
28d2add37d
fix tests
2013-12-09 15:02:09 +01:00
Etienne Roudeix
090b201fea
test rewriting
2013-12-09 13:01:39 +01:00
Etienne Roudeix
a9a2a256fa
fix updatePositionDownTest
2013-12-06 11:20:15 +01:00
gmorel
ffc699fa7f
Merge branch 'master' of git://github.com/thelia/thelia
...
* 'master' of git://github.com/thelia/thelia:
fix typo
Implemented mail messages templates and layouts
Email template + test email
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
2013-11-28 20:58:24 +01:00
Franck Allimant
33e0a854f2
Implemented mail messages templates and layouts
2013-11-27 21:21:07 +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
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
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
2884b0a3b7
Coupon : spelling
2013-11-23 22:33:30 +01:00
gmorel
bcad9b5da1
Coupon : rename
2013-11-23 22:31:18 +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
