Skip to content

Commit

Permalink
refactored from bulkcheckin to quickscancheckin
Browse files Browse the repository at this point in the history
  • Loading branch information
adagioajanes committed Dec 21, 2021
1 parent 7acb559 commit b01a446
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions resources/lang/en/general.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
'bulkaudit' => 'Bulk Audit',
'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'bulk_checkin' => 'Bulk Checkin',
'bulk_checkin_status' => 'Bulk Checkin Status',
'quickscan_checkin' => 'Quick Scan Checkin',
'quickscan_checkin_status' => 'Bulk Checkin Status',
'bystatus' => 'by Status',
'cancel' => 'Cancel',
'categories' => 'Categories',
Expand Down
6 changes: 3 additions & 3 deletions resources/views/hardware/quickscan-checkin.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{-- Page title --}}
@section('title')
{{ trans('general.bulk_checkin') }}
{{ trans('general.quickscan_checkin') }}
@parent
@stop

Expand Down Expand Up @@ -64,15 +64,15 @@
<div class="col-md-6">
<div class="box box-default" id="checkedin-div" style="display: none">
<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 class="box-body">

<table id="checkedin" class="table table-striped snipe-table">
<thead>
<tr>
<th>{{ trans('general.asset_tag') }}</th>
<th>{{ trans('general.bulk_checkin_status') }}</th>
<th>{{ trans('general.quickscan_checkin_status') }}</th>
<th></th>
</tr>
<tr id="checkin-loader" style="display: none;">
Expand Down
6 changes: 3 additions & 3 deletions resources/views/layouts/default.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -481,9 +481,9 @@

<li class="divider">&nbsp;</li>
@can('checkin', \App\Models\Asset::class)
<li{!! (Request::is('hardware/bulkcheckin') ? ' class="active"' : '') !!}>
<a href="{{ route('hardware/bulkcheckin') }}">
{{ trans('general.bulk_checkin') }}
<li{!! (Request::is('hardware/quickscancheckin') ? ' class="active"' : '') !!}>
<a href="{{ route('hardware/quickscancheckin') }}">
{{ trans('general.quickscan_checkin') }}
</a>
</li>
@endcan
Expand Down
4 changes: 2 additions & 2 deletions routes/web/hardware.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ function () {
[AssetsController::class, 'quickScan']
)->name('assets.bulkaudit');

Route::get('bulkcheckin',
Route::get('quickscancheckin',
[AssetsController::class, 'quickScanCheckin']
)->name('hardware/bulkcheckin');
)->name('hardware/quickscancheckin');

// Asset Maintenances
Route::resource('maintenances',
Expand Down

0 comments on commit b01a446

Please sign in to comment.