From 42f198ffedf541344c3687d2401f6615b467488d Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Thu, 13 Apr 2023 12:24:59 -0700
Subject: [PATCH 01/67] fixes footer space when customized

---
 resources/views/layouts/default.blade.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 37554e6a83..4cefedd720 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -851,7 +851,11 @@
 
             </div><!-- /.content-wrapper -->
 
-            <footer class="main-footer hidden-print">
+            @if($snipeSettings->footer_text!='')
+                <footer class="main-footer hidden-print" style="height:100px;">
+            @else
+                <footer class="main-footer hidden-print">
+            @endif
 
                 <div class="pull-right hidden-xs">
                     @if ($snipeSettings->version_footer!='off')

From b2940f9915d32e95b9af62b3d8d33e76b3d45783 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 12:29:48 -0700
Subject: [PATCH 02/67] Added confirm modal

Signed-off-by: snipe <snipe@snipe.net>
---
 .../views/modals/confirm-action.blade.php     | 31 +++++++++++++++++++
 resources/views/modals/upload-file.blade.php  |  2 +-
 routes/web/licenses.php                       | 11 +++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 resources/views/modals/confirm-action.blade.php

diff --git a/resources/views/modals/confirm-action.blade.php b/resources/views/modals/confirm-action.blade.php
new file mode 100644
index 0000000000..2d1a7fcd32
--- /dev/null
+++ b/resources/views/modals/confirm-action.blade.php
@@ -0,0 +1,31 @@
+<!-- Modal -->
+<div class="modal fade" id="confirmAction" tabindex="-1" role="dialog" aria-labelledby="confirmActionLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="confirmActionLabel">{{ trans('general.file_upload') }}</h4>
+            </div>
+            {{ Form::open([
+            'method' => 'POST',
+            'route' => ['upload/'.$item_type, $item_id],
+            'files' => true,
+            'class' => 'form-horizontal' ]) }}
+            <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+            <div class="modal-body">
+
+                <div class="row">
+                    <div class="col-md-12">
+                        Blah
+                    </div>
+                </div>
+
+            </div> <!-- /.modal-body-->
+            <div class="modal-footer">
+                <a href="#" class="pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</a>
+                <button type="submit" class="btn btn-primary">{{ trans('button.upload') }}</button>
+            </div>
+            {{ Form::close() }}
+        </div>
+    </div>
+</div>
diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php
index f87e3e4962..09c53751ce 100644
--- a/resources/views/modals/upload-file.blade.php
+++ b/resources/views/modals/upload-file.blade.php
@@ -4,7 +4,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h2 class="modal-title" id="uploadFileModalLabel">{{ trans('general.file_upload') }}</h4>
+                <h4 class="modal-title" id="uploadFileModalLabel">{{ trans('general.file_upload') }}</h4>
             </div>
             {{ Form::open([
             'method' => 'POST',
diff --git a/routes/web/licenses.php b/routes/web/licenses.php
index ebcb5a2b2b..b70347793c 100644
--- a/routes/web/licenses.php
+++ b/routes/web/licenses.php
@@ -25,10 +25,21 @@ Route::group(['prefix' => 'licenses', 'middleware' => ['auth']], function () {
         [Licenses\LicenseCheckinController::class, 'store']
     )->name('licenses.checkin.save');
 
+    Route::post(
+        '{licenseId}/bulkcheckin',
+        [Licenses\LicenseCheckinController::class, 'bulkCheckin']
+    )->name('licenses.bulkcheckin');
+
+    Route::post(
+        '{licenseId}/bulkcheckout',
+        [Licenses\LicenseCheckoutController::class, 'bulkCheckout']
+    )->name('licenses.bulkcheckout');
+
     Route::post(
     '{licenseId}/upload',
         [Licenses\LicenseFilesController::class, 'store']
     )->name('upload/license');
+
     Route::delete(
     '{licenseId}/deletefile/{fileId}',
         [Licenses\LicenseFilesController::class, 'destroy']

From 0210ecde88824db147f75703d760afa182d036a7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 12:29:55 -0700
Subject: [PATCH 03/67] Include confirm modal

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 21260ae4bb..28fe510b71 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -557,6 +557,11 @@
   </div>  <!-- /.col -->
 </div> <!-- /.row -->
 
+
+@can('update', \App\Models\License::class)
+  @include ('modals.confirm-action', ['item_type' => 'user', 'item_id' => $user->id])
+@endcan
+
 @can('update', \App\Models\License::class)
   @include ('modals.upload-file', ['item_type' => 'license', 'item_id' => $license->id])
 @endcan

From 8183b8deba55bda182296fd57e4270cc61c7fe28 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 12:30:02 -0700
Subject: [PATCH 04/67] Added stub method

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Licenses/LicenseCheckinController.php         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php
index 257722b005..d1c7607493 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -112,4 +112,19 @@ class LicenseCheckinController extends Controller
         // Redirect to the license page with error
         return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkin.error'));
     }
+
+    /**
+     * Bulk checkin all license seats
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see LicenseCheckinController::create() method that provides the form view
+     * @since [v6.1.1]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+
+    public function bulkCheckin() {
+
+    }
+
 }

From 79ff6a8fc2f88bac72bbff799ec534dfbd317cc2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 12:30:23 -0700
Subject: [PATCH 05/67] Disallow deleting in the API view if there are things
 checked out

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Transformers/LicensesTransformer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php
index 3c389a1b18..8df6b89f19 100644
--- a/app/Http/Transformers/LicensesTransformer.php
+++ b/app/Http/Transformers/LicensesTransformer.php
@@ -56,7 +56,7 @@ class LicensesTransformer
             'checkin' => Gate::allows('checkin', License::class),
             'clone' => Gate::allows('create', License::class),
             'update' => Gate::allows('update', License::class),
-            'delete' => Gate::allows('delete', License::class),
+            'delete' => (Gate::allows('delete', License::class) && ($license->seats == $license->availCount()->count())) ? true : false,
         ];
 
         $array += $permissions_array;

From 8e5042418a2d0b13e6c563100babb92433ac5b3a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 12:30:32 -0700
Subject: [PATCH 06/67] Added buttons

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 40 +++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 28fe510b71..d879f29d1c 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -82,7 +82,7 @@
 
         <div class="tab-pane active" id="details">
           <div class="row">
-            <div class="col-md-12">
+            <div class="col-md-9">
               <div class="container row-new-striped">
 
                 @if (!is_null($license->company))
@@ -378,8 +378,41 @@
 
               </div> <!-- end row-striped -->
             </div>
-            </div>
-          </div> <!-- end tab-pane -->
+
+          <div class="col-md-3">
+
+            @can('update', $license)
+              <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block btn-default" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.edit') }}</a>
+              <a href="{{ route('clone/license', $license->id) }}" class="btn btn-block btn-default" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.clone') }}</a>
+            @endcan
+
+              @can('checkout', $license)
+                @if ($license->availCount()->count() > 0)
+                  <a href="{{ route('licenses.checkout', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;">Checkout</a>
+                  <a href="{{ route('licenses.edit', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;">Checkout Remaining to All Users</a>
+                @else
+                    <a href="{{ route('licenses.checkout', $license->id) }}" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;">Checkout</a>
+                    <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;">Checkout Remaining to All Users</a>
+                @endif
+              @endcan
+
+              @can('checkin', $license)
+                @if (($license->seats - $license->availCount()->count()) > 0 )
+                  <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block bg-purple" style="margin-bottom: 10px;">Checkin All</a>
+                @endif
+              @endcan
+
+            @can('delete', $license)
+
+              @if ($license->availCount()->count() == 0)
+                <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
+              @else
+                <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger disabled" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
+              @endif
+            @endcan
+          </div>
+          </div>
+       </div> <!-- end tab-pane -->
 
 
 
@@ -555,6 +588,7 @@
       </div> <!-- /.tab-content -->
     </div> <!-- nav-tabs-custom -->
   </div>  <!-- /.col -->
+
 </div> <!-- /.row -->
 
 

From 06d46a452300c8732c1787bf6d1eab90acf35067 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:17:55 -0700
Subject: [PATCH 07/67] Indenting change for clarity

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/view.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index a130d1629d..c7a07cbc16 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -122,7 +122,8 @@
         @endcan
 
         @can('update', \App\Models\User::class)
-          <li class="pull-right"><a href="#" data-toggle="modal" data-target="#uploadFileModal">
+          <li class="pull-right">
+              <a href="#" data-toggle="modal" data-target="#uploadFileModal">
               <span class="hidden-xs"><i class="fas fa-paperclip" aria-hidden="true"></i></span>
               <span class="hidden-lg hidden-md hidden-xl"><i class="fas fa-paperclip fa-2x" aria-hidden="true"></i></span>
               <span class="hidden-xs hidden-sm">{{ trans('button.upload') }}</span>

From cf7f244942c4e1f43b9032b7fb8b1f812925ca9b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:19:37 -0700
Subject: [PATCH 08/67] Added (clarified?) edit autoassign_licenses in user
 edit

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/edit.blade.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index a94f0734b7..34005e9bc7 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -370,6 +370,20 @@
                               </div>
                           </div>
 
+                          <!-- Auto assign checkbox -->
+
+                          <div class="form-group">
+                              <div class="col-md-7 col-md-offset-3">
+
+                                  <label class="form-control" for="autoassign_licenses">
+                                      <input type="checkbox" value="1" name="autoassign_licenses" {{ (old('autoassign_licenses', $user->autoassign_licenses)) == '1' ? " checked='checked'" : '' }} aria-label="autoassign_licenses">
+                                      {{ trans('general.autoassign_licenses') }}
+                                  </label>
+
+                                  <p class="help-block">{{ trans('general.autoassign_licenses_help_long') }}</p>
+                              </div>
+                          </div>
+
 
                           <!-- remote checkbox -->
                           <div class="form-group">
@@ -383,15 +397,6 @@
                               </div>
                           </div>
 
-                          <!-- Auto Assign checkbox -->
-                          <div class="form-group">
-                              <div class="col-md-7 col-md-offset-3">
-                                  <label for="autoassign_licenses" class="form-control">
-                                      <input type="checkbox" value="1" name="autoassign_licenses" {{ (old('autoassign_licenses', $user->autoassign_licenses)) == '1' ? ' checked="checked"' : '' }} aria-label="autoassign_licenses">
-                                      {{ trans('admin/users/general.auto_assign_label') }}
-                                  </label>
-                              </div>
-                          </div>
 
                           <!-- Location -->
                           @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
@@ -444,8 +449,8 @@
                           <!-- Country -->
                           <div class="form-group{{ $errors->has('country') ? ' has-error' : '' }}">
                               <label class="col-md-3 control-label" for="country">{{ trans('general.country') }}</label>
-                              <div class="col-md-6">
-                                  {!! Form::countries('country', old('country', $user->country), 'col-md-6 select2') !!}
+                              <div class="col-md-9">
+                                  {!! Form::countries('country', old('country', $user->country), 'col-md-12 select2') !!}
                                   {!! $errors->first('country', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                               </div>
                           </div>

From 73188df0909882bea32bd263020567963510c941 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:22:37 -0700
Subject: [PATCH 09/67] Added autoassign_licenses to bulk user edit

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/bulk-edit.blade.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index 10ae6261d0..f1e84a0f81 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -119,6 +119,29 @@
                             </div>
                         </div> <!--/form-group-->
 
+                        <!-- activated -->
+                        <div class="form-group">
+                            <div class="col-sm-3 control-label">
+                                {{ trans('general.autoassign_licenses') }}
+                            </div>
+                            <div class="col-sm-9">
+
+                                <label for="no_change_autoassign_licenses" class="form-control">
+                                    {{ Form::radio('autoassign_licenses', '', true, ['id' => 'no_change_autoassign_licenses', 'aria-label'=>'no_change']) }}
+                                    {{  trans('general.do_not_change') }}
+                                </label>
+                                <label for="autoassign_licenses" class="form-control">
+                                    {{ Form::radio('autoassign_licenses', '1', old('autoassign_licenses'), ['id' => 'autoassign_licenses', 'aria-label'=>'autoassign_licenses']) }}
+                                    {{  trans('general.autoassign_licenses_help')}}
+                                </label>
+                                <label for="dont_autoassign_licenses" class="form-control">
+                                    {{ Form::radio('autoassign_licenses', '0', old('autoassign_licenses'), ['id' => 'dont_autoassign_licenses', 'aria-label'=>'dont_autoassign_licenses']) }}
+                                    {{  trans('general.no_autoassign_licenses_help')}}
+                                </label>
+
+                            </div>
+                        </div> <!--/form-group-->
+
                         <!-- activated -->
                         <div class="form-group">
                             <div class="col-sm-3 control-label">

From bc7c0aa80d7127380227bba0c6b757a1eb788781 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:23:00 -0700
Subject: [PATCH 10/67] Fixed clone tooltip

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/partials/bootstrap-table.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 9c49323760..3697e7f721 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -261,7 +261,7 @@
             }
 
             if ((row.available_actions) && (row.available_actions.clone === true)) {
-                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="btn btn-sm btn-info" data-tooltip="true" title="{{ trans('general.clone_item') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
+                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="btn btn-sm btn-info" data-tooltip="true" data-toggle="tooltip" title="{{ trans('general.clone_item') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
             }
 
             if ((row.available_actions) && (row.available_actions.update === true)) {

From ff9af7ea740b1148f266fbde3c6dd92d3723e9ae Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:23:15 -0700
Subject: [PATCH 11/67] Added genetic modal partial

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/modals/confirm-action.blade.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/resources/views/modals/confirm-action.blade.php b/resources/views/modals/confirm-action.blade.php
index 2d1a7fcd32..14e97fdd4d 100644
--- a/resources/views/modals/confirm-action.blade.php
+++ b/resources/views/modals/confirm-action.blade.php
@@ -1,31 +1,27 @@
 <!-- Modal -->
-<div class="modal fade" id="confirmAction" tabindex="-1" role="dialog" aria-labelledby="confirmActionLabel" aria-hidden="true">
+<div class="modal modal-purple fade" id="{{ $modal_name }}" tabindex="-1" role="dialog" aria-labelledby="{{ $modal_name }}Label" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="confirmActionLabel">{{ trans('general.file_upload') }}</h4>
+                <h4 class="modal-title" id="{{ $modal_name }}Label">{{ $title }}</h4>
             </div>
-            {{ Form::open([
-            'method' => 'POST',
-            'route' => ['upload/'.$item_type, $item_id],
-            'files' => true,
-            'class' => 'form-horizontal' ]) }}
+            <form action="{{ $route }}" method="POST" class="form-horizontal">
             <input type="hidden" name="_token" value="{{ csrf_token() }}" />
             <div class="modal-body">
 
                 <div class="row">
                     <div class="col-md-12">
-                        Blah
+                        {{ $body }}
                     </div>
                 </div>
 
             </div> <!-- /.modal-body-->
             <div class="modal-footer">
                 <a href="#" class="pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</a>
-                <button type="submit" class="btn btn-primary">{{ trans('button.upload') }}</button>
+                <button type="submit" class="btn btn-primary">{{ trans('general.confirm') }}</button>
             </div>
-            {{ Form::close() }}
+            </form>
         </div>
     </div>
 </div>

From add9e561f9a1de6c6c42bdac511924e12e8a1b60 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:23:42 -0700
Subject: [PATCH 12/67] Added buttons on license page, greyed out where
 appriate

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 64 ++++++++++++++++++-------
 1 file changed, 46 insertions(+), 18 deletions(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index d879f29d1c..0d8f3a642f 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -382,25 +382,37 @@
           <div class="col-md-3">
 
             @can('update', $license)
-              <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block btn-default" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.edit') }}</a>
-              <a href="{{ route('clone/license', $license->id) }}" class="btn btn-block btn-default" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.clone') }}</a>
+              <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.edit') }}</a>
+              <a href="{{ route('clone/license', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 25px;">{{ trans('admin/licenses/general.clone') }}</a>
             @endcan
 
-              @can('checkout', $license)
-                @if ($license->availCount()->count() > 0)
-                  <a href="{{ route('licenses.checkout', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;">Checkout</a>
-                  <a href="{{ route('licenses.edit', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;">Checkout Remaining to All Users</a>
-                @else
-                    <a href="{{ route('licenses.checkout', $license->id) }}" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;">Checkout</a>
-                    <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;">Checkout Remaining to All Users</a>
-                @endif
-              @endcan
+            @can('checkout', $license)
+              @if ($license->availCount()->count() > 0)
+                <a href="{{ route('licenses.checkout', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;" data-toggle="tooltip" title="{{ trans('general.checkout') }}">
+                  Checkout
+                </a>
+                <a href="#" class="btn-block btn bg-maroon" style="margin-bottom: 10px;" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true"  data-target="#checkoutFromAllModal">Checkout Remaining to All Users</a>
+              @else
+                  <a href="{{ route('licenses.checkout', $license->id) }}" class="btn btn-block bg-maroon disabled">
+                    Checkout
+                  </a>
+                  <a href="#" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;">
+                    Checkout Remaining to All Users
+                  </a>
+              @endif
+            @endcan
 
-              @can('checkin', $license)
-                @if (($license->seats - $license->availCount()->count()) > 0 )
-                  <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block bg-purple" style="margin-bottom: 10px;">Checkin All</a>
-                @endif
-              @endcan
+            @can('checkin', $license)
+              @if (($license->seats - $license->availCount()->count()) > 0 )
+                <a href="#" class="btn btn-block bg-purple" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" data-toggle="tooltip" title="Checkin all checked out seats for this license">
+                  Checkin All
+                </a>
+              @else
+                  <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 10px;" data-tooltip="true" data-toggle="tooltip" title="This is disabled because there is nothing to checkin">
+                    Checkin All
+                  </a>
+              @endif
+            @endcan
 
             @can('delete', $license)
 
@@ -592,8 +604,24 @@
 </div> <!-- /.row -->
 
 
-@can('update', \App\Models\License::class)
-  @include ('modals.confirm-action', ['item_type' => 'user', 'item_id' => $user->id])
+@can('checkin', \App\Models\License::class)
+  @include ('modals.confirm-action',
+        [
+            'modal_name' => 'checkinFromAllModal',
+            'route' => route('licenses.bulkcheckin', $license->id),
+            'title' => trans('general.license_checkin_all_confirm_modal_header'),
+            'body' => trans_choice('general.license_checkin_all_confirm_modal_body', 2, ['count' => ($license->seats - $license->availCount()->count())])
+        ])
+@endcan
+
+@can('checkout', \App\Models\License::class)
+  @include ('modals.confirm-action',
+        [
+            'modal_name' => 'checkoutFromAllModal',
+            'route' => route('licenses.bulkcheckout', $license->id),
+            'title' => trans('general.license_checkout_all_confirm_modal_header'),
+            'body' => trans_choice('general.license_checkout_all_confirm_modal_body', 2, ['count' => $license->availCount()->count()])
+        ])
 @endcan
 
 @can('update', \App\Models\License::class)

From dd78d2fc66da923569030fd120b255b6384c1a2c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:23:51 -0700
Subject: [PATCH 13/67] Added language strings

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/general.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index cb51b28a42..fe1be3faf5 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -439,4 +439,14 @@ return [
     'setup_migration_output' => 'Migration output:',
     'setup_migration_create_user' => 'Next: Create User',
     'importer_generic_error'    => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
+    'confirm' => 'Confirm',
+    'license_checkin_all_confirm_modal_header' => 'Are you SURE you wish to checkin all seats for this licence?',
+    'license_checkin_all_confirm_modal_body' => 'This will action checkin one seat. | This action will checkin all :count seats.',
+    'license_checkout_all_confirm_modal_header' => 'Are you SURE you wish to checkout all available seats for this licence?',
+    'license_checkout_all_confirm_modal_body' => 'This will action check in one seat to the first available user. | This action will checkout all :count seats to the first available users.',
+    'autoassign_licenses' => 'Auto-Assign Licenses',
+    'autoassign_licenses_help' => 'Allow user to be have licenses assigned via the bulk-assign license UI or cli tools.',
+    'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
+    'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
+
 ];

From 73cf62e060cc23e4edc9f2a2be0c00776cc2a9b6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:24:00 -0700
Subject: [PATCH 14/67] Added autoassign_licenses to presenter

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Presenters/UserPresenter.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index b5eefdf811..fbb41a4d51 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -294,6 +294,15 @@ class UserPresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'trueFalseFormatter',
             ],
+            [
+                'field' => 'autoassign_licenses',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.autoassign_licenses'),
+                'visible' => false,
+                'formatter' => 'trueFalseFormatter',
+            ],
             [
                 'field' => 'created_by',
                 'searchable' => false,

From 6acce098c9f2f181ecbc7201a4c0135e27d76e2f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:24:56 -0700
Subject: [PATCH 15/67] Added autoassign_licenses on user model

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/User.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Models/User.php b/app/Models/User.php
index c716da074b..69eac6338a 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -65,6 +65,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'avatar',
         'gravatar',
         'vip',
+        'autoassign_licenses',
     ];
 
     protected $casts = [
@@ -78,6 +79,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'deleted_at'   => 'datetime',
         'start_date'   => 'datetime:Y-m-d',
         'end_date'     => 'datetime:Y-m-d',
+        'autoassign_licenses'    => 'boolean',
     ];
 
     /**
@@ -97,6 +99,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'location_id'             => 'exists:locations,id|nullable',
         'start_date'              => 'nullable|date_format:Y-m-d',
         'end_date'                => 'nullable|date_format:Y-m-d|after_or_equal:start_date',
+        'autoassign_licenses'     => 'boolean',
     ];
 
     /**

From f40bef8f9bcd6767c2a497b6091d4732b324d180 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:25:08 -0700
Subject: [PATCH 16/67] Added autoassign_licenses to user importer

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Importer/UserImporter.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php
index bcbc632eb3..9f2c1c5f43 100644
--- a/app/Importer/UserImporter.php
+++ b/app/Importer/UserImporter.php
@@ -58,7 +58,8 @@ class UserImporter extends ItemImporter
         $this->item['department_id'] = $this->createOrFetchDepartment($this->findCsvMatch($row, 'department'));
         $this->item['manager_id'] = $this->fetchManager($this->findCsvMatch($row, 'manager_first_name'), $this->findCsvMatch($row, 'manager_last_name'));
         $this->item['remote'] =($this->fetchHumanBoolean($this->findCsvMatch($row, 'remote')) ==1 ) ? '1' : 0;
-        $this->item['vip'] =($this->fetchHumanBoolean($this->findCsvMatch($row, 'vip')) ==1 ) ? '1' : 0;
+        $this->item['vip'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'vip')) ==1 ) ? '1' : 0;
+        $this->item['autoassign_licenses'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'autoassign_licenses')) ==1 ) ? '1' : 0;
 
 
         $user_department = $this->findCsvMatch($row, 'department');

From 6a94a2f51586a9fbeeeff183a7d048e87c0dfcae Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:25:26 -0700
Subject: [PATCH 17/67] Return true/false for autoassign_licenses in the API

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Transformers/UsersTransformer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php
index 9447d65455..867a884619 100644
--- a/app/Http/Transformers/UsersTransformer.php
+++ b/app/Http/Transformers/UsersTransformer.php
@@ -56,6 +56,7 @@ class UsersTransformer
                 'notes'=> e($user->notes),
                 'permissions' => $user->decodePermissions(),
                 'activated' => ($user->activated == '1') ? true : false,
+                'autoassign_licenses' => ($user->autoassign_licenses == '1') ? true : false,
                 'ldap_import' => ($user->ldap_import == '1') ? true : false,
                 'two_factor_enrolled' => ($user->two_factor_active_and_enrolled()) ? true : false,
                 'two_factor_optin' => ($user->two_factor_active()) ? true : false,

From 03cc55cb6ab3b9d3df6a59bcb6aedfae81691da8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:25:52 -0700
Subject: [PATCH 18/67] Set autoassign_licenses to false if unchecked

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Users/UsersController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 7e95484f6e..b839533658 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -120,7 +120,7 @@ class UsersController extends Controller
         $user->created_by = Auth::user()->id;
         $user->start_date = $request->input('start_date', null);
         $user->end_date = $request->input('end_date', null);
-        $user->autoassign_licenses= $request->input('autoassign_licenses', 1);
+        $user->autoassign_licenses = $request->input('autoassign_licenses', 0);
 
         // Strip out the superuser permission if the user isn't a superadmin
         $permissions_array = $request->input('permission');
@@ -275,7 +275,7 @@ class UsersController extends Controller
         $user->website = $request->input('website', null);
         $user->start_date = $request->input('start_date', null);
         $user->end_date = $request->input('end_date', null);
-        $user->autoassign_licenses = $request->input('autoassign_licenses', 1);
+        $user->autoassign_licenses = $request->input('autoassign_licenses', 0);
 
         // Update the location of any assets checked out to this user
         Asset::where('assigned_type', User::class)

From 9833d861d4c12803c1b1002f4030e31037756cda Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:26:33 -0700
Subject: [PATCH 19/67] Added autoassign_licenses tp bulk users conditional

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Users/BulkUsersController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php
index 67ecae542e..a2d3d496da 100644
--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -113,7 +113,8 @@ class BulkUsersController extends Controller
             ->conditionallyAddItem('locale')
             ->conditionallyAddItem('remote')
             ->conditionallyAddItem('ldap_import')
-            ->conditionallyAddItem('activated');
+            ->conditionallyAddItem('activated')
+            ->conditionallyAddItem('autoassign_licenses');
 
 
         // If the manager_id is one of the users being updated, generate a warning.

From 844ad834310badd242647e25b7eb6b04c7fde7e9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:26:59 -0700
Subject: [PATCH 20/67] Added method to bulk checkout license seats

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Licenses/LicenseCheckoutController.php    | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
index 6f2ae003ca..ef637d3ecc 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -126,4 +126,64 @@ class LicenseCheckoutController extends Controller
 
         return false;
     }
+
+    /**
+     * Bulk checkin all license seats
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see LicenseCheckinController::create() method that provides the form view
+     * @since [v6.1.1]
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+
+    public function bulkCheckout($licenseId) {
+
+        \Log::debug('checking out '.$licenseId.' via bulk');
+        $license = License::findOrFail($licenseId);
+        $this->authorize('checkin', $license);
+
+        $users = User::whereNull('deleted_at')->where('autoassign_licenses', '=', 1)->with('licenses')->get();
+        \Log::debug($users->count().' will be assigned');
+
+        if ($users->count() > $license->getAvailSeatsCountAttribute()) {
+            \Log::debug('You do not have enough free seats to complete this task, so we will check out as many as we can. ');
+        }
+
+        $count = 0;
+        foreach ($users as $user) {
+
+            // Check to make sure this user doesn't already have this license checked out
+            // to them
+
+            if ($user->licenses->where('id', '=', $licenseId)->count()) {
+                \Log::debug($user->username.' already has this license checked out to them. Skipping... ');
+                continue;
+            }
+
+            // If the license is valid, check that there is an available seat
+            if ($license->availCount()->count() < 1) {
+                return redirect()->back()->with('error', 'No more available seats');
+            }
+
+            $licenseSeat = $license->freeSeat();
+
+            // Update the seat with checkout info,
+            $licenseSeat->assigned_to = $user->id;
+
+            if ($licenseSeat->save()) {
+                $count++;
+                \Log::debug('License seat '.$licenseSeat.' is now assigned to '.$licenseSeat->assigned_to);
+                $licenseSeat->logCheckout('Checked out bulk license checkout in license GUI', $user);
+                \Log::debug('License '.$licenseId.' seat '.$licenseSeat->id.' checked out to '.$user->username);
+            }
+        }
+
+        if ($count ==  0) {
+            return redirect()->back()->with('warning', 'No error was encountered, but there were no eligible users to checkout to.');
+        }
+
+        return redirect()->back()->with('success', 'Licenses checked out successfully to '.$count.' users!');
+
+    }
 }

From 4b66ca6ac547fb00f6eca8faccd436fc4dd97b16 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:27:15 -0700
Subject: [PATCH 21/67] Added method to bulk checkin (much simpler than
 checking out)

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Licenses/LicenseCheckinController.php     | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php
index d1c7607493..b3f02b880b 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -123,7 +123,25 @@ class LicenseCheckinController extends Controller
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
 
-    public function bulkCheckin() {
+    public function bulkCheckin(Request $request, $licenseId) {
+
+        $license = License::findOrFail($licenseId);
+        $this->authorize('checkin', $license);
+
+        $licenseSeats = LicenseSeat::where('license_id', '=', $licenseId)
+            ->whereNotNull('assigned_to')
+            ->with('user')
+            ->get();
+
+        foreach ($licenseSeats as $seat) {
+            $seat->assigned_to = null;
+
+            if ($seat->save()) {
+                $seat->logCheckin($seat->user, 'Checked in via bulk checkin on license page');
+            }
+        }
+
+        return redirect()->back()->with('success', 'All licenses checked in successfully!');
 
     }
 

From 16ab2bec06c3de3e3eee4b12158eb72e433cb762 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:27:39 -0700
Subject: [PATCH 22/67] Added sorting and searching on autoassign_licenses via
 user API

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/UsersController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 060858128b..d5d0675210 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -71,6 +71,7 @@ class UsersController extends Controller
             'users.start_date',
             'users.end_date',
             'users.vip',
+            'users.autoassign_licenses',
 
         ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy',)
             ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count');
@@ -187,6 +188,10 @@ class UsersController extends Controller
             $users->has('accessories', '=', $request->input('accessories_count'));
         }
 
+        if ($request->filled('autoassign_licenses')) {
+            $users->has('autoassign_licenses', '=', $request->input('autoassign_licenses'));
+        }
+
         if ($request->filled('search')) {
             $users = $users->TextSearch($request->input('search'));
         }
@@ -260,6 +265,7 @@ class UsersController extends Controller
                         'vip',
                         'start_date',
                         'end_date',
+                        'autoassign_licenses',
                     ];
 
                 $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'first_name';
@@ -357,7 +363,7 @@ class UsersController extends Controller
             $user->permissions = $permissions_array;
         }
 
-        $tmp_pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 20);
+        $tmp_pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 40);
         $user->password = bcrypt($request->get('password', $tmp_pass));
 
         app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');

From 0afaaa4a6b5fc0f75ba3862295287c9355103a92 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 15:28:08 -0700
Subject: [PATCH 23/67] Added autoassign_licenses option to create admin

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Console/Commands/CreateAdmin.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/CreateAdmin.php
index 5aebde3777..114f92dae4 100644
--- a/app/Console/Commands/CreateAdmin.php
+++ b/app/Console/Commands/CreateAdmin.php
@@ -20,13 +20,14 @@ class CreateAdmin extends Command
      * @property string $password
      * @property boolean $activated
      * @property boolean $show_in_list
+     * @property boolean $autoassign_licenses
      * @property \Illuminate\Support\Carbon|null $created_at
      * @property mixed $created_by
      */
 
 
 
-    protected $signature = 'snipeit:create-admin {--first_name=} {--last_name=}  {--email=}  {--username=}  {--password=}   {show_in_list?}';
+    protected $signature = 'snipeit:create-admin {--first_name=} {--last_name=}  {--email=}  {--username=}  {--password=} {show_in_list?} {autoassign_licenses?}';
 
     /**
      * The console command description.
@@ -54,6 +55,9 @@ class CreateAdmin extends Command
         $email = $this->option('email');
         $password = $this->option('password');
         $show_in_list = $this->argument('show_in_list');
+        $autoassign_licenses = $this->argument('autoassign_licenses');
+
+
 
         if (($first_name == '') || ($last_name == '') || ($username == '') || ($email == '') || ($password == '')) {
             $this->info('ERROR: All fields are required.');
@@ -70,6 +74,11 @@ class CreateAdmin extends Command
             if ($show_in_list == 'false') {
                 $user->show_in_list = 0;
             }
+
+            if ($autoassign_licenses == 'false') {
+                $user->autoassign_licenses = 0;
+            }
+
             if ($user->save()) {
                 $this->info('New user created');
                 $user->groups()->attach(1);

From a83991041a2b24b5a6c5b3998c95385f06184749 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 16 Apr 2023 16:08:06 -0700
Subject: [PATCH 24/67] Better placement for errors

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Licenses/LicenseCheckoutController.php    | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
index ef637d3ecc..0581e8ddac 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -150,40 +150,41 @@ class LicenseCheckoutController extends Controller
             \Log::debug('You do not have enough free seats to complete this task, so we will check out as many as we can. ');
         }
 
-        $count = 0;
+        // If the license is valid, check that there is an available seat
+        if ($license->availCount()->count() < 1) {
+            return redirect()->back()->with('error', 'No more available seats');
+        }
+
+        $avail_count = $license->availCount()->count();
+        $assigned_count = 0;
+
         foreach ($users as $user) {
 
-            // Check to make sure this user doesn't already have this license checked out
-            // to them
-
+            // Check to make sure this user doesn't already have this license checked out to them
             if ($user->licenses->where('id', '=', $licenseId)->count()) {
                 \Log::debug($user->username.' already has this license checked out to them. Skipping... ');
                 continue;
             }
 
-            // If the license is valid, check that there is an available seat
-            if ($license->availCount()->count() < 1) {
-                return redirect()->back()->with('error', 'No more available seats');
-            }
-
             $licenseSeat = $license->freeSeat();
 
-            // Update the seat with checkout info,
+            // Update the seat with checkout info
             $licenseSeat->assigned_to = $user->id;
 
             if ($licenseSeat->save()) {
-                $count++;
+                $avail_count--;
+                $assigned_count--;
                 \Log::debug('License seat '.$licenseSeat.' is now assigned to '.$licenseSeat->assigned_to);
                 $licenseSeat->logCheckout('Checked out bulk license checkout in license GUI', $user);
                 \Log::debug('License '.$licenseId.' seat '.$licenseSeat->id.' checked out to '.$user->username);
             }
+
+            if ($avail_count ==  0) {
+                return redirect()->back()->with('warning', $assigned_count.' users were assigned this asset, but we ran out of open seats.');
+            }
         }
 
-        if ($count ==  0) {
-            return redirect()->back()->with('warning', 'No error was encountered, but there were no eligible users to checkout to.');
-        }
-
-        return redirect()->back()->with('success', 'Licenses checked out successfully to '.$count.' users!');
+        return redirect()->back()->with('success', 'Licenses checked out successfully to '.$assigned_count.' users!');
 
     }
 }

From 0cca45d8585009d9f1b1b428bfb279508cbabaec Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 17 Apr 2023 11:57:35 -0700
Subject: [PATCH 25/67] footer now uses flex

---
 app/Models/User.php                       | 37 +++++++++++++----------
 resources/views/layouts/default.blade.php |  8 ++---
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index c716da074b..f75a2be8ba 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -73,13 +73,18 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'location_id'  => 'integer',
         'company_id'   => 'integer',
         'vip'      => 'boolean',
-        'created_at'   => 'datetime',
-        'updated_at'   => 'datetime',
-        'deleted_at'   => 'datetime',
-        'start_date'   => 'datetime:Y-m-d',
-        'end_date'     => 'datetime:Y-m-d',
     ];
 
+
+    protected $dates = [
+        'created_at',
+        'updated_at',
+        'deleted_at',
+        'start_date' => 'date_format:Y-m-d',
+        'end_date' => 'date_format:Y-m-d',
+    ];
+
+
     /**
      * Model validation rules
      *
@@ -117,7 +122,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
 
     /**
      * The relations and their attributes that should be included when searching the model.
-     * 
+     *
      * @var array
      */
     protected $searchableRelations = [
@@ -267,7 +272,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     {
         // At this point the endpoint is the same for everything.
         //  In the future this may want to be adapted for individual notifications.
-        $this->endpoint = \App\Models\Setting::getSettings()->webhook_endpoint;
+        $this->endpoint = \App\Models\Setting::getSettings()->slack_endpoint;
 
         return $this->endpoint;
     }
@@ -349,11 +354,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         $licensesCount = $this->licenses()->count();
         $accessoriesCount = $this->accessories()->count();
         $consumablesCount = $this->consumables()->count();
-        
+
         $totalCount = $assetsCount + $licensesCount + $accessoriesCount + $consumablesCount;
-    
+
         return (int) $totalCount;
-        }
+    }
 
     /**
      * Establishes the user -> actionlogs relationship
@@ -507,7 +512,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
 
     /**
      * Generate email from full name
-     * 
+     *
      * @author A. Gianotto <snipe@snipe.net>
      * @since [v2.0]
      *
@@ -555,7 +560,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
                 $username = str_slug($first_name).str_slug($last_name);
             } elseif ($format == 'firstnamelastinitial') {
                 $username = str_slug(($first_name.substr($last_name, 0, 1)));
-              }
+            }
         }
 
         $user['first_name'] = $first_name;
@@ -652,9 +657,9 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      */
     public function scopeSimpleNameSearch($query, $search)
     {
-           $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
-               ->orWhere('last_name', 'LIKE', '%'.$search.'%')
-               ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]);
+        $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
+            ->orWhere('last_name', 'LIKE', '%'.$search.'%')
+            ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]);
 
         return $query;
     }
