allow intl in coupon edition

This commit is contained in:
Manuel Raynaud
2014-02-10 13:03:07 +01:00
parent e4916e5198
commit 99e89e4249
2 changed files with 16 additions and 2 deletions

View File

@@ -187,6 +187,9 @@ class CouponController extends BaseAdminController
return $this->pageNotFound();
}
$coupon->setLocale($this->getCurrentEditionLocale());
/** @var CouponFactory $couponFactory */
$couponFactory = $this->container->get('thelia.coupon.factory');
$couponManager = $couponFactory->buildCouponFromModel($coupon);
@@ -232,7 +235,7 @@ class CouponController extends BaseAdminController
'isRemovingPostage' => $coupon->getIsRemovingPostage(),
'maxUsage' => $coupon->getMaxUsage(),
'conditions' => $conditions,
'locale' => $coupon->getLocale(),
'locale' => $this->getCurrentEditionLocale(),
);
$args['conditions'] = $this->cleanConditionForTemplate($conditions);

View File

@@ -3,6 +3,7 @@
<section class="row">
<form action="{$formAction}" {form_enctype form=$form} method="POST" >
<div class="col-md-12 general-block-decorator">
{form_hidden_fields form=$form}
@@ -17,6 +18,14 @@
<div class="span4">
<div class="control-group">
{if !$noConditions}
{include
file = "includes/inner-form-toolbar.html"
hide_submit_buttons = false
page_url = "{url path="{$formAction}"}"
}
{/if}
<div class="col-md-4">
{form_field form=$form field='code'}
<div class="form-group {if $error}has-error{/if}">
@@ -146,7 +155,9 @@
</div>
{/form_field}
{if $noConditions}
<button id="save-coupon-btn" type="submit" class="btn btn-default btn-primary">{intl l='Save your modifications'}</button>
{/if}
</div>
</div>