diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php index 59ffc3ddda..55387a57af 100644 --- a/resources/views/hardware/requested.blade.php +++ b/resources/views/hardware/requested.blade.php @@ -13,124 +13,118 @@ {{-- Page content --}} @section('content') -
| {{ trans('general.image') }} | -{{ trans('general.name') }} | -{{ trans('admin/hardware/table.location') }} | -{{ trans('admin/hardware/form.expected_checkin') }} | -{{ trans('admin/hardware/table.requesting_user') }} | -{{ trans('admin/hardware/table.requested_date') }} | -{{ trans('button.actions') }} | -{{ trans('general.checkout') }} | -
|---|
| {{ trans('general.image') }} | +{{ trans('general.name') }} | +{{ trans('admin/hardware/table.location') }} | +{{ trans('admin/hardware/form.expected_checkin') }} | +{{ trans('admin/hardware/table.requesting_user') }} | +{{ trans('admin/hardware/table.requested_date') }} | +{{ trans('button.actions') }} | +{{ trans('general.checkout') }} | +||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
- @if (($request->itemType() == "asset") && ($request->requestable))
- | |||||||||||||||
|
+ @if (($request->itemType() == "asset") && ($request->requestable))
+ |
+ + @if ($request->itemType() == "asset") + + {{ $request->name() }} + + @elseif ($request->itemType() == "asset_model") + + {{ $request->name() }} + + @endif - | -+ | ++ {{ $request->location() ? $request->location()->name : '' }} + | - @if ($request->itemType() == "asset") - - {{ $request->name() }} - - @elseif ($request->itemType() == "asset_model") - - {{ $request->name() }} - - @endif ++ @if ($request->itemType() == "asset") + {{ App\Helpers\Helper::getFormattedDateObject($request->requestable->expected_checkin, 'datetime', false) }} + @endif + | ++ @if ($request->requestingUser() && !$request->requestingUser()->trashed()) + + {{ $request->requestingUser()->display_name }} + + @else + {{ trans('admin/reports/general.deleted_user') }} + @endif + | ++ {{ App\Helpers\Helper::getFormattedDateObject($request->created_at, 'datetime', false) }} + | ++ + | ++ @if ($request->itemType() == "asset") + @if ($request->requestable->assigned_to=='') + {{ trans('general.checkout') }} + @else + {{ trans('general.checkin') }} + @endif + @endif + | - - @if ($request->location()) -{{ $request->location()->name }} | - @else -- @endif - - | - @if ($request->itemType() == "asset") - {{ App\Helpers\Helper::getFormattedDateObject($request->requestable->expected_checkin, 'datetime', false) }} - @endif - | -- @if ($request->requestingUser() && !$request->requestingUser()->trashed()) - - {{ $request->requestingUser()->display_name }} - - @else - (deleted user) - @endif - | -{{ App\Helpers\Helper::getFormattedDateObject($request->created_at, 'datetime', false) }} | -- - | -- @if ($request->itemType() == "asset") - @if ($request->requestable->assigned_to=='') - {{ trans('general.checkout') }} - @else - {{ trans('general.checkin') }} + |
| {{ trans('general.id') }} | -{{ trans('general.username') }} | -{{ trans('admin/users/table.display_name') }} | -{{ trans('general.employee_number') }} | -{{ trans('general.first_name') }} | -{{ trans('general.last_name') }} | -{{ trans('general.email') }} | -{{ trans('general.notes') }} | -
|---|---|---|---|---|---|---|---|
| {{ trans('general.id') }} | +{{ trans('general.username') }} | +{{ trans('admin/users/table.display_name') }} | +{{ trans('general.employee_number') }} | +{{ trans('general.first_name') }} | +{{ trans('general.last_name') }} | +{{ trans('general.email') }} | +{{ trans('general.notes') }} | +
| {{ (array_key_exists('id', $entry)) ? $entry['id'] : '' }} | -{{ $entry['username'] }} | -{{ $entry['display_name'] }} | -{{ $entry['employee_number'] }} | -{{ $entry['firstname'] }} | -{{ $entry['lastname'] }} | -{{ $entry['email'] }} | -- @if ($entry['status']=='success') - {!! $entry['note'] !!} - @else - - @endif + @foreach (Session::get('summary') as $entry) + |
| {{ (array_key_exists('id', $entry)) ? $entry['id'] : '' }} | +{{ $entry['username'] }} | +{{ $entry['display_name'] }} | +{{ $entry['employee_number'] }} | +{{ $entry['firstname'] }} | +{{ $entry['lastname'] }} | +{{ $entry['email'] }} | ++ @if ($entry['status']=='success') + {!! $entry['note'] !!} + @else + + @endif + | +