@@ -765,4 +770,4 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     {
         return $this->locale;
     }
-}
+}
\ No newline at end of file
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 4cefedd720..7a7b82f449 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -850,13 +850,11 @@
                 </section>
 
             </div><!-- /.content-wrapper -->
-
-            @if($snipeSettings->footer_text!='')
-                <footer class="main-footer hidden-print" style="height:100px;">
+            @if ($snipeSettings->footer_text!='')
+                <footer class="main-footer hidden-print" style="display:flex;flex-direction:row;" >
             @else
                 <footer class="main-footer hidden-print">
             @endif
-
                 <div class="pull-right hidden-xs">
                     @if ($snipeSettings->version_footer!='off')
                         @if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
@@ -884,7 +882,7 @@
 
                 </div>
                 @if ($snipeSettings->footer_text!='')
-                    <div class="pull-right">
+                    <div class="pull-right" style="display: flex;flex-direction: row;">
                         {!!  Helper::parseEscapedMarkedown($snipeSettings->footer_text)  !!}
                     </div>
                 @endif

From 1001b52c4f3efc310e65b6f35025514e265f27c2 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 17 Apr 2023 12:01:09 -0700
Subject: [PATCH 26/67] removes unncessary files

---
 app/Models/User.php | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index f75a2be8ba..df97800917 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -73,18 +73,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'location_id'  => 'integer',
         'company_id'   => 'integer',
         'vip'      => 'boolean',
