diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index e7b10877cf..ada57298a4 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -206,6 +206,7 @@ class LoginController extends Controller $user->password = bcrypt($request->input('password')); } + $user->last_login = \Carbon::now(); $user->email = $ldap_attr['email']; $user->first_name = $ldap_attr['firstname']; $user->last_name = $ldap_attr['lastname']; //FIXME (or TODO?) - do we need to map additional fields that we now support? E.g. country, phone, etc. @@ -432,6 +433,7 @@ class LoginController extends Controller if (Google2FA::verifyKey($user->two_factor_secret, $secret)) { $user->two_factor_enrolled = 1; + $user->last_login = \Carbon::now(); $user->saveQuietly(); $request->session()->put('2fa_authed', $user->id); diff --git a/resources/views/reports/unaccepted_assets.blade.php b/resources/views/reports/unaccepted_assets.blade.php index 69512537e8..6c23d9e191 100644 --- a/resources/views/reports/unaccepted_assets.blade.php +++ b/resources/views/reports/unaccepted_assets.blade.php @@ -68,7 +68,7 @@ @foreach ($assetsForReport as $item) @if ($item['assetItem']) trashed()) style="text-decoration: line-through" @endif> - {{ $item['acceptance']->created_at }} + {{ Helper::getFormattedDateObject($item['acceptance']->created_at, 'datetime', false) }} {{ ($item['assetItem']->company) ? $item['assetItem']->company->name : '' }} {!! $item['assetItem']->model->category->present()->nameUrl() !!} {!! $item['assetItem']->present()->modelUrl() !!}