DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #2341

Browse source
This commit is contained in:
snipe 2016-07-28 07:36:58 -07:00
parent 214a7d548d
commit f53c5706f6
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/AssetsController.php
View file

@ -624,7 +624,12 @@ class AssetsController extends Controller
// Was the asset updated?
if ($asset->save()) {
$checkout_at = e(Input::get('checkin_at'));
if ($request->input('checkout_at')== Carbon::now()->format('Y-m-d')) {
$checkout_at = Carbon::now();
} else {
$checkout_at = Carbon::now()->format('Y-m-d h:i:s');
}
//$checkout_at = e(Input::get('checkin_at'));
$logaction = $asset->createLogRecord('checkin', $asset, $admin, $user, null, e(Input::get('note')), $checkout_at);