+        'created_at'   => 'datetime',
+        'updated_at'   => 'datetime',
+        'deleted_at'   => 'datetime',
     ];
 
-
-    protected $dates = [
-        'created_at',
-        'updated_at',
-        'deleted_at',
-        'start_date' => 'date_format:Y-m-d',
-        'end_date' => 'date_format:Y-m-d',
-    ];
-
-
     /**
      * Model validation rules
      *
@@ -122,7 +115,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
 
     /**
      * The relations and their attributes that should be included when searching the model.
-     *
+     * 
      * @var array
      */
     protected $searchableRelations = [
@@ -272,7 +265,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     {
         // At this point the endpoint is the same for everything.
         //  In the future this may want to be adapted for individual notifications.
-        $this->endpoint = \App\Models\Setting::getSettings()->slack_endpoint;
+        $this->endpoint = \App\Models\Setting::getSettings()->webhook_endpoint;
 
         return $this->endpoint;
     }
@@ -354,11 +347,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         $licensesCount = $this->licenses()->count();
         $accessoriesCount = $this->accessories()->count();
         $consumablesCount = $this->consumables()->count();
-
+        
         $totalCount = $assetsCount + $licensesCount + $accessoriesCount + $consumablesCount;
-
+    
         return (int) $totalCount;
-    }
+        }
 
     /**
      * Establishes the user -> actionlogs relationship
@@ -512,7 +505,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
 
     /**
      * Generate email from full name
-     *
+     * 
      * @author A. Gianotto <snipe@snipe.net>
      * @since [v2.0]
      *
@@ -560,7 +553,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
                 $username = str_slug($first_name).str_slug($last_name);
             } elseif ($format == 'firstnamelastinitial') {
                 $username = str_slug(($first_name.substr($last_name, 0, 1)));
-            }
+              }
         }
 
         $user['first_name'] = $first_name;
@@ -657,9 +650,9 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      */
     public function scopeSimpleNameSearch($query, $search)
     {
-        $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
-            ->orWhere('last_name', 'LIKE', '%'.$search.'%')
-            ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]);
+           $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
+               ->orWhere('last_name', 'LIKE', '%'.$search.'%')
+               ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]);
 
         return $query;
     }
@@ -770,4 +763,4 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     {
         return $this->locale;
     }
-}
\ No newline at end of file
+}

From 247c881d87c190d6f6d6e9673a0e4b741f304c65 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 17 Apr 2023 12:10:54 -0700
Subject: [PATCH 27/67] add back casts

---
 app/Models/User.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Models/User.php b/app/Models/User.php
index df97800917..c716da074b 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -76,6 +76,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'created_at'   => 'datetime',
         'updated_at'   => 'datetime',
         'deleted_at'   => 'datetime',
