From 02c2f6560e7d4b7f822d9e466fcf7dbc8d474f72 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Thu, 24 Oct 2013 14:49:15 +0200 Subject: [PATCH 1/3] add todo comment in coupon event --- core/lib/Thelia/Action/Coupon.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/lib/Thelia/Action/Coupon.php b/core/lib/Thelia/Action/Coupon.php index e3a8defbf..0177e5ce2 100755 --- a/core/lib/Thelia/Action/Coupon.php +++ b/core/lib/Thelia/Action/Coupon.php @@ -124,6 +124,7 @@ 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); From 2f7dcb7f51223fd0bc3fdbc656d99bbbf5a84adc Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Thu, 24 Oct 2013 15:55:35 +0200 Subject: [PATCH 2/3] remove tooltip from coupon edit controller --- core/lib/Thelia/Controller/Admin/CouponController.php | 2 +- templates/admin/default/coupon/form.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 59ef312d5..da0ec200a 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/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; } diff --git a/templates/admin/default/coupon/form.html b/templates/admin/default/coupon/form.html index 5e132b5cc..d2642657f 100644 --- a/templates/admin/default/coupon/form.html +++ b/templates/admin/default/coupon/form.html @@ -107,7 +107,7 @@