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

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

Browse Source 
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less
This commit is contained in:
gmorel
2013-09-04 16:23:16 +02:00
parent 7b0f2ee4bc
commit b9577e87e3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,9 +118,9 @@ class CouponController extends BaseAdminController
); );
$this->adminLogAppend( $this->adminLogAppend(
sprintf( sprintf(
'Coupon %s (ID %s) created', 'Coupon %s (ID ) created',
$couponEvent->getTitle(), $couponEvent->getTitle()
$couponEvent->getCoupon()->getId() // $couponEvent->getCoupon()->getId()
) )
); );
// @todo redirect if successful // @todo redirect if successful

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

@@ -72,7 +72,7 @@
<label for="expiration-date">Expiration date :</label> <label for="expiration-date">Expiration date :</label>
<div class="input-append date" data-date="12/02/2012" data-date-format="dd/mm/yyyy"> <div class="input-append date" data-date="12/02/2012" data-date-format="dd/mm/yyyy">
{form_field form=$form field='expirationDate'} {form_field form=$form field='expirationDate'}
<input type="text" id="expiration-date" name="expiration-date" value="{$value}"> <input type="text" id="expiration-date" name="{$name}" value="{$value}">
{if $error}{$message}{/if} {if $error}{$message}{/if}
{/form_field} {/form_field}
<span class="add-on"><span class="icon-th"></span></span> <span class="add-on"><span class="icon-th"></span></span>