Skip to content

A free open source IT asset/license management system

First stab

snipe53c090fd6c5b
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 682a84a1b0..30084b4dde 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -16,6 +16,8 @@ class IconHelper
return 'fas fa-pencil-alt';
case 'clone':
return 'far fa-clone';
+ case 'upload':
+ return 'fa-solid fa-file-circle-plus';
case 'delete':
case 'upload deleted':
return 'fas fa-trash';
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index e6481f910e..1b807f46cb 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -243,7 +243,7 @@ class Accessory extends SnipeModel
*
* @return string
*/
- public function getImageUrl()
+ public function getImageUrl($path = null)
{
if ($this->image) {
return Storage::disk('public')->url(app('accessories_upload_path').$this->image);
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index e85d205644..c469123478 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -410,6 +410,15 @@ class Asset extends Depreciable
);
}
+
+ public function isDeletable()
+ {
+
+ return Gate::allows('delete', $this)
+ && ($this->deleted_at == '');
+ }
+
+
/**
* Establishes the asset -> company relationship
*
@@ -819,7 +828,7 @@ class Asset extends Depreciable
*
* @return string | false
*/
- public function getImageUrl()
+ public function getImageUrl($path = null)
{
if ($this->image && ! empty($this->image)) {
return Storage::disk('public')->url(app('assets_upload_path').e($this->image));
diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php
index 2647c3662c..dba7bbe027 100755
--- a/app/Models/AssetModel.php
+++ b/app/Models/AssetModel.php
@@ -228,7 +228,7 @@ class AssetModel extends SnipeModel
*
* @return Relation
*/
- public function getImageUrl()
+ public function getImageUrl($path = null)
{
if ($this->image) {
return Storage::disk('public')->url(app('models_upload_path').$this->image);
diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php
index 9019f7718d..8f3856e767 100644
--- a/app/Models/Consumable.php
+++ b/app/Models/Consumable.php
@@ -248,7 +248,7 @@ class Consumable extends SnipeModel
*
* @return string | false
*/
- public function getImageUrl()
+ public function getImageUrl($path = null)
{
// If there is a consumable image, use that
if ($this->image) {
diff --git a/app/Models/Maintenance.php b/app/Models/Maintenance.php
index 307f507af8..42cf1b5043 100644
--- a/app/Models/Maintenance.php
+++ b/app/Models/Maintenance.php
@@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Storage;
use Watson\Validating\ValidatingTrait;
/**
@@ -161,6 +162,7 @@ class Maintenance extends SnipeModel implements ICompanyableChild
}
$this->attributes['completion_date'] = $value;
}
+
/**
* asset
diff --git a/app/Models/SnipeModel.php b/app/Models/SnipeModel.php
index 18ee385486..691f6da229 100644
--- a/app/Models/SnipeModel.php
+++ b/app/Models/SnipeModel.php
@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Storage;
class SnipeModel extends Model
{
@@ -226,4 +227,26 @@ class SnipeModel extends Model
return null;
}
+
+ public function getImageUrl($path = null)
+ {
+ // If there is a consumable image, use that
+ if ($this->image) {
+ return Storage::disk('public')->url($path . $this->image);
+ }
+ return false;
+ }
+
+ public function showCheckoutButton($item)
+ {
+ if ((method_exists($item, 'numRemaining')) && ($item->numRemaining() > 0)) {
+ return true;
+ }
+
+ if ((method_exists($item, 'availableForCheckout')) && ($item->deleted_at == '')) {
+ return true;
+ }
+
+ return false;
+ }
}
diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php
index 187026bfaf..2877c8b494 100644
--- a/app/Providers/SettingsServiceProvider.php
+++ b/app/Providers/SettingsServiceProvider.php
@@ -188,6 +188,10 @@ class SettingsServiceProvider extends ServiceProvider
return 'maintenances/';
});
+ app()->singleton('maintenances_upload_path', function () {
+ return 'maintenances/';
+ });
+
// Set the monetary locale to the configured locale to make helper::parseFloat work.
setlocale(LC_MONETARY, config('app.locale'));
setlocale(LC_NUMERIC, config('app.locale'));
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 63d3ff8b55..02f2629c00 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -559,6 +559,8 @@ return [
'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
'error_assets_already_checked_out' => 'One or more of the assets are already checked out',
'assigned_assets_removed' => 'The following were removed from the selected assets because they are already checked out',
+ 'upload_files' => 'Upload Files',
+ 'Uploaded Files' => 'Uploaded Files',
'importer' => [
'checked_out_to_fullname' => 'Checked Out to: Full Name',
'checked_out_to_first_name' => 'Checked Out to: First Name',
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index b199a2ef2c..008b8fe5d0 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -27,57 +27,51 @@
<x-tabs.checkedout-tab :item="$accessory" count="{{ $accessory->checkouts_count }}" />
<x-tabs.files-tab count="{{ $accessory->uploads()->count() }}" />
<x-tabs.history-tab model="\App\Models\Accessory::class"/>
+ <x-tabs.upload-tab :item="$accessory"/>
+ </x-slot:tabnav>
- @can('update', $accessory)
- <x-tabs.nav-item-upload />
- @endcan
-
- <x-slot:tabpanes>
-
- <!-- start assigned tab pane -->
- <x-tabs.pane name="assigned" class="in active">
- <x-slot:table_header>
- {{ trans('general.checked_out') }}
- </x-slot:table_header>
-
- <x-table
- api_url="{{ route('api.accessories.checkedout', $accessory->id) }}"
- :presenter="\App\Presenters\AccessoryPresenter::assignedDataTableLayout()"
- export_filename="export-{{ str_slug($accessory->name) }}-assets-{{ date('Y-m-d') }}"
- />
-
- </x-tabs.pane>
- <!-- end assigned tab pane -->
-
- <!-- start history tab pane -->
- <x-tabs.pane name="history">
- <x-slot:table_header>
- {{ trans('general.history') }}
- </x-slot:table_header>
-
- <x-table
- name="accessoryHistory"
- api_url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}"
- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"
- export_filename="export-accessory-{{ str_slug($accessory->name) }}-{{ date('Y-m-d') }}"
- />
-
+ <x-slot:tabpanes>
+
+ <!-- start assigned tab pane -->
+ <x-tabs.pane name="assigned">
+ <x-slot:table_header>
+ {{ trans('general.checked_out') }}
+ </x-slot:table_header>
+
+ <x-table
+ api_url="{{ route('api.accessories.checkedout', $accessory->id) }}"
+ :presenter="\App\Presenters\AccessoryPresenter::assignedDataTableLayout()"
+ export_filename="export-{{ str_slug($accessory->name) }}-assets-{{ date('Y-m-d') }}"
+ />
+
+ </x-tabs.pane>
+ <!-- end assigned tab pane -->
+
+ <!-- start history tab pane -->
+ <x-tabs.pane name="history">
+ <x-slot:table_header>
+ {{ trans('general.history') }}
+ </x-slot:table_header>
+
+ <x-table
+ name="accessoryHistory"
+ api_url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}"
+ :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"
+ export_filename="export-accessory-{{ str_slug($accessory->name) }}-{{ date('Y-m-d') }}"
+ />
+
+ </x-tabs.pane>
+ <!-- end history tab pane -->
+
+ <!-- start files tab pane -->
+ @can('accessories.files', $accessory)
+ <x-tabs.pane name="files">
+ <x-table.files object_type="accessories" :object="$accessory"/>
</x-tabs.pane>
- <!-- end history tab pane -->
-
- <!-- start files tab pane -->
- @can('accessories.files', $accessory)
- <x-tabs.pane name="files">
- <x-table.files object_type="accessories" :object="$accessory"/>
- </x-tabs.pane>
- @endcan
- <!-- end files tab pane -->
-
-
-
- </x-slot:tabpanes>
+ @endcan
+ <!-- end files tab pane -->
+ </x-slot:tabpanes>
- </x-slot:tabnav>
</x-tabs>
</x-page-column>
diff --git a/resources/views/blade/box/info-panel.blade.php b/resources/views/blade/box/info-panel.blade.php
index 3ace037af2..f8bac1e32c 100644
--- a/resources/views/blade/box/info-panel.blade.php
+++ b/resources/views/blade/box/info-panel.blade.php
@@ -17,9 +17,9 @@
<div class="box-body box-profile">
- @if (($infoPanelObj->image) && ($img_path))
- <a href="{{ Storage::disk('public')->url($img_path.e($infoPanelObj->image)) }}" data-toggle="lightbox" data-type="image">
- <img src="{{ Storage::disk('public')->url($img_path.e($infoPanelObj->image)) }}" class="profile-user-img img-responsive img-thumbnail" alt="{{ $infoPanelObj->name }}" style="margin-bottom: 10px;">
+ @if (($img_path) && ($infoPanelObj->getImageUrl($img_path)))
+ <a href="{{ $infoPanelObj->getImageUrl() }}" data-toggle="lightbox" data-type="image">
+ <img src="{{ $infoPanelObj->getImageUrl() }}" class="profile-user-img img-responsive img-thumbnail" alt="{{ $infoPanelObj->name }}" style=" width: 100% !important; margin-bottom: 10px;">
</a>
<br>
@endif
@@ -300,8 +300,10 @@
({{ $infoPanelObj->depreciation->months.' '.trans('general.months')}})
</x-info-element>
- <x-info-element icon_type="depreciation-calendar" title="{{ trans('general.depreciates') }}">
+ <x-info-element icon_type="depreciation-calendar" title="{{ trans('admin/hardware/form.fully_depreciated') }}">
{{ Helper::getFormattedDateObject($infoPanelObj->depreciated_date(), 'date', false) }}
+ -
+ <span class="text-muted">{{ Carbon::parse($infoPanelObj->depreciated_date())->diffForHumans(['parts' => 2]) }}</span>
</x-info-element>
@endif
@@ -395,7 +397,8 @@
<x-info-element>
<x-icon type="calendar" class="fa-fw" title="{{ trans('general.purchase_date') }}" />
{{ trans('general.purchased_plain') }}
- {{ Helper::getFormattedDateObject($infoPanelObj->purchase_date, 'datetime', false) }}
+ {{ Helper::getFormattedDateObject($infoPanelObj->purchase_date, 'datetime', false) }} -
+ <span class="text-muted">{{ Carbon::parse($infoPanelObj->purchase_date)->diffForHumans(['parts' => 2]) }}</span>
</x-info-element>
@endif
diff --git a/resources/views/blade/button/audit.blade.php b/resources/views/blade/button/audit.blade.php
new file mode 100644
index 0000000000..e21025ec4b
--- /dev/null
+++ b/resources/views/blade/button/audit.blade.php
@@ -0,0 +1,16 @@
+@props([
+ 'item' => null,
+ 'route' => null,
+ 'wide' => false,
+])
+
+@can('audit', $item)
+ <span class="tooltip-wrapper"{!! (!$item->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
+ <a href="{{ $route }}" class="btn btn-sm btn-primary hidden-print{{ (!$item->model ? ' disabled' : '') }}" data-tooltip="true" title="{{ trans('general.audit') }}">
+ <x-icon type="audit" class="fa-fw"/>
+ @if ($wide=='true')
+ {{ trans('general.audit') }}
+ @endif
+ </a>
+ </span>
+@endcan
diff --git a/resources/views/blade/button/checkout.blade.php b/resources/views/blade/button/checkout.blade.php
index a1c69470de..1d7dcc2d35 100644
--- a/resources/views/blade/button/checkout.blade.php
+++ b/resources/views/blade/button/checkout.blade.php
@@ -6,14 +6,12 @@
])
@can('checkout', $item)
- @if ((method_exists($item, 'numRemaining')) && ($item->numRemaining() > 0))
+ @if ($item->showCheckoutButton($item))
<a href="{{ $route }}" class="btn btn-sm bg-maroon hidden-print" data-tooltip="true" data-placement="top" data-title="{{ trans('general.checkout') }}">
<x-icon type="checkout" class="fa-fw" />
-
@if ($wide=='true')
{{ trans('general.checkout') }}
@endif
</a>
@endif
-
@endcan
diff --git a/resources/views/blade/button/delete.blade.php b/resources/views/blade/button/delete.blade.php
index 7d37e38f6a..ae7440774f 100644
--- a/resources/views/blade/button/delete.blade.php
+++ b/resources/views/blade/button/delete.blade.php
@@ -10,11 +10,11 @@
<!-- start delete button component -->
@if ((method_exists($item, 'isDeletable')) && ($item->deleted_at==''))
@if (!$item->isDeletable())
- <button class="btn btn-sm btn-danger hidden-print disabled {{ ($wide=='true') ?? ' btn-block btn-social' }}" data-tooltip="true" data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}">
+ <button class="pull-right btn btn-sm btn-danger hidden-print disabled {{ ($wide=='true') ?? ' btn-block btn-social' }}" style="margin-right: 8px;" data-tooltip="true" data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}">
<x-icon type="delete" class="fa-fw" />
</button>
@else
- <button class="btn btn-sm btn-danger delete-asset{{ ($wide=='true') ?? ' btn-block btn-social' }}" data-toggle="modal" title="{{ trans('general.delete_what', ['item'=> trans('general.'.$type)]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $item->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-icon="fa fa-trash" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.'.$type)]) }}" onClick="return false;">
+ <button class="pull-right btn btn-sm btn-danger delete-asset{{ ($wide=='true') ?? ' btn-block btn-social' }}" style="margin-right: 8px;" data-toggle="modal" title="{{ trans('general.delete_what', ['item'=> trans('general.'.$type)]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $item->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-icon="fa fa-trash" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.'.$type)]) }}" onClick="return false;">
<x-icon type="delete" class="fa-fw" />
</button>
@endif
diff --git a/resources/views/blade/button/info-panel-toggle.blade.php b/resources/views/blade/button/info-panel-toggle.blade.php
new file mode 100644
index 0000000000..02d53e026f
--- /dev/null
+++ b/resources/views/blade/button/info-panel-toggle.blade.php
@@ -0,0 +1 @@
+<i class="fa-regular fa-2x fa-square-caret-right pull-right" id="expand-info-panel-button" data-tooltip="true" title="{{ trans('button.show_hide_info') }}"></i>
\ No newline at end of file
diff --git a/resources/views/blade/button/label.blade.php b/resources/views/blade/button/label.blade.php
new file mode 100644
index 0000000000..9f4b8b968c
--- /dev/null
+++ b/resources/views/blade/button/label.blade.php
@@ -0,0 +1,18 @@
+@props([
+ 'item' => null,
+ 'wide' => false,
+ 'route' => null,
+])
+
+<form method="POST" action="{{ $route }}" accept-charset="UTF-8" class="form-inline" target="_blank" id="bulkForm" style="display: inline;">
+ @csrf
+ <input type="hidden" name="bulk_actions" value="labels"/>
+ <input type="hidden" name="ids[{{$item->id}}]" value="{{ $item->id }}"/>
+ <button class="btn btn-sm btn-default hidden-print{{ ($wide=='true') ?? ' btn-block btn-social' }}" id="bulkEdit" {{ (!$item->model ? ' disabled' : '') }} data-tooltip="true" title="{!! (!$item->model ? ' '.trans('admin/hardware/general.model_invalid').'"' : trans_choice('button.generate_labels', 1)) !!}">
+ <x-icon type="assets" class="fa-fw"/>
+ @if ($wide=='true')
+ {{ trans_choice('button.generate_labels', 1) }}
+ @endif
+
+ </button>
+</form>
\ No newline at end of file
diff --git a/resources/views/blade/button/note.blade.php b/resources/views/blade/button/note.blade.php
new file mode 100644
index 0000000000..e09c504458
--- /dev/null
+++ b/resources/views/blade/button/note.blade.php
@@ -0,0 +1,18 @@
+@props([
+ 'item' => null,
+ 'route' => null,
+ 'wide' => false,
+])
+
+@can('update', $item)
+ <!-- start note button component -->
+ <a href="#" data-toggle="modal" data-target="#createNoteModal" class="btn btn-sm btn-theme hidden-print{{ ($wide=='true') ?? ' btn-block btn-social' }}" data-tooltip="true" data-placement="top" data-title="{{ trans('general.add_note') }}">
+ <x-icon type="note" class="fa-fw"/>
+
+ @if ($wide=='true')
+ {{ trans('general.add_note') }}
+ @endif
+
+ </a>
+ <!-- end note button component -->
+@endcan
diff --git a/resources/views/blade/data-row.blade.php b/resources/views/blade/data-row.blade.php
new file mode 100644
index 0000000000..08dcbdfdef
--- /dev/null
+++ b/resources/views/blade/data-row.blade.php
@@ -0,0 +1,13 @@
+@props([
+ 'label',
+ 'copy_what',
+])
+
+@if (!$slot->isEmpty())
+ <dt>
+ {{ $label }}
+ </dt>
+ <dd>
+ <x-copy-to-clipboard copy_what="{{ $copy_what }}" class="pull-right">{{ $slot }}</x-copy-to-clipboard>
+ </dd>
+@endif
\ No newline at end of file
diff --git a/resources/views/blade/page-data.blade.php b/resources/views/blade/page-data.blade.php
new file mode 100644
index 0000000000..db2228b029
--- /dev/null
+++ b/resources/views/blade/page-data.blade.php
@@ -0,0 +1,8 @@
+<div class="row">
+ <div class="col-md-12">
+
+ <dl class="table-display">
+ {{ $slot }}
+ </dl>
+ </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/blade/tabs/files-tab.blade.php b/resources/views/blade/tabs/files-tab.blade.php
index 8c96881773..0893254258 100644
--- a/resources/views/blade/tabs/files-tab.blade.php
+++ b/resources/views/blade/tabs/files-tab.blade.php
@@ -9,4 +9,5 @@
icon_type="files"
label="{{ trans('general.files') }}"
count="{{ $count }}"
+ tooltip="{{ trans('general.files') }}"
/>
\ No newline at end of file
diff --git a/resources/views/blade/tabs/index.blade.php b/resources/views/blade/tabs/index.blade.php
index d4e5437ab9..68ee27e87a 100644
--- a/resources/views/blade/tabs/index.blade.php
+++ b/resources/views/blade/tabs/index.blade.php
@@ -1,12 +1,21 @@
+@props([
+ 'tabnav',
+ 'tabpanes',
+])
+
<!-- start tab container -->
<div class="nav-tabs-custom">
<ul class="nav nav-tabs hidden-print">
+ @if (!$tabnav->isEmpty())
{{ $tabnav }}
+ @endif
</ul>
<div class="tab-content">
- {{ $tabpanes }}
+ @if (!$tabpanes->isEmpty())
+ {{ $tabpanes }}
+ @endif
</div>
diff --git a/resources/views/blade/tabs/model-files-tab.blade.php b/resources/views/blade/tabs/model-files-tab.blade.php
new file mode 100644
index 0000000000..3e69bda183
--- /dev/null
+++ b/resources/views/blade/tabs/model-files-tab.blade.php
@@ -0,0 +1,13 @@
+@props([
+ 'count' => null,
+ 'class' => false,
+])
+
+<x-tabs.nav-item
+ :$class
+ name="files"
+ icon_type="more-files"
+ label="{{ trans('general.additional_files') }}"
+ count="{{ $count }}"
+ tooltip="{{ trans('general.additional_files') }}"
+/>
\ No newline at end of file
diff --git a/resources/views/blade/tabs/nav-item-upload.blade.php b/resources/views/blade/tabs/nav-item-upload.blade.php
deleted file mode 100644
index 096b2ecca2..0000000000
--- a/resources/views/blade/tabs/nav-item-upload.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<li class="pull-right">
- <a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <x-icon type="paperclip" />
- {{ trans('button.upload') }}
- </a>
-</li>
\ No newline at end of file
diff --git a/resources/views/blade/tabs/nav-item.blade.php b/resources/views/blade/tabs/nav-item.blade.php
index 8507465f2c..48d64fe722 100644
--- a/resources/views/blade/tabs/nav-item.blade.php
+++ b/resources/views/blade/tabs/nav-item.blade.php
@@ -11,7 +11,7 @@
<!-- start tab nav item -->
<li {{ $attributes->merge(['class' => 'snipetab']) }}>
- <a href="#{{ $name ?? 'info' }}" data-toggle="tab" data-tooltip="true" title="{{ $tooltip ?? $label }}">
+ <a href="#{{ $name ?? 'details' }}" data-toggle="tab" data-tooltip="true" title="{{ $tooltip ?? $label }}">
@if ($icon_type || $icon)
diff --git a/resources/views/blade/tabs/upload-tab.blade.php b/resources/views/blade/tabs/upload-tab.blade.php
new file mode 100644
index 0000000000..013932637e
--- /dev/null
+++ b/resources/views/blade/tabs/upload-tab.blade.php
@@ -0,0 +1,11 @@
+@props([
+ 'item',
+])
+
+@can('update', $item)
+ <li class="pull-right">
+ <a href="#" data-toggle="modal" data-target="#uploadFileModal" data-tooltip="true" data-placement="top" data-title="{{ trans('general.upload_files') }}">
+ <x-icon type="paperclip" style="font-size: 16px"/>
+ </a>
+</li>
+@endcan
\ No newline at end of file
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index 3b1d866106..360194370b 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -26,10 +26,7 @@
<x-tabs.files-tab count="{{ $snipe_component->uploads()->count() }}" />
<x-tabs.history-tab model="\App\Models\Component::class"/>
-
- @can('update', $snipe_component)
- <x-tabs.nav-item-upload />
- @endcan
+ <x-tabs.upload-tab :item="$snipe_component"/>
</x-slot:tabnav>
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index 525b85ef2d..d9ff8cf659 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -29,12 +29,8 @@
/>
<x-tabs.files-tab count="{{ $consumable->uploads()->count() }}" />
-
<x-tabs.history-tab model="\App\Models\Consumable::class"/>
-
- @can('update', $consumable)
- <x-tabs.nav-item-upload />
- @endcan
+ <x-tabs.upload-tab :item="$consumable"/>
</x-slot:tabnav>
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 7c1939b805..de96c042e5 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -6,1403 +6,134 @@
@parent
@stop
+@section('header_right')
+ <x-button.info-panel-toggle/>
+@endsection
+
{{-- Page content --}}
@section('content')
-
- <div class="row">
-
- @if (!$asset->model)
- <div class="col-md-12">
- <div class="callout callout-danger">
- <p><strong>{{ trans('admin/models/message.no_association') }}</strong> {{ trans('admin/models/message.no_association_fix') }}</p>
- </div>
- </div>
- @endif
-
- @if ($asset->checkInvalidNextAuditDate())
- <div class="col-md-12">
- <div class="callout callout-warning">
- <p><strong>{{ trans('general.warning',
- [
- 'warning' => trans('admin/hardware/message.warning_audit_date_mismatch',
- [
- 'last_audit_date' => Helper::getFormattedDateObject($asset->last_audit_date, 'datetime', false),
- 'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date, 'date', false)
- ]
- )
- ]
- ) }}</strong></p>
- </div>
- </div>
- @endif
-
- @if ($asset->deleted_at!='')
- <div class="col-md-12">
- <div class="callout callout-warning">
- <x-icon type="warning" />
- {{ trans('general.asset_deleted_warning') }}
- </div>
- </div>
- @endif
-
- <div class="col-md-12">
- <div class="nav-tabs-custom">
- <ul class="nav nav-tabs hidden-print">
-
- <li class="active">
- <a href="#details" data-toggle="tab">
- <span class="hidden-lg hidden-md">
- <x-icon type="info-circle" class="fa-2x" />
- </span>
- <span class="hidden-xs hidden-sm">
- {{ trans('admin/users/general.info') }}
- </span>
- </a>
- </li>
-
- <li>
- <a href="#software" data-toggle="tab">
- <span class="hidden-lg hidden-md">
- <x-icon type="licenses" class="fa-2x" />
- </span>
- <span class="hidden-xs hidden-sm">
- {{ trans('general.licenses') }}
- </span>
- {!! ($asset->licenses->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->licenses->count()).'</span>' : '' !!}
-
- </a>
- </li>
-
- <li>
- <a href="#components" data-toggle="tab">
- <span class="hidden-lg hidden-md">
- <x-icon type="components" class="fa-2x" />
- </span>
- <span class="hidden-xs hidden-sm">
- {{ trans('general.components') }}
- </span>
- {!! ($asset->components->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->components->count()).'</span>' : '' !!}
-
- </a>
- </li>
-
- <li>
- <a href="#assets" data-toggle="tab">
- <span class="hidden-lg hidden-md">
- <x-icon type="assets" class="fa-2x" />
- </span>
- <span class="hidden-xs hidden-sm">
- {{ trans('general.assets') }}
- </span>
- {!! ($asset->assignedAssets()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAssets()->count()).'</span>' : '' !!}
-
- </a>
- </li>
-
- @if ($asset->assignedAccessories->count() > 0)
- <li>
- <a href="#accessories_assigned" data-toggle="tab" data-tooltip="true">
- <span class="hidden-lg hidden-md">
- <i class="fas fa-keyboard fa-2x"></i>
- </span>
- <span class="hidden-xs hidden-sm">
- {{ trans('general.accessories_assigned') }}
- </span>
- {!! ($asset->assignedAccessories()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAccessories()->count()).'</span>' : '' !!}
- </a>
- </li>
- @endif
-
-
- @if ($asset->audits->count() > 0)
- <li>
- <a href="#audits" data-toggle="tab" data-tooltip="true">
- <span class="hidden-lg hidden-md">
- <i class="fas fa-clipboard-check fa-2x"></i>
- </span>
- <span class="hidden-xs hidden-sm">
- {{ trans('general.audits') }}
- </span>
- {!! ($asset->audits()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->audits()->count()).'</span>' : '' !!}
- </a>
- </li>
- @endif
-
- <li>
- <a href="#history" data-toggle="tab">
- <span class="hidden-lg hidden-md">
- <x-icon type="history" class="fa-2x "/>
- </span>
- <span class="hidden-xs hidden-sm">{{ trans('general.history') }}
- </span>
- </a>
- </li>
-
- <li>
- <a href="#maintenances" data-toggle="tab">
- <span class="hidden-lg hidden-md">
- <x-icon type="maintenances" class="fa-2x" />
- </span>
- <span class="hidden-xs hidden-sm">
- {{ trans('general.maintenances') }}
- </span>
- {!! ($asset->maintenances()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->maintenances()->count()).'</span>' : '' !!}
- </a>
- </li>
-
- <li>
- <a href="#files" data-toggle="tab">
- <span class="hidden-lg hidden-md">
- <x-icon type="files" class="fa-2x" />
- </span>
- <span class="hidden-xs hidden-sm">
- {{ trans('general.files') }}
- </span>
- {!! ($asset->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->uploads->count()).'</span>' : '' !!}
- </a>
- </li>
-
- @can('view', $asset->model)
- <li>
- <a href="#modelfiles" data-toggle="tab">
- <span class="hidden-lg hidden-md">
- <x-icon type="more-files" class="fa-2x" />
- </span>
- <span class="hidden-xs hidden-sm">
- {{ trans('general.additional_files') }}
- </span>
- {!! ($asset->model) && ($asset->model->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->model->uploads->count()).'</span>' : '' !!}
- </a>
- </li>
- @endcan
-
-
- @can('update', \App\Models\Asset::class)
- <li class="pull-right">
- <a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <span class="hidden-lg hidden-xl hidden-md">
- <x-icon type="paperclip" class="fa-2x" />
- </span>
- <span class="hidden-xs hidden-sm">
- <x-icon type="paperclip" />
- {{ trans('button.upload') }}
- </span>
- </a>
- </li>
- @endcan
-
- </ul>
-
- <div class="tab-content">
- <div class="tab-pane fade in active" id="details">
- <div class="row">
-
- <div class="info-stack-container">
- <!-- Start button column -->
- <div class="col-md-3 col-xs-12 col-sm-push-9 info-stack">
-
- <div class="col-md-12 text-center">
- @if (($asset->image) || (($asset->model) && ($asset->model->image!='')))
- <div class="text-center col-md-12" style="padding-bottom: 15px;">
- <a href="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" data-toggle="lightbox" data-type="image">
- <img src="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
- </a>
- </div>
- @else
- <!-- generic image goes here -->
- @endif
- </div>
-
-
- @if ($asset->deleted_at=='')
- @can('update', $asset)
- <div class="col-md-12 hidden-print" style="padding-top: 5px;">
- <a href="{{ route('hardware.edit', $asset) }}" class="btn btn-sm btn-warning btn-social btn-block hidden-print">
- <x-icon type="edit" />
- {{ trans('admin/hardware/general.edit') }}
- </a>
- </div>
- @endcan
-
-
- @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
- @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
- @can('checkin', $asset)
- <div class="col-md-12 hidden-print" style="padding-top: 5px;">
- <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
- <a role="button" href="{{ route('hardware.checkin.create', $asset->id) }}" class="btn btn-sm btn-theme bg-purple btn-social btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
- <x-icon type="checkin" />
- {{ trans('admin/hardware/general.checkin') }}
- </a>
- </span>
- </div>
- @endcan
- @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
- @can('checkout', $asset)
- <div class="col-md-12 hidden-print" style="padding-top: 5px;">
- <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
- <a href="{{ route('hardware.checkout.create', $asset->id) }}" class="btn btn-sm bg-maroon btn-social btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
- <x-icon type="checkout" />
- {{ trans('admin/hardware/general.checkout') }}
- </a>
- </span>
- </div>
- @endcan
+ <style>
+ .main-panel-content {
+ line-height: 20px;
+ border-bottom: var(--tab-bottom-border);
+ padding: 10px 15px;
+ }
+
+
+
+
+ /* table */
+
+ dl.table-display {
+ float: left;
+ width: 100%;
+ margin: 1em 0;
+ padding: 0;
+ }
+
+ .table-display dt {
+ clear: left;
+ float: left;
+ text-align: right;
+ width: 20%;
+ margin: 0;
+ padding: 10px;
+ border-top: var(--tab-bottom-border);
+ font-weight: bold;
+ }
+
+ .table-display dd {
+ float: left;
+ width: 80%;
+ margin: 0;
+ padding: 10px;
+ border-top: var(--tab-bottom-border);
+ }
+
+
+ .table-display dd:first-of-type, .table-display dt:first-of-type {
+ border-top: 0 !important;
+ }
+
+ </style>
+ <x-container columns="2">
+ <x-page-column class="col-md-9 main-panel">
+
+ <x-tabs>
+ <x-slot:tabnav>
+ <x-tabs.details-tab/>
+ <x-tabs.license-tab count="{{ $asset->licenses->count() }}"/>
+ <x-tabs.component-tab count="{{ $asset->components->count() }}"/>
+ <x-tabs.asset-tab count="{{ $asset->assignedAssets()->AssetsForShow()->count() }}"/>
+ <x-tabs.maintenance-tab count="{{ $asset->maintenances->count() }}"/>
+ <x-tabs.files-tab count="{{ $asset->uploads()->count() }}"/>
+ <x-tabs.model-files-tab count="{{ $asset->model->uploads()->count() }}"/>
+ <x-tabs.history-tab model="\App\Models\Asset::class"/>
+ <x-tabs.upload-tab :item="$asset"/>
+ </x-slot:tabnav>
+
+ <x-slot:tabpanes>
+ <x-tabs.pane name="details">
+
+ <x-page-data>
+ <x-data-row :label="trans('admin/hardware/form.tag')" copy_what="asset_tag">
+ {{ $asset->asset_tag }}
+ </x-data-row>
+ <x-data-row :label="trans('admin/hardware/form.name')" copy_what="asset_name">
+ {{ $asset->name }}
+ </x-data-row>
+ <x-data-row :label="trans('general.last_audit')" copy_what="audit_date">
+ @if ((isset($audit_log)) && ($audit_log->created_at))
+ {!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
+ {{ Helper::getFormattedDateObject($audit_log->created_at, 'datetime', false) }}
+ @if ($audit_log->user)
+ -
+ <a href="{{ route('users.show', $audit_log->user->id) }}">{{ $audit_log->user->display_name }}</a>
@endif
@endif
+ </x-data-row>
- <!-- Add notes -->
- @can('update', \App\Models\Asset::class)
- <div class="col-md-12 hidden-print" style="padding-top: 5px;">
- <a href="#" style="width: 100%" data-toggle="modal" data-target="#createNoteModal" class="btn btn-sm btn-theme btn-block btn-social hidden-print">
- <x-icon type="note" />
- {{ trans('general.add_note') }}
- </a>
- @include ('modals.add-note', ['type' => 'asset', 'id' => $asset->id])
- </div>
- @endcan
-
-
-
-
- @can('audit', \App\Models\Asset::class)
- <div class="col-md-12 hidden-print" style="padding-top: 5px;">
- <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
- <a href="{{ route('asset.audit.create', $asset->id) }}" class="btn btn-sm btn-primary btn-block btn-social hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
- <x-icon type="audit" />
- {{ trans('general.audit') }}
- </a>
- </span>
- </div>
- @endcan
- @endif
-
- @can('create', $asset)
- <div class="col-md-12 hidden-print" style="padding-top: 5px;">
- <a href="{{ route('clone/hardware', $asset->id) }}" class="btn btn-sm btn-info btn-block btn-social hidden-print">
- <x-icon type="clone" />
- {{ trans('admin/hardware/general.clone') }}
- </a>
- </div>
- @endcan
-
- <div class="col-md-12 hidden-print" style="padding-top: 5px;">
- <form
- method="POST"
- action="{{ route('hardware.bulkedit.show') }}"
- accept-charset="UTF-8"
- class="form-inline"
- target="_blank"
- id="bulkForm"
- >
- @csrf
- <input type="hidden" name="bulk_actions" value="labels" />
- <input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
- <button class="btn btn-block btn-social btn-sm btn-default" id="bulkEdit"{{ (!$asset->model ? ' disabled' : '') }}{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid').'"' : '') !!}>
- <x-icon type="assets" />
- {{ trans_choice('button.generate_labels', 1) }}</button>
- </form>
- </div>
-
- @can('delete', $asset)
- <div class="col-md-12 hidden-print" style="padding-top: 30px; padding-bottom: 30px;">
-
- @if ($asset->deleted_at=='')
- <button class="btn btn-sm btn-block btn-danger btn-social delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $asset->asset_tag]) }}" data-target="#dataConfirmModal">
-
- <x-icon type="delete" />
- @if ($asset->assignedTo)
- {{ trans('general.checkin_and_delete') }}
- @else
- {{ trans('general.delete') }}
- @endif
- </button>
- <span class="sr-only">{{ trans('general.delete') }}</span>
- @else
- <form method="POST" action="{{ route('restore/hardware', [$asset]) }}">
- @csrf
- <button class="btn btn-sm btn-block btn-warning btn-social">
- <x-icon type="restore" />
- {{ trans('general.restore') }}
- </button>
- </form>
- @endif
- </div>
- @endcan
-
- @if (($asset->assignedTo) && ($asset->deleted_at==''))
- <div class="col-md-12" style="text-align: left">
- <h2>
- {{ trans('admin/hardware/form.checkedout_to') }}
- <x-icon type="long-arrow-right" />
- </h2>
-
- <ul class="list-unstyled" style="line-height: 25px; font-size: 14px">
-
- @if (($asset->checkedOutToUser()) && ($asset->assignedTo->present()->gravatar()))
- <li>
- <img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline hidden-print" alt="{{ $asset->assignedTo->display_name }}">
- {!! $asset->assignedTo->present()->nameUrl() !!}
- </li>
- @else
- <li>
- <x-icon type="{{ $asset->assignedType() }}" class="fa-fw" />
- {!! $asset->assignedTo->present()->nameUrl() !!}
- </li>
- @endif
-
-
- @if ((isset($asset->assignedTo->employee_num)) && ($asset->assignedTo->employee_num!=''))
- <li>
- <x-icon type="employee_num" class="fa-fw"/>
- {{ $asset->assignedTo->employee_num }}
- </li>
- @endif
- @if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
- <li>
- <x-icon type="email" class="fa-fw" />
- <a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a>
- </li>
- @endif
-
- @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
- <li>
- <x-icon type="phone" class="fa-fw" />
- <a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
- </li>
- @endif
-
- @if((isset($asset->assignedTo)) && ($asset->assignedTo->department))
- <li>
- <x-icon type="department" class="fa-fw" />
- {{ $asset->assignedTo->department->name}}</li>
- @endif
-
- @if (isset($asset->location))
- <li>
- <x-icon type="locations" class="fa-fw" />
- {{ $asset->location->parent?->name }}
- @if ($asset->location->parent)
- <i class="fas fa-long-arrow-alt-right" aria-hidden="true"></i>
- @endif
- {!! $asset->location->present()->formattedNameLink !!}
- </li>
- <li>{{ $asset->location->address }}
- @if ($asset->location->address2!='')
- {{ $asset->location->address2 }}
- @endif
- </li>
-
- <li>{{ $asset->location->city }}
- @if (($asset->location->city!='') && ($asset->location->state!=''))
- ,
- @endif
- {{ $asset->location->state }} {{ $asset->location->zip }}
- </li>
- @endif
- <li>
- <x-icon type="calendar" class="fa-fw" />
- {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}
- </li>
- @if (isset($asset->expected_checkin))
- <li>
- <x-icon type="calendar" class="fa-fw" />
- {{ trans('general.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
- </li>
- @endif
- </ul>
- </div>
- @endif
- @if (($snipeSettings->qr_code=='1') || $snipeSettings->label2_2d_type!='none')
- <div class="col-md-12 text-center asset-qr-img" style="padding-top: 15px;">
- <img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail" style="height: 150px; width: 150px; margin-right: 10px;" alt="QR code for {{ $asset->getDisplayNameAttribute() }}">
- </div>
- @endif
- <br><br>
- </div>
-
-
-
-
- <!-- End button column -->
-
- <div class="col-md-9 col-xs-12 col-sm-pull-3 info-stack">
-
- <div class="row-new-striped">
-
- @if ($asset->asset_tag)
- <div class="row">
- <div class="col-md-3">
- <strong>{{ trans('admin/hardware/form.tag') }}</strong>
- </div>
- <div class="col-md-9">
- <x-copy-to-clipboard copy_what="assettag">{{ $asset->asset_tag }}</x-copy-to-clipboard>
- </div>
- </div>
- @endif
-
-
- @if ($asset->deleted_at!='')
- <div class="row">
- <div class="col-md-3">
- <span class="text-danger"><strong>{{ trans('general.deleted') }}</strong></span>
- </div>
- <div class="col-md-9">
- {{ \App\Helpers\Helper::getFormattedDateObject($asset->deleted_at, 'date', false) }}
-
- </div>
- </div>
- @endif
-
-
-
- <x-info-element.status :infoObject="$asset" />
-
-
- @if ($asset->company)
- <div class="row">
- <div class="col-md-3">
- <strong>{{ trans('general.company') }}</strong>
- </div>
- <div class="col-md-9">
- {!! $asset->company->present()->formattedNameLink !!}
- </div>
- </div>
- @endif
-
- @if ($asset->name)
- <div class="row">
- <div class="col-md-3">
- <strong>{{ trans('admin/hardware/form.name') }}</strong>
- </div>
- <div class="col-md-9">
- <x-copy-to-clipboard copy_what="assetname">
- {{ $asset->name }}
- </x-copy-to-clipboard>
-
- </div>
- </div>
- @endif
-
- @if ($asset->serial)
- <div class="row">
- <div class="col-md-3">
- <strong>{{ trans('admin/hardware/form.serial') }}</strong>
- </div>
- <div class="col-md-9">
- <x-copy-to-clipboard copy_what="serial">
- {{ $asset->serial }}
- </x-copy-to-clipboard>
- </div>
- </div>
- @endif
-
- @if ($asset->last_checkout!='')
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/table.checkout_date') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
- </div>
- </div>
- @endif
-
- @if ((isset($audit_log)) && ($audit_log->created_at))
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.last_audit') }}
- </strong>
- </div>
- <div class="col-md-9">
- {!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
- {{ Helper::getFormattedDateObject($audit_log->created_at, 'datetime', false) }}
- @if ($audit_log->user)
- (<a href="{{ route('users.show', $audit_log->user->id) }}">{{ $audit_log->user->display_name }}</a>)
- @endif
-
- </div>
- </div>
- @endif
-
- @if ($asset->next_audit_date)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.next_audit_date') }}
- </strong>
- </div>
- <div class="col-md-9">
- {!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
- {{ Helper::getFormattedDateObject($asset->next_audit_date, 'date', false) }}
- </div>
- </div>
- @endif
-
- @if (($asset->model) && ($asset->model->manufacturer))
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/form.manufacturer') }}
- </strong>
- </div>
- <div class="col-md-9">
- <ul class="list-unstyled">
-
- <li>
- <x-copy-to-clipboard copy_what="manufacturer">{!! $asset->model->manufacturer->present()->formattedNameLink !!}</x-copy-to-clipboard>
- </li>
-
- @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->url!=''))
- <li>
- <x-icon type="globe-us" />
- <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->url) }}" target="_blank">
- {{ $asset->present()->dynamicUrl($asset->model->manufacturer->url) }}
- <x-icon type="external-link" />
- </a>
- </li>
- @endif
-
- @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->support_url!=''))
- <li>
- <x-icon type="more-info" />
- <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}" target="_blank">
- {{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}
- <x-icon type="external-link" />
- </a>
- </li>
- @endif
-
- @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!=''))
- <li>
- <x-icon type="maintenances" />
- <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}" target="_blank">
- {{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}
-
- <x-icon type="external-link" />
- <span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
- </a>
- </li>
- @endif
-
- @if (($asset->model) && ($asset->model->manufacturer->support_phone))
- <li>
- <x-icon type="phone" />
- <a href="tel:{{ $asset->model->manufacturer->support_phone }}">
- {{ $asset->model->manufacturer->support_phone }}
- </a>
- </li>
- @endif
-
- @if (($asset->model) && ($asset->model->manufacturer->support_email))
- <li>
- <x-icon type="email" />
- <a href="mailto:{{ $asset->model->manufacturer->support_email }}">
- {{ $asset->model->manufacturer->support_email }}
- </a>
- </li>
- @endif
- </ul>
- </div>
- </div>
- @endif
-
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.category') }}
- </strong>
- </div>
- <div class="col-md-9">
- @if (($asset->model) && ($asset->model->category))
- <x-copy-to-clipboard copy_what="category">{!! $asset->model->category->present()->formattedNameLink !!}</x-copy-to-clipboard>
- @else
- Invalid category
- @endif
- </div>
- </div>
-
- @if ($asset->model)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/form.model') }}
- </strong>
- </div>
- <div class="col-md-9">
- @if ($asset->model)
- <x-copy-to-clipboard copy_what="model">{!! $asset->model->present()->formattedNameLink !!}</x-copy-to-clipboard>
-
- @endif
- </div>
- </div>
- @endif
-
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/models/table.modelnumber') }}
- </strong>
- </div>
- <div class="col-md-9">
- @if (($asset->model) && ($asset->model->model_number!=''))
- <x-copy-to-clipboard copy_what="model_number">{{ ($asset->model) ? $asset->model->model_number : ''}}</x-copy-to-clipboard>
- @endif
- </div>
- </div>
-
- <!-- byod -->
- <div class="row byod">
- <div class="col-md-3">
- <strong>{{ trans('general.byod') }}</strong>
- </div>
- <div class="col-md-9">
- {!! ($asset->byod=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times text-danger" aria-hidden="true"></i> '.trans('general.no') !!}
- </div>
- </div>
-
- <!-- requestable -->
- <div class="row">
- <div class="col-md-3">
- <strong>{{ trans('admin/hardware/general.requestable') }}</strong>
- </div>
- <div class="col-md-9">
- {!! ($asset->requestable=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times text-danger" aria-hidden="true"></i> '.trans('general.no') !!}
- </div>
- </div>
-
- @if (($asset->model) && ($asset->model->fieldset))
- @foreach($asset->model->fieldset->fields as $field)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ $field->name }}
- </strong>
- </div>
- <div class="col-md-9{{ (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) ? ' ellipsis': '' }}">
-
- @if (!empty($asset->{$field->db_column_name()}))
- <x-copy-to-clipboard copy_what="{{ $field->id }}">
- </x-copy-to-clipboard>
- {{-- Hidden span used as copy target --}}
- {{-- It's tempting to break out the HTML into separate lines for this, but it results in extra spaces being added onto the end of the copied value --}}
- @if (($field->field_encrypted=='1') && (Gate::allows('assets.view.encrypted_custom_fields')))
- <span class="js-copy-{{ $field->id }} visually-hidden hidden-print" style="font-size: 0px;">{{ ($field->isFieldDecryptable($asset->{$field->db_column_name()}) ? Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) : $asset->{$field->db_column_name()}) }}</span>
- @elseif (($field->field_encrypted=='1') && (Gate::denies('assets.view.encrypted_custom_fields')))
- <span class="js-copy-{{ $field->id }} visually-hidden hidden-print" style="font-size: 0px;">{{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}</span>
- @else
- <span class="js-copy-{{ $field->id }} visually-hidden hidden-print" style="font-size: 0px;">{{ $asset->{$field->db_column_name()} }}</span>
- @endif
-
-
- @endif
- @if (($field->field_encrypted=='1') && ($asset->{$field->db_column_name()}!='') && (Gate::allows('assets.view.encrypted_custom_fields')))
- <i class="fas fa-lock" data-tooltip="true" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}" onclick="showHideEncValue(this)" id="text-{{ $field->id }}"></i>
- @endif
-
- @if ($field->isFieldDecryptable($asset->{$field->db_column_name()} ))
- @can('assets.view.encrypted_custom_fields')
- @php
- $fieldSize = strlen(Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}))
- @endphp
- @if ($fieldSize > 0)
- <span id="text-{{ $field->id }}-to-hide">***********</span>
- @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
- <span class="js-copy-{{ $field->id }} hidden-print"
- id="text-{{ $field->id }}-to-show"
- style="font-size: 0px;">
- <a href="{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}"
- target="_new">{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}</a>
- </span>
- @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!=''))
- <span class="js-copy-{{ $field->id }} hidden-print"
- id="text-{{ $field->id }}-to-show"
- style="font-size: 0px;">{{ \App\Helpers\Helper::gracefulDecrypt($field, \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false)) }}</span>
- @else
- <span class="js-copy-{{ $field->id }} hidden-print"
- id="text-{{ $field->id }}-to-show"
- style="font-size: 0px;">{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}</span>
- @endif
- @endif
- @else
- {{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}
- @endcan
-
- @else
- @if (($field->format=='BOOLEAN') && ($asset->{$field->db_column_name()}!=''))
- {!! ($asset->{$field->db_column_name()} == 1) ? "<span class='fas fa-check-circle' style='color:green' />" : "<span class='fas fa-times-circle' style='color:red' />" !!}
- @elseif (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
- <a href="{{ $asset->{$field->db_column_name()} }}" target="_new">{{ $asset->{$field->db_column_name()} }}</a>
- @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!=''))
- {{ \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false) }}
- @else
- {!! nl2br(e($asset->{$field->db_column_name()})) !!}
- @endif
-
- @endif
-
- @if ($asset->{$field->db_column_name()}=='')
- &nbsp;
- @endif
- </div>
- </div>
- @endforeach
- @endif
-
-
- @if ($asset->purchase_date)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/form.date') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ Helper::getFormattedDateObject($asset->purchase_date, 'date', false) }}
- -
- {{ Carbon::parse($asset->purchase_date)->diffForHumans(['parts' => 3]) }}
-
- </div>
- </div>
- @endif
-
- @if ($asset->purchase_cost)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/form.cost') }}
- </strong>
- </div>
- <div class="col-md-9">
- <x-copy-to-clipboard copy_what="purchase_cost">
- @if (($asset->id) && ($asset->location))
- {{ $asset->location->currency }}
- @elseif (($asset->id) && ($asset->location))
- {{ $asset->location->currency }}
- @else
- {{ $snipeSettings->default_currency }}
- @endif
- {{ Helper::formatCurrencyOutput($asset->purchase_cost)}}
- </x-copy-to-clipboard>
-
- </div>
- </div>
- @endif
- @if(($asset->components->count() > 0) && ($asset->purchase_cost))
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/table.components_cost') }}
- </strong>
- </div>
- <div class="col-md-9">
- <x-copy-to-clipboard copy_what="component_cost">
- @if (($asset->id) && ($asset->location))
- {{ $asset->location->currency }}
- @elseif (($asset->id) && ($asset->location))
- {{ $asset->location->currency }}
- @else
- {{ $snipeSettings->default_currency }}
- @endif
- {{Helper::formatCurrencyOutput($asset->getComponentCost())}}
- </x-copy-to-clipboard>
- </div>
- </div>
- @endif
- @if (($asset->model) && ($asset->depreciation) && ($asset->purchase_date))
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/table.current_value') }}
- </strong>
- </div>
- <div class="col-md-9">
- <x-copy-to-clipboard copy_what="current_value">
- @if (($asset->id) && ($asset->location))
- {{ $asset->location->currency }}
- @elseif (($asset->id) && ($asset->location))
- {{ $asset->location->currency }}
- @else
- {{ $snipeSettings->default_currency }}
- @endif
- {{ Helper::formatCurrencyOutput($asset->getDepreciatedValue() )}}
- </x-copy-to-clipboard>
-
-
- </div>
- </div>
- @endif
- @if ($asset->order_number)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.order_number') }}
- </strong>
- </div>
- <div class="col-md-9">
- <x-copy-to-clipboard copy_what="order_number"><a href="{{ route('hardware.index', ['order_number' => $asset->order_number]) }}">{{ $asset->order_number }}</a></x-copy-to-clipboard>
- </div>
- </div>
- @endif
-
- @if ($asset->supplier)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.supplier') }}
- </strong>
- </div>
- <div class="col-md-9">
- <x-copy-to-clipboard copy_what="supplier">{!! $asset->supplier->present()->formattedNameLink !!}</x-copy-to-clipboard>
- </div>
- </div>
- @endif
-
-
- @if ($asset->warranty_months)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/form.warranty') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ trans_choice('general.months_plural', $asset->warranty_months) }}
- @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!=''))
- <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}" target="_blank">
- <x-icon type="external-link" />
- <span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
- </a>
- @endif
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/form.warranty_expires') }}
-
-
- </strong>
- </div>
- <div class="col-md-9">
- @if ($asset->purchase_date)
- {{ Helper::getFormattedDateObject($asset->present()->warranty_expires(), 'date', false) }}
- -
- {{ Carbon::parse($asset->present()->warranty_expires())->diffForHumans(['parts' => 3]) }}
-
- @if ($asset->purchase_date)
- {!! $asset->present()->warranty_expires() < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
- @endif
- @else
- {{ trans('general.na_no_purchase_date') }}
- @endif
- </div>
- </div>
-
- @endif
-
- @if (($asset->model) && ($asset->depreciation))
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.depreciation') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ $asset->depreciation->name }}
- ({{ trans_choice('general.months_plural', $asset->depreciation->months) }})
- </div>
- </div>
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/form.fully_depreciated') }}
- </strong>
- </div>
- <div class="col-md-9">
- @if ($asset->purchase_date)
- {{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }}
- -
- {{ Carbon::parse($asset->depreciated_date())->diffForHumans(['parts' => 3]) }}
- @else
- {{ trans('general.na_no_purchase_date') }}
- @endif
-
- </div>
- </div>
- @endif
-
- @if (($asset->asset_eol_date) && ($asset->purchase_date))
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/form.eol_rate') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true) }}
- {{ trans('admin/hardware/form.months') }}
-
- </div>
- </div>
- @endif
- @if ($asset->asset_eol_date)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/form.eol_date') }}
- @if ($asset->purchase_date)
- {!! $asset->asset_eol_date < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
- @endif
- </strong>
- </div>
- <div class="col-md-9">
- @if ($asset->asset_eol_date)
- {{ Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) }}
- -
- {{ Carbon::parse($asset->asset_eol_date)->locale(app()->getLocale())->diffForHumans(['parts' => 3]) }}
- @else
- {{ trans('general.na_no_purchase_date') }}
- @endif
- @if ($asset->eol_explicit =='1')
- <span data-tooltip="true"
- data-placement="top"
- data-title="Explicit EOL"
- title="Explicit EOL">
- <x-icon type="warning" class="text-primary" />
- </span>
- @endif
- </div>
- </div>
- @endif
-
-
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/form.notes') }}
- </strong>
- </div>
- <div class="col-md-9">
- {!! nl2br(Helper::parseEscapedMarkedownInline($asset->notes)) !!}
- </div>
- </div>
-
- @if ($asset->location)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.location') }}
- </strong>
- </div>
- <div class="col-md-9">
- <x-copy-to-clipboard copy_what="location">
- @can('superuser')
- <a href="{{ route('locations.show', ['location' => $asset->location->id]) }}">
- {{ $asset->location->name }}
- </a>
- @else
- {{ $asset->location->name }}
- @endcan
- </x-copy-to-clipboard>
- </div>
- </div>
- @endif
-
- @if ($asset->defaultLoc)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/form.default_location') }}
- </strong>
- </div>
- <div class="col-md-9">
- <x-copy-to-clipboard copy_what="default_location">
- @can('superuser')
- <a href="{{ route('locations.show', ['location' => $asset->defaultLoc->id]) }}">
- {{ $asset->defaultLoc->name }}
- </a>
- @else
- {{ $asset->defaultLoc->name }}
- @endcan
- </x-copy-to-clipboard>
- </div>
- </div>
- @endif
-
- @if ($asset->created_at!='')
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.created_at') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ Helper::getFormattedDateObject($asset->created_at, 'datetime', false) }}
- </div>
- </div>
- @endif
-
- @if ($asset->updated_at!='')
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.updated_at') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ Helper::getFormattedDateObject($asset->updated_at, 'datetime', false) }}
- </div>
- </div>
- @endif
-
- @if ($asset->expected_checkin!='')
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.expected_checkin') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
- </div>
- </div>
- @endif
-
-{{-- <div class="row">--}}
-{{-- <div class="col-md-3">--}}
-{{-- <strong>--}}
-{{-- {!! trans('general.first_checkout') !!}--}}
-{{-- </strong>--}}
-{{-- </div>--}}
-{{-- <div class="col-md-9">--}}
-{{-- {{ Helper::getFormattedDateObject($asset->first_checkout_at, 'datetime')['formatted'] ?? '' }}--}}
-{{-- </div>--}}
-{{-- </div>--}}
-
-
- @if ($asset->last_checkin!='')
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/hardware/table.last_checkin_date') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ Helper::getFormattedDateObject($asset->last_checkin, 'datetime', false) }}
- </div>
- </div>
- @endif
-
-
-
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.checkouts_count') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ ($asset->checkouts) ? (int) $asset->checkouts->count() : '0' }}
- </div>
- </div>
-
-
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.checkins_count') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ ($asset->checkins) ? (int) $asset->checkins->count() : '0' }}
- </div>
- </div>
-
-
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('general.user_requests_count') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }}
- </div>
- </div>
-
- </div> <!--/end striped container-->
- </div> <!-- end col-md-9 -->
- </div><!-- end info-stack-container -->
- </div> <!--/.row-->
- </div><!-- /.tab-pane -->
-
- <div class="tab-pane fade" id="software">
- <div class="row{{($asset->licenses->count() > 0 ) ? '' : ' hidden-print'}}">
- <div class="col-md-12">
- <!-- Licenses assets table -->
- <table class="table">
- <thead>
- <tr>
- <th>{{ trans('general.name') }}</th>
- <th><span class="line"></span>{{ trans('admin/licenses/form.license_key') }}</th>
- <th><span class="line"></span>{{ trans('admin/licenses/form.expiration') }}</th>
- <th><span class="line"></span>{{ trans('table.actions') }}</th>
- </tr>
- </thead>
- <tbody>
- @foreach ($asset->licenseseats as $seat)
- @if ($seat->license)
- <tr>
- <td><a href="{{ route('licenses.show', $seat->license->id) }}">{{ $seat->license->name }}</a></td>
- <td>
- @can('viewKeys', $seat->license)
- <code class="single-line"><span class="js-copy-link" data-clipboard-target=".js-copy-key-{{ $seat->id }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}"><span class="js-copy-key-{{ $seat->id }}">{{ $seat->license->serial }}</span></span></code>
- @else
- ------------
- @endcan
- </td>
- <td>
- {{ Helper::getFormattedDateObject($seat->license->expiration_date, 'date', false) }}
- </td>
- <td>
- <a href="{{ route('licenses.checkin', $seat->id) }}" class="btn btn-sm bg-purple hidden-print" data-tooltip="true">{{ trans('general.checkin') }}</a>
- </td>
- </tr>
- @endif
- @endforeach
- </tbody>
- </table>
- </div><!-- /col -->
- </div> <!-- row -->
- </div> <!-- /.tab-pane software -->
-
- <div class="tab-pane fade" id="components">
- <!-- checked out assets table -->
- <div class="row{{($asset->components->count() > 0 ) ? '' : ' hidden-print'}}">
- <div class="col-md-12">
-
- <table class="table table-striped">
- <thead>
- <th>{{ trans('general.name') }}</th>
- <th>{{ trans('general.qty') }}</th>
- <th>{{ trans('general.purchase_cost') }}</th>
- <th>{{trans('admin/hardware/form.serial')}}</th>
- <th>{{trans('general.checkin')}}</th>
- <th></th>
- </thead>
- <tbody>
- <?php $totalCost = 0; ?>
- @foreach ($asset->components as $component)
-
-
- @if (is_null($component->deleted_at))
- <tr>
- <td>
- <a href="{{ route('components.show', $component->id) }}">{{ $component->name }}</a>
- </td>
- <td>{{ $component->pivot->assigned_qty }}</td>
- <td>
- @if ($component->purchase_cost!='')
- {{ trans('general.cost_each', ['amount' => Helper::formatCurrencyOutput($component->purchase_cost)]) }}
- @endif
- </td>
- <td>{{ $component->serial }}</td>
- <td>
- <a href="{{ route('components.checkin.show', $component->pivot->id) }}" class="btn btn-sm bg-purple hidden-print" data-tooltip="true">{{ trans('general.checkin') }}</a>
- </td>
-
- <?php $totalCost = $totalCost + ($component->purchase_cost *$component->pivot->assigned_qty) ?>
- </tr>
- @endif
- @endforeach
- </tbody>
-
- <tfoot>
- <tr>
- <td colspan="2">
- </td>
- <td>{{ $totalCost }}</td>
- </tr>
- </tfoot>
- </table>
- </div>
- </div>
- </div> <!-- /.tab-pane components -->
-
-
- <div class="tab-pane fade" id="assets">
- <div class="row{{($asset->assignedAssets->count() > 0 ) ? '' : ' hidden-print'}}">
- <div class="col-md-12">
-
- @include('partials.asset-bulk-actions')
-
- <!-- checked out assets table -->
- <table
- data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
- data-show-columns-search="true"
- data-cookie-id-table="assetsTable"
- data-id-table="assetsTable"
- data-side-pagination="server"
- data-sort-order="asc"
- data-toolbar="#assetsBulkEditToolbar"
- data-bulk-button-id="#bulkAssetEditButton"
- data-bulk-form-id="#assetsBulkForm"
- id="assetsListingTable"
- class="table table-striped snipe-table"
- data-url="{{route('api.assets.index',['assigned_to' => $asset->id, 'assigned_type' => 'App\Models\Asset']) }}"
- data-export-options='{
- "fileName": "export-assets-{{ str_slug($asset->name) }}-assets-{{ date('Y-m-d') }}",
- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
- }'>
- </table>
- </div><!-- /col -->
- </div> <!-- row -->
- </div> <!-- /.tab-pane software -->
-
-
- <div class="tab-pane" id="accessories_assigned">
-
- <h2 class="box-title" style="float:left">
- {{ trans('general.accessories_assigned') }}
- </h2>
-
- <table
- data-columns="{{ \App\Presenters\AssetPresenter::assignedAccessoriesDataTableLayout() }}"
- data-cookie-id-table="accessoriesAssignedListingTable"
- data-id-table="accessoriesAssignedListingTable"
- data-side-pagination="server"
- data-sort-order="asc"
- id="accessoriesAssignedListingTable"
- class="table table-striped snipe-table"
- data-url="{{ route('api.assets.assigned_accessories', ['asset' => $asset]) }}"
- data-export-options='{
- "fileName": "export-locations-{{ str_slug($asset->name) }}-accessories-{{ date('Y-m-d') }}",
- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
- }'>
- </table>
+ <x-data-row :label="trans('general.next_audit_date')" copy_what="next_audit_date">
+ {!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
+ {{ Helper::getFormattedDateObject($asset->next_audit_date, 'date', false) }}
+ </x-data-row>
+ </x-page-data>
+ </x-tabs.pane>
- </div><!-- /.tab-pane -->
+ <x-tabs.pane name="licenses">
+ </x-tabs.pane>
- <div class="tab-pane fade" id="maintenances">
- <div class="row{{($asset->maintenances->count() > 0 ) ? '' : ' hidden-print'}}">
- <div class="col-md-12">
+ </x-slot:tabpanes>
- <!-- Asset Maintenance table -->
- <table
- data-columns="{{ \App\Presenters\MaintenancesPresenter::dataTableLayout() }}"
- class="table table-striped snipe-table"
- id="MaintenancesTable"
- data-buttons="maintenanceButtons"
- data-id-table="MaintenancesTable"
- data-side-pagination="server"
- data-toolbar="#maintenance-toolbar"
- data-export-options='{
- "fileName": "export-{{ $asset->asset_tag }}-maintenances",
- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
- }'
- data-url="{{ route('api.maintenances.index', array('asset_id' => $asset->id)) }}"
- data-cookie-id-table="MaintenancesTable"
- data-cookie="true">
- </table>
- </div> <!-- /.col-md-12 -->
- </div> <!-- /.row -->
- </div> <!-- /.tab-pane maintenances -->
+ </x-tabs>
+ </x-page-column>
- <div class="tab-pane fade" id="audits">
- <!-- checked out assets table -->
- <div class="row">
- <div class="col-md-12">
- <table
- class="table table-striped snipe-table"
- id="assetAuditHistory"
- data-id-table="assetAuditHistory"
- data-side-pagination="server"
- data-sort-order="desc"
- data-sort-name="created_at"
- data-export-options='{
- "fileName": "export-asset-{{ $asset->id }}-audits",
- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
- }'
- data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset', 'action_type' => 'audit']) }}"
- data-cookie-id-table="assetHistory"
- data-cookie="true">
- <thead>
- <tr>
- <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
- <th data-visible="true" data-field="created_at" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
- <th data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
- <th data-visible="true" data-field="image" data-formatter="auditImageFormatter">{{ trans('general.image') }}</th>
- <th class="col-sm-2" data-field="file" data-sortable="true" data-visible="false" data-formatter="fileNameFormatter">{{ trans('general.file_name') }}</th>
- <th data-field="note">{{ trans('general.notes') }}</th>
- <th data-visible="false" data-field="file" data-visible="false" data-formatter="fileDownloadButtonsFormatter">{{ trans('general.download') }}</th>
- <th data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th>
- <th data-field="remote_ip" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_ip') }}</th>
- <th data-field="user_agent" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_user_agent') }}</th>
- <th data-field="action_source" data-visible="false" data-sortable="true">{{ trans('general.action_source') }}</th>
- </tr>
- </thead>
- </table>
- </div>
- </div> <!-- /.row -->
- </div> <!-- /.tab-pane history -->
+ <x-page-column class="col-md-3">
+ <x-box class="side-box expanded">
+ <x-box.info-panel :infoPanelObj="$asset" img_path="{{ app('assets_upload_url') }}">
+ <x-slot:buttons>
+ <x-button.checkout permission="checkout" :item="$asset" :route="route('hardware.checkout.create', $asset->id)"/>
+ <x-button.edit :item="$asset" :route="route('hardware.edit', $asset->id)"/>
+ <x-button.clone :item="$asset" :route="route('clone/hardware', $asset->id)"/>
+ <x-button.note :item="$asset" :route="route('clone/hardware', $asset->id)"/>
+ <x-button.audit :item="$asset" :route="route('asset.audit.create', $asset->id)"/>
+ <x-button.label :item="$asset" :route="route('restore/hardware', ['asset' => $asset->id])"/>
+ <x-button.delete :item="$asset"/>
+ <x-button.restore :item="$asset" :route="route('restore/hardware', ['asset' => $asset->id])"/>
+ </x-slot:buttons>
+ </x-box.info-panel>
+ </x-box>
+ </x-page-column>
- <div class="tab-pane fade" id="history">
- <!-- checked out assets table -->
- <div class="row">
- <div class="col-md-12">
- <table
- data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
- class="table table-striped snipe-table"
- id="assetHistory_{{ $asset->id }}"
- data-id-table="assetHistory_{{ $asset->id }}"
- data-side-pagination="server"
- data-sort-order="desc"
- data-sort-name="created_at"
- data-export-options='{
- "fileName": "export-asset-{{ $asset->id }}-history",
- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
- }'
- data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}"
- data-cookie-id-table="assetHistory_{{ $asset->id }}"
- data-cookie="true">
- </table>
- </div>
- </div> <!-- /.row -->
- </div> <!-- /.tab-pane history -->
+ </x-container>
- <div class="tab-pane fade" id="files">
- <div class="row{{ ($asset->uploads->count() > 0 ) ? '' : ' hidden-print' }}">
- <div class="col-md-12">
- <x-table.files object_type="assets" :object="$asset"/>
- </div> <!-- /.col-md-12 -->
- </div> <!-- /.row -->
- </div> <!-- /.tab-pane files -->
- @if ($asset->model)
- @can('view', $asset->model)
- <div class="tab-pane fade" id="modelfiles">
- <div class="row{{ (($asset->model) && ($asset->model->uploads->count() > 0)) ? '' : ' hidden-print' }}">
- <div class="col-md-12">
- <x-table.files object_type="models" :object="$asset->model"/>
- </div> <!-- /.col-md-12 -->
- </div> <!-- /.row -->
- </div> <!-- /.tab-pane files -->
- @endcan
- @endif
- </div><!-- /.tab-content -->
- </div><!-- nav-tabs-custom -->
- </div>
- @can('update', \App\Models\Asset::class)
+ @can('update', \App\Models\Asset::class)
@include ('modals.upload-file', ['item_type' => 'asset', 'item_id' => $asset->id])
@endcan
@stop
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index ed9244028f..72f44f3375 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -35,10 +35,7 @@
<x-tabs.files-tab name="files" count="{{ $license->uploads()->count() }}"/>
<x-tabs.history-tab model="\App\Models\License::class"/>
-
- @can('update', $license)
- <x-tabs.nav-item-upload />
- @endcan
+ <x-tabs.upload-tab :item="$license"/>
</x-slot:tabnav>
<x-slot:tabpanes>
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 7192860b0b..2b5522baba 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -96,10 +96,7 @@
<x-tabs.files-tab count="{{ $location->uploads->count() }}"/>
<x-tabs.history-tab model="\App\Models\Location::class"/>
-
- @can('update', $location)
- <x-tabs.nav-item-upload />
- @endcan
+ <x-tabs.upload-tab :item="$location"/>
</x-slot:tabnav>
diff --git a/resources/views/maintenances/view.blade.php b/resources/views/maintenances/view.blade.php
index b62820087d..ee7e23f72d 100644
--- a/resources/views/maintenances/view.blade.php
+++ b/resources/views/maintenances/view.blade.php
@@ -20,15 +20,11 @@ use Carbon\Carbon;
<x-page-column class="col-md-9 main-panel">
<x-tabs>
<x-slot:tabnav>
-
<x-tabs.details-tab/>
<x-tabs.files-tab count="{{ $maintenance->uploads()->count() }}" />
-
- @can('update', $maintenance)
- <x-tabs.nav-item-upload />
- @endcan
-
+ <x-tabs.upload-tab :item="$maintenance"/>
</x-slot:tabnav>
+
<x-slot:tabpanes>
<x-tabs.pane name="details">
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 91aa8dc7c7..74a71f3957 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -29,15 +29,12 @@
<x-slot:tabnav>
<x-tabs.asset-tab count="{{ $model->assets()->AssetsForShow()->count() }}" />
<x-tabs.files-tab name="files" count="{{ $model->uploads()->count() }}" />
-
- @can('update', $model)
- <x-tabs.nav-item-upload />
- @endcan
+ <x-tabs.upload-tab :item="$model"/>
</x-slot:tabnav>
<x-slot:tabpanes>
- <x-tabs.pane name="assets" class="in active">
+ <x-tabs.pane name="assets">
<x-table.assets :route="route('api.assets.index', ['model_id' => $model->id, 'status' => $model->deleted_at!='' ? 'Deleted' : ''])" />
</x-tabs.pane>