Manuel Raynaud
7500680a77
Merge pull request #284 from roadster31/basemodulecontroller
...
Various improvements, and URL calculation fix
2014-04-14 16:32:29 +02:00
Franck Allimant
060df3ed61
Added heper methods to easyly get order status object
2014-04-12 02:36:17 +02:00
Manuel Raynaud
b60abb206b
fix cs
2014-04-11 09:36:43 +02:00
Manuel Raynaud
334ebf12f5
change string to array in OrderQuery method
2014-04-11 08:57:43 +02:00
Manuel Raynaud
8f988b3553
set invoiceDate to current date when order status is changed to paid
2014-04-11 08:52:22 +02:00
Manuel Raynaud
2532a3bb4b
fix cs
2014-04-10 12:06:43 +02:00
Manuel Raynaud
48b7eb9353
create a new event fire when cart item is duplicated
2014-04-09 17:06:11 +02:00
Manuel Raynaud
886320789a
add cart item id on order product save event
2014-03-28 09:18:03 +01:00
Manuel Raynaud
25e605e8ab
set column has not modified when customer credential are erased
2014-03-19 09:29:05 +01:00
Manuel Raynaud
99eb5c01f4
add some phpdoc
2014-03-17 15:14:58 +01:00
Manuel Raynaud
613aac093e
remove all callback in customer class before saving it
2014-03-13 17:10:21 +01:00
Manuel Raynaud
81a09e1a98
remove unused code
2014-03-10 11:57:58 +01:00
Manuel Raynaud
265d8b5a5f
fix cs
2014-03-09 19:40:36 +01:00
Manuel Raynaud
a27e317245
update phpDoc and fix cs
2014-03-05 15:12:11 +01:00
Manuel Raynaud
06539ad9bf
coupons effect are recalculated after each product's cart modification. Fix #237
2014-03-03 17:40:54 +01:00
Franck Allimant
defd66af27
Added status change helper methods (setPaid / isPaid, etc)
2014-03-01 22:02:56 +01:00
Franck Allimant
73baab5283
Changed CODE_PROCESSED into CODE_PROCESSING ( fixes #240 )
2014-03-01 22:02:55 +01:00
Manuel Raynaud
a5cfcf91ca
update changelog and fix cs
2014-02-22 19:01:37 +01:00
Manuel Raynaud
dafce9e070
Do not allow to cumulate the coupon many times. Fix #217
2014-02-19 16:56:58 +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
a51c54db26
x default position value
2014-02-09 15:49:19 +01:00
Manuel Raynaud
69c746537e
remove console.log in js
2014-02-08 10:03:30 +01:00
Manuel Raynaud
acb1fdd60a
refactor stat on OrderQuery
2014-02-07 16:41:13 +01:00
Franck Allimant
89653f452b
Removes container from all Thelia actions, but Modules ( #198 )
2014-01-31 20:06:42 +01:00
Franck Allimant
3363200607
Improved languages management, added many country flags. Fix #183
2014-01-27 23:22:02 +01:00
Franck Allimant
c5cc6aae76
Added administrator preferred locale (see issue #183 )
2014-01-27 14:29:37 +01:00
Franck Allimant
a27c913f70
Fixed LONG VARCHAR problem in coupon table
2014-01-27 14:29:06 +01:00
Franck Allimant
af47399f09
Minor cosmetic changes
2014-01-24 15:19:16 +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
Franck Allimant
66d6d03770
Fixed depracation of rewritten URL
2014-01-20 23:38:14 +01:00
Franck Allimant
c60bb02da7
Fixed imporper use of Thelia\Model\Base\LangQuery
2014-01-17 14:42:41 +01:00
Manuel Raynaud
4e1521775f
alloow possibility to specify a ref for a customer
2014-01-17 11:15:55 +01:00
Manuel Raynaud
7ec7fcfa5e
check if pbject exists before deleting it
2014-01-10 09:40:33 +01:00
Manuel Raynaud
6070d74ac3
update propel version
2014-01-08 12:05:56 +01:00
Etienne Roudeix
26aae5adfc
remove cache behavior from product table
2014-01-06 14:20:12 +01:00
Etienne Roudeix
4e847bf5ae
fix model
2014-01-06 12:23:01 +01:00
Etienne Roudeix
99038e688a
Revert "Revert "Merge branch 'cleanmaster' into modules""
...
This reverts commit b3ac365b45
2014-01-06 11:25:25 +01:00
Manuel Raynaud
cf255a6a9c
delete product on category removal. delete only when it's the default
...
category. Fix issue #151
2014-01-02 13:02:11 +01:00
Manuel Raynaud
b992cc8488
delete all sub categories on category removal, fix issue #150
2014-01-02 10:30:24 +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
9a22bdafa1
Coupon : Fix unit test
2013-12-29 14:47:51 +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
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
