From f53c5706f6a5f5bb0572d35d5bcba206ab2b336f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 28 Jul 2016 07:36:58 -0700
Subject: [PATCH] Fixes #2341

---
 app/Http/Controllers/AssetsController.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index b6cd4d6f82..11bea8f0c0 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -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);