Franck Allimant
|
b34f1c35c7
|
Fixed the checking of maximum coupon usage count
|
2014-06-12 16:42:00 +02:00 |
|
Franck Allimant
|
992100f145
|
Added helper to chek if number of uses is reached
|
2014-06-12 16:40:07 +02:00 |
|
Franck Allimant
|
96ebcf1880
|
Added the COUPON_CLEAR_ALL event, and a route to trigger it.
|
2014-06-12 16:39:27 +02:00 |
|
Franck Allimant
|
95841809c4
|
Refactored coupons to reduce code duplication
|
2014-06-12 13:14:46 +02:00 |
|
Franck Allimant
|
db29505fee
|
Added Attribute value related coupons
|
2014-06-12 13:14:07 +02:00 |
|
Franck Allimant
|
147d4a70f1
|
Improved coupon UI
|
2014-06-12 12:12:31 +02:00 |
|
Manuel Raynaud
|
9783b251c2
|
remove url test
|
2014-06-12 10:04:33 +02:00 |
|
Manuel Raynaud
|
21f83e444c
|
Merge pull request #470 from lunika/install
don't try to change permission on file during install process
|
2014-06-11 18:25:18 +02:00 |
|
Manuel Raynaud
|
2ddc0fb6a3
|
fix cs
|
2014-06-11 17:14:13 +02:00 |
|
Manuel Raynaud
|
863f7a479a
|
don't try to change permission on file during install process
|
2014-06-11 16:52:21 +02:00 |
|
Manuel Raynaud
|
2a795945a4
|
Merge pull request #463 from lunika/2.0.2
prepare release 2.0.2
|
2014-06-11 16:24:43 +02:00 |
|
Manuel Raynaud
|
5edeee6996
|
fix cs
|
2014-06-11 16:09:44 +02:00 |
|
Manuel Raynaud
|
3434010b54
|
prepare release 2.0.2
|
2014-06-11 16:05:08 +02:00 |
|
Manuel Raynaud
|
733794c312
|
Merge pull request #469 from lunika/breadcrumb
manage breadcrumb on images and documents
|
2014-06-11 16:04:19 +02:00 |
|
Manuel Raynaud
|
4856a5f733
|
remove unused variable
|
2014-06-11 15:59:20 +02:00 |
|
Manuel Raynaud
|
b3262a537b
|
Merge pull request #464 from touffies/frontend
Refactor script.js [Fix bug "Out of Stock"] + Add QuickView functionnality
|
2014-06-11 15:06:44 +02:00 |
|
Christophe Laffont
|
8de56ffb94
|
Resolve conflict git
|
2014-06-11 15:00:26 +02:00 |
|
Christophe Laffont
|
3db2df3253
|
Close the dialog box when the user presses the escape (ESC) key.
|
2014-06-11 14:53:41 +02:00 |
|
Christophe Laffont
|
75d339f811
|
Refactor addToProduct's and change Quantity scripts and i added a way to get the product's quickView
|
2014-06-11 14:53:41 +02:00 |
|
Manuel Raynaud
|
6084d9ac00
|
implement new breadcrumb on image and document edition in the catalog. Fix #460
|
2014-06-11 14:50:19 +02:00 |
|
Manuel Raynaud
|
476bda3d4a
|
implement new breadcrumb on image and document edition in the catalog
|
2014-06-11 14:50:19 +02:00 |
|
Manuel Raynaud
|
afe48b2d33
|
Merge pull request #468 from lovenunu/master
Fix mail sending to ensure compatibility with secured SMTP
|
2014-06-11 14:35:12 +02:00 |
|
Benjamin Perche
|
e3d19f0dd0
|
Fix mail sending to ensure compatibility with secured SMTP
modifié: local/modules/Front/Controller/ContactController.php
|
2014-06-11 14:30:12 +02:00 |
|
Manuel Raynaud
|
dd040e3728
|
Merge pull request #465 from touffies/googlemap
Contact Page : Replace IFRAME by GMAP API V3.
|
2014-06-11 14:28:33 +02:00 |
|
Manuel Raynaud
|
8949660927
|
Merge pull request #466 from touffies/patch-2
Avoid JS console errors
|
2014-06-11 14:28:08 +02:00 |
|
Christophe Laffont
|
c02d6e2115
|
Close the dialog box when the user presses the escape (ESC) key.
|
2014-06-11 12:30:51 +02:00 |
|
Christophe Laffont
|
863c3ec1fd
|
Avoid console errors
Use script from HTML5 Boilerplate to avoid console errors.
https://github.com/h5bp/html5-boilerplate/blob/master/js/plugins.js
|
2014-06-11 11:37:25 +02:00 |
|
Christophe Laffont
|
a6a9d793c3
|
Delete config.codekit
|
2014-06-11 11:30:39 +02:00 |
|
Christophe Laffont
|
2424481df3
|
Contact Page : Replace IFRAME by GMAP API V3.
|
2014-06-11 11:19:53 +02:00 |
|
Christophe Laffont
|
d2dfbbf4b2
|
Refactor addToProduct's and change Quantity scripts and i added a way to get the product's quickView
|
2014-06-11 10:15:33 +02:00 |
|
Manuel Raynaud
|
5279cc72ce
|
Merge pull request #462 from touffies/patch-1
Clean up mini-cart.html
|
2014-06-11 09:57:31 +02:00 |
|
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 |
|