DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixes action_date for check-in not including H:i:s

Browse source
This commit is contained in:
Godfrey M 2022-04-07 11:08:43 -07:00
parent f7cd21a007
commit 5d0a1ebb7a
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,11 +106,12 @@ class AssetCheckinController extends Controller
$asset->location_id = e($request->get('location_id')); $asset->location_id = e($request->get('location_id'));
} }
$checkin_at = date('Y-m-d'); $checkin_at = date('Y-m-d H:i:s');
if ($request->filled('checkin_at')) { if (($request->filled('checkin_at')) && ($request->get('checkin_at') != date('Y-m-d'))) {
$checkin_at = $request->input('checkin_at'); $checkin_at = $request->get('checkout_at');
} }
if(!empty($asset->licenseseats->all())){ if(!empty($asset->licenseseats->all())){
foreach ($asset->licenseseats as $seat){ foreach ($asset->licenseseats as $seat){
$seat->assigned_to = null; $seat->assigned_to = null;

5
app/Models/Loggable.php
View file

@ -4,6 +4,7 @@ namespace App\Models;
use App\Models\Setting; use App\Models\Setting;
use App\Notifications\AuditNotification; use App\Notifications\AuditNotification;
use Carbon\Carbon;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
trait Loggable trait Loggable
@ -115,6 +116,10 @@ trait Loggable
$log->note = $note; $log->note = $note;
$log->action_date = $action_date; $log->action_date = $action_date;
if (! $log->action_date) {
$log->action_date = date('Y-m-d H:i:s');
}
if (Auth::user()) { if (Auth::user()) {
$log->user_id = Auth::user()->id; $log->user_id = Auth::user()->id;
} }