From 98db6fe9df04ef88d66d0bba6d8e3669acf14cd5 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 9 Feb 2016 14:23:45 -0800
Subject: [PATCH] Fixes #1741 - adds serial to checkout email

---
 app/config/version.php                     |  4 ++--
 app/controllers/admin/AssetsController.php |  1 +
 app/views/emails/accept-asset.blade.php    | 10 ++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index f7252126a5..894ab1893d 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -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',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index b06c03d49b..93ac260e3a 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -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'))) {
diff --git a/app/views/emails/accept-asset.blade.php b/app/views/emails/accept-asset.blade.php
index 779364e07d..04f33ebb74 100755
--- a/app/views/emails/accept-asset.blade.php
+++ b/app/views/emails/accept-asset.blade.php
@@ -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: