DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 00:54:07 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2016-07-28 08:51:15 -07:00
parent f78a577210 68b7b8f932
commit 011cb1120d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,7 @@ use Symfony\Component\Console\Output\BufferedOutput;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use TCPDF; use TCPDF;
use View; use View;
use Carbon\Carbon;
/** /**
* This class controls all actions related to assets for * This class controls all actions related to assets for
@ -624,10 +625,10 @@ class AssetsController extends Controller
// Was the asset updated? // Was the asset updated?
if ($asset->save()) { 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(); $checkout_at = Carbon::now();
} else { } 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')); //$checkout_at = e(Input::get('checkin_at'));
$logaction = $asset->createLogRecord('checkin', $asset, $admin, $user, null, e(Input::get('note')), $checkout_at); $logaction = $asset->createLogRecord('checkin', $asset, $admin, $user, null, e(Input::get('note')), $checkout_at);