diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 078adb626..275f9b5de 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -611,6 +611,7 @@ class CouponController extends BaseAdminController $condition = array(); $condition['serviceId'] = $availableCondition->getServiceId(); $condition['name'] = $availableCondition->getName(); + $condition['toolTip'] = $availableCondition->getToolTip(); $cleanedConditions[] = $condition; } diff --git a/templates/backOffice/default/assets/js/coupon.js b/templates/backOffice/default/assets/js/coupon.js index 51cf41058..0bf95b41a 100755 --- a/templates/backOffice/default/assets/js/coupon.js +++ b/templates/backOffice/default/assets/js/coupon.js @@ -133,6 +133,10 @@ $(function($){ $.couponManager.onConditionChange = function() { $('#category-condition').on('change', function () { var $this = $(this); + var mainDiv = $('#condition-add-type'); + var optionSelected = $('option:selected', this); + mainDiv.find('.typeToolTip').html(optionSelected.attr('data-description')); + // Only if add mode if (false != $.couponManager.conditionToUpdateIndex) { // Reload condition summaries ajax diff --git a/templates/backOffice/default/coupon/form.html b/templates/backOffice/default/coupon/form.html index b44fa59e7..be00100b1 100755 --- a/templates/backOffice/default/coupon/form.html +++ b/templates/backOffice/default/coupon/form.html @@ -195,11 +195,12 @@