From 71ba1af647b5038f4261e9f72b64f62b1c0d6509 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 26 Dec 2017 16:48:28 -0800
Subject: [PATCH 1/2] Fixed button class on asset view

---
 resources/views/hardware/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 638e94d7f3..adabaa07a9 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -479,7 +479,7 @@
                       <td><a href="{{ route('licenses.show', $seat->license->id) }}">{{ $seat->license->name }}</a></td>
                       <td>{{ $seat->license->serial }}</td>
                       <td>
-                        <a href="{{ route('licenses.checkin', $seat->id) }}" class="btn-flat info btn-sm">{{ trans('general.checkin') }}</a>
+                        <a href="{{ route('licenses.checkin', $seat->id) }}" class="btn btn-sm bg-purple" data-tooltip="true">{{ trans('general.checkin') }}</a>
                       </td>
                     </tr>
                     @endforeach

From 8864f8140268d328336dbfa61c4de05eb5fd86d7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 26 Dec 2017 16:49:01 -0800
Subject: [PATCH 2/2] Fixed manufacturer error on printable user page

Manufacturer is not required for accessories, so need to account for that
---
 resources/views/users/print.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 4ddfecae4c..2367978336 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -128,7 +128,7 @@
 
             <tr>
                 <td>{{ $acounter }}</td>
-                <td>{{ $accessory->manufacturer->name }} {{ $accessory->name }} {{ $accessory->model_number }}</td>
+                <td>{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}</td>
                 <td>{{ $accessory->category->name }}</td>
                 <td>{{  $accessory->assetlog->first()->created_at }}</td>
             </tr>
@@ -163,7 +163,7 @@
 
             <tr>
                 <td>{{ $ccounter }}</td>
-                <td>{{ $consumable->manufacturer->name }} {{ $consumable->name }} {{ $consumable->model_number }}</td>
+                <td>{{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }}  {{ $consumable->name }} {{ $consumable->model_number }}</td>
                 <td>{{ $consumable->category->name }}</td>
                 <td>{{  $consumable->assetlog->first()->created_at }}</td>
             </tr>