Franck Allimant
|
71ea9e9671
|
php-cs fixes.
|
2014-06-11 09:43:27 +02:00 |
|
Franck Allimant
|
441764cf94
|
Added new coupon types
|
2014-06-11 09:43:26 +02:00 |
|
Franck Allimant
|
a1ba63d5d5
|
Order total may be calculated with or without discounted items
|
2014-06-11 09:43:24 +02:00 |
|
Franck Allimant
|
80653fee0b
|
Order total may be calculated with or without discounted items
|
2014-06-11 09:43:23 +02:00 |
|
Franck Allimant
|
a1eeddc51b
|
The coupon type is now passed to te template
|
2014-06-11 09:43:22 +02:00 |
|
Franck Allimant
|
6e7d54c0aa
|
Added new coupon types
|
2014-06-11 09:43:21 +02:00 |
|
Franck Allimant
|
5c61c9c093
|
Added new coupon types translations
|
2014-06-11 09:43:20 +02:00 |
|
Franck Allimant
|
5cb01ff30f
|
Fixed typo.
|
2014-06-11 09:43:20 +02:00 |
|
Franck Allimant
|
ff78e982cd
|
Fixed typo.
|
2014-06-11 09:43:19 +02:00 |
|
Franck Allimant
|
0bb24298aa
|
replaced ucfirst by underscoreToCamelcase for calculating method name
|
2014-06-11 09:43:15 +02:00 |
|
Franck Allimant
|
5873b29fc1
|
Changed "return_to" into "previous"
|
2014-06-11 09:43:14 +02:00 |
|
Franck Allimant
|
15da99446c
|
Added "js" parameter to intl function for a safe usage in JS string,
|
2014-06-11 09:43:14 +02:00 |
|
Franck Allimant
|
87837224f7
|
PHP-CS fixer
|
2014-06-11 09:43:13 +02:00 |
|
Franck Allimant
|
919e0ac09b
|
Checked coupon type before trying to get the service.
|
2014-06-11 09:43:11 +02:00 |
|
Franck Allimant
|
d9164495d3
|
Removed no longer useful tests
|
2014-06-11 09:43:10 +02:00 |
|
Franck Allimant
|
0683d20d2c
|
Improved and simplified coupon form management
|
2014-06-11 09:43:09 +02:00 |
|
Jérôme Billiras
|
5c8584c398
|
Code review following pull request comments
|
2014-06-10 11:43:06 +02:00 |
|
Jérôme Billiras
|
bead28f5d2
|
Update test to consider only standards modules
|
2014-06-10 11:13:06 +02:00 |
|
Jérôme Billiras
|
0381239881
|
Add refresh command tests
|
2014-06-10 10:37:48 +02:00 |
|
Jérôme Billiras
|
76b08ddca9
|
Register refresh command to Thelia core
|
2014-06-10 10:34:19 +02:00 |
|
Jérôme Billiras
|
f6aa0ed7da
|
Add refresh command
|
2014-06-10 10:33:47 +02:00 |
|
Manuel Raynaud
|
980cd08704
|
fix cs
|
2014-06-05 17:39:15 +02:00 |
|
Manuel Raynaud
|
83ed4aa833
|
fix copy/past issue
|
2014-06-05 17:21:37 +02:00 |
|
Manuel Raynaud
|
a4e28e5561
|
implement search on content loop.
|
2014-06-05 17:21:37 +02:00 |
|
Manuel Raynaud
|
57cf2d1a10
|
implement seach on content loop.
|
2014-06-05 17:21:37 +02:00 |
|
Manuel Raynaud
|
ac028a70b5
|
implement seach on category loop.
|
2014-06-05 17:21:37 +02:00 |
|
Manuel Raynaud
|
86c34f589c
|
fix payment and delivery form. Fix #434
|
2014-06-05 17:21:37 +02:00 |
|
Julien Chanséaume
|
fc15d466b4
|
Fixed issue when installing Thelia on database with special characters
|
2014-06-05 14:01:47 +02:00 |
|
Benjamin Perche
|
946a671c4d
|
Fix cs
modifié: core/lib/Thelia/Core/Event/SessionEvent.php
modifié: core/lib/Thelia/Core/EventListener/SessionListener.php
modifié: core/lib/Thelia/Core/TheliaKernelEvents.php
modifié: core/lib/Thelia/Model/CartItem.php
|
2014-06-04 13:43:03 +02:00 |
|
Guillaume Barral
|
2a7ea88d13
|
As the customerController, the method performAdditionalUpdateAction is useless as long as we have an <input type="hidden" name="page" /> AND a well configured successUrl :)
|
2014-06-04 09:02:55 +02:00 |
|
Guillaume Barral
|
a0eb7603ce
|
correction of the method performAdditionalUpdateAction
|
2014-06-04 08:40:17 +02:00 |
|
Guillaume Barral
|
eb895bc544
|
Add pagination to the product list (backOffice)
|
2014-06-03 12:35:52 +02:00 |
|
Manuel Raynaud
|
d439197133
|
translate product in car. Fix #416
|
2014-05-30 17:07:55 +02:00 |
|
Manuel Raynaud
|
fe620a5a3b
|
force default locale when uploading new document. Fix #403
|
2014-05-30 16:43:26 +02:00 |
|
Manuel Raynaud
|
eb13849b79
|
fix parameter in document loop. Fix #405
|
2014-05-30 12:22:22 +02:00 |
|
Manuel Raynaud
|
8370158f9d
|
fix saves & close action on document and images. Fix #402
|
2014-05-30 11:49:03 +02:00 |
|
Manuel Raynaud
|
ee6bb052ad
|
Merge pull request #439 from roadster31/coupon-types
Coupon types
|
2014-05-28 15:58:01 +02:00 |
|
Franck Allimant
|
567fee839c
|
Added RemoveAmountOnCategories coupon type
|
2014-05-28 12:02:56 +02:00 |
|
Manuel Raynaud
|
087fc6e9bf
|
reset modified column after admin connection
|
2014-05-27 17:09:53 +02:00 |
|
Guillaume Barral
|
2587f208c6
|
add argument id to the order_product loop
|
2014-05-27 08:44:49 +02:00 |
|
Manuel Raynaud
|
6eaea72043
|
don't catch exception when javscript assets are processed
|
2014-05-26 11:07:02 +02:00 |
|
Manuel Raynaud
|
ad469298bc
|
Merge pull request #428 from roadster31/coupon-types
Temporary fix for #427
|
2014-05-23 00:32:26 +02:00 |
|
Franck Allimant
|
e4029c9fdd
|
Temporary fix for #427
|
2014-05-22 23:39:34 +02:00 |
|
Manuel Raynaud
|
2ace0796e8
|
session is now initialize using dispatcher
|
2014-05-20 09:44:04 +02:00 |
|
Manuel Raynaud
|
ec50b30ff6
|
Merge pull request #417 from Yochima/yochima-branch
set the placedOrder in the createManual function
|
2014-05-19 11:12:32 +02:00 |
|
Guillaume Barral
|
bcd817f9d9
|
initialize the order in the $event object in the createManual function.
We need to initialize it because we have to use the placedOrder instead
|
2014-05-19 11:06:19 +02:00 |
|
Guillaume Barral
|
c4be881ab8
|
add the test of a non null order in the $event object in createManual function
|
2014-05-19 11:01:19 +02:00 |
|
Manuel Raynaud
|
1a08cabd6e
|
Merge pull request #413 from roadster31/coupon-types
Coupon types
|
2014-05-19 10:50:53 +02:00 |
|
Franck Allimant
|
d576e62082
|
Removed uses of Base in core/lib/Thelia/Model
|
2014-05-19 09:50:18 +02:00 |
|
Guillaume Barral
|
db94749dc0
|
set the placedOrder in the createManual function
|
2014-05-19 09:43:42 +02:00 |
|