From 044dfe26200334a1f798d7079ff6ec45dd6d9558 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 10 Nov 2020 00:54:39 -0800
Subject: [PATCH 1/4] Fixed [ch945] - Status colors are not displaying
 correctly in the chart on the dashboard

---
 app/Http/Controllers/Api/StatuslabelsController.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php
index 22283be8a6..06246588bc 100644
--- a/app/Http/Controllers/Api/StatuslabelsController.php
+++ b/app/Http/Controllers/Api/StatuslabelsController.php
@@ -171,20 +171,26 @@ class StatuslabelsController extends Controller
 
         $labels=[];
         $points=[];
-        $colors=[];
+        $default_color = Helper::chartColors();
+        $default_color_count = 0;
+
         foreach ($statuslabels as $statuslabel) {
             if ($statuslabel->assets_count > 0) {
 
                 $labels[]=$statuslabel->name. ' ('.number_format($statuslabel->assets_count).')';
                 $points[]=$statuslabel->assets_count;
+
                 if ($statuslabel->color!='') {
-                    $colors[]=$statuslabel->color;
+                    $colors_array[] = $statuslabel->color;
+                } else {
+                    $colors_array[] = $default_color[$default_color_count];
+                    $default_color_count++;
                 }
             }
         }
 
         
-        $colors_array = array_merge($colors, Helper::chartColors());
+        $colors_array = array_merge($colors_array, Helper::chartColors());
 
         $result= [
             "labels" => $labels,

From 6757df5a2dd276270199aa51dd02631507e33beb Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 10 Nov 2020 01:02:08 -0800
Subject: [PATCH 2/4] Added Checkout Date Time to Asset Details Page [ch1418]

---
 resources/views/hardware/view.blade.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index aa08c93937..121286459b 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -673,6 +673,19 @@
                                             </div>
                                         </div>
                                     @endif
+                                     @if ($asset->last_checkout!='')
+                                        <div class="row">
+                                            <div class="col-md-2">
+                                                <strong>
+                                                    {{ trans('admin/hardware/table.checkout_date') }}
+                                                </strong>
+                                            </div>
+                                            <div class="col-md-6">
+                                                {{ \App\Helpers\Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
+                                            </div>
+                                        </div>
+                                     @endif
+
 
 
                                     <div class="row">

From 178ed82dc4d0b18fd5c12b9833ce5c499e4d9984 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 10 Nov 2020 01:13:13 -0800
Subject: [PATCH 3/4] Fixed [ch9336] - Removed time stamp in Depreciation
 report

---
 resources/views/reports/depreciation.blade.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/views/reports/depreciation.blade.php b/resources/views/reports/depreciation.blade.php
index 63e61b218b..611a06887d 100644
--- a/resources/views/reports/depreciation.blade.php
+++ b/resources/views/reports/depreciation.blade.php
@@ -110,7 +110,9 @@
                   {{ $asset->defaultloc->name }}
                   @endif
                 </td>
-                <td>{{ $asset->purchase_date }}</td>
+                <td>
+                  {{ \Carbon\Carbon::parse($asset->purchase_date)->format('Y-m-d') }}
+                 </td>
 
                 <td>
                   @if ($asset->model->eol) {{ $asset->present()->eol_date() }}

From 8c19b11e73f0e0b7f1ec9462b37ae78dd422d795 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 10 Nov 2020 01:48:18 -0800
Subject: [PATCH 4/4] =?UTF-8?q?Fixed=20#8448=20-=20=E2=80=9Cundefined?=
 =?UTF-8?q?=E2=80=9D=20when=20testing=20email=20from=20quickstart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/vendor/mail/html/message.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
index c78d087451..7c1e696e47 100644
--- a/resources/views/vendor/mail/html/message.blade.php
+++ b/resources/views/vendor/mail/html/message.blade.php
@@ -2,7 +2,7 @@
 {{-- Header --}}
 @slot('header')
 @component('mail::header', ['url' => config('app.url')])
-@if (($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted()))
+@if (isset($snipeSettings) && ($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted()))
 
 @if ($snipeSettings->brand == '3')
 @if ($snipeSettings->logo!='')