+        'start_date'   => 'datetime:Y-m-d',
+        'end_date'     => 'datetime:Y-m-d',
     ];
 
     /**

From aabd5e92a86034738732255af3cd548930c51ee7 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 17 Apr 2023 12:44:06 -0700
Subject: [PATCH 28/67] surrounding text aligns correctly

---
 resources/assets/less/overrides.less      |  3 +++
 resources/views/layouts/default.blade.php | 17 ++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 23d87fe6f4..278cef9c49 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -141,6 +141,9 @@ a.accordion-header {
 .dropdown-menu li a {
   //color: inherit;
 }
+.pull-text-right{
+  text-align: right; !important;
+}
 
 .main-header .sidebar-toggle:before {
   content: "\f0c9";
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 7a7b82f449..d5fcee65cd 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -851,11 +851,11 @@
 
             </div><!-- /.content-wrapper -->
             @if ($snipeSettings->footer_text!='')
-                <footer class="main-footer hidden-print" style="display:flex;flex-direction:row;" >
+                <footer class="main-footer hidden-print" style="display:grid;flex-direction:row;" >
             @else
                 <footer class="main-footer hidden-print">
             @endif
-                <div class="pull-right hidden-xs">
+                <div class="pull-text-right hidden-xs">
                     @if ($snipeSettings->version_footer!='off')
                         @if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
                             &nbsp; <strong>Version</strong> {{ config('version.app_version') }} -
@@ -876,21 +876,20 @@
                     @if ($snipeSettings->privacy_policy_link!='')
                         <a target="_blank" class="btn btn-default btn-xs" rel="noopener"
                            href="{{  $snipeSettings->privacy_policy_link }}"
-                           target="_new">{{ trans('admin/settings/general.privacy_policy') }}</a>
+                           target="_new" >{{ trans('admin/settings/general.privacy_policy') }}</a>
                     @endif
-
-
+                made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
+                        class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
                 </div>
+                <div class="pull-text-right"><a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,</div>
                 @if ($snipeSettings->footer_text!='')
-                    <div class="pull-right" style="display: flex;flex-direction: row;">
+                    <div  style="flex-direction: row;">
                         {!!  Helper::parseEscapedMarkedown($snipeSettings->footer_text)  !!}
                     </div>
                 @endif
+                    <br>
 
 
-                <a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,
-                made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
-                        class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
             </footer>
 
 

From 2b10357c4eb77014efeb4fb7c1a0f6ecc4694f9a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 17 Apr 2023 19:06:27 -0700
Subject: [PATCH 29/67] Updated dev assets

Signed-off-by: snipe <snipe@snipe.net>
---
 public/css/dist/skins/skin-black-dark.css     | Bin 12543 -> 12815 bytes
 public/css/dist/skins/skin-black-dark.min.css | Bin 12543 -> 12815 bytes
 public/css/dist/skins/skin-blue-dark.css      | Bin 11874 -> 12495 bytes
 public/css/dist/skins/skin-blue-dark.min.css  | Bin 11874 -> 12495 bytes
 public/css/dist/skins/skin-green-dark.css     | Bin 11777 -> 12275 bytes
 public/css/dist/skins/skin-green-dark.min.css | Bin 11777 -> 12275 bytes
 public/css/dist/skins/skin-orange-dark.css    | Bin 11833 -> 12454 bytes
 .../css/dist/skins/skin-orange-dark.min.css   | Bin 11833 -> 12454 bytes
 public/css/dist/skins/skin-purple-dark.css    | Bin 12038 -> 12659 bytes
 .../css/dist/skins/skin-purple-dark.min.css   | Bin 12038 -> 12659 bytes
 public/css/dist/skins/skin-red-dark.css       | Bin 11841 -> 12440 bytes
 public/css/dist/skins/skin-red-dark.min.css   | Bin 11841 -> 12440 bytes
 public/css/dist/skins/skin-yellow-dark.css    | Bin 11050 -> 11698 bytes
 .../css/dist/skins/skin-yellow-dark.min.css   | Bin 11050 -> 11698 bytes
 public/mix-manifest.json                      |  28 +++++++++---------
 15 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css
index 5ba6c5eadd40a857a8ff870f275ac6484bc9a16f..c9f573c75f14a37dcc3cde33386d3a2d304aa353 100644
GIT binary patch
delta 135
zcmeyL*q^e2S;Vj)F+DRcu_QA;Pr*(hClg2{DpYeRC?x0S<QG{flqD8v=<4QVre~A@
z$-Hb$>&c8d3X>J2IJxx@S|{5v$xeQt#W%T4kALz45iwb04P3QcNJ@bgOm0-sn{21Y
JyGi7~3;^)^EWH2#

delta 12
TcmeBA`JcFfS!A=Y=pPvXB$fpZ

diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css
index 5ba6c5eadd40a857a8ff870f275ac6484bc9a16f..c9f573c75f14a37dcc3cde33386d3a2d304aa353 100644
GIT binary patch
delta 135
zcmeyL*q^e2S;Vj)F+DRcu_QA;Pr*(hClg2{DpYeRC?x0S<QG{flqD8v=<4QVre~A@
z$-Hb$>&c8d3X>J2IJxx@S|{5v$xeQt#W%T4kALz45iwb04P3QcNJ@bgOm0-sn{21Y
JyGi7~3;^)^EWH2#

delta 12
TcmeBA`JcFfS!A=Y=pPvXB$fpZ

diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css
index a393ee578c90261a95ae7e544d1a1b7cd56e556c..c728a5af28afeecdbb1f21a4d9bd1c4f34d05c07 100644
GIT binary patch
delta 281
zcmaD9b3SoHhA>w_VtQs?Vo7Fx-sA@yqC#bfMH;%gIhpAhB|tJSThn@SqKdjeEteib
zp@N;lWL_nW$#nw!RtgG9`9&$IMY_rPIr&9a3Yhx2(DmviCYNNErA|I0t3H`io0qAU
zYqE;6BAbF<ZfaiX<c%7#lNIE7prY~+QJ{@EnLr}ZDkHxvwMap)peR4RD7Cm4tbBts
zKTn2{UP)qcc0AY&c~KdSyu`AkM4+=ui%arzbwR>F{d!PQAO$mWvaGDzWL_z*$&;9c
KH&+WkmjVE@Ok4^8

delta 12
TcmX?~_$X#WhVbUAqQ9g7E9C}D

diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css
index a393ee578c90261a95ae7e544d1a1b7cd56e556c..c728a5af28afeecdbb1f21a4d9bd1c4f34d05c07 100644
GIT binary patch
delta 281
zcmaD9b3SoHhA>w_VtQs?Vo7Fx-sA@yqC#bfMH;%gIhpAhB|tJSThn@SqKdjeEteib
zp@N;lWL_nW$#nw!RtgG9`9&$IMY_rPIr&9a3Yhx2(DmviCYNNErA|I0t3H`io0qAU
zYqE;6BAbF<ZfaiX<c%7#lNIE7prY~+QJ{@EnLr}ZDkHxvwMap)peR4RD7Cm4tbBts
zKTn2{UP)qcc0AY&c~KdSyu`AkM4+=ui%arzbwR>F{d!PQAO$mWvaGDzWL_z*$&;9c
KH&+WkmjVE@Ok4^8

delta 12
TcmX?~_$X#WhVbUAqQ9g7E9C}D

diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css
index 3fe0a606d38617f3403d8a383b0bf5b4cb9eaa6a..5bf1b300d36427ee8ee2cd81b6eee321c6dca1a0 100644
GIT binary patch
delta 287
zcmZpS`5eDtvM^UcVtQs?Vo7Fx-Xu=Z$$a8$JUN-^86~<onR(fo){_^?sq@xy=^<22
zc4U&B{6L;>@=5{z$p#`~vdGH0P?RdzDNIt*o4i7cm#LO(@&P49HU+)h)V$Kk7v+^E
z`--wdMdcx)K-D>!KqAp9Bfl)QNI|clC_lX@wYV6lTyb)MG<QITkzPq+adte&425bg
z1%>4Noctmyg|fsV4PB^%K`zKkEK5o((oHTcF3Hc;1*^7GfQbSnVKz<PDdWZh^5^DW
WVKx5EI?639lh?`WZoaRs#0CHWtY1g~

delta 69
zcmewy-x#xDvhc(v;myKgy!^a*iDgNNMY=#r!A@cF7ZF89y~+DoMJF4mNKKBF=bwC9
Wif6NeY6}a9F<DhXdGke0B{l#~HWujs

diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css
index 3fe0a606d38617f3403d8a383b0bf5b4cb9eaa6a..5bf1b300d36427ee8ee2cd81b6eee321c6dca1a0 100644
GIT binary patch
delta 287
zcmZpS`5eDtvM^UcVtQs?Vo7Fx-Xu=Z$$a8$JUN-^86~<onR(fo){_^?sq@xy=^<22
zc4U&B{6L;>@=5{z$p#`~vdGH0P?RdzDNIt*o4i7cm#LO(@&P49HU+)h)V$Kk7v+^E
z`--wdMdcx)K-D>!KqAp9Bfl)QNI|clC_lX@wYV6lTyb)MG<QITkzPq+adte&425bg
z1%>4Noctmyg|fsV4PB^%K`zKkEK5o((oHTcF3Hc;1*^7GfQbSnVKz<PDdWZh^5^DW
WVKx5EI?639lh?`WZoaRs#0CHWtY1g~

delta 69
zcmewy-x#xDvhc(v;myKgy!^a*iDgNNMY=#r!A@cF7ZF89y~+DoMJF4mNKKBF=bwC9
Wif6NeY6}a9F<DhXdGke0B{l#~HWujs

diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css
index fe7af4f628987e97d09d1c3c304e8bd79480a5b6..5f4e719296bdf7ae19d1cb9210dc2ffcbffc2868 100644
GIT binary patch
delta 266
zcmdlPvn+8#mM~XAVtQs?Vo7Fx-ed(%(aHT9Y&<!c=@})uIhlFcn%0vas;KkUa_J!{
z^JbEryg-<5@)=S7$>*fRG?0~Zp(s_bQ_xFHF3BuQ1+o$+8)~Xd{tnc%R9S&dK`%Eo
zuXJ*wrY2J@*W@M2it-Q<pu(I?kZP-p{Ib*{1-*iz{Pd#K;$omuMe+2a{L;J>O>3Yv
z8Af^~iN)FRU}G#rWHj;;%aRg{bdyVqOY(DdLBb&Gp`t(vX7c2@vTl>TMYtw6F$!<4
I72YES0EOIHtpET3

delta 12
TcmZ3MxHD!$mhk55qUWUmC?5sV

diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css
index fe7af4f628987e97d09d1c3c304e8bd79480a5b6..5f4e719296bdf7ae19d1cb9210dc2ffcbffc2868 100644
GIT binary patch
delta 266
zcmdlPvn+8#mM~XAVtQs?Vo7Fx-ed(%(aHT9Y&<!c=@})uIhlFcn%0vas;KkUa_J!{
z^JbEryg-<5@)=S7$>*fRG?0~Zp(s_bQ_xFHF3BuQ1+o$+8)~Xd{tnc%R9S&dK`%Eo
zuXJ*wrY2J@*W@M2it-Q<pu(I?kZP-p{Ib*{1-*iz{Pd#K;$omuMe+2a{L;J>O>3Yv
z8Af^~iN)FRU}G#rWHj;;%aRg{bdyVqOY(DdLBb&Gp`t(vX7c2@vTl>TMYtw6F$!<4
I72YES0EOIHtpET3

delta 12
TcmZ3MxHD!$mhk55qUWUmC?5sV

diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css
index e1bd8edb4abe29607be60ec784ee10d89cbf250e..cec9819d7d7debcccaef176488c98804d04375e2 100644
GIT binary patch
delta 326
zcmZpR`<%34pD<TJVtQs?Vo7Fx-ed(%(aE-A99-!cCAvA8dD)uQlNV~L^VV|dAt~}^
zlAY`z!#}xRfNk<CNgkV|{Gyc9BHiTtoctmyg|fsV4PBsSgb`dQ+7;{+^b(UxGRsnd
zti;KR(#n(9YV&FW)s!R_XBX?{rskD`)T9*U7o_Bu=fMPWG8Obda+4RzYpN2ZdUB$i
z2&Y~_QGR++YH{&oLm3^O3?r~D@nC}t#bh+{63dbjfo?A?F3Hb@S)~UR1yVql04=st
dn7muoZF09Z=j294k<Ax{0|h{w&AKW#xd5z~ZT$cM

delta 25
hcmeyI)E2j4pYY@+M&Zp4Vu1pa6|{La&sMv^1ptZM361~&

diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css
index e1bd8edb4abe29607be60ec784ee10d89cbf250e..cec9819d7d7debcccaef176488c98804d04375e2 100644
GIT binary patch
delta 326
zcmZpR`<%34pD<TJVtQs?Vo7Fx-ed(%(aE-A99-!cCAvA8dD)uQlNV~L^VV|dAt~}^
zlAY`z!#}xRfNk<CNgkV|{Gyc9BHiTtoctmyg|fsV4PBsSgb`dQ+7;{+^b(UxGRsnd
zti;KR(#n(9YV&FW)s!R_XBX?{rskD`)T9*U7o_Bu=fMPWG8Obda+4RzYpN2ZdUB$i
z2&Y~_QGR++YH{&oLm3^O3?r~D@nC}t#bh+{63dbjfo?A?F3Hb@S)~UR1yVql04=st
dn7muoZF09Z=j294k<Ax{0|h{w&AKW#xd5z~ZT$cM

delta 25
hcmeyI)E2j4pYY@+M&Zp4Vu1pa6|{La&sMv^1ptZM361~&

diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css
index cbb5b07d140cf4f8f0e26355751bb8b67b976857..bcce285ed1fe30eb8b12fc4d526e3caf2cf04bb5 100644
GIT binary patch
delta 280
zcmX>YGb3?>mM~XAVtQs?Vo7Fx-sA%uqLTv@*?4j?(=$qRb29U?HLWK%ifeM~At};j
zlAW9&%;!{=S)5stngUhErJ#_MUzCzsq???dlV4<|P?lJvp$n8mn8a1fg=CI`ox)@t
zCB4Znw0N0nxhB6+Qe;xloBUoz7s``Y(92EDD+Mac$pjLKRvGzasYMEU1x5MkMXANb
zlLMvXCRa-H@nsn4l_VBt$AeW@Pd+FqrID9dmXru|NojFOey%Rm7(J*ckb)UH`KgTC
WWLrtDi3f!@+Y0xyZhj;YFA4x1?_R|K

delta 29
lcmbP{cra#zmhk53qKjB3?@{5O+$+j8d7d=)W_Rg8Q2?^e3Y`D|

diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css
index cbb5b07d140cf4f8f0e26355751bb8b67b976857..bcce285ed1fe30eb8b12fc4d526e3caf2cf04bb5 100644
GIT binary patch
delta 280
zcmX>YGb3?>mM~XAVtQs?Vo7Fx-sA%uqLTv@*?4j?(=$qRb29U?HLWK%ifeM~At};j
zlAW9&%;!{=S)5stngUhErJ#_MUzCzsq???dlV4<|P?lJvp$n8mn8a1fg=CI`ox)@t
zCB4Znw0N0nxhB6+Qe;xloBUoz7s``Y(92EDD+Mac$pjLKRvGzasYMEU1x5MkMXANb
zlLMvXCRa-H@nsn4l_VBt$AeW@Pd+FqrID9dmXru|NojFOey%Rm7(J*ckb)UH`KgTC
WWLrtDi3f!@+Y0xyZhj;YFA4x1?_R|K

delta 29
lcmbP{cra#zmhk53qKjB3?@{5O+$+j8d7d=)W_Rg8Q2?^e3Y`D|

diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css
index 5691df21940c93ce09cead9e600f597652207323..fddcde6fa7ef88a9317b2ea8dc5424d54c3c0331 100644
GIT binary patch
delta 274
zcmZ1#wkdkU4gtY}#PrO(#FEVXJOw+2oJ<9~$pxw+lh14MOcoMW6R73VLs2lfMqYDr
zpE%p(cy6A_F5DtqIhpAhCAvA8dD)X0#T7(Q6ze4>mt>ZuPOg(y=g-J5ODzJc)3oNQ
z<(fQML6J>CFE=%>baJDn(&P_{>`V|*d59>~F$#%RV4Vtj1x5MkMXANbK;??!=|%aa
zc`0C%GK};}5{t9r!A2E`NNeilC6*;67U?FJ7MJAb>Vm|9hQUOEk}#tupO<o*T+hon
MaiYlP(*p5Q0P7c9O#lD@

delta 15
XcmdlKy((<O4uOf2gf|BZ$4dbKIz<Lf

diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css
index 5691df21940c93ce09cead9e600f597652207323..fddcde6fa7ef88a9317b2ea8dc5424d54c3c0331 100644
GIT binary patch
delta 274
zcmZ1#wkdkU4gtY}#PrO(#FEVXJOw+2oJ<9~$pxw+lh14MOcoMW6R73VLs2lfMqYDr
zpE%p(cy6A_F5DtqIhpAhCAvA8dD)X0#T7(Q6ze4>mt>ZuPOg(y=g-J5ODzJc)3oNQ
z<(fQML6J>CFE=%>baJDn(&P_{>`V|*d59>~F$#%RV4Vtj1x5MkMXANbK;??!=|%aa
zc`0C%GK};}5{t9r!A2E`NNeilC6*;67U?FJ7MJAb>Vm|9hQUOEk}#tupO<o*T+hon
MaiYlP(*p5Q0P7c9O#lD@

delta 15
XcmdlKy((<O4uOf2gf|BZ$4dbKIz<Lf

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 7142f3d899..4edbabcaa6 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -5,16 +5,16 @@
     "/css/build/app.css": "/css/build/app.css?id=2e40bdf6f6d3d6d6954c391a0a91285e",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=f343f659ca1d45534d2c2c3cc30fb619",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=57e634d63101d3613f4c73aaa2e3f50a",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=5120ce6a4b70d11bbc84a5125aa31949",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=ca38553d041220a4296dda555940e056",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=032f18fdd48936784cfcfe70712a68ae",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=e5b6ec4691d8fd647d38722886f983e6",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=713b1205aa2d7c9db282f8cd5754c0e4",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=7d92dea45d94be7e1d4e427c728d335d",
     "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=6fe68325d5356197672c27bc77cedcb4",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=6ea1eecb7f939256c373c92f58749e72",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=1c0f59079342d1a10099bf41d2e46f59",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=218c6d947f73c767d23a663a9859d97e",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=87c6506e9aac3ebc68dfd99b6f983602",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=c0d21166315b7c2cdd4819fa4a5e4d1e",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=28b36223cf7b1d6e5f236859a4ef2b45",
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898",
@@ -34,18 +34,18 @@
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=7a506bf59323cf5b5fe97f7080fc5ee0",
     "/js/dist/all.js": "/js/dist/all.js?id=97b1034b75e3ac29a2eb9770d66c3370",
     "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=c0d21166315b7c2cdd4819fa4a5e4d1e",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=28b36223cf7b1d6e5f236859a4ef2b45",
     "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=76482123f6c70e866d6b971ba91de7bb",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=1c0f59079342d1a10099bf41d2e46f59",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=87c6506e9aac3ebc68dfd99b6f983602",
     "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=f677207c6cf9678eb539abecb408c374",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=57e634d63101d3613f4c73aaa2e3f50a",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=032f18fdd48936784cfcfe70712a68ae",
     "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=5120ce6a4b70d11bbc84a5125aa31949",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=e5b6ec4691d8fd647d38722886f983e6",
     "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=44bf834f2110504a793dadec132a5898",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=6ea1eecb7f939256c373c92f58749e72",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=218c6d947f73c767d23a663a9859d97e",
     "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=6fe68325d5356197672c27bc77cedcb4",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=713b1205aa2d7c9db282f8cd5754c0e4",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=7d92dea45d94be7e1d4e427c728d335d",
     "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=f343f659ca1d45534d2c2c3cc30fb619",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=ca38553d041220a4296dda555940e056",
     "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=da6c7997d9de2f8329142399f0ce50da"
 }

From 31530137157a44f5763146d3a0f90c325001d103 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 17 Apr 2023 20:14:45 -0700
Subject: [PATCH 30/67] Fixed semicolon parse error from #12832

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/assets/less/overrides.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 278cef9c49..60a75358fb 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -142,7 +142,7 @@ a.accordion-header {
   //color: inherit;
 }
 .pull-text-right{
-  text-align: right; !important;
+  text-align: right !important;
 }
 
 .main-header .sidebar-toggle:before {

From 9698c3b07bfe481379e89f1856c283dd30232f2e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 17 Apr 2023 20:14:50 -0700
Subject: [PATCH 31/67] Updated dev assets

Signed-off-by: snipe <snipe@snipe.net>
---
 public/css/build/app.css       | Bin 23057 -> 23110 bytes
 public/css/build/overrides.css | Bin 16207 -> 16260 bytes
 public/css/dist/all.css        | Bin 549199 -> 549305 bytes
 public/mix-manifest.json       |   6 +++---
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/css/build/app.css b/public/css/build/app.css
index 558970fa05c157938147a2b1a81e6d23650108a1..8ab54a32517fffc1d7dd7cd001b09544ac3904fb 100644
GIT binary patch
delta 44
zcmbQZh4I)H#tm(Xf(4~HIl3jO6(zbwnduoN3e}S@vWQGhVw9bHflX)ge#IaQ0FGo4
A00000

delta 18
acmX@Mg>m8*#tm(XlMl05ZvLVeWB~wC0|)>B

diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index 37ec7d15c319c9b7c64bbe52c14595d3e17d441f..296136c7a64603dc067bb487a85aaa3a48071405 100644
GIT binary patch
delta 61
zcmX?K*HXXX2%AAcX-<xANoqxjZc%1>Mu|c-mx2PAo0yZCo@b>15mn60Eyyn_Nz5zR
Jyq|4?1px2S7p?#R

delta 12
TcmZpvKVP@u2;1hLY~2<BEBFRL

diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index 8585073ccb1d716166680d787068a3460e62fa7f..e0ffcf96d06f8e1369783b9040fefee692be015d 100644
GIT binary patch
delta 107
zcmX?qNO9+3#fBEf7N!>F7M2#)7Pc+yOP2~3l;-5<mZVmc=oV$BXOt*ZPj`@K6`9`H
b$}T(Ip@4;d`vVP*e2eV{_t>X+5vdpeQM@K7

delta 71
zcmdmaSn>QJ#fBEf7N!>F7M2#)7Pc+yOP5anQNqGI-JyVmfBL^JcG>OenjAqE+f(nc
JPw~Pk1px4p8ub7G

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 4edbabcaa6..dd2e0fc1d5 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,8 +1,8 @@
 {
     "/js/build/app.js": "/js/build/app.js?id=7caeae38608edd96421f8ef59d33f5f6",
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=ce23fa22306439befbf49e8e63adb4e0",
-    "/css/build/app.css": "/css/build/app.css?id=2e40bdf6f6d3d6d6954c391a0a91285e",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=ce20eefb1895545e882840c480bca0dc",
+    "/css/build/app.css": "/css/build/app.css?id=3afc900b0a697567f8285f46aded1c89",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=ca38553d041220a4296dda555940e056",
@@ -18,7 +18,7 @@
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898",
-    "/css/dist/all.css": "/css/dist/all.css?id=1faccd9b34013f9893ed467fa3ddcb39",
+    "/css/dist/all.css": "/css/dist/all.css?id=2b87a5b5f1e6f09861732fa41d159bc4",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=2df05d4beaa48550d71234e8dca79141",

From 912f6c45eed1b62fb15d2cd771bd2cd7fc3c11f7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 17 Apr 2023 21:04:47 -0700
Subject: [PATCH 32/67] Reverted #12832

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/layouts/default.blade.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index d5fcee65cd..98b1c52817 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -850,12 +850,9 @@
                 </section>
 
             </div><!-- /.content-wrapper -->
-            @if ($snipeSettings->footer_text!='')
-                <footer class="main-footer hidden-print" style="display:grid;flex-direction:row;" >
-            @else
-                <footer class="main-footer hidden-print">
-            @endif
-                <div class="pull-text-right hidden-xs">
+            <footer class="main-footer hidden-print">
+
+                <div class="pull-right hidden-xs">
                     @if ($snipeSettings->version_footer!='off')
                         @if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
                             &nbsp; <strong>Version</strong> {{ config('version.app_version') }} -
@@ -876,23 +873,25 @@
                     @if ($snipeSettings->privacy_policy_link!='')
                         <a target="_blank" class="btn btn-default btn-xs" rel="noopener"
                            href="{{  $snipeSettings->privacy_policy_link }}"
-                           target="_new" >{{ trans('admin/settings/general.privacy_policy') }}</a>
+                           target="_new">{{ trans('admin/settings/general.privacy_policy') }}</a>
                     @endif
-                made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
-                        class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
+
+
                 </div>
-                <div class="pull-text-right"><a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,</div>
                 @if ($snipeSettings->footer_text!='')
-                    <div  style="flex-direction: row;">
+                    <div class="pull-right">
                         {!!  Helper::parseEscapedMarkedown($snipeSettings->footer_text)  !!}
                     </div>
                 @endif
-                    <br>
 
 
+                <a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,
+                made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
+                        class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
             </footer>
 
 
+
         </div><!-- ./wrapper -->
 
 

From 087f0e596aaf61f26c579ae2de1585ecc7e98ee8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 17 Apr 2023 22:44:05 -0700
Subject: [PATCH 33/67] Fixed has to where

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/UsersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index d872dccab0..dc444ec9e9 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -189,7 +189,7 @@ class UsersController extends Controller
         }
 
         if ($request->filled('autoassign_licenses')) {
-            $users->has('autoassign_licenses', '=', $request->input('autoassign_licenses'));
+            $users->where('autoassign_licenses', '=', $request->input('autoassign_licenses'));
         }
 
         if ($request->filled('search')) {

From 6ab4314221b9e0c4e14875d38ef0d38a911375c9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 01:01:13 -0700
Subject: [PATCH 34/67] Removed unused method

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/Supplier.php | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php
index d60d3c42fe..fa00fbad2a 100755
--- a/app/Models/Supplier.php
+++ b/app/Models/Supplier.php
@@ -78,24 +78,7 @@ class Supplier extends SnipeModel
     {
         return $this->hasMany(Asset::class)->whereNull('deleted_at')->selectRaw('supplier_id, count(*) as count')->groupBy('supplier_id');
     }
-
-    /**
-     * Sets the license seat count attribute
-     *
-     * @todo I don't see the licenseSeatsRelation here?
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @since [v1.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function getLicenseSeatsCountAttribute()
-    {
-        if ($this->licenseSeatsRelation->first()) {
-            return $this->licenseSeatsRelation->first()->count;
-        }
-
-        return 0;
-    }
+    
 
     /**
      * Establishes the supplier -> assets relationship

From de78f8d41f8c2df6229d7d9fae7bc2661a0e48ab Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 01:01:44 -0700
Subject: [PATCH 35/67] Renamed/refactorered licenses method

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/License.php | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/app/Models/License.php b/app/Models/License.php
index ff69d5f66d..4261b1fc45 100755
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -455,40 +455,27 @@ class License extends Depreciable
      * @since [v2.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function licenseSeatsRelation()
+    public function seats()
     {
         return $this->hasMany(LicenseSeat::class)->whereNull('deleted_at')->selectRaw('license_id, count(*) as count')->groupBy('license_id');
     }
 
+
     /**
-     * Sets the license seat count attribute
+     * Returns the number of total available seats for this license
+     * @todo - refactor all of these weird counters for licenses. The relationships are donked, yo.
      *
      * @author A. Gianotto <snipe@snipe.net>
      * @since [v2.0]
      * @return int
      */
