mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
refactored from bulkcheckin to quickscancheckin
This commit is contained in:
parent
7acb559069
commit
b01a4468c7
|
@ -30,8 +30,8 @@
|
||||||
'bulkaudit' => 'Bulk Audit',
|
'bulkaudit' => 'Bulk Audit',
|
||||||
'bulkaudit_status' => 'Audit Status',
|
'bulkaudit_status' => 'Audit Status',
|
||||||
'bulk_checkout' => 'Bulk Checkout',
|
'bulk_checkout' => 'Bulk Checkout',
|
||||||
'bulk_checkin' => 'Bulk Checkin',
|
'quickscan_checkin' => 'Quick Scan Checkin',
|
||||||
'bulk_checkin_status' => 'Bulk Checkin Status',
|
'quickscan_checkin_status' => 'Bulk Checkin Status',
|
||||||
'bystatus' => 'by Status',
|
'bystatus' => 'by Status',
|
||||||
'cancel' => 'Cancel',
|
'cancel' => 'Cancel',
|
||||||
'categories' => 'Categories',
|
'categories' => 'Categories',
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{{-- Page title --}}
|
{{-- Page title --}}
|
||||||
@section('title')
|
@section('title')
|
||||||
{{ trans('general.bulk_checkin') }}
|
{{ trans('general.quickscan_checkin') }}
|
||||||
@parent
|
@parent
|
||||||
@stop
|
@stop
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div class="box box-default" id="checkedin-div" style="display: none">
|
<div class="box box-default" id="checkedin-div" style="display: none">
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h2 class="box-title"> {{ trans('general.bulk_checkin_status') }} (<span id="checkin-counter">0</span> assets checked in) </h2>
|
<h2 class="box-title"> {{ trans('general.quickscan_checkin_status') }} (<span id="checkin-counter">0</span> assets checked in) </h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{{ trans('general.asset_tag') }}</th>
|
<th>{{ trans('general.asset_tag') }}</th>
|
||||||
<th>{{ trans('general.bulk_checkin_status') }}</th>
|
<th>{{ trans('general.quickscan_checkin_status') }}</th>
|
||||||
<th></th>
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr id="checkin-loader" style="display: none;">
|
<tr id="checkin-loader" style="display: none;">
|
||||||
|
|
|
@ -481,9 +481,9 @@
|
||||||
|
|
||||||
<li class="divider"> </li>
|
<li class="divider"> </li>
|
||||||
@can('checkin', \App\Models\Asset::class)
|
@can('checkin', \App\Models\Asset::class)
|
||||||
<li{!! (Request::is('hardware/bulkcheckin') ? ' class="active"' : '') !!}>
|
<li{!! (Request::is('hardware/quickscancheckin') ? ' class="active"' : '') !!}>
|
||||||
<a href="{{ route('hardware/bulkcheckin') }}">
|
<a href="{{ route('hardware/quickscancheckin') }}">
|
||||||
{{ trans('general.bulk_checkin') }}
|
{{ trans('general.quickscan_checkin') }}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
@endcan
|
@endcan
|
||||||
|
|
|
@ -28,9 +28,9 @@ Route::group(
|
||||||
[AssetsController::class, 'quickScan']
|
[AssetsController::class, 'quickScan']
|
||||||
)->name('assets.bulkaudit');
|
)->name('assets.bulkaudit');
|
||||||
|
|
||||||
Route::get('bulkcheckin',
|
Route::get('quickscancheckin',
|
||||||
[AssetsController::class, 'quickScanCheckin']
|
[AssetsController::class, 'quickScanCheckin']
|
||||||
)->name('hardware/bulkcheckin');
|
)->name('hardware/quickscancheckin');
|
||||||
|
|
||||||
// Asset Maintenances
|
// Asset Maintenances
|
||||||
Route::resource('maintenances',
|
Route::resource('maintenances',
|
||||||
|
|
Loading…
Reference in a new issue