diff --git a/resources/lang/en/admin/licenses/general.php b/resources/lang/en/admin/licenses/general.php index 0187d076a318..b2766d063ef3 100644 --- a/resources/lang/en/admin/licenses/general.php +++ b/resources/lang/en/admin/licenses/general.php @@ -26,6 +26,7 @@ 'modal' => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.', 'enabled_tooltip' => 'Checkin ALL seats for this license from both users and assets', 'disabled_tooltip' => 'This is disabled because there are no seats currently checked out', + 'disabled_tooltip_reassignable' => 'This is disabled because the License is not reassignable', 'success' => 'License successfully checked in! | All licenses were successfully checked in!', 'log_msg' => 'Checked in via bulk license checkout in license GUI', ], diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index 8dcf10caf24a..950ba1af2ca1 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -577,17 +577,23 @@ class="table table-striped snipe-table" @endcan @can('checkin', $license) - - @if (($license->seats - $license->availCount()->count()) > 0 ) - - {{ trans('admin/licenses/general.bulk.checkin_all.button') }} - - @else + + @if (($license->seats - $license->availCount()->count()) <= 0 ) {{ trans('admin/licenses/general.bulk.checkin_all.button') }} - + + @elseif (! $license->reassignable) + + + {{ trans('admin/licenses/general.bulk.checkin_all.button') }} + + + @else + + {{ trans('admin/licenses/general.bulk.checkin_all.button') }} + @endif @endcan