Fixes #1741 - adds serial to checkout email

This commit is contained in:
snipe
2016-02-09 14:23:45 -08:00
parent 20fd420690
commit 98db6fe9df
3 changed files with 13 additions and 2 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v2.1.0-8',
'hash_version' => 'v2.1.0-8-g1b1a733',
'app_version' => 'v2.1.0-10',
'hash_version' => 'v2.1.0-10-g771e21d',
);
@@ -650,6 +650,7 @@ class AssetsController extends AdminController
$data['item_name'] = $asset->showAssetName();
$data['checkin_date'] = $logaction->created_at;
$data['item_tag'] = $asset->asset_tag;
$data['item_serial'] = $asset->serial;
$data['note'] = $logaction->note;
if ((($asset->checkin_email()=='1')) && ($user) && (!Config::get('app.lock_passwords'))) {
+10
View File
@@ -25,6 +25,16 @@
</td>
</tr>
@endif
@if ($item_serial)
<tr>
<td style="background-color:#ccc">
Serial:
</td>
<td>
<strong>{{{ $item_serial }}}</strong>
</td>
</tr>
@endif
<tr>
<td style="background-color:#ccc">
Checkout Date: