From 68b7b8f9322827e1e7ca9d7e9aa2f3e60c594c63 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 28 Jul 2016 08:51:01 -0700
Subject: [PATCH] Fixes Carbon date

---
 app/Http/Controllers/AssetsController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 11bea8f0c0..87fc6b458d 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -39,6 +39,7 @@ use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use TCPDF;
 use View;
+use Carbon\Carbon;
 
 /**
  * This class controls all actions related to assets for
@@ -624,10 +625,10 @@ class AssetsController extends Controller
         // Was the asset updated?
         if ($asset->save()) {
 
-            if ($request->input('checkout_at')== Carbon::now()->format('Y-m-d')) {
+            if ($request->input('checkin_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 = $request->input('checkin_at').' 00:00:00';
             }
             //$checkout_at = e(Input::get('checkin_at'));
             $logaction = $asset->createLogRecord('checkin', $asset, $admin, $user, null, e(Input::get('note')), $checkout_at);