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
de5a2025cd
Fixed coupon input field name
2014-06-11 09:43:10 +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
Franck Allimant
a743b7f20d
Added coupon changes details.
2014-06-11 09:39:59 +02:00
Christophe Laffont
fdbf166b36
Clean up mini-cart.html
...
Remove this code >> data-tip="tooltip" data-title="Delete" data-original-title=""
Note : If you need a tooltip you can use http://getbootstrap.com/javascript/#tooltips
Remove <DIV> tag
2014-06-11 09:32:27 +02:00
Franck Allimant
13e74f783a
php-cs fixes.
2014-06-10 16:34:33 +02:00
Franck Allimant
b6ae937a1d
Added new coupon types
2014-06-10 16:04:30 +02:00
Franck Allimant
acca19e9d1
Added new coupon type translations
2014-06-10 16:03:08 +02:00
Franck Allimant
fc1061b556
Coupon type template framgment may define a couponInputFormSetup JS function
2014-06-10 16:01:38 +02:00
Franck Allimant
511bdf0d7c
Order total may be calculated with or without discounted items
2014-06-10 16:00:46 +02:00
Franck Allimant
39ff464319
Order total may be calculated with or without discounted items
2014-06-10 15:59:36 +02:00
Franck Allimant
993be2f37a
The coupon type is now passed to te template
2014-06-10 15:59:02 +02:00
Franck Allimant
296d697e3f
Added new coupon types
2014-06-10 15:58:28 +02:00
Franck Allimant
f13ec21337
Added new coupon types translations
2014-06-10 15:58:01 +02:00
Franck Allimant
1916e2a63d
Fixed typo.
2014-06-10 15:57:33 +02:00
Franck Allimant
f2770c5a2b
Fixed typo.
2014-06-10 15:56:38 +02:00
Franck Allimant
466f938cd5
Added js=1 parameter toi {intl} calls used in javascript strings
2014-06-10 15:55:23 +02:00
Franck Allimant
4ab3149bca
Changed {navigate to="return_to"} to {navigate to="previous"}
2014-06-10 15:54:42 +02:00
Franck Allimant
49411183da
Fixed InvalidArgumentException: No module found for code 'default'
2014-06-10 15:52:08 +02:00
Manuel Raynaud
a018102572
Merge pull request #457 from bilhackmac/RefreshCommand
...
Refresh command
2014-06-10 12:26:17 +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
c8d5bdb1e7
Merge pull request #455 from lovenunu/master
...
Fix typo order_tab instead of oder_tab smarty variable
2014-06-06 12:34:52 +02:00
Benjamin Perche
da959c3732
Fix typo order_tab instead of oder_tab smarty variable
...
modifié: templates/backOffice/default/order-edit.html
2014-06-06 10:47:22 +02:00
Julien
415b444e6b
Merge pull request #454 from lunika/2.0.2
...
Fixes version 2.0.2
2014-06-06 09:12:33 +02:00
Manuel Raynaud
c552f8485a
fiw wrong description in search page
2014-06-06 09:06:42 +02:00
Franck Allimant
eb23187782
replaced ucfirst by underscoreToCamelcase for calculating method name
2014-06-05 18:49:40 +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
Manuel Raynaud
84c97e80ea
write in uppercase the resource value used in admin_position_block function. Fix #444
2014-06-05 17:21:37 +02:00
Julien
3419aaaaa1
Merge pull request #453 from bibich/issue-452
...
Fixed issue when installing Thelia on database with special characters
fixes the issue #452
2014-06-05 14:46:43 +02:00
Julien Chanséaume
fc15d466b4
Fixed issue when installing Thelia on database with special characters
2014-06-05 14:01:47 +02:00
Franck Allimant
1a3cc6896a
Changed "return_to" into "previous"
2014-06-04 16:14:04 +02:00
Julien
17f22d920c
Merge pull request #451 from lovenunu/master
...
Fix cs
2014-06-04 14:19:46 +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
Julien
4baeb5156d
Merge pull request #449 from Yochima/yochima-branch
...
Add pagination to the product list (backOffice)
2014-06-04 10:33:08 +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
Manuel Raynaud
3df31f1ecb
Merge pull request #450 from driou/master
...
Update fr_FR.php
2014-06-03 15:47:46 +02:00
driou
78b0be3126
Update fr_FR.php
2014-06-03 15:25:12 +02:00
Guillaume Barral
eb895bc544
Add pagination to the product list (backOffice)
2014-06-03 12:35:52 +02:00