-    public function getLicenseSeatsCountAttribute()
-    {
-        if ($this->licenseSeatsRelation->first()) {
-            return $this->licenseSeatsRelation->first()->count;
-        }
-
-        return 0;
-    }
-
-    /**
-     * Returns the number of total available seats across all licenses
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @since [v2.0]
-     * @return int
-     */
-    public static function availassetcount()
+    public function availableSeats()
     {
         return LicenseSeat::whereNull('assigned_to')
-                   ->whereNull('asset_id')
-                   ->whereNull('deleted_at')
-                   ->count();
+            ->where('license_id', '=', $this->id)
+            ->whereNull('asset_id')
+            ->whereNull('deleted_at')
+            ->count();
     }
 
     /**
@@ -500,7 +487,7 @@ class License extends Depreciable
      */
     public function availCount()
     {
-        return $this->licenseSeatsRelation()
+        return $this->seats()
             ->whereNull('asset_id')
             ->whereNull('assigned_to')
             ->whereNull('deleted_at');
@@ -531,7 +518,7 @@ class License extends Depreciable
      */
     public function assignedCount()
     {
-        return $this->licenseSeatsRelation()->where(function ($query) {
+        return $this->seats()->where(function ($query) {
             $query->whereNotNull('assigned_to')
             ->orWhereNotNull('asset_id');
         });

From 3f4159f05897d4980b61f3c2937430844a10e456 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 01:01:52 -0700
Subject: [PATCH 36/67] Added translations

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/admin/licenses/general.php | 29 ++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/resources/lang/en/admin/licenses/general.php b/resources/lang/en/admin/licenses/general.php
index 25a536ec56..ac685ec1b6 100644
--- a/resources/lang/en/admin/licenses/general.php
+++ b/resources/lang/en/admin/licenses/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    'about_licenses_title'            => 'About Licenses',
-    'about_licenses'                  => 'Licenses are used to track software.  They have a specified number of seats that can be checked out to individuals',
+    'about_licenses_title'      => 'About Licenses',
+    'about_licenses'            => 'Licenses are used to track software.  They have a specified number of seats that can be checked out to individuals',
     'checkin'  					=> 'Checkin License Seat',
     'checkout_history'  		=> 'Checkout History',
     'checkout'  				=> 'Checkout License Seat',
@@ -18,4 +18,29 @@ return array(
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
     'view'  					=> 'View License',
+    'bulk'                      =>
+        [
+            'checkin_all'           => [
+                'button'            => 'Checkin All Seats',
+                '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',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+            ],
+
+            'checkout_all'           => [
+                'button'            => 'Checkout All Seats',
+                'modal'             => 'This will action check in one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. ',
+                'enabled_tooltip'   => 'Checkout ALL seats (or as many as are available) to ALL users',
+                'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
+                'success'           => 'License successfully checked out! | :count licenses were successfully checked out!',
+                'error_no_seats'    => 'There are no remaining seats left for this license.',
+                'warn_not_enough_seats'    => ':count users were assigned this license, but we ran out of available license seats.',
+
+
+            ],
+
+        'checkout'  => 'The :attribute must be between :min - :max characters.',
+        'array'   => 'The :attribute must have between :min and :max items.',
+    ],
 );

From 25a83c29150306fcc9f4a2be594d5d1831b1d777 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 01:02:01 -0700
Subject: [PATCH 37/67] Removed moved translations

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/general.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index fe1be3faf5..3133df2220 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -440,13 +440,10 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'importer_generic_error'    => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
     'confirm' => 'Confirm',
-    'license_checkin_all_confirm_modal_header' => 'Are you SURE you wish to checkin all seats for this licence?',
-    'license_checkin_all_confirm_modal_body' => 'This will action checkin one seat. | This action will checkin all :count seats.',
-    'license_checkout_all_confirm_modal_header' => 'Are you SURE you wish to checkout all available seats for this licence?',
-    'license_checkout_all_confirm_modal_body' => 'This will action check in one seat to the first available user. | This action will checkout all :count seats to the first available users.',
     'autoassign_licenses' => 'Auto-Assign Licenses',
     'autoassign_licenses_help' => 'Allow user to be have licenses assigned via the bulk-assign license UI or cli tools.',
     'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
     'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
+    'modal_confirm_generic'      => 'Are you sure?',
 
 ];

From d3b087b5da945ade96a15fbbcbfbcb20e318c446 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 01:02:19 -0700
Subject: [PATCH 38/67] Clearer padding between buttons, added tooltips

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 47 +++++++++++++++----------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 0d8f3a642f..d5c774c5e2 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -383,40 +383,49 @@
 
             @can('update', $license)
               <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.edit') }}</a>
-              <a href="{{ route('clone/license', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 25px;">{{ trans('admin/licenses/general.clone') }}</a>
+              <a href="{{ route('clone/license', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.clone') }}</a>
             @endcan
 
             @can('checkout', $license)
+
               @if ($license->availCount()->count() > 0)
-                <a href="{{ route('licenses.checkout', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;" data-toggle="tooltip" title="{{ trans('general.checkout') }}">
-                  Checkout
+                <a href="{{ route('licenses.checkout', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;">
+                  {{ trans('general.checkout') }}
                 </a>
-                <a href="#" class="btn-block btn bg-maroon" style="margin-bottom: 10px;" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true"  data-target="#checkoutFromAllModal">Checkout Remaining to All Users</a>
+                <a href="#" class="btn-block btn bg-maroon" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
+                  {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
+                </a>
+
               @else
-                  <a href="{{ route('licenses.checkout', $license->id) }}" class="btn btn-block bg-maroon disabled">
-                    Checkout
-                  </a>
-                  <a href="#" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;">
-                    Checkout Remaining to All Users
+                  <a href="{{ route('licenses.checkout', $license->id) }}" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;">
+                    {{ trans('general.checkout') }}
                   </a>
+                  <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
+                    <a href="#" class="btn btn-block bg-maroon disabled" style="margin-bottom: 25px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+                      {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
+                    </a>
+                  </span>
               @endif
             @endcan
 
             @can('checkin', $license)
+
               @if (($license->seats - $license->availCount()->count()) > 0 )
-                <a href="#" class="btn btn-block bg-purple" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" data-toggle="tooltip" title="Checkin all checked out seats for this license">
-                  Checkin All
+                <a href="#" class="btn btn-block bg-purple" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" title="{{ trans('admin/licenses/general.bulk.checkin_all.enabled_tooltip') }}">
+                  {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
                 </a>
               @else
-                  <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 10px;" data-tooltip="true" data-toggle="tooltip" title="This is disabled because there is nothing to checkin">
-                    Checkin All
-                  </a>
+                  <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip') }}">
+                    <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 10px;">
+                     {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
+                    </a>
+                  </span>
               @endif
             @endcan
 
             @can('delete', $license)
 
-              @if ($license->availCount()->count() == 0)
+              @if ($license->availCount()->count() == $license->seats)
                 <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
               @else
                 <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger disabled" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
@@ -609,8 +618,8 @@
         [
             'modal_name' => 'checkinFromAllModal',
             'route' => route('licenses.bulkcheckin', $license->id),
-            'title' => trans('general.license_checkin_all_confirm_modal_header'),
-            'body' => trans_choice('general.license_checkin_all_confirm_modal_body', 2, ['count' => ($license->seats - $license->availCount()->count())])
+            'title' => trans('general.modal_confirm_generic'),
+            'body' => trans_choice('admin/licenses/general.bulk.checkin_all.modal', 2, ['checkedout_seats_count' => $checkedout_seats_count])
         ])
 @endcan
 
@@ -619,8 +628,8 @@
         [
             'modal_name' => 'checkoutFromAllModal',
             'route' => route('licenses.bulkcheckout', $license->id),
-            'title' => trans('general.license_checkout_all_confirm_modal_header'),
-            'body' => trans_choice('general.license_checkout_all_confirm_modal_body', 2, ['count' => $license->availCount()->count()])
+            'title' => trans('general.modal_confirm_generic'),
+            'body' => trans_choice('admin/licenses/general.bulk.checkout_all.modal', 2, ['available_seats_count' => $available_seats_count])
         ])
 @endcan
 

From 220e20d20847383a9bf8721d0fba8d5fb76e8cd2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 01:02:36 -0700
Subject: [PATCH 39/67] Changed tooltip invocation

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/layouts/default.blade.php          | 2 +-
 resources/views/partials/bootstrap-table.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 37554e6a83..18419caab9 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -974,7 +974,7 @@
 
             $(function () {
 
-                $('[data-toggle="tooltip"]').tooltip();
+                $('[data-tooltip="true"]').tooltip();
                 $('[data-toggle="popover"]').popover();
                 $('.select2 span').addClass('needsclick');
                 $('.select2 span').removeAttr('title');
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 3697e7f721..ccb3963a6f 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -94,7 +94,7 @@
 
             exportTypes: ['xlsx', 'excel', 'csv', 'pdf','json', 'xml', 'txt', 'sql', 'doc' ],
             onLoadSuccess: function () {
-                $('[data-toggle="tooltip"]').tooltip(); // Needed to attach tooltips after ajax call
+                $('[data-tooltip="true"]').tooltip(); // Needed to attach tooltips after ajax call
             }
 
             });

From bfcbd9628a56fe042ec2057f258cdb95c7c208bc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 01:02:58 -0700
Subject: [PATCH 40/67] Refactored license controller with new counts

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Licenses/LicensesController.php           | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php
index a0467654ca..f298bec890 100755
--- a/app/Http/Controllers/Licenses/LicensesController.php
+++ b/app/Http/Controllers/Licenses/LicensesController.php
@@ -6,6 +6,8 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Company;
 use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -232,17 +234,34 @@ class LicensesController extends Controller
     public function show($licenseId = null)
     {
         $license = License::with('assignedusers')->find($licenseId);
+        $users_count = User::where('autoassign_licenses', '1')->count();
+        $total_seats_count = $license->totalSeatsByLicenseID();
+        $available_seats_count = $license->availableSeats();
+        $checkedout_seats_count = ($total_seats_count - $available_seats_count);
+
 
         if ($license) {
             $this->authorize('view', $license);
-
-            return view('licenses/view', compact('license'));
+            return view('licenses.view', compact('license'))
+                ->with('users_count', $users_count)
+                ->with('total_seats_count', $total_seats_count)
+                ->with('available_seats_count', $available_seats_count)
+                ->with('checkedout_seats_count', $checkedout_seats_count);
         }
 
-        return redirect()->route('licenses.index')
+        return redirect()->route('licenses.view')
             ->with('error', trans('admin/licenses/message.does_not_exist'));
     }
 
+
+    /**
+     * Returns a view with prepopulated data for clone
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $licenseId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
     public function getClone($licenseId = null)
     {
         if (is_null($license_to_clone = License::find($licenseId))) {

From 725adebffe5013fe228a899fc434f6aa6d61d978 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 01:07:12 -0700
Subject: [PATCH 41/67] Translate log message

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/admin/licenses/general.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/lang/en/admin/licenses/general.php b/resources/lang/en/admin/licenses/general.php
index ac685ec1b6..c26ab05e75 100644
--- a/resources/lang/en/admin/licenses/general.php
+++ b/resources/lang/en/admin/licenses/general.php
@@ -26,16 +26,18 @@ return array(
                 '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',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
             ],
 
-            'checkout_all'           => [
-                'button'            => 'Checkout All Seats',
-                'modal'             => 'This will action check in one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. ',
+            'checkout_all'              => [
+                'button'                => 'Checkout All Seats',
+                'modal'                 => 'This will action check in one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. ',
                 'enabled_tooltip'   => 'Checkout ALL seats (or as many as are available) to ALL users',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
                 'success'           => 'License successfully checked out! | :count licenses were successfully checked out!',
                 'error_no_seats'    => 'There are no remaining seats left for this license.',
                 'warn_not_enough_seats'    => ':count users were assigned this license, but we ran out of available license seats.',
+                'log_msg'           => 'Checked out via bulk license checkout in license GUI',
 
 
             ],

From f21d9c27e6aeec38e18a3694d81c0a407682f6ad Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 01:07:26 -0700
Subject: [PATCH 42/67] Use new translations for logs

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Licenses/LicenseCheckinController.php     | 29 +++++++++++++++----
 .../Licenses/LicenseCheckoutController.php    | 23 ++++++++-------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php
index b3f02b880b..50e20c7985 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -128,20 +128,37 @@ class LicenseCheckinController extends Controller
         $license = License::findOrFail($licenseId);
         $this->authorize('checkin', $license);
 
-        $licenseSeats = LicenseSeat::where('license_id', '=', $licenseId)
+        $licenseSeatsByUser = LicenseSeat::where('license_id', '=', $licenseId)
             ->whereNotNull('assigned_to')
             ->with('user')
             ->get();
 
-        foreach ($licenseSeats as $seat) {
-            $seat->assigned_to = null;
+        foreach ($licenseSeatsByUser as $user_seat) {
+            $user_seat->assigned_to = null;
 
-            if ($seat->save()) {
-                $seat->logCheckin($seat->user, 'Checked in via bulk checkin on license page');
+            if ($user_seat->save()) {
+                \Log::debug('Checking in '.$license->name.' from user '.$user_seat->username);
+                $user_seat->logCheckin($user_seat->user, trans('admin/licenses/general.bulk.checkin_all.log_msg'));
             }
         }
 
-        return redirect()->back()->with('success', 'All licenses checked in successfully!');
+        $licenseSeatsByAsset = LicenseSeat::where('license_id', '=', $licenseId)
+            ->whereNotNull('asset_id')
+            ->with('asset')
+            ->get();
+
+        $count = 0;
+        foreach ($licenseSeatsByAsset as $asset_seat) {
+            $asset_seat->asset_id = null;
+
+            if ($asset_seat->save()) {
+                \Log::debug('Checking in '.$license->name.' from asset '.$asset_seat->asset_tag);
+                $asset_seat->logCheckin($asset_seat->asset, trans('admin/licenses/general.bulk.checkin_all.log_msg'));
+                $count++;
+            }
+        }
+
+        return redirect()->back()->with('success', trans_choice('admin/licenses/general.bulk.checkin_all.success', 2, ['count' => $count] ));
 
     }
 
diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
index 0581e8ddac..4eb108afc9 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -139,23 +139,24 @@ class LicenseCheckoutController extends Controller
 
     public function bulkCheckout($licenseId) {
 
-        \Log::debug('checking out '.$licenseId.' via bulk');
+        \Log::debug('Checking out '.$licenseId.' via bulk');
         $license = License::findOrFail($licenseId);
         $this->authorize('checkin', $license);
+        $avail_count = $license->getAvailSeatsCountAttribute();
 
         $users = User::whereNull('deleted_at')->where('autoassign_licenses', '=', 1)->with('licenses')->get();
-        \Log::debug($users->count().' will be assigned');
+        \Log::debug($avail_count.' will be assigned');
 
-        if ($users->count() > $license->getAvailSeatsCountAttribute()) {
+        if ($users->count() > $avail_count) {
             \Log::debug('You do not have enough free seats to complete this task, so we will check out as many as we can. ');
         }
 
         // If the license is valid, check that there is an available seat
         if ($license->availCount()->count() < 1) {
-            return redirect()->back()->with('error', 'No more available seats');
+            return redirect()->back()->with('error', trans('admin/licenses/general.bulk.checkout_all.error_no_seats'));
         }
 
-        $avail_count = $license->availCount()->count();
+
         $assigned_count = 0;
 
         foreach ($users as $user) {
@@ -173,18 +174,18 @@ class LicenseCheckoutController extends Controller
 
             if ($licenseSeat->save()) {
                 $avail_count--;
-                $assigned_count--;
-                \Log::debug('License seat '.$licenseSeat.' is now assigned to '.$licenseSeat->assigned_to);
-                $licenseSeat->logCheckout('Checked out bulk license checkout in license GUI', $user);
-                \Log::debug('License '.$licenseId.' seat '.$licenseSeat->id.' checked out to '.$user->username);
+                $assigned_count++;
+                $licenseSeat->logCheckout(trans('admin/licenses/general.bulk.checkout_all.log_msg'), $user);
+                \Log::debug('License '.$license->name.' seat '.$licenseSeat->id.' checked out to '.$user->username);
             }
 
             if ($avail_count ==  0) {
-                return redirect()->back()->with('warning', $assigned_count.' users were assigned this asset, but we ran out of open seats.');
+                return redirect()->back()->with('warning', trans('admin/licenses/general.bulk.checkout_all.warn_not_enough_seats', ['count' => $assigned_count]));
             }
         }
 
-        return redirect()->back()->with('success', 'Licenses checked out successfully to '.$assigned_count.' users!');
+        return redirect()->back()->with('success', trans_choice('admin/licenses/general.bulk.checkout_all.success', 2, ['count' => $assigned_count] ));
+
 
     }
 }

From ec0413254e4e958417c796045f5271d0d6766512 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 01:09:40 -0700
Subject: [PATCH 43/67] Removed action menu

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index d5c774c5e2..a6b2b8e758 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -56,21 +56,7 @@
             <span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
           </a>
         </li>
-
-    
-        @can('update', $license)
-          <li class="dropdown pull-right">
-            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-              <i class="fas fa-cog" aria-hidden="true"></i> {{ trans('button.actions') }}
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-              <li><a href="{{ route('licenses.edit', $license->id) }}">{{ trans('admin/licenses/general.edit') }}</a></li>
-              <li><a href="{{ route('clone/license', $license->id) }}">{{ trans('admin/licenses/general.clone') }}</a></li>
-            </ul>
-          </li>
-        @endcan
-
+        
         @can('update', \App\Models\License::class)
           <li class="pull-right"><a href="#" data-toggle="modal" data-target="#uploadFileModal">
               <i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}</a>
@@ -392,7 +378,7 @@
                 <a href="{{ route('licenses.checkout', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;">
                   {{ trans('general.checkout') }}
                 </a>
-                <a href="#" class="btn-block btn bg-maroon" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
+                <a href="#" class="btn-block btn bg-maroon" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
                   {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
                 </a>
 
@@ -401,7 +387,7 @@
                     {{ trans('general.checkout') }}
                   </a>
                   <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
-                    <a href="#" class="btn btn-block bg-maroon disabled" style="margin-bottom: 25px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+                    <a href="#" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
                       {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
                     </a>
                   </span>
@@ -411,12 +397,12 @@
             @can('checkin', $license)
 
               @if (($license->seats - $license->availCount()->count()) > 0 )
-                <a href="#" class="btn btn-block bg-purple" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" title="{{ trans('admin/licenses/general.bulk.checkin_all.enabled_tooltip') }}">
+                <a href="#" class="btn btn-block bg-purple" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" title="{{ trans('admin/licenses/general.bulk.checkin_all.enabled_tooltip') }}">
                   {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
                 </a>
               @else
                   <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip') }}">
-                    <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 10px;">
+                    <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 25px;">
                      {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
                     </a>
                   </span>

From 9f7058a128c0045f81895f80ac17ab62e03570f3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 01:36:34 -0700
Subject: [PATCH 44/67] Revert "Renamed/refactorered licenses method"

This reverts commit de78f8d41f8c2df6229d7d9fae7bc2661a0e48ab.

Signed-off-by: snipe <snipe@snipe.net>

From 8a41f37054ea633092c6ac994844d72d7b4abec3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 02:00:06 -0700
Subject: [PATCH 45/67] Persists buttons through tabs

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 111 +++++++++++++-----------
 1 file changed, 58 insertions(+), 53 deletions(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index a6b2b8e758..fdd24d437e 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -10,7 +10,7 @@
 {{-- Page content --}}
 @section('content')
 <div class="row">
-  <div class="col-md-12">
+  <div class="col-md-9">
 
     <!-- Custom Tabs -->
     <div class="nav-tabs-custom">
@@ -365,59 +365,7 @@
               </div> <!-- end row-striped -->
             </div>
 
-          <div class="col-md-3">
 
-            @can('update', $license)
-              <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.edit') }}</a>
-              <a href="{{ route('clone/license', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.clone') }}</a>
-            @endcan
-
-            @can('checkout', $license)
-
-              @if ($license->availCount()->count() > 0)
-                <a href="{{ route('licenses.checkout', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;">
-                  {{ trans('general.checkout') }}
-                </a>
-                <a href="#" class="btn-block btn bg-maroon" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
-                  {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
-                </a>
-
-              @else
-                  <a href="{{ route('licenses.checkout', $license->id) }}" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;">
-                    {{ trans('general.checkout') }}
-                  </a>
-                  <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
-                    <a href="#" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
-                      {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
-                    </a>
-                  </span>
-              @endif
-            @endcan
-
-            @can('checkin', $license)
-
-              @if (($license->seats - $license->availCount()->count()) > 0 )
-                <a href="#" class="btn btn-block bg-purple" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" title="{{ trans('admin/licenses/general.bulk.checkin_all.enabled_tooltip') }}">
-                  {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
-                </a>
-              @else
-                  <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip') }}">
-                    <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 25px;">
-                     {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
-                    </a>
-                  </span>
-              @endif
-            @endcan
-
-            @can('delete', $license)
-
-              @if ($license->availCount()->count() == $license->seats)
-                <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
-              @else
-                <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger disabled" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
-              @endif
-            @endcan
-          </div>
           </div>
        </div> <!-- end tab-pane -->
 
@@ -590,11 +538,68 @@
               </table>
               </div>
             </div> <!-- /.col-md-12-->
+
+
           </div> <!-- /.row-->
         </div> <!-- /.tab-pane -->
+
       </div> <!-- /.tab-content -->
+
     </div> <!-- nav-tabs-custom -->
   </div>  <!-- /.col -->
+  <div class="col-md-3">
+
+    @can('update', $license)
+      <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.edit') }}</a>
+      <a href="{{ route('clone/license', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.clone') }}</a>
+    @endcan
+
+    @can('checkout', $license)
+
+      @if ($license->availCount()->count() > 0)
+        <a href="{{ route('licenses.checkout', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;">
+          {{ trans('general.checkout') }}
+        </a>
+        <a href="#" class="btn-block btn bg-maroon" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
+          {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
+        </a>
+
+      @else
+        <a href="{{ route('licenses.checkout', $license->id) }}" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;">
+          {{ trans('general.checkout') }}
+        </a>
+        <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
+                    <a href="#" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+                      {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
+                    </a>
+                  </span>
+      @endif
+    @endcan
+
+    @can('checkin', $license)
+
+      @if (($license->seats - $license->availCount()->count()) > 0 )
+        <a href="#" class="btn btn-block bg-purple" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" title="{{ trans('admin/licenses/general.bulk.checkin_all.enabled_tooltip') }}">
+          {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
+        </a>
+      @else
+        <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip') }}">
+                    <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 25px;">
+                     {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
+                    </a>
+                  </span>
+      @endif
+    @endcan
+
+    @can('delete', $license)
+
+      @if ($license->availCount()->count() == $license->seats)
+        <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
+      @else
+        <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger disabled" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
+      @endif
+    @endcan
+  </div>
 
 </div> <!-- /.row -->
 

From 3e53870b37df3fea4cf9b4bbcb1433fa2c55eb30 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 02:00:13 -0700
Subject: [PATCH 46/67] Updated language

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/admin/licenses/general.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/en/admin/licenses/general.php b/resources/lang/en/admin/licenses/general.php
index c26ab05e75..98ed9f1959 100644
--- a/resources/lang/en/admin/licenses/general.php
+++ b/resources/lang/en/admin/licenses/general.php
@@ -31,12 +31,13 @@ return array(
 
             'checkout_all'              => [
                 'button'                => 'Checkout All Seats',
-                'modal'                 => 'This will action check in one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. ',
+                'modal'                 => 'This action will checkout one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. ',
                 'enabled_tooltip'   => 'Checkout ALL seats (or as many as are available) to ALL users',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
                 'success'           => 'License successfully checked out! | :count licenses were successfully checked out!',
                 'error_no_seats'    => 'There are no remaining seats left for this license.',
                 'warn_not_enough_seats'    => ':count users were assigned this license, but we ran out of available license seats.',
+                'warn_no_avail_users'    => 'Nothing to do. There are no users who do not already have this license assigned to them.',
                 'log_msg'           => 'Checked out via bulk license checkout in license GUI',
 
 

From e84ba0c7a02909512c52b331eee6b6c66c82d8cb Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 02:06:32 -0700
Subject: [PATCH 47/67] Revert back to old method name

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/License.php | 78 ++++++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 29 deletions(-)

diff --git a/app/Models/License.php b/app/Models/License.php
index 4261b1fc45..2fc0aafe62 100755
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -106,10 +106,10 @@ class License extends Depreciable
      * @var array
      */
     protected $searchableRelations = [
-      'manufacturer' => ['name'],
-      'company'      => ['name'],
-      'category'     => ['name'],
-      'depreciation' => ['name'],
+        'manufacturer' => ['name'],
+        'company'      => ['name'],
+        'category'     => ['name'],
+        'depreciation' => ['name'],
     ];
 
     /**
@@ -425,7 +425,7 @@ class License extends Depreciable
     public static function assetcount()
     {
         return LicenseSeat::whereNull('deleted_at')
-                   ->count();
+            ->count();
     }
 
 
@@ -441,8 +441,8 @@ class License extends Depreciable
     public function totalSeatsByLicenseID()
     {
         return LicenseSeat::where('license_id', '=', $this->id)
-                   ->whereNull('deleted_at')
-                   ->count();
+            ->whereNull('deleted_at')
+            ->count();
     }
 
     /**
@@ -455,29 +455,49 @@ class License extends Depreciable
      * @since [v2.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function seats()
+    public function licenseSeatsRelation()
     {
         return $this->hasMany(LicenseSeat::class)->whereNull('deleted_at')->selectRaw('license_id, count(*) as count')->groupBy('license_id');
     }
 
-
     /**
-     * Returns the number of total available seats for this license
-     * @todo - refactor all of these weird counters for licenses. The relationships are donked, yo.
+     * Sets the license seat count attribute
      *
      * @author A. Gianotto <snipe@snipe.net>
      * @since [v2.0]
      * @return int
      */
-    public function availableSeats()
+    public function getLicenseSeatsCountAttribute()
+    {
+        if ($this->licenseSeatsRelation->first()) {
+            return $this->licenseSeatsRelation->first()->count;
+        }
+
+        return 0;
+    }
+
+    /**
+     * Returns the number of total available seats across all licenses
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v2.0]
+     * @return int
+     */
+    public static function availassetcount()
     {
         return LicenseSeat::whereNull('assigned_to')
-            ->where('license_id', '=', $this->id)
             ->whereNull('asset_id')
             ->whereNull('deleted_at')
             ->count();
     }
 
+    public function availableSeats()
+    {
+        return LicenseSeat::whereNull('assigned_to')
+            ->whereNull('asset_id')
+            ->whereNull('deleted_at');
+    }
+
     /**
      * Returns the number of total available seats for this license
      *
@@ -487,7 +507,7 @@ class License extends Depreciable
      */
     public function availCount()
     {
-        return $this->seats()
+        return $this->licenseSeatsRelation()
             ->whereNull('asset_id')
             ->whereNull('assigned_to')
             ->whereNull('deleted_at');
@@ -518,9 +538,9 @@ class License extends Depreciable
      */
     public function assignedCount()
     {
-        return $this->seats()->where(function ($query) {
+        return $this->licenseSeatsRelation()->where(function ($query) {
             $query->whereNotNull('assigned_to')
-            ->orWhereNotNull('asset_id');
+                ->orWhereNotNull('asset_id');
         });
     }
 
@@ -608,13 +628,13 @@ class License extends Depreciable
     public function freeSeat()
     {
         return  $this->licenseseats()
-                    ->whereNull('deleted_at')
-                    ->where(function ($query) {
-                        $query->whereNull('assigned_to')
-                            ->whereNull('asset_id');
-                    })
-                    ->orderBy('id', 'asc')
-                    ->first();
+            ->whereNull('deleted_at')
+            ->where(function ($query) {
+                $query->whereNull('assigned_to')
+                    ->whereNull('asset_id');
+            })
+            ->orderBy('id', 'asc')
+            ->first();
     }
 
 
@@ -644,11 +664,11 @@ class License extends Depreciable
         $days = (is_null($days)) ? 60 : $days;
 
         return self::whereNotNull('expiration_date')
-        ->whereNull('deleted_at')
-        ->whereRaw(DB::raw('DATE_SUB(`expiration_date`,INTERVAL '.$days.' DAY) <= DATE(NOW()) '))
-        ->where('expiration_date', '>', date('Y-m-d'))
-        ->orderBy('expiration_date', 'ASC')
-        ->get();
+            ->whereNull('deleted_at')
+            ->whereRaw(DB::raw('DATE_SUB(`expiration_date`,INTERVAL '.$days.' DAY) <= DATE(NOW()) '))
+            ->where('expiration_date', '>', date('Y-m-d'))
+            ->orderBy('expiration_date', 'ASC')
+            ->get();
     }
 
     /**
@@ -692,4 +712,4 @@ class License extends Depreciable
         return $query->leftJoin('companies as companies', 'licenses.company_id', '=', 'companies.id')->select('licenses.*')
             ->orderBy('companies.name', $order);
     }
-}
+}
\ No newline at end of file

From a8a3ca3624e5d12a6b8179411e772dfa1c5df0d2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 02:06:42 -0700
Subject: [PATCH 48/67] Use count on availSeats

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Licenses/LicensesController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php
index f298bec890..5113a42a6c 100755
--- a/app/Http/Controllers/Licenses/LicensesController.php
+++ b/app/Http/Controllers/Licenses/LicensesController.php
@@ -236,7 +236,7 @@ class LicensesController extends Controller
         $license = License::with('assignedusers')->find($licenseId);
         $users_count = User::where('autoassign_licenses', '1')->count();
         $total_seats_count = $license->totalSeatsByLicenseID();
-        $available_seats_count = $license->availableSeats();
+        $available_seats_count = $license->availableSeats()->count();
         $checkedout_seats_count = ($total_seats_count - $available_seats_count);
 
 

From dc6eb6f10454a1d8d7054d69e07f5965710d4001 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 02:07:17 -0700
Subject: [PATCH 49/67] Throw a warning if there were no users affected

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Licenses/LicenseCheckoutController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
index 4eb108afc9..a710497692 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -184,6 +184,10 @@ class LicenseCheckoutController extends Controller
             }
         }
 
+        if ($assigned_count ==  0) {
+            return redirect()->back()->with('warning', trans('admin/licenses/general.bulk.checkout_all.warn_no_avail_users', ['count' => $assigned_count]));
+        }
+
         return redirect()->back()->with('success', trans_choice('admin/licenses/general.bulk.checkout_all.success', 2, ['count' => $assigned_count] ));
 
 

From 9da36833be771dc06444a7367125723dcd0eb1de Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 02:43:44 -0700
Subject: [PATCH 50/67] Removed unused method

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/License.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/Models/License.php b/app/Models/License.php
index 2fc0aafe62..162b3d662a 100755
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -491,12 +491,6 @@ class License extends Depreciable
             ->count();
     }
 
-    public function availableSeats()
-    {
-        return LicenseSeat::whereNull('assigned_to')
-            ->whereNull('asset_id')
-            ->whereNull('deleted_at');
-    }
 
     /**
      * Returns the number of total available seats for this license

From 41490f1e3a2400260b14a2b72c7603d1d15dd623 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 02:43:59 -0700
Subject: [PATCH 51/67] =?UTF-8?q?Use=20=E2=80=9Cname=E2=80=9D=20instead=20?=
 =?UTF-8?q?of=20=E2=80=9Clicense=E2=80=9D=20for=20consistency?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Presenters/LicensePresenter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index 1e8784f2fc..5a44bf52ab 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -33,7 +33,7 @@ class LicensePresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
-                'title' => trans('admin/licenses/table.title'),
+                'title' => trans('general.name'),
                 'formatter' => 'licensesLinkFormatter',
             ], [
                 'field' => 'product_key',

From beba31afbf5d6b21afda879fd08a851b7f409b72 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 02:44:09 -0700
Subject: [PATCH 52/67] Added tooltip for disabled delete buttons

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/admin/licenses/general.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/en/admin/licenses/general.php b/resources/lang/en/admin/licenses/general.php
index 98ed9f1959..4e0c8af5fd 100644
--- a/resources/lang/en/admin/licenses/general.php
+++ b/resources/lang/en/admin/licenses/general.php
@@ -18,6 +18,7 @@ return array(
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
     'view'  					=> 'View License',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
     'bulk'                      =>
         [
             'checkin_all'           => [

From 4d09021e9c2243983b8e10c0c2052141c26c8164 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 02:44:19 -0700
Subject: [PATCH 53/67] Compact tooltip for un-deletable

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/general.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 3133df2220..1b9d9b623a 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -445,5 +445,6 @@ return [
     'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
     'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
     'modal_confirm_generic'      => 'Are you sure?',
+    'cannot_be_deleted'      => 'This item cannot be deleted',
 
 ];

From 3a808aa8060ef3c2b610dc6063104a92efd2b522 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 02:44:33 -0700
Subject: [PATCH 54/67] Updated method for available seat count

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Licenses/LicensesController.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php
index 5113a42a6c..a3607c1810 100755
--- a/app/Http/Controllers/Licenses/LicensesController.php
+++ b/app/Http/Controllers/Licenses/LicensesController.php
@@ -236,9 +236,14 @@ class LicensesController extends Controller
         $license = License::with('assignedusers')->find($licenseId);
         $users_count = User::where('autoassign_licenses', '1')->count();
         $total_seats_count = $license->totalSeatsByLicenseID();
-        $available_seats_count = $license->availableSeats()->count();
+        $available_seats_count = $license->availCount()->count();
         $checkedout_seats_count = ($total_seats_count - $available_seats_count);
 
+        \Log::debug('Total: '.$total_seats_count);
+        \Log::debug('Users: '.$users_count);
+        \Log::debug('Available: '.$available_seats_count);
+        \Log::debug('Checkedout: '.$checkedout_seats_count);
+
 
         if ($license) {
             $this->authorize('view', $license);

From 7aab4290c71053f37a1be17a86b369f852f7b7d9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 02:44:50 -0700
Subject: [PATCH 55/67] Updated tooltips with data-tooltip=true from old method

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/custom_fields/index.blade.php |  4 +--
 resources/views/groups/edit.blade.php         |  6 ++--
 resources/views/hardware/view.blade.php       |  2 +-
 resources/views/licenses/view.blade.php       | 12 ++++---
 .../views/models/custom_fields_form.blade.php |  2 +-
 .../views/partials/bootstrap-table.blade.php  | 32 +++++++++----------
 .../forms/edit/minimum_quantity.blade.php     |  2 +-
 .../forms/edit/permissions-base.blade.php     |  4 +--
 8 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index d2435d7db5..0ad8511183 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -21,7 +21,7 @@
         <h2 class="box-title">{{ trans('admin/custom_fields/general.fieldsets') }}</h2>
         <div class="box-tools pull-right">
           @can('create', \App\Models\CustomFieldset::class)
-          <a href="{{ route('fieldsets.create') }}" class="btn btn-sm btn-primary" data-toggle="tooltip" title="{{ trans('admin/custom_fields/general.create_fieldset_title') }}">{{ trans('admin/custom_fields/general.create_fieldset') }}</a>
+          <a href="{{ route('fieldsets.create') }}" class="btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('admin/custom_fields/general.create_fieldset_title') }}">{{ trans('admin/custom_fields/general.create_fieldset') }}</a>
           @endcan
         </div>
       </div><!-- /.box-header -->
@@ -111,7 +111,7 @@
         <h2 class="box-title">{{ trans('admin/custom_fields/general.custom_fields') }}</h2>
         <div class="box-tools pull-right">
           @can('create', \App\Models\CustomField::class)
-          <a href="{{ route('fields.create') }}" class="btn btn-sm btn-primary" data-toggle="tooltip" title="{{ trans('admin/custom_fields/general.create_field_title') }}">{{ trans('admin/custom_fields/general.create_field') }}</a>
+          <a href="{{ route('fields.create') }}" class="btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('admin/custom_fields/general.create_field_title') }}">{{ trans('admin/custom_fields/general.create_field') }}</a>
           @endcan
         </div>
 
diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index f5948e4841..cb95b3762a 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -77,7 +77,7 @@
             <tbody class="permissions-group">
                 <tr class="header-row permissions-row">
                     <td class="col-md-5 tooltip-base permissions-item"
-                        data-toggle="tooltip"
+                        data-tooltip="true"
                         data-placement="right"
                         title="{{ $localPermission['note'] }}">
                             @unless (empty($localPermission['label']))
@@ -100,7 +100,7 @@
             <tbody class="permission-group">
                 <tr class="header-row permissions-row">
                     <td class="col-md-5 tooltip-base permissions-item header-name"
-                        data-toggle="tooltip"
+                        data-tooltip="true"
                         data-placement="right"
                         title="{{ $localPermission['note'] }}">
                         <h2>{{ $area }}</h2>
@@ -122,7 +122,7 @@
                     <tr class="permissions-row">
                         <td
                                 class="col-md-5 tooltip-base permissions-item"
-                                data-toggle="tooltip"
+                                data-tooltip="true"
                                 data-placement="right"
                                 title="{{ $this_permission['note'] }}">
                                 {{ $this_permission['label'] }}
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index e33f681f6e..ccd3f86536 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -456,7 +456,7 @@
                                                 </div>
                                                 <div class="col-md-6{{ (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) ? ' ellipsis': '' }}">
                                                     @if ($field->field_encrypted=='1')
-                                                        <i class="fas fa-lock" data-toggle="tooltip" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}"></i>
+                                                        <i class="fas fa-lock" data-tooltip="true" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}"></i>
                                                     @endif
 
                                                     @if ($field->isFieldDecryptable($asset->{$field->db_column_name()} ))
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index fdd24d437e..97265349e6 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -584,10 +584,10 @@
         </a>
       @else
         <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip') }}">
-                    <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 25px;">
-                     {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
-                    </a>
-                  </span>
+            <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 25px;">
+             {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
+            </a>
+          </span>
       @endif
     @endcan
 
@@ -596,7 +596,9 @@
       @if ($license->availCount()->count() == $license->seats)
         <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
       @else
-        <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger disabled" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
+          <span data-tooltip="true" title=" {{ trans('admin/licenses/general.delete_disabled') }}">
+            <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger disabled" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
+          </span>
       @endif
     @endcan
   </div>
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 0f3ee9a3e6..cbc6a731ab 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -77,7 +77,7 @@
 
         @if ($field->field_encrypted)
         <div class="col-md-1 col-sm-1 text-left">
-            <i class="fas fa-lock" data-toggle="tooltip" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}"></i>
+            <i class="fas fa-lock" data-tooltip="true" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}"></i>
         </div>
         @endif
 
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index ccb3963a6f..1e1022083a 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -215,7 +215,7 @@
                         text_help = '';
                 }
 
-                return '<nobr><a href="{{ config('app.url') }}/' + destination + '/' + value.id + '" data-toggle="tooltip" title="'+ status_meta[value.status_meta] + '"> <i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + value.name + ' ' + text_help + ' </a> </nobr>';
+                return '<nobr><a href="{{ config('app.url') }}/' + destination + '/' + value.id + '" data-tooltip="true" title="'+ status_meta[value.status_meta] + '"> <i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + value.name + ' ' + text_help + ' </a> </nobr>';
             } else if ((value) && (value.name)) {
 
                 // Add some overrides for any funny urls we have
@@ -261,7 +261,7 @@
             }
 
             if ((row.available_actions) && (row.available_actions.clone === true)) {
-                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="btn btn-sm btn-info" data-tooltip="true" data-toggle="tooltip" title="{{ trans('general.clone_item') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
+                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="btn btn-sm btn-info" data-tooltip="true" data-tooltip="true" title="{{ trans('general.clone_item') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
             }
 
             if ((row.available_actions) && (row.available_actions.update === true)) {
@@ -270,20 +270,20 @@
 
             if ((row.available_actions) && (row.available_actions.delete === true)) {
                 actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '" '
-                    + ' class="btn btn-danger btn-sm delete-asset"  data-toggle="tooltip"  '
+                    + ' class="btn btn-danger btn-sm delete-asset" data-tooltip="true"  '
                     + ' data-toggle="modal" '
                     + ' data-content="{{ trans('general.sure_to_delete') }} ' + row.name + '?" '
                     + ' data-title="{{  trans('general.delete') }}" onClick="return false;">'
                     + '<i class="fas fa-trash" aria-hidden="true"></i><span class="sr-only">Delete</span></a>&nbsp;';
             } else {
-                actions += '<a class="btn btn-danger btn-sm delete-asset disabled" onClick="return false;"><i class="fas fa-trash"></i></a>&nbsp;';
+                actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_deleted') }}"><a class="btn btn-danger btn-sm delete-asset disabled" onClick="return false;"><i class="fas fa-trash"></i></a></span>&nbsp;';
             }
 
 
             if ((row.available_actions) && (row.available_actions.restore === true)) {
                 actions += '<form style="display: inline;" method="POST" action="{{ config('app.url') }}/' + dest + '/' + row.id + '/restore"> ';
                 actions += '@csrf';
-                actions += '<button class="btn btn-sm btn-warning" data-toggle="tooltip" title="{{ trans('general.restore') }}"><i class="fas fa-retweet"></i></button>&nbsp;';
+                actions += '<button class="btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.restore') }}"><i class="fas fa-retweet"></i></button>&nbsp;';
             }
 
             actions +='</nobr>';
@@ -364,9 +364,9 @@
     function licenseSeatInOutFormatter(value, row) {
         // 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.asset_id) && (!row.assigned_to))) {
-            return '<a href="{{ config('app.url') }}/licenses/' + row.license_id + '/checkout/'+row.id+'" class="btn btn-sm bg-maroon" data-toggle="tooltip" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
+            return '<a href="{{ config('app.url') }}/licenses/' + row.license_id + '/checkout/'+row.id+'" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
         } else {
-            return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-toggle="tooltip" title="Check in this license seat.">{{ trans('general.checkin') }}</a>';
+            return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check in this license seat.">{{ trans('general.checkin') }}</a>';
         }
 
     }
@@ -376,18 +376,18 @@
 
             // The user is allowed to check items out, AND the item is deployable
             if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) {
-                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm bg-maroon" data-toggle="tooltip" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
+                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
 
             // The user is allowed to check items out, but the item is not deployable
             } else if (((row.user_can_checkout == false)) && (row.available_actions.checkout == true) && (!row.assigned_to)) {
-                return '<div  data-toggle="tooltip" title="This item has a status label that is undeployable and cannot be checked out at this time."><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></div>';
+                return '<span  data-tooltip="true" title="This item has a status label that is undeployable and cannot be checked out at this time."><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></span>';
 
             // The user is allowed to check items in
             } else if (row.available_actions.checkin == true)  {
                 if (row.assigned_to) {
-                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-toggle="tooltip" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
+                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
                 } else if (row.assigned_pivot_id) {
-                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-toggle="tooltip" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
+                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
                 }
 
             }
@@ -401,11 +401,11 @@
     // This is only used by the requestable assets section
     function assetRequestActionsFormatter (row, value) {
         if (value.assigned_to_self == true){
-            return '<button class="btn btn-danger btn-sm disabled" data-toggle="tooltip" title="Cancel this item request">{{ trans('button.cancel') }}</button>';
+            return '<button class="btn btn-danger btn-sm disabled" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button>';
         } else if (value.available_actions.cancel == true)  {
-            return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-danger btn-sm" data-toggle="tooltip" title="Cancel this item request">{{ trans('button.cancel') }}</button></form>';
+            return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-danger btn-sm" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button></form>';
         } else if (value.available_actions.request == true)  {
-            return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-primary btn-sm" data-toggle="tooltip" title="Request this item">{{ trans('button.request') }}</button></form>';
+            return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-primary btn-sm" data-tooltip="true" title="Request this item">{{ trans('button.request') }}</button></form>';
         }
 
     }
@@ -537,7 +537,7 @@
         if ((row) && (row!=undefined)) {
             return '<a href="{{ config('app.url') }}/locations/' + row.id + '">' + row.name + '</a>';
         } else if (value.rtd_location) {
-            return '<a href="{{ config('app.url') }}/locations/' + value.rtd_location.id + '" data-toggle="tooltip" title="Default Location">' + value.rtd_location.name + '</a>';
+            return '<a href="{{ config('app.url') }}/locations/' + value.rtd_location.id + '" data-tooltip="true" title="Default Location">' + value.rtd_location.name + '</a>';
         }
 
     }
@@ -779,7 +779,7 @@
         //  This is necessary to make the bootstrap tooltips work inside of the
         // wenzhixin/bootstrap-table formatters
         $('#table').on('post-body.bs.table', function () {
-            $('[data-toggle="tooltip"]').tooltip({
+            $('[data-tooltip="true"]').tooltip({
                 container: 'body'
             });
 
diff --git a/resources/views/partials/forms/edit/minimum_quantity.blade.php b/resources/views/partials/forms/edit/minimum_quantity.blade.php
index 83b15a124c..1566ab2e9c 100644
--- a/resources/views/partials/forms/edit/minimum_quantity.blade.php
+++ b/resources/views/partials/forms/edit/minimum_quantity.blade.php
@@ -6,7 +6,7 @@
             <input class="form-control col-md-3" type="text" name="min_amt" id="min_amt" aria-label="min_amt" value="{{ old('min_amt', $item->min_amt) }}" />
         </div>
             <div class="col-md-7" style="margin-left: -15px;">
-                <a href="#" data-toggle="tooltip" title="{{ trans('general.min_amt_help') }}"><i class="fas fa-info-circle" aria-hidden="true"></i>
+                <a href="#" data-tooltip="true" title="{{ trans('general.min_amt_help') }}"><i class="fas fa-info-circle" aria-hidden="true"></i>
                 <span class="sr-only">{{ trans('general.min_amt_help') }}</span>
             </a>
 
diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php
index a702c619ae..a6a6abf9e0 100644
--- a/resources/views/partials/forms/edit/permissions-base.blade.php
+++ b/resources/views/partials/forms/edit/permissions-base.blade.php
@@ -4,7 +4,7 @@
     <tbody class="permissions-group">
     <tr class="header-row permissions-row">
       <td class="col-md-5 tooltip-base permissions-item"
-        data-toggle="tooltip"
+        data-tooltip="true"
         data-placement="right"
         title="{{ $localPermission['note'] }}"
       >
@@ -76,7 +76,7 @@
         @if ($permission['display'])
           <td
             class="col-md-5 tooltip-base permissions-item"
-            data-toggle="tooltip"
+            data-tooltip="true"
             data-placement="right"
             title="{{ $permission['note'] }}"
           >

From df7b19bc1ec31480875374a2a49b61b346099eb3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 04:35:06 -0700
Subject: [PATCH 56/67] Removed unused validations

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/admin/licenses/general.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/lang/en/admin/licenses/general.php b/resources/lang/en/admin/licenses/general.php
index 4e0c8af5fd..6d6d345812 100644
--- a/resources/lang/en/admin/licenses/general.php
+++ b/resources/lang/en/admin/licenses/general.php
@@ -43,8 +43,5 @@ return array(
 
 
             ],
-
-        'checkout'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
     ],
 );

From 0eadc00f4d0315b9cf35b94b17939851482f121c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 04:37:04 -0700
Subject: [PATCH 57/67] Removed unneeded css class

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/modals/confirm-action.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/modals/confirm-action.blade.php b/resources/views/modals/confirm-action.blade.php
index 14e97fdd4d..135a9799ed 100644
--- a/resources/views/modals/confirm-action.blade.php
+++ b/resources/views/modals/confirm-action.blade.php
@@ -1,5 +1,5 @@
 <!-- Modal -->
-<div class="modal modal-purple fade" id="{{ $modal_name }}" tabindex="-1" role="dialog" aria-labelledby="{{ $modal_name }}Label" aria-hidden="true">
+<div class="modal fade" id="{{ $modal_name }}" tabindex="-1" role="dialog" aria-labelledby="{{ $modal_name }}Label" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">

From 95767c46ac832cc26b3a5eb2c321d8ab14ed03d0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 04:37:13 -0700
Subject: [PATCH 58/67] Fixed delete modal

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 97265349e6..68403ff120 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -579,7 +579,7 @@
     @can('checkin', $license)
 
       @if (($license->seats - $license->availCount()->count()) > 0 )
-        <a href="#" class="btn btn-block bg-purple" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" title="{{ trans('admin/licenses/general.bulk.checkin_all.enabled_tooltip') }}">
+        <a href="#" class="btn btn-block bg-purple" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" data-content="{{ trans('general.sure_to_delete') }} data-title="{{  trans('general.delete') }}" onClick="return false;">
           {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
         </a>
       @else
@@ -594,10 +594,14 @@
     @can('delete', $license)
 
       @if ($license->availCount()->count() == $license->seats)
-        <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
+        <button class="btn btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $license->name]) }}" data-target="#dataConfirmModal">
+          {{ trans('general.delete') }}
+        </button>
       @else
           <span data-tooltip="true" title=" {{ trans('admin/licenses/general.delete_disabled') }}">
-            <a href="{{ route('licenses.destroy', $license->id) }}" class="btn btn-block btn-danger disabled" style="margin-bottom: 10px;">{{ trans('general.delete') }}</a>
+            <a href="#" class="btn btn-block btn-danger disabled">
+              {{ trans('general.delete') }}
+            </a>
           </span>
       @endif
     @endcan
@@ -626,6 +630,8 @@
         ])
 @endcan
 
+
+
 @can('update', \App\Models\License::class)
   @include ('modals.upload-file', ['item_type' => 'license', 'item_id' => $license->id])
 @endcan
@@ -634,5 +640,15 @@
 
 
 @section('moar_scripts')
+  <script>
+
+    $('#dataConfirmModal').on('show.bs.modal', function (event) {
+      var content = $(event.relatedTarget).data('content');
+      var title = $(event.relatedTarget).data('title');
+      $(this).find(".modal-body").text(content);
+      $(this).find(".modal-header").text(title);
+    });
+
+  </script>
   @include ('partials.bootstrap-table')
 @stop

From 2c5c4ab9742cfdd3b5a53f70d188166b9986bf1a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 04:40:06 -0700
Subject: [PATCH 59/67] Nicer layout

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 68403ff120..1e0d3c063b 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -68,7 +68,7 @@
 
         <div class="tab-pane active" id="details">
           <div class="row">
-            <div class="col-md-9">
+            <div class="col-md-12">
               <div class="container row-new-striped">
 
                 @if (!is_null($license->company))

From 59f4fe67d6e537fec9338ce9e3d903a858335e94 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 11:28:35 -0700
Subject: [PATCH 60/67] Removed duplicate tooltip

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/partials/bootstrap-table.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 1e1022083a..122e547bad 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -261,7 +261,7 @@
             }
 
             if ((row.available_actions) && (row.available_actions.clone === true)) {
-                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="btn btn-sm btn-info" data-tooltip="true" data-tooltip="true" title="{{ trans('general.clone_item') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
+                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="btn btn-sm btn-info" data-tooltip="true" title="{{ trans('general.clone_item') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
             }
 
             if ((row.available_actions) && (row.available_actions.update === true)) {

From 41358eba85f69b73282a0ef69a4512a6a556ef3e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 11:29:28 -0700
Subject: [PATCH 61/67] Updated label

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/bulk-edit.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index f1e84a0f81..bdc1ad9289 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -127,7 +127,7 @@
                             <div class="col-sm-9">
 
                                 <label for="no_change_autoassign_licenses" class="form-control">
-                                    {{ Form::radio('autoassign_licenses', '', true, ['id' => 'no_change_autoassign_licenses', 'aria-label'=>'no_change']) }}
+                                    {{ Form::radio('autoassign_licenses', '', true, ['id' => 'no_change_autoassign_licenses', 'aria-label'=>'no_change_autoassign_licenses']) }}
                                     {{  trans('general.do_not_change') }}
                                 </label>
                                 <label for="autoassign_licenses" class="form-control">

From 4d9d75379fb69612a4b41ce73c0c158fd19b9eb0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 11:39:16 -0700
Subject: [PATCH 62/67] Improved translation string

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/admin/licenses/general.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en/admin/licenses/general.php b/resources/lang/en/admin/licenses/general.php
index 6d6d345812..0187d076a3 100644
--- a/resources/lang/en/admin/licenses/general.php
+++ b/resources/lang/en/admin/licenses/general.php
@@ -32,7 +32,7 @@ return array(
 
             'checkout_all'              => [
                 'button'                => 'Checkout All Seats',
-                'modal'                 => 'This action will checkout one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. ',
+                'modal'                 => 'This action will checkout one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. A user is considered available for this seat if they do not already have this license checked out to them, and the Auto-Assign License property is enabled on their user account.',
                 'enabled_tooltip'   => 'Checkout ALL seats (or as many as are available) to ALL users',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
                 'success'           => 'License successfully checked out! | :count licenses were successfully checked out!',

From 00a9591c4c307b8159fe83dd0ae4de43009f0bdf Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 11:49:29 -0700
Subject: [PATCH 63/67] Added autoassign_licenses in view, added fa-fw

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/view.blade.php | 29 +++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index c7a07cbc16..fdbd9cfb1a 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -520,23 +520,23 @@
                     </div>
                     @endif
 
-                    <!-- login enabled -->
+                    <!-- vip -->
                     <div class="row">
                       <div class="col-md-3">
                         {{ trans('admin/users/general.vip_label') }}
                       </div>
                       <div class="col-md-9">
-                        {!! ($user->vip=='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')  !!}
+                        {!! ($user->vip=='1') ? '<i class="fas fa-check fa-fw fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
                       </div>
                     </div> 
                     
-                    <!-- login enabled -->
+                    <!-- remote -->
                      <div class="row">
                       <div class="col-md-3">
                         {{ trans('admin/users/general.remote') }}
                       </div>
                       <div class="col-md-9">
-                        {!! ($user->remote=='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')  !!}
+                        {!! ($user->remote=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
                       </div>
                     </div>
 
@@ -546,17 +546,28 @@
                         {{ trans('general.login_enabled') }}
                       </div>
                       <div class="col-md-9">
-                        {!! ($user->activated=='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')  !!}
+                        {!! ($user->activated=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
                       </div>
                     </div>
 
-                    <!-- LDAP -->
+                   <!-- auto assign license -->
+                   <div class="row">
+                       <div class="col-md-3">
+                           {{ trans('general.autoassign_licenses') }}
+                       </div>
+                       <div class="col-md-9">
+                           {!! ($user->autoassign_licenses=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
+                       </div>
+                   </div>
+
+
+                   <!-- LDAP -->
                     <div class="row">
                       <div class="col-md-3">
                           LDAP
                       </div>
                       <div class="col-md-9">
-                        {!! ($user->ldap_import=='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')  !!}
+                        {!! ($user->ldap_import=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
 
                       </div>
                     </div>
@@ -570,7 +581,7 @@
                             </div>
                             <div class="col-md-9">
                           
-                              {!! ($user->two_factor_active()) ? '<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')  !!}
+                              {!! ($user->two_factor_active()) ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
                           
                             </div>
                           </div>
@@ -581,7 +592,7 @@
                               {{ trans('admin/users/general.two_factor_enrolled') }}
                             </div>
                             <div class="col-md-9" id="two_factor_reset_toggle">
-                              {!! ($user->two_factor_active_and_enrolled()) ? '<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')  !!}
+                              {!! ($user->two_factor_active_and_enrolled()) ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
 
                             </div>
                           </div>

From d871a146878c6997148abc7d10e7b91121b8550e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 11:49:40 -0700
Subject: [PATCH 64/67] Added fa-fw for nicer display

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 1e0d3c063b..e48ab859bd 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -318,7 +318,7 @@
                       </strong>
                     </div>
                     <div class="col-md-9">
-                      {!! $license->maintained ? '<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') !!}
+                      {!! $license->maintained ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no') !!}
                     </div>
                   </div>
 
@@ -344,7 +344,7 @@
                       </strong>
                     </div>
                     <div class="col-md-9">
-                      {!! $license->reassignable ? '<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') !!}
+                      {!! $license->reassignable ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no') !!}
                     </div>
                   </div>
 

From 031586495ad8e54736675a41e109114feb82e907 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 12:09:41 -0700
Subject: [PATCH 65/67] Small cosmetic tweaks to 2FA reset class, fixed weird
 layout on 2FA reset button

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/view.blade.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index fdbd9cfb1a..47d6dea328 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -602,11 +602,11 @@
                             <!-- 2FA reset -->
                             <div class="row">
                               <div class="col-md-3">
-                          
+
                               </div>
-                              <div class="col-md-9" style="margin-top: 10px;">
+                              <div class="col-md-9">
                                 
-                                <a class="btn btn-default btn-sm pull-left" id="two_factor_reset" style="margin-right: 10px;"> 
+                                <a class="btn btn-default btn-sm" id="two_factor_reset" style="margin-right: 10px; margin-top: 10px;">
                                   {{ trans('admin/settings/general.two_factor_reset') }}
                                 </a>
                                 <span id="two_factor_reseticon">
@@ -1043,9 +1043,9 @@ $(function () {
       dataType: 'json',
 
       success: function (data) {
-        $("#two_factor_reset_toggle").html('').html('<i class="fas fa-times text-danger" aria-hidden="true"></i> {{ trans('general.no') }}');
+        $("#two_factor_reset_toggle").html('').html('<span class="text-danger"><i class="fas fa-times" aria-hidden="true"></i> {{ trans('general.no') }}</span>');
         $("#two_factor_reseticon").html('');
-        $("#two_factor_resetstatus").html('<i class="fas fa-check text-success"></i>' + data.message);
+        $("#two_factor_resetstatus").html('<span class="text-success"><i class="fas fa-check"></i> ' + data.message + '</span>');
 
       },
 

From 92f516484eb0aab569a3a3a735753b397265645f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 12:54:06 -0700
Subject: [PATCH 66/67] Small tooltip improvements for undeployable items

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/admin/hardware/general.php       |  1 +
 resources/lang/en/general.php                      |  1 +
 resources/views/partials/bootstrap-table.blade.php | 12 ++++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php
index 3d1e43c2df..b0a48f2ce4 100644
--- a/resources/lang/en/admin/hardware/general.php
+++ b/resources/lang/en/admin/hardware/general.php
@@ -23,6 +23,7 @@ return [
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'Pending',
     'undeployable'  			=> 'Undeployable',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
     'import_text' => '
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 1b9d9b623a..328eb32090 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -446,5 +446,6 @@ return [
     'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
     'modal_confirm_generic'      => 'Are you sure?',
     'cannot_be_deleted'      => 'This item cannot be deleted',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
 
 ];
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 122e547bad..51008c241c 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -376,11 +376,19 @@
 
             // The user is allowed to check items out, AND the item is deployable
             if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) {
+
                     return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
 
-            // The user is allowed to check items out, but the item is not deployable
+            // The user is allowed to check items out, but the item is not able to be checked out
             } else if (((row.user_can_checkout == false)) && (row.available_actions.checkout == true) && (!row.assigned_to)) {
-                return '<span  data-tooltip="true" title="This item has a status label that is undeployable and cannot be checked out at this time."><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></span>';
+
+                // We use slightly different language for assets versus other things, since they are the only
+                // item that has a status label
+                if (destination =='assets') {
+                    return '<span  data-tooltip="true" title="{{ trans('admin/hardware/general.undeployable_tooltip') }}"><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></span>';
+                } else {
+                    return '<span  data-tooltip="true" title="{{ trans('general.undeployable_tooltip') }}"><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></span>';
+                }
 
             // The user is allowed to check items in
             } else if (row.available_actions.checkin == true)  {

From d3bdaf7cd36fab6a5049aa30de0b1e281ea6ffc4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Apr 2023 12:59:46 -0700
Subject: [PATCH 67/67] Fixed destination name

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/partials/bootstrap-table.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 51008c241c..21a4f29349 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -384,7 +384,7 @@
 
                 // We use slightly different language for assets versus other things, since they are the only
                 // item that has a status label
-                if (destination =='assets') {
+                if (destination =='hardware') {
                     return '<span  data-tooltip="true" title="{{ trans('admin/hardware/general.undeployable_tooltip') }}"><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></span>';
                 } else {
                     return '<span  data-tooltip="true" title="{{ trans('general.undeployable_tooltip') }}"><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></span>';