A free open source IT asset/license management system
Added copy+paste, added additional fields
snipec9f41c950a8e
diff --git a/app/Models/Consumable.php b/app/Models/Consumable.phpindex a48636546f..08f0cb74b9 100644--- a/app/Models/Consumable.php+++ b/app/Models/Consumable.php@@ -13,6 +13,7 @@ use App\Presenters\Presentable;use Illuminate\Database\Eloquent\Factories\HasFactory;use Illuminate\Database\Eloquent\Relations\Relation;use Illuminate\Database\Eloquent\SoftDeletes;+use Illuminate\Support\Facades\Gate;use Illuminate\Support\Facades\Storage;use Watson\Validating\ValidatingTrait;@@ -131,6 +132,13 @@ class Consumable extends SnipeModel$this->attributes['requestable'] = filter_var($value, FILTER_VALIDATE_BOOLEAN);}+ public function isDeletable()+ {+ return Gate::allows('delete', $this)+ && ($this->numCheckedOut() === 0)+ && ($this->deleted_at == '');+ }+/*** Establishes the consumable -> admin user relationship*diff --git a/resources/views/blade/box/info-panel.blade.php b/resources/views/blade/box/info-panel.blade.phpindex 99df0bb02e..0fac1a2d18 100644--- a/resources/views/blade/box/info-panel.blade.php+++ b/resources/views/blade/box/info-panel.blade.php@@ -84,7 +84,19 @@@if ($infoPanelObj->model_number)<x-info-element icon_type="number" title="{{ trans('general.model_no') }}">+ {{ trans('general.model_no') }}+ <x-copy-to-clipboard copy_what="model_number" class="pull-right">{{ $infoPanelObj->model_number }}+ </x-copy-to-clipboard>+ </x-info-element>+ @endif++ @if ($infoPanelObj->item_no)+ <x-info-element icon_type="number" title="{{ trans('admin/consumables/general.item_no') }}">+ {{ trans('admin/consumables/general.item_no') }}+ <x-copy-to-clipboard copy_what="item_no" class="pull-right">+ {{ $infoPanelObj->item_no }}+ </x-copy-to-clipboard></x-info-element>@endif@@ -142,13 +154,17 @@@if ($infoPanelObj->order_number)<x-info-element icon_type="order" title="{{ trans('general.order_number') }}">- {{ $infoPanelObj->order_number }}+ <x-copy-to-clipboard copy_what="order_number" class="pull-right">+ {{ $infoPanelObj->order_number }}+ </x-copy-to-clipboard></x-info-element>@endif@if ($infoPanelObj->purchase_order)<x-info-element icon_type="purchase_order" title="{{ trans('admin/licenses/form.purchase_order') }}">+ <x-copy-to-clipboard copy_what="purchase_order" class="pull-right">{{ $infoPanelObj->purchase_order }}+ </x-copy-to-clipboard></x-info-element>@endifdiff --git a/resources/views/blade/button/wide-checkout.blade.php b/resources/views/blade/button/wide-checkout.blade.phpindex e6da9cd559..1dad37d1fc 100644--- a/resources/views/blade/button/wide-checkout.blade.php+++ b/resources/views/blade/button/wide-checkout.blade.php@@ -1,11 +1,13 @@@props(['item' => null,- 'route' => null,+ 'route',])@can('checkout', $item)- <a href="{{ $route }}" class="btn btn-sm bg-maroon btn-social btn-block hidden-print">- <x-icon type="checkout" />- {{ trans('general.checkout') }}- </a>+ @if ((method_exists($item, 'numRemaining')) && ($item->numRemaining() > 0))+ <a href="{{ $route }}" class="btn btn-sm bg-maroon btn-social btn-block hidden-print">+ <x-icon type="checkout" />+ {{ trans('general.checkout') }}+ </a>+ @endif@endcandiff --git a/resources/views/blade/copy-to-clipboard.blade.php b/resources/views/blade/copy-to-clipboard.blade.phpindex 517d2b8ce8..f8e8613e82 100644--- a/resources/views/blade/copy-to-clipboard.blade.php+++ b/resources/views/blade/copy-to-clipboard.blade.php@@ -3,7 +3,7 @@])<!-- copy to clipboard -->-<i class="fa-regular fa-clipboard js-copy-link hidden-print fa-fw" data-clipboard-target=".js-copy-{{ $copy_what }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">+<i {{ $attributes->merge(['class' => 'fa-regular fa-clipboard js-copy-link hidden-print fa-fw']) }} style="font-size: 16px;" data-clipboard-target=".js-copy-{{ $copy_what }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}"><span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span></i>diff --git a/resources/views/blade/tabs/accessory-tab.blade.php b/resources/views/blade/tabs/accessory-tab.blade.phpindex 930386f1a8..34130e28ae 100644--- a/resources/views/blade/tabs/accessory-tab.blade.php+++ b/resources/views/blade/tabs/accessory-tab.blade.php@@ -1,9 +1,11 @@@props(['count' => null,])+@aware(['class'])@can('view', \App\Models\Accessory::class)<x-tabs.nav-item+ :$classname="accessories"icon_type="accessory"label="{{ trans('general.accessories') }}"diff --git a/resources/views/blade/tabs/asset-tab.blade.php b/resources/views/blade/tabs/asset-tab.blade.phpindex 4cbcefe5d0..b38ca95d11 100644--- a/resources/views/blade/tabs/asset-tab.blade.php+++ b/resources/views/blade/tabs/asset-tab.blade.php@@ -1,11 +1,12 @@@props(['count' => null,])+@aware(['class'])@can('view', \App\Models\Asset::class)<x-tabs.nav-item+ :$classname="assets"- class="active"icon_type="assets"label="{{ trans('general.assets') }}"count="{{ $count }}"diff --git a/resources/views/blade/tabs/checkedout-tab.blade.php b/resources/views/blade/tabs/checkedout-tab.blade.phpindex 0e7c39ac67..54f59b6b80 100644--- a/resources/views/blade/tabs/checkedout-tab.blade.php+++ b/resources/views/blade/tabs/checkedout-tab.blade.php@@ -3,6 +3,7 @@'model' => null,'class' => null,])+@aware(['class'])@can('view', $model)<x-tabs.nav-itemdiff --git a/resources/views/blade/tabs/component-tab.blade.php b/resources/views/blade/tabs/component-tab.blade.phpindex f6c5bfad19..75019b32fe 100644--- a/resources/views/blade/tabs/component-tab.blade.php+++ b/resources/views/blade/tabs/component-tab.blade.php@@ -1,6 +1,7 @@@props(['count' => null,])+@aware(['class'])@can('view', \App\Models\Component::class)<x-tabs.nav-itemdiff --git a/resources/views/blade/tabs/consumable-tab.blade.php b/resources/views/blade/tabs/consumable-tab.blade.phpindex d6eb18b86e..8901e17b5b 100644--- a/resources/views/blade/tabs/consumable-tab.blade.php+++ b/resources/views/blade/tabs/consumable-tab.blade.php@@ -1,6 +1,7 @@@props(['count' => null,])+@aware(['class'])@can('view', \App\Models\Consumable::class)<x-tabs.nav-itemdiff --git a/resources/views/blade/tabs/files-tab.blade.php b/resources/views/blade/tabs/files-tab.blade.phpindex c4ce3f286a..4e5721bb6c 100644--- a/resources/views/blade/tabs/files-tab.blade.php+++ b/resources/views/blade/tabs/files-tab.blade.php@@ -1,6 +1,9 @@@props(['count' => null,])++@aware(['class'])+<x-tabs.nav-itemname="files"icon_type="files"diff --git a/resources/views/blade/tabs/history-tab.blade.php b/resources/views/blade/tabs/history-tab.blade.phpindex c844126fa5..8741d55d91 100644--- a/resources/views/blade/tabs/history-tab.blade.php+++ b/resources/views/blade/tabs/history-tab.blade.php@@ -3,6 +3,7 @@'model' => null,])+@aware(['class'])@can('view', $model)<x-tabs.nav-itemdiff --git a/resources/views/blade/tabs/license-tab.blade.php b/resources/views/blade/tabs/license-tab.blade.phpindex 6b574f4845..8749e1ae57 100644--- a/resources/views/blade/tabs/license-tab.blade.php+++ b/resources/views/blade/tabs/license-tab.blade.php@@ -1,9 +1,11 @@@props(['count' => null,])+@aware(['class'])@can('view', \App\Models\License::class)<x-tabs.nav-item+ :$classname="licenses"icon_type="licenses"label="{{ trans('general.licenses') }}"diff --git a/resources/views/blade/tabs/nav-item.blade.php b/resources/views/blade/tabs/nav-item.blade.phpindex 619310de64..4f3fa44458 100644--- a/resources/views/blade/tabs/nav-item.blade.php+++ b/resources/views/blade/tabs/nav-item.blade.php@@ -7,6 +7,7 @@'tooltip' => null,'icon_type' => null,])+<!-- start tab nav item --><li {{ $attributes->merge(['class' => '']) }}>diff --git a/resources/views/blade/tabs/user-tab.blade.php b/resources/views/blade/tabs/user-tab.blade.phpindex 398430e582..e987bb7d94 100644--- a/resources/views/blade/tabs/user-tab.blade.php+++ b/resources/views/blade/tabs/user-tab.blade.php@@ -1,9 +1,11 @@@props(['count' => null,])+@aware(['class'])@can('view', \App\Models\User::class)<x-tabs.nav-item+ :$classname="users"icon_type="user"label="{{ trans('general.users') }}"diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.phpindex d84af0e14a..f36cf60b69 100644--- a/resources/views/components/view.blade.php+++ b/resources/views/components/view.blade.php@@ -81,16 +81,11 @@<x-slot:before_list>- @can('checkout', \App\Models\Component::class)- <x-button.wide-checkout :item="$snipe_component" :route="route('components.checkout.show', $snipe_component->id)" />- @endcan-+ <x-button.wide-checkout :item="$snipe_component" :route="route('components.checkout.show', $snipe_component->id)" /><x-button.wide-edit :item="$snipe_component" :route="route('components.edit', $snipe_component->id)" /><x-button.wide-clone :item="$snipe_component" :route="route('components.clone.create', $snipe_component->id)" />-<x-button.wide-delete :item="$snipe_component" />-</x-slot:before_list></x-box.info-panel>diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.phpindex a9763e9011..da88132e73 100644--- a/resources/views/consumables/view.blade.php+++ b/resources/views/consumables/view.blade.php@@ -85,16 +85,11 @@<x-slot:before_list>- @can('checkout', \App\Models\Component::class)- <x-button.wide-checkout :item="$consumable" :route="route('consumables.checkout.show', $consumable->id)" />- @endcan-+ <x-button.wide-checkout :item="$consumable" :route="route('consumables.checkout.show', $consumable->id)" /><x-button.wide-edit :item="$consumable" :route="route('consumables.edit', $consumable->id)" /><x-button.wide-clone :item="$consumable" :route="route('consumables.clone.create', $consumable->id)" />-<x-button.wide-delete :item="$consumable" />-</x-slot:before_list></x-box.info-panel>diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.phpindex a1080ebe89..17b42ad416 100755--- a/resources/views/suppliers/view.blade.php+++ b/resources/views/suppliers/view.blade.php@@ -20,8 +20,8 @@<x-tabs><x-slot:tabnav>- <x-tabs.asset-tab count="{{ $supplier->assets()->AssetsForShow()->count() }}" />- <x-tabs.license-tab count="{{ $supplier->licenses->count() }}" />+ <x-tabs.asset-tab count="{{ $supplier->assets()->AssetsForShow()->count() }}" class="active" />+ <x-tabs.license-tab count="{{ $supplier->licenses->count() }}" class="active" /><x-tabs.accessory-tab count="{{ $supplier->accessories->count() }}" /><x-tabs.consumable-tab count="{{ $supplier->consumables->count() }}" /><x-tabs.component-tab count="{{ $supplier->components->count() }}" />