A free open source IT asset/license management system
Added to assets license tab as well
snipe54d01409dc10
diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.phpindex ae816c34fe..48466552f1 100644--- a/app/Http/Transformers/AssetsTransformer.php+++ b/app/Http/Transformers/AssetsTransformer.php@@ -388,6 +388,9 @@ class AssetsTransformer$permissions_array['available_actions'] = ['checkout' => false,'checkin' => Gate::allows('checkin', License::class),+ 'bulk_selectable' => [+ 'checkin' => Gate::allows('checkin', License::class),+ ],];$array += $permissions_array;diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.phpindex 21b837582b..9243f1b7db 100644--- a/app/Http/Transformers/LicensesTransformer.php+++ b/app/Http/Transformers/LicensesTransformer.php@@ -66,7 +66,6 @@ class LicensesTransformer'created_at' => Helper::getFormattedDateObject($license->created_at, 'datetime'),'updated_at' => Helper::getFormattedDateObject($license->updated_at, 'datetime'),'deleted_at' => Helper::getFormattedDateObject($license->deleted_at, 'datetime'),- 'user_can_checkout' => (bool) ($license->free_seats_count > 0),'disabled' => $license->isInactive(),];@@ -76,6 +75,7 @@ class LicensesTransformer'clone' => Gate::allows('create', License::class),'update' => Gate::allows('update', License::class),'delete' => $license->isDeletable(),+ 'user_can_checkout' => (bool) (($license->free_seats_count - License::unReassignableCount($license)) > 0),'bulk_selectable' => ['delete' => $license->isDeletable(),],diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.phpindex 110e707c6f..4c3857c0fc 100644--- a/app/Presenters/LicensePresenter.php+++ b/app/Presenters/LicensePresenter.php@@ -345,9 +345,22 @@ class LicensePresenter extends Presenterreturn json_encode($layout);}- public static function dataTableLayoutSeatsCheckedOutToAssets()+ public static function dataTableLayoutSeatsCheckedOutToAssets($hide_fields = []){- $layout = [+ $layout = [];++ if (! in_array('checkbox', $hide_fields)) {+ $layout[] = [+ 'field' => 'checkbox',+ 'checkbox' => true,+ 'formatter' => 'checkboxEnabledFormatter',+ 'titleTooltip' => trans('general.select_all_none'),+ 'printIgnore' => true,+ 'class' => 'hidden-print',+ ];+ }++ $layout = array_merge($layout, [['field' => 'id','searchable' => false,@@ -398,7 +411,7 @@ class LicensePresenter extends Presenter'printIgnore' => true,'class' => 'hidden-print',],- ];+ ]);return json_encode($layout);}diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.phpindex 6560433a4b..9152ed20db 100755--- a/resources/views/hardware/view.blade.php+++ b/resources/views/hardware/view.blade.php@@ -330,7 +330,29 @@</x-tabs.pane><x-tabs.pane name="licenses" :count="$asset->licenses->count()">- <x-table.licenses show_search="false" :route="route('api.assets.licenselist', $asset)" :presenter="\App\Presenters\LicensePresenter::dataTableLayoutSeatsCheckedOutToAssets()"/>+ @can('view', \App\Models\License::class)+ <x-slot:table_header>{{ trans('general.licenses') }}</x-slot:table_header>+ @endcan++ @can('checkin', \App\Models\License::class)+ <x-slot:bulkactions>+ <x-table.bulk-actions+ action_route="{{ route('licenses.bulkcheckin.selected') }}"+ model_name="seat"+ >+ <option value="checkin">{{ trans('general.checkin') }}</option>+ </x-table.bulk-actions>+ </x-slot:bulkactions>+ @endcan++ @can('view', \App\Models\License::class)+ <x-table+ show_search="false"+ api_url="{{ route('api.assets.licenselist', $asset) }}"+ :presenter="\App\Presenters\LicensePresenter::dataTableLayoutSeatsCheckedOutToAssets()"+ export_filename="export-licenses-{{ str_slug($asset->asset_tag) }}-{{ date('Y-m-d') }}"+ />+ @endcan</x-tabs.pane><x-tabs.pane name="components" :count="$asset->components->sum('assigned_qty')">diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.phpindex 61181c5384..83c1ddf0a3 100644--- a/resources/views/partials/bootstrap-table.blade.php+++ b/resources/views/partials/bootstrap-table.blade.php@@ -1822,17 +1822,14 @@}function licenseInOutFormatter(value, row) {+ var user_can_checkout = row.available_actions && row.available_actions.user_can_checkout;- // check that checkin is not disabled- if (row.user_can_checkout === false) {- return '<span class="btn btn-sm bg-maroon btn-checkout disabled" data-tooltip="true" title="{{ trans('admin/licenses/message.checkout.unavailable') }}">{{ trans('general.checkout') }}</span>';- } else if (row.disabled === true) {+ if (row.disabled === true) {return '<span class="btn btn-sm bg-maroon btn-checkout disabled" data-tooltip="true" title="{{ trans('admin/licenses/message.checkout.license_is_inactive') }}">{{ trans('general.checkout') }}</span>';-- } else- // The user is allowed to check the license seat out and it's available- if ((row.available_actions.checkout === true) && (row.user_can_checkout === true) && (row.disabled === false)) {+ } else if ((row.available_actions.checkout === true) && (user_can_checkout === true) && (row.disabled === false)) {return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkout" class="btn btn-sm bg-maroon btn-checkout" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';+ } else if (row.available_actions.checkout === true) {+ return '<span class="btn btn-sm bg-maroon btn-checkout disabled" data-tooltip="true" title="{{ trans('admin/licenses/message.checkout.unavailable') }}">{{ trans('general.checkout') }}</span>';}}// We need a special formatter for license seats, since they don't work exactly the same