diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php index 9d6917787..3a7c77b7b 100644 --- a/resources/views/account/requestable-assets.blade.php +++ b/resources/views/account/requestable-assets.blade.php @@ -143,19 +143,17 @@ {{ trans('general.image') }} {{ trans('admin/hardware/table.asset_model') }} {{ trans('admin/accessories/general.remaining') }} - {{ trans('general.quantity') }} - {{ trans('table.actions') }} + + {{ trans('table.actions') }} @foreach($models as $requestableModel) -
- {{ csrf_field() }} + + @if ($requestableModel->image) @@ -167,16 +165,20 @@ {{$requestableModel->name}} {{$requestableModel->assets->where('requestable', '1')->count()}} - + + + {{ csrf_field() }} + @if ($requestableModel->isRequestedBy(Auth::user())) - {{Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}} + {{ Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}} @else - {{Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}} + {{ Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}} @endif + - + @endforeach diff --git a/resources/views/emails/asset-requested.blade.php b/resources/views/emails/asset-requested.blade.php index c5ece1311..e8a2a253d 100644 --- a/resources/views/emails/asset-requested.blade.php +++ b/resources/views/emails/asset-requested.blade.php @@ -6,9 +6,9 @@

{{ trans('mail.user') }} {{ $requested_by }}
{{ trans('mail.item') }} {{ $item_name }} ({{ $item_type }})
- {{ trans('mail.requested') }} {{ $requested_date }} + {{ trans('general.requested') }} {{ $requested_date }} @if ($item_quantity > 1) -{{ trans('mail.quantity') }} {{ $item_quantity}} +
{{ trans('general.qty') }} {{ $item_quantity}} @endif @if ($snipeSettings->show_url_in_emails=='1')