Manuel Raynaud
d573ff54c2
put correct error messages in Document loop
2014-01-21 11:27:15 +01:00
Manuel Raynaud
4e1521775f
alloow possibility to specify a ref for a customer
2014-01-17 11:15:55 +01:00
Franck Allimant
30b8277975
Fixed internationalisation of exceptions
2014-01-16 12:20:17 +01:00
Franck Allimant
435e195a53
Delete a module when module directory is missing is now possible.
2014-01-16 12:13:29 +01:00
Franck Allimant
8f06c8050b
Delete module request contains now "data data" flag
2014-01-16 12:01:05 +01:00
Manuel Raynaud
3121fc4f5f
clear order and consumed coupon in session after processing order. Fix #162
2014-01-10 14:55:52 +01:00
Manuel Raynaud
9d0121f321
fix cs
2014-01-10 11:41:55 +01:00
Manuel Raynaud
75007cc6c5
don't save order untill it's not the payment method
2014-01-10 10:34:57 +01:00
Etienne Roudeix
99038e688a
Revert "Revert "Merge branch 'cleanmaster' into modules""
...
This reverts commit b3ac365b45
2014-01-06 11:25:25 +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
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
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
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
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
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
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
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
Etienne Roudeix
02b9d2e509
Merge branch 'cleanmaster' into modules
2013-12-10 15:57:37 +01:00
touffies
6648613772
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
...
Conflicts:
core/lib/Thelia/Action/BaseAction.php
core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php
core/lib/Thelia/Controller/Admin/ProductController.php
core/lib/Thelia/Core/Event/UpdateSeoEvent.php
core/lib/Thelia/Form/ProductModificationForm.php
core/lib/Thelia/Form/SeoFieldsTrait.php
core/lib/Thelia/Model/Base/Product.php
core/lib/Thelia/Model/Base/ProductI18n.php
core/lib/Thelia/Model/Base/ProductI18nQuery.php
core/lib/Thelia/Model/Map/ProductI18nTableMap.php
core/lib/Thelia/Model/Map/ProductTableMap.php
install/thelia.sql
local/config/schema.xml
templates/backOffice/default/includes/product-general-tab.html
templates/backOffice/default/includes/seo-tab.html
templates/backOffice/default/product-edit.html
2013-12-09 15:22:17 +01:00
touffies
d476672150
Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT
2013-12-09 15:00:51 +01:00
touffies
6447385605
Add Action + Event to manage SEO information
2013-12-09 14:51:51 +01:00
Etienne Roudeix
090b201fea
test rewriting
2013-12-09 13:01:39 +01:00
Etienne Roudeix
f4a2744d19
url management in backoffice
2013-12-09 11:28:13 +01:00
Franck Allimant
8c864021f5
Added sorting and position ùmanagement to modules.
2013-12-06 18:59:46 +01:00
Franck Allimant
e96088080d
Merge branch 'master' into modules
2013-12-06 17:16:14 +01:00
Franck Allimant
5857c07ef0
Fixed issue 118
2013-12-05 15:57:56 +01:00
gmorel
d18b9a237f
Merge branch 'master' of git://github.com/thelia/thelia into french_translation
...
* 'master' of git://github.com/thelia/thelia: (23 commits)
Coupon : Add unit test for coupon removing X Amount & X Percent
Coupon : Add unit test for coupon removing X Amount & X Percent
Coupon : Add unit test for coupon removing X Amount & X Percent
Coupon : Add unit test for coupon removing X Amount & X Percent
Coupon : Add unit test for coupon removing X Amount & X Percent
Coupon : Fix namespace issues
Coupon : Fix namespace issues
Coupon : Adding unit tests
Coupon : Adding unit tests
Coupon : Adding unit tests
Coupon : Adding unit tests
Coupon : buildCouponFromModel becomes public
Coupon : Add ability to know usage left after decremental
Coupon : Bug fix when coupon max usage was not correctly decremented
Coupon : spelling
Coupon : rename
Coupon : Fix the error if a given coupon leads to an unknown service id
Coupon not found by the factory now just return false
Fix generated unit test stub files
Refactor removing Manager notion
...
2013-11-28 21:29:22 +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
touffies
6418914a6d
Add Action + Event to manage SEO information
2013-11-28 12:10:10 +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
