mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-28 06:59:41 -08:00
296de34e8a
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. * Upgraded framework to Laravel 6 ### TO DO: - Fix password restriction rules- the old library isn’t compatible with Laravel 6 :( - Figure out why in-app API calls are returning “Unauthorized” * More updates from Input:: to Request:: helper * Switch to Request:: from Input * Added passport config * Fixed goofy password minimum in seeder * Added laravel/helpers * Changed ($item) to ($item->id) in forms I have no idea why this is necessary * Changed ($item) to ($item->id) in forms * Updated API middleware to auth:api * Updated with added laravel auth.php values * FIxed *&!^$%^&$^%!!!! ajax issue * Switch to Request::get from Input::get * Switched to Request facade * Added password security minimums back in The package we were using has not been updated to Laravel v6, so I created custom validators instead * Added language strings for error messages for password rules * Fixed `($item)` issue in formActions for partials
88 lines
3.2 KiB
PHP
88 lines
3.2 KiB
PHP
@extends('layouts/default')
|
|
|
|
{{-- Page title --}}
|
|
@section('title')
|
|
{{ trans('admin/consumables/general.checkout') }}
|
|
@parent
|
|
@stop
|
|
|
|
{{-- Page content --}}
|
|
@section('content')
|
|
|
|
<div class="row">
|
|
<div class="col-md-9">
|
|
|
|
<form class="form-horizontal" method="post" action="" autocomplete="off">
|
|
<!-- CSRF Token -->
|
|
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
|
|
|
<div class="box box-default">
|
|
|
|
@if ($consumable->id)
|
|
<div class="box-header with-border">
|
|
<div class="box-heading">
|
|
<h3 class="box-title">{{ $consumable->name }} </h3>
|
|
</div>
|
|
</div><!-- /.box-header -->
|
|
@endif
|
|
|
|
<div class="box-body">
|
|
@if ($consumable->name)
|
|
<!-- consumable name -->
|
|
<div class="form-group">
|
|
<label class="col-sm-3 control-label">{{ trans('admin/consumables/general.consumable_name') }}</label>
|
|
<div class="col-md-6">
|
|
<p class="form-control-static">{{ $consumable->name }}</p>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
<!-- User -->
|
|
@include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to', 'required'=> 'true'])
|
|
|
|
|
|
@if ($consumable->requireAcceptance() || $consumable->getEula() || ($snipeSettings->slack_endpoint!=''))
|
|
<div class="form-group notification-callout">
|
|
<div class="col-md-8 col-md-offset-3">
|
|
<div class="callout callout-info">
|
|
|
|
@if ($consumable->category->require_acceptance=='1')
|
|
<i class="fa fa-envelope"></i>
|
|
{{ trans('admin/categories/general.required_acceptance') }}
|
|
<br>
|
|
@endif
|
|
|
|
@if ($consumable->getEula())
|
|
<i class="fa fa-envelope"></i>
|
|
{{ trans('admin/categories/general.required_eula') }}
|
|
<br>
|
|
@endif
|
|
|
|
@if ($snipeSettings->slack_endpoint!='')
|
|
<i class="fa fa-slack"></i>
|
|
A slack message will be sent
|
|
@endif
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
<!-- Note -->
|
|
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
|
|
<label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
|
|
<div class="col-md-7">
|
|
<textarea class="col-md-6 form-control" id="note" name="note">{{ Request::old('note', $consumable->note) }}</textarea>
|
|
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|
|
</div> <!-- .box-body -->
|
|
<div class="box-footer">
|
|
<a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
|
|
<button type="submit" class="btn btn-success pull-right"><i class="fa fa-check icon-white"></i> {{ trans('general.checkout') }}</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
|
|
</div>
|
|
</div>
|
|
@stop
|