Manuel Raynaud
|
0da2b2de04
|
Merge pull request #459 from roadster31/coupon-type
Adding several new coupon types
|
2014-06-11 09:52:20 +02:00 |
|
Franck Allimant
|
ad02198e19
|
Merge branch 'coupon-type' of https://github.com/roadster31/thelia into coupon-type
Conflicts:
CHANGELOG.md
|
2014-06-11 09:46:15 +02:00 |
|
Franck Allimant
|
4b4a31aed5
|
Added coupon changes details.
|
2014-06-11 09:44:55 +02:00 |
|
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
|
89bf71f4b0
|
Added new coupon type translations
|
2014-06-11 09:43:25 +02:00 |
|
Franck Allimant
|
8f5369a1b8
|
Coupon type template framgment may define a couponInputFormSetup JS function
|
2014-06-11 09:43:24 +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
|
71a6497edb
|
Added js=1 parameter toi {intl} calls used in javascript strings
|
2014-06-11 09:43:18 +02:00 |
|
Franck Allimant
|
8869a3c571
|
Changed {navigate to="return_to"} to {navigate to="previous"}
|
2014-06-11 09:43:17 +02:00 |
|
Franck Allimant
|
0f3e99ac1f
|
Fixed InvalidArgumentException: No module found for code 'default'
|
2014-06-11 09:43:16 +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
|
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 |
|
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 |
|