DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2020-11-10 01:59:18 -08:00
parent 9e319e91d6 8c19b11e73
commit c607d89817
4 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Http/Controllers/Api/StatuslabelsController.php
View file

@ -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,

13
resources/views/hardware/view.blade.php
View file

@ -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">

4
resources/views/reports/depreciation.blade.php
View file

@ -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() }}

2
resources/views/vendor/mail/html/message.blade.php vendored
View file

@ -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!='')