From fd9e8b712bb1a9203da3ee40edec7fe56436ca75 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Fri, 24 Jul 2015 09:26:34 +0930
Subject: [PATCH 1/3] Add flexibility if values not present

---
 app/views/emails/accept-asset.blade.php | 54 ++++++++++++++-----------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/app/views/emails/accept-asset.blade.php b/app/views/emails/accept-asset.blade.php
index 62ad51a932..ade6312ee6 100755
--- a/app/views/emails/accept-asset.blade.php
+++ b/app/views/emails/accept-asset.blade.php
@@ -15,14 +15,16 @@
 			<strong>{{{ $item_name }}}</strong>
 		</td>
 	</tr>
-	<tr>
-		<td style="background-color:#ccc">
-			Asset Tag:
-		</td>
-		<td>
-			<strong>{{{ $item_tag }}}</strong>
-		</td>
-	</tr>
+	@if ($item_tag)
+		<tr>
+			<td style="background-color:#ccc">
+				Asset Tag:
+			</td>
+			<td>
+				<strong>{{{ $item_tag }}}</strong>
+			</td>
+		</tr>
+	@endif
 	<tr>
 		<td style="background-color:#ccc">
 			Checkout Date:
@@ -31,22 +33,26 @@
 			<strong>{{{ $checkout_date }}}</strong>
 		</td>
 	</tr>
-	<tr>
-		<td style="background-color:#ccc">
-			Expected Checkin Date:
-		</td>
-		<td>
-			<strong>{{{ $expected_checkin }}}</strong>
-		</td>
-	</tr>
-	<tr>
-		<td style="background-color:#ccc">
-			Additional Notes:
-		</td>
-		<td>
-			<strong>{{{ $note }}}</strong>
-		</td>
-	</tr>
+	@if ($expected_checkin)
+		<tr>
+			<td style="background-color:#ccc">
+				Expected Checkin Date:
+			</td>
+			<td>
+				<strong>{{{ $expected_checkin }}}</strong>
+			</td>
+		</tr>
+	@endif
+	@if ($note)
+		<tr>
+			<td style="background-color:#ccc">
+				Additional Notes:
+			</td>
+			<td>
+				<strong>{{{ $note }}}</strong>
+			</td>
+		</tr>
+	@endif
 </table>
 	
 @if (($require_acceptance==1) && ($eula!=''))

From e4277b47e8ace642f5006f223087480833b24440 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Fri, 24 Jul 2015 09:27:44 +0930
Subject: [PATCH 2/3] Add extra fields for email

---
 app/controllers/admin/AccessoriesController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/admin/AccessoriesController.php b/app/controllers/admin/AccessoriesController.php
index ae2de57723..f6f6e3197c 100755
--- a/app/controllers/admin/AccessoriesController.php
+++ b/app/controllers/admin/AccessoriesController.php
@@ -322,6 +322,10 @@ class AccessoriesController extends AdminController
             $data['eula'] = $accessory->getEula();
             $data['first_name'] = $user->first_name;
             $data['item_name'] = $accessory->name;
+            $data['checkout_date'] = $logaction->created_at;
+            $data['item_tag'] = '';
+            $data['expected_checkin'] = '';
+            $data['note'] = $logaction->note;
             $data['require_acceptance'] = $accessory->requireAcceptance();
 
 

From d62d6ebf0553cb2987eb9ef93d7493768e9b9c07 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Fri, 24 Jul 2015 09:28:17 +0930
Subject: [PATCH 3/3] Add extra fields for email

---
 app/controllers/admin/ConsumablesController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/admin/ConsumablesController.php b/app/controllers/admin/ConsumablesController.php
index edc8faeee2..05376143b6 100644
--- a/app/controllers/admin/ConsumablesController.php
+++ b/app/controllers/admin/ConsumablesController.php
@@ -322,6 +322,10 @@ class ConsumablesController extends AdminController
             $data['eula'] = $consumable->getEula();
             $data['first_name'] = $user->first_name;
             $data['item_name'] = $consumable->name;
+            $data['checkout_date'] = $logaction->created_at;
+            $data['item_tag'] = '';
+            $data['expected_checkin'] = '';
+            $data['note'] = $logaction->note;
             $data['require_acceptance'] = $consumable->requireAcceptance();