Manuel Raynaud
a5cfcf91ca
update changelog and fix cs
2014-02-22 19:01:37 +01:00
Manuel Raynaud
16275ef51a
create error message when a customer is deleted and already have orders.
...
Fix #199
2014-02-19 10:41:26 +01:00
Manuel Raynaud
99e89e4249
allow intl in coupon edition
2014-02-10 13:03:07 +01:00
Manuel Raynaud
e4916e5198
allow intl for document object
2014-02-10 12:04:03 +01:00
Manuel Raynaud
b9575432fd
allow intl for image object
2014-02-10 11:53:20 +01:00
Franck Allimant
f9be7d1963
Imporved exception logging
2014-02-04 00:55:02 +01:00
Franck Allimant
89653f452b
Removes container from all Thelia actions, but Modules ( #198 )
2014-01-31 20:06:42 +01:00
Franck Allimant
f8e3553924
Removed unused container dependency from the FileManager class
2014-01-31 15:55:21 +01:00
Franck Allimant
3363200607
Improved languages management, added many country flags. Fix #183
2014-01-27 23:22:02 +01:00
Franck Allimant
7043a9e388
Fixed #196
2014-01-27 22:12:29 +01:00
Franck Allimant
c5cc6aae76
Added administrator preferred locale (see issue #183 )
2014-01-27 14:29:37 +01:00
Franck Allimant
6b78a33f97
Improved order management in back-office
2014-01-25 19:14:57 +01:00
Franck Allimant
c8620ea63b
Merge branch 'master' of https://github.com/thelia/thelia
2014-01-23 09:34:25 +01:00
Franck Allimant
54db55467b
Fixed injection of TaxManager in TaxCreationForm instance
2014-01-23 09:33:09 +01:00
Manuel Raynaud
1b2c1d53ac
remove some unused variables
2014-01-22 15:50:40 +01:00
Manuel Raynaud
1974d3e3c3
fix psr
2014-01-22 12:52:36 +01:00
Franck Allimant
5d92ea0bab
TaxManager is now a service in the container.
2014-01-22 01:18:28 +01:00
Manuel Raynaud
2bd23777ca
"save and close" button had now effect. Fix #185
2014-01-20 14:52:44 +01:00
Manuel Raynaud
3e4eff172f
fix getExistingObject method for several controller.
2014-01-20 12:01:25 +01:00
Etienne Roudeix
809d2631c0
remove old functions
2014-01-20 11:11:44 +01:00
Manuel Raynaud
992b5be95c
fix routing name in Coupon module. Fix #171
2014-01-17 14:33:09 +01:00
Manuel Raynaud
9b81e88946
fix pdf generation. Fix #170
2014-01-17 12:23:08 +01:00
Manuel Raynaud
4e1521775f
alloow possibility to specify a ref for a customer
2014-01-17 11:15:55 +01:00
Franck Allimant
42737940a9
The router id is now configurable via setters and getters to allow
...
modules to use their own router.
2014-01-16 19:35:12 +01:00
Franck Allimant
9335a41447
Delete module request contains now "data data" flag
2014-01-16 12:01:54 +01:00
Manuel Raynaud
eb5056f089
AbstractController::getExistingObject return object with hte needed
...
locale inside
2014-01-14 14:39:08 +01:00
Manuel Raynaud
882bfeb80c
import missing namespaces in Proruct controller
2014-01-13 10:12:08 +01:00
Manuel Raynaud
9d0121f321
fix cs
2014-01-10 11:41:55 +01:00
Manuel Raynaud
8214ab77ec
refactor update process. Now only available with command line
2014-01-08 16:23:54 +01:00
Manuel Raynaud
653c418aa6
log more events in update process
2014-01-08 14:37:58 +01:00
Manuel Raynaud
366454ebe8
create sql script for migrations
2014-01-08 14:16:32 +01:00
Manuel Raynaud
97a9ff26be
finish update process
2014-01-08 12:16:25 +01:00
Manuel Raynaud
b72fab5212
start update process
2014-01-08 12:16:25 +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
b8c2c2d703
Coupon : Condition module : add tooltip on condition select
2014-01-05 20:17:30 +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
46c68ae4c2
Coupon : Fix bug preventing to update coupon
...
Use $parent instead of $folder_id in folders admin template
uncomment needed return statement
add missing value in folder modification form
uncomment needed loop for parent folder
start a new section in changelog file
2014-01-01 16:20:34 +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
15219b11f4
Coupon : Fix controller
2013-12-29 18:11:52 +01:00
Manuel Raynaud
29feda718b
uncomment needed return statement
2013-12-29 17:18:52 +01:00
gmorel
ae1a05eb85
Merge
2013-12-29 04:28:11 +01:00
gmorel
ff2b1b6376
Refactor : Thelia2 can now deduce extended effect parameters
2013-12-29 04:27:55 +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
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
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
Manuel Raynaud
2f4158d1f6
fix cs
2013-12-18 10:04:13 +01:00
