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 |
|
Etienne Roudeix
|
99038e688a
|
Revert "Revert "Merge branch 'cleanmaster' into modules""
This reverts commit b3ac365b45.
Conflicts:
Readme.md
core/lib/Thelia/Controller/Admin/AbstractCrudController.php
core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
core/lib/Thelia/Core/Template/TemplateDefinition.php
core/lib/Thelia/Model/Base/Coupon.php
core/lib/Thelia/Model/Base/CouponQuery.php
core/lib/Thelia/Model/Base/CouponVersion.php
core/lib/Thelia/Model/Base/CouponVersionQuery.php
core/lib/Thelia/Model/Base/OrderCouponQuery.php
|
2014-01-06 11:25:25 +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
|
1ba60103f3
|
coupon in orders + model review : backquote use
|
2013-12-18 17:46:42 +01:00 |
|
Franck Allimant
|
de0542b33c
|
Changed direct accesses to verifyStok by calls to checkAvailableStock
|
2013-12-05 13:02:13 +01:00 |
|
Etienne Roudeix
|
48409c29a9
|
Colissimo in progress
|
2013-11-14 11:21:34 +01:00 |
|
Etienne Roudeix
|
84204cbf05
|
Merge branch 'master' into template
Conflicts:
core/lib/Thelia/Core/Template/Loop/Feed.php
|
2013-09-16 15:32:17 +02:00 |
|
Etienne Roudeix
|
e0a48df23e
|
cart integration
|
2013-09-16 13:15:35 +02:00 |
|
Manuel Raynaud
|
da60359c15
|
save if producSaleElements is in promo or not
|
2013-09-16 10:49:42 +02:00 |
|
Manuel Raynaud
|
50a5fd166b
|
create smarty attribute for cart
|
2013-09-13 15:17:43 +02:00 |
|
Etienne Roudeix
|
c5f30baba5
|
pass container to thelialoop smarty plugin then to baseloop
|
2013-09-09 18:15:49 +02:00 |
|
Etienne Roudeix
|
86b11096ba
|
Merge branch 'master' into loops
Conflicts:
core/lib/Thelia/Core/Template/Loop/Category.php
core/lib/Thelia/Core/Template/Loop/FeatureValue.php
core/lib/Thelia/Core/Template/Loop/Folder.php
core/lib/Thelia/Core/Template/Loop/Product.php
core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
install/faker.php
|
2013-08-21 09:19:56 +02:00 |
|
Manuel Raynaud
|
ea81889aea
|
create method for retriving last item added to cart
|
2013-08-06 12:08:12 +02:00 |
|
Manuel Raynaud
|
e0be762236
|
check if we have to verify stock on duplicate cart
|
2013-08-06 11:23:52 +02:00 |
|
Manuel Raynaud
|
1d1bd65a94
|
add new price if priceis not valid anymore in cart
|
2013-08-06 11:15:01 +02:00 |
|
Manuel Raynaud
|
89e15c9bc4
|
check if price is already valid on duplicate cart
|
2013-08-06 10:37:51 +02:00 |
|
Manuel Raynaud
|
dcfb4edda3
|
allow possibility to fix cookie end of life
|
2013-08-06 09:50:19 +02:00 |
|
Manuel Raynaud
|
9995daa158
|
dispatch event when cart is duplicated
|
2013-08-02 16:01:21 +02:00 |
|
Manuel Raynaud
|
542a83e22c
|
remove references to stock table
|
2013-07-30 17:25:16 +02:00 |
|
Manuel Raynaud
|
acb05f81dc
|
change stock table name
|
2013-07-30 17:06:29 +02:00 |
|
Manuel Raynaud
|
72e9c13967
|
put getCart into action classes
|
2013-07-25 09:38:18 +02:00 |
|
Manuel Raynaud
|
fc088fcbd6
|
start to implement cart creation process
|
2013-07-24 17:48:10 +02:00 |
|
Manuel Raynaud
|
38e4b6a09d
|
cart is persist now
|
2013-07-23 16:01:00 +02:00 |
|