TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Franck Allimant
2013-10-24 16:56:52 +02:00
parent d0213f36d4 9b5c631fcb
commit 54f2172ca1
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/Action/Coupon.php
View File

@@ -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 // @todo insert false product in cart with the name of the coupon and the discount as negative price
// Decrement coupon quantity // Decrement coupon quantity
// @todo move this part in after order event
$couponQuery = CouponQuery::create(); $couponQuery = CouponQuery::create();
$couponModel = $couponQuery->findOneByCode($coupon->getCode()); $couponModel = $couponQuery->findOneByCode($coupon->getCode());
$couponManager->decrementeQuantity($couponModel); $couponManager->decrementeQuantity($couponModel);
$request->getSession()->getCart()->setDiscount($totalDiscount); $request
->getSession()
->getCart()
->setDiscount($totalDiscount)
->save()
;
} }

2
core/lib/Thelia/Controller/Admin/CouponController.php
View File

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

2
templates/admin/default/coupon/form.html
View File

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