DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 09:04:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-07-12 19:22:49 +01:00
parent 3a6d8ef684 44231fa52c
commit 8c74e906ef
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/Assets/AssetCheckinController.php
View file

@ -94,14 +94,18 @@ class AssetCheckinController extends Controller
\Log::debug('Manually override the location IDs'); \Log::debug('Manually override the location IDs');
\Log::debug('Original Location ID: '.$asset->location_id); \Log::debug('Original Location ID: '.$asset->location_id);
$asset->location_id = ''; $asset->location_id = '';
\Log::debug('New RTD Location ID: '.$asset->location_id); \Log::debug('New Location ID: '.$asset->location_id);
} }
$asset->location_id = $asset->rtd_location_id; $asset->location_id = $asset->rtd_location_id;
if ($request->filled('location_id')) { if ($request->filled('location_id')) {
\Log::debug('NEW Location ID: '.$request->get('location_id')); \Log::debug('NEW Location ID: '.$request->get('location_id'));
$asset->location_id = e($request->get('location_id')); $asset->location_id = $request->get('location_id');
if ($request->get('update_default_location') == 0){
$asset->rtd_location_id = $request->get('location_id');
}
} }
$checkin_at = date('Y-m-d H:i:s'); $checkin_at = date('Y-m-d H:i:s');

2
resources/views/hardware/checkin.blade.php
View file

@ -73,7 +73,7 @@
</div> </div>
</div> </div>
@include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id', 'help_text' => ($asset->defaultLoc) ? 'You can choose to check this asset in to a location other than the default location of '.$asset->defaultLoc->name.' if one is set.' : null]) @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id', 'help_text' => ($asset->defaultLoc) ? 'You can choose to check this asset in to a location other than the default location of '.$asset->defaultLoc->name.' if one is set.' : null, 'hide_location_radio' => true])
<!-- Checkout/Checkin Date --> <!-- Checkout/Checkin Date -->
<div class="form-group{{ $errors->has('checkin_at') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('checkin_at') ? ' has-error' : '' }}">

15
resources/views/partials/forms/edit/location-select.blade.php
View file

@ -30,6 +30,21 @@
</div> </div>
@endif @endif
@if (isset($hide_location_radio))
<!-- Update actual location -->
<div class="form-group">
<div class="col-md-9 col-md-offset-3">
<label class="form-control">
{{ Form::radio('update_default_location', '1', old('update_default_location'), ['checked'=> 'checked', 'aria-label'=>'update_default_location']) }}
{{ trans('admin/hardware/form.asset_location') }}
</label>
<label class="form-control">
{{ Form::radio('update_default_location', '0', old('update_default_location'), ['aria-label'=>'update_default_location']) }}
{{ trans('admin/hardware/form.asset_location_update_default_current') }}
</label>
</div>
</div> <!--/form-group-->
@endif
</div> </div>