From f7e23cf7c89970094be27a529fb14c0a252cb22f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 20 Oct 2017 18:51:14 -0700
Subject: [PATCH 1/3] Fixes #4272 - adds serial to assigned assets view

---
 resources/views/account/view-assets.blade.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index 0ba077919..65c570c75 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -30,6 +30,7 @@ View Assets for  {{ $user->present()->fullName() }}
                 <tr>
                   <th class="col-md-4">{{ trans('admin/hardware/table.asset_model') }}</th>
                   <th class="col-md-2">{{ trans('admin/hardware/table.asset_tag') }}</th>
+                  <th class="col-md-3">{{ trans('admin/hardware/table.serial') }}</th>
                   <th class="col-md-3">{{ trans('general.name') }}</th>
                   <th></th>
                 </tr>
@@ -43,6 +44,7 @@ View Assets for  {{ $user->present()->fullName() }}
                     @endif
                   </td>
                   <td>{{ $asset->asset_tag }}</td>
+                  <td>{{ $asset->serial }}</td>
                   <td>{{ $asset->name }}</td>
                   <td>
                     @if (($asset->image) && ($asset->image!=''))

From fd210c64397943419eabf53a8e0006162a3a9e47 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 20 Oct 2017 18:58:11 -0700
Subject: [PATCH 2/3] Fixes #4267 - email notifications showing model name as
 number

---
 resources/views/emails/accept-asset.blade.php  | 4 ++--
 resources/views/emails/checkin-asset.blade.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/emails/accept-asset.blade.php b/resources/views/emails/accept-asset.blade.php
index ca209610c..8e56ba40c 100755
--- a/resources/views/emails/accept-asset.blade.php
+++ b/resources/views/emails/accept-asset.blade.php
@@ -38,7 +38,7 @@
 		@if (isset($model_name))
 			<tr>
 				<td>
-					{{ trans('general.model_no') }}:
+					{{ trans('general.asset_model') }}:
 				</td>
 				<td>
 					<strong>{{ $model_name }}</strong>
@@ -48,7 +48,7 @@
 		@if (isset($model_number))
 			<tr>
 				<td>
-					{{ trans('general.asset_model') }}:
+					{{ trans('general.model_no') }}:
 				</td>
 				<td>
 					<strong>{{ $model_number }}</strong>
diff --git a/resources/views/emails/checkin-asset.blade.php b/resources/views/emails/checkin-asset.blade.php
index 2dba781e7..8364802b5 100644
--- a/resources/views/emails/checkin-asset.blade.php
+++ b/resources/views/emails/checkin-asset.blade.php
@@ -35,23 +35,23 @@
 			</td>
 		</tr>
 	@endif
-	@if (isset($model_name))
+	@if (isset($model_number))
 		<tr>
 			<td style="background-color:#ccc">
 				{{ trans('general.model_no') }}:
 			</td>
 			<td>
-				<strong>{{ $model_name }}</strong>
+				<strong>{{ $model_number }}</strong>
 			</td>
 		</tr>
 	@endif
-	@if (isset($model_number))
+	@if (isset($model_name))
 		<tr>
 			<td style="background-color:#ccc">
 				{{ trans('general.asset_model') }}:
 			</td>
 			<td>
-				<strong>{{ $model_number }}</strong>
+				<strong>{{ $model_name }}</strong>
 			</td>
 		</tr>
 	@endif

From c0f8b3773ceaebb0f00a41eed4ed75d01d8fad5a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 20 Oct 2017 20:22:14 -0700
Subject: [PATCH 3/3] Temp fix for markdown stuff

---
 resources/views/vendor/mail/markdown/footer.blade.php | 4 ----
 resources/views/vendor/mail/markdown/header.blade.php | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/resources/views/vendor/mail/markdown/footer.blade.php b/resources/views/vendor/mail/markdown/footer.blade.php
index bbcc5f635..3338f620e 100644
--- a/resources/views/vendor/mail/markdown/footer.blade.php
+++ b/resources/views/vendor/mail/markdown/footer.blade.php
@@ -1,5 +1 @@
-@if ($show_url_in_emails=='1')
-[{{ $slot }}]({{ $url }})
-@else
 {{ $slot }}
-@endif
diff --git a/resources/views/vendor/mail/markdown/header.blade.php b/resources/views/vendor/mail/markdown/header.blade.php
index 99e2b4a1d..aaa3e5754 100644
--- a/resources/views/vendor/mail/markdown/header.blade.php
+++ b/resources/views/vendor/mail/markdown/header.blade.php
@@ -1,6 +1 @@
-@if ($show_url_in_emails=='1')
 [{{ $slot }}]({{ $url }})
-@else
-{{ $slot }}
-@endif
-