From 458d61fafebdb5a870bb1e7a480b11af3282e340 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Jul 2022 17:57:39 -0700
Subject: [PATCH] Front-end updates for checkin without delete

Signed-off-by: snipe <snipe@snipe.net>
---
 .../views/users/confirm-bulk-delete.blade.php | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index bdc084fde..505a4cb98 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -42,6 +42,7 @@
                     <th class="col-md-5">{{ trans('general.assets') }}</th>
                     <th class="col-md-5">{{ trans('general.accessories') }}</th>
                     <th class="col-md-5">{{ trans('general.licenses') }}</th>
+                    <th class="col-md-5">{{ trans('general.consumables') }}</th>
                   </tr>
                 </thead>
                 <tbody>
@@ -49,14 +50,14 @@
                   <tr {!! ($user->isSuperUser() ? ' class="danger"':'') !!}>
                     <td>
                       @if (Auth::id()!=$user->id)
-                      <input type="checkbox" name="ids[]" value="{{ $user->id }}" checked="checked">
+                      <input type="checkbox" name="ids[]" value="{{ $user->id }}" class="minimal" checked="checked">
                       @else
-                      <input type="checkbox" name="ids[]" value="{{ $user->id }}" disabled>
+                      <input type="checkbox" name="ids[]" value="{{ $user->id }}" class="minimal" disabled>
                       @endif
                     </td>
 
                     <td>
-                      <span {{ (Auth::user()->id==$user->id ? ' style="text-decoration: line-through"' : '') }}>
+                      <span {!! (Auth::user()->id==$user->id ? ' style="text-decoration: line-through"' : '') !!}>
                         {{ $user->present()->fullName() }} ({{ $user->username }})
                       </span>
                       {{ (Auth::id()==$user->id ? ' (cannot delete yourself)' : '') }}
@@ -77,19 +78,26 @@
                     <td>
                       {{ number_format($user->licenses()->count())  }}
                     </td>
+                    <td>
+                      {{ number_format($user->consumables()->count())  }}
+                    </td>
                   </tr>
                   @endforeach
                 </tbody>
                 <tfoot>
+
                   <tr>
-                    <td colspan="6" class="warning">
+                    <td colspan="7">
                       {{ Form::select('status_id', $statuslabel_list , Request::old('status_id'), array('class'=>'select2', 'style'=>'width:250px')) }}
-                      <label>{{ trans('admin/users/general.update_user_assets_status') }}</label></label>
+                      <label>{{ trans('admin/users/general.update_user_assets_status') }}</label>
                     </td>
                   </tr>
                   <tr>
-                    <td colspan="6" class="warning">
-                      <label><input type="checkbox" name="ids['.e($user->id).']" checked>{{ trans('admin/users/general.checkin_user_properties') }}</label>
+                    <td colspan="7" class="text-danger">
+                      <label>
+                        <input type="checkbox" name="delete_user" value="1" class="minimal">
+                        <i class="fa fa-warning text-danger"></i> {{ trans('general.bulk_soft_delete') }}
+                      </label>
                     </td>
                   </tr>
                 </tfoot>