Merge branch 'master' of https://github.com/thelia/thelia

core/lib/Thelia/Action/Coupon.php

@@ -124,11 +124,17 @@ class Coupon extends BaseAction implements EventSubscriberInterface
             // @todo insert false product in cart with the name of the coupon and the discount as negative price
 
             // Decrement coupon quantity
+            // @todo move this part in after order event
             $couponQuery = CouponQuery::create();
             $couponModel = $couponQuery->findOneByCode($coupon->getCode());
             $couponManager->decrementeQuantity($couponModel);
 
-            $request->getSession()->getCart()->setDiscount($totalDiscount);
+            $request
+                ->getSession()
+                ->getCart()
+                ->setDiscount($totalDiscount)
+                ->save()
+            ;
 
         }
 

core/lib/Thelia/Controller/Admin/CouponController.php

@@ -522,7 +522,7 @@ class CouponController extends BaseAdminController
             $condition = array();
             $condition['serviceId'] = $availableCondition->getServiceId();
             $condition['name'] = $availableCondition->getName();
-            $condition['toolTip'] = $availableCondition->getToolTip();
+           // $condition['toolTip'] = $availableCondition->getToolTip();
             $cleanedConditions[] = $condition;
         }
 

templates/admin/default/coupon/form.html

@@ -107,7 +107,7 @@
                                 <select name="{$name}" id="type" class="col-md-12 form-control">
                                     <option value="-1" data-description="">{intl l='Please select a coupon type'}</option>
                                     {foreach from=$availableCoupons item=availableCoupon}
-                                        <option value="{$availableCoupon.serviceId}" data-description="{$availableCoupon.toolTip}" {if $value == $availableCoupon.serviceId}selected{/if}>
+                                        <option value="{$availableCoupon.serviceId}" {if $value == $availableCoupon.serviceId}selected{/if}>
                                             {$availableCoupon.name}
                                         </option>
                                     {/foreach}