Franck Allimant
a06b0a57e3
Fixed "save & close"
2014-06-30 19:15:07 +02:00
Franck Allimant
1458d2ff69
Brand related translations
2014-06-30 14:50:15 +02:00
Franck Allimant
6bc22fd7ef
Brand integration
2014-06-30 14:49:29 +02:00
Franck Allimant
a0aa0bd1c2
Added brand logo image selection
2014-06-27 21:07:51 +02:00
Franck Allimant
15f60ad22b
Added product's brand selection in the general tab.
2014-06-27 19:51:41 +02:00
Franck Allimant
0dde8b888a
Added brands management
2014-06-26 10:52:13 +02:00
Franck Allimant
ce3ed19b67
Introduced the automatic form fields binding.
2014-06-26 10:41:26 +02:00
Franck Allimant
b49f8a6423
Fixes #495
2014-06-21 12:00:37 +02:00
Franck Allimant
0d8f9f3c6e
Fixed minor typos
2014-06-19 01:51:39 +02:00
Manuel Raynaud
588be42e0f
Merge pull request #473 from roadster31/coupon-end
...
Major coupon types refactoring.
2014-06-17 21:11:14 +02:00
Guillaume Barral
8196690458
Add link in template-edit to go to Attributes and features edition (this is more intuitive)
2014-06-17 11:48:35 +02:00
Guillaume Barral
816a9b81ca
Allow to search a customer in the default template if $search is not null
2014-06-17 11:19:16 +02:00
Franck Allimant
63f00d82b9
Using 0 as default value if some loop parameters are not defined
2014-06-17 00:39:00 +02:00
Franck Allimant
e3dc87dd6a
Updated translations after finishing coupons
2014-06-17 00:37:06 +02:00
stephaniepinet
7d92398863
Order invoice new button label
2014-06-13 15:36:48 +02:00
alexian dugour
7bf2d8ec58
Mise à jours lien fiche produit sur template order-edit dans le back-office
2014-06-13 08:57:28 +02:00
Franck Allimant
e9a0661938
Pushed forward the refactoring, using traits
2014-06-12 17:00:17 +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
733794c312
Merge pull request #469 from lunika/breadcrumb
...
manage breadcrumb on images and documents
2014-06-11 16:04:19 +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
476bda3d4a
implement new breadcrumb on image and document edition in the catalog
2014-06-11 14:50:19 +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
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
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
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
0683d20d2c
Improved and simplified coupon form management
2014-06-11 09:43:09 +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
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
Manuel Raynaud
c552f8485a
fiw wrong description in search page
2014-06-06 09:06:42 +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
84c97e80ea
write in uppercase the resource value used in admin_position_block function. Fix #444
2014-06-05 17:21:37 +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
driou
78b0be3126
Update fr_FR.php
2014-06-03 15:25:12 +02:00
