Skip to content

A free open source IT asset/license management system

Added isDeleteable to Accessories

snipe3ebc0532caa9
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index df0f916ffb..df94c846db 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -119,6 +119,9 @@ class Accessory extends SnipeModel
}
+ public function isDeletable() {
+ return $this->checkouts_count === 0;
+ }
/**
* Sets the requestable attribute on the accessory
*
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 895cfffede..bcda6eb785 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -24,29 +24,9 @@
<x-tabs>
<x-slot:tabnav>
- <x-tabs.nav-item
- name="checkedout"
- class="active"
- icon_type="checkedout"
- label="{{ trans('general.checked_out') }}"
- count="{{ $accessory->checkouts_count }}"
- />
-
-
- <x-tabs.nav-item
- name="history"
- icon="fa-solid fa-clock-rotate-left fa-fw"
- label="{{ trans('general.history') }}"
- tooltip="{{ trans('general.history') }}"
- />
-
- <x-tabs.nav-item
- name="files"
- icon="fa-solid fa-file-contract fa-fw"
- label="{{ trans('general.files') }}"
- count="{{ $accessory->uploads()->count() }}"
- />
-
+ <x-tabs.checkedout-tab count="{{ $accessory->checkouts_count }}" />
+ <x-tabs.files-tab count="{{ $accessory->uploads()->count() }}" />
+ <x-tabs.history-tab model="\App\Models\Accessory::class"/>
@can('update', $accessory)
<x-tabs.nav-item-upload />
@@ -114,10 +94,8 @@
<x-slot:before_list>
@can('update', $accessory)
- <a href="{{ route('accessories.edit', $accessory->id) }}" class="btn btn-warning btn-sm btn-social btn-block hidden-print" style="margin-bottom: 5px;">
- <x-icon type="edit" />
- {{ trans('button.edit') }}
- </a>
+ <x-button.wide-edit :item="$accessory" :route="route('accessories.edit', $accessory->id)" />
+
<a href="{{ route('clone/accessories', $accessory->id) }}" class="btn btn-info btn-block btn-sm btn-social hidden-print" style="margin-bottom: 5px;">
<x-icon type="clone" />
{{ trans('button.clone') }}</a>
@@ -126,12 +104,7 @@
@can('checkout', $accessory)
@if (($accessory->numRemaining() > 0))
-
- <a href="{{ route('accessories.checkout.show', $accessory->id) }}" class="btn bg-maroon btn-sm btn-social btn-block hidden-print" style="margin-bottom: 5px;">
- <x-icon type="checkout" />
- {{ trans('general.checkout') }}
- </a>
-
+ <x-button.wide-checkout :item="$accessory" :route="route('accessories.checkout.show', $accessory->id)" />
@else
<span data-tooltip="true" title="{{ ($accessory->numRemaining() == 0) ? trans('admin/accessories/general.bulk.checkout_all.disabled_tooltip') : trans('admin/accessories/message.checkout.license_is_inactive') }}" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 5px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
<x-icon type="checkout" />
@@ -144,20 +117,7 @@
@can('delete', $accessory)
-
- @if ($accessory->numRemaining() == 0)
- <a class="btn btn-block btn-danger btn-sm btn-social delete-asset" data-icon="fa fa trash" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal" onClick="return false;">
- <x-icon type="delete" />
- {{ trans('general.delete') }}
- </a>
- @else
- <span data-tooltip="true" title=" {{ trans('admin/accessories/general.delete_disabled') }}">
- <a href="#" class="btn btn-block btn-danger btn-sm btn-social delete-asset disabled" onClick="return false;">
- <x-icon type="delete" />
- {{ trans('general.delete') }}
- </a>
- </span>
- @endif
+ <x-button.wide-delete :item="$accessory" :route="route('accessories.destroy', $accessory->id)" />
@endcan
diff --git a/resources/views/blade/tabs/checkedout-tab.blade.php b/resources/views/blade/tabs/checkedout-tab.blade.php
new file mode 100644
index 0000000000..786245f70b
--- /dev/null
+++ b/resources/views/blade/tabs/checkedout-tab.blade.php
@@ -0,0 +1,14 @@
+@props([
+ 'count' => null,
+ 'model' => null,
+])
+
+@can('view', $model)
+ <x-tabs.nav-item
+ name="assigned"
+ icon_type="checkedout"
+ label="{{ trans('general.checked_out') }}"
+ count="{{ $count }}"
+ tooltip="{{ trans('general.checked_out') }}"
+ />
+@endcan
\ No newline at end of file
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 438fe00d72..7d543dc9bb 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -19,54 +19,12 @@
<x-page-column class="col-md-9 main-panel">
<x-tabs>
<x-slot:tabnav>
- @can('view', \App\Models\Asset::class)
- <x-tabs.nav-item
- name="assets"
- class="active"
- icon="fas fa-barcode fa-fw"
- label="{{ trans('general.assets') }}"
- count="{{ $supplier->assets()->AssetsForShow()->count() }}"
- />
- @endcan
- @can('view', \App\Models\License::class)
- <x-tabs.nav-item
- name="licenses"
- icon="far fa-save"
- label="{{ trans('general.licenses') }}"
- count="{{ $supplier->licenses->count() }}"
- tooltip="{{ trans('general.licenses') }}"
- />
- @endcan
-
-
- @can('view', \App\Models\Accessory::class)
- <x-tabs.nav-item
- name="accessories"
- icon="far fa-keyboard fa-fw"
- label="{{ trans('general.accessories') }}"
- count="{{ $supplier->accessories()->count() }}"
- />
- @endcan
-
-
- @can('view', \App\Models\Consumable::class)
- <x-tabs.nav-item
- name="consumables"
- icon="fas fa-tint fa-fw"
- label="{{ trans('general.consumables') }}"
- count="{{ $supplier->consumables()->count() }}"
- />
- @endcan
-
- @can('view', \App\Models\Component::class)
- <x-tabs.nav-item
- name="components"
- icon="fas fa-hdd fa-fw"
- label="{{ trans('general.components') }}"
- count="{{ $supplier->components->count() }}"
- />
- @endcan
+ <x-tabs.asset-tab count="{{ $supplier->assets()->AssetsForShow()->count() }}" />
+ <x-tabs.license-tab count="{{ $manufacturer->licenses->count() }}" />
+ <x-tabs.accessory-tab count="{{ $manufacturer->accessories->count() }}" />
+ <x-tabs.consumable-tab count="{{ $manufacturer->consumables->count() }}" />
+ <x-tabs.component-tab count="{{ $manufacturer->components->count() }}" />
@can('view', \App\Models\AssetMaintenance::class)
<x-tabs.nav-item