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, 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 @@ @endif + @if ($asset->last_checkout!='') +
+
+ + {{ trans('admin/hardware/table.checkout_date') }} + +
+
+ {{ \App\Helpers\Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }} +
+
+ @endif +
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 - {{ $asset->purchase_date }} + + {{ \Carbon\Carbon::parse($asset->purchase_date)->format('Y-m-d') }} + @if ($asset->model->eol) {{ $asset->present()->eol_date() }} 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!='')