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
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
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
