Added logging action on checkin and checkout

This commit is contained in:
snipe
2013-11-19 02:00:17 -05:00
parent e22d381a20
commit f7f79681f3
+23 -4
View File
@@ -7,6 +7,7 @@ use Asset;
use User;
use Redirect;
use DB;
use Actionlog;
use Model;
use Depreciation;
use Sentry;
@@ -36,7 +37,6 @@ class AssetsController extends AdminController {
return View::make('backend/reports/index', compact('assets'));
}
/**
* Asset create.
*
@@ -98,7 +98,6 @@ class AssetsController extends AdminController {
return Redirect::back()->withInput()->withErrors($errors);
}
// Redirect to the asset create page with an error
return Redirect::to('assets/create')->with('error', Lang::get('admin/assets/message.create.error'));
@@ -245,7 +244,6 @@ class AssetsController extends AdminController {
$assigned_to = e(Input::get('assigned_to'));
// Declare the rules for the form validation
$rules = array(
'assigned_to' => 'required|min:1'
@@ -272,10 +270,18 @@ class AssetsController extends AdminController {
// Update the asset data
$asset->assigned_to = e(Input::get('assigned_to'));
// Was the asset updated?
if($asset->save())
{
$logaction = new Actionlog();
$logaction->asset_id = $asset->id;
$logaction->checkedout_to = $asset->assigned_to;
$logaction->location_id = $assigned_to->location_id;
$logaction->user_id = Sentry::getUser()->id;
$log = $logaction->logaction('checkout');
// Redirect to the new asset page
return Redirect::to("admin")->with('success', Lang::get('admin/assets/message.checkout.success'));
}
@@ -299,9 +305,22 @@ class AssetsController extends AdminController {
// Update the asset data
$asset->assigned_to = '';
if (!is_null($asset->assigned_to)) {
$user = User::find($asset->assigned_to);
}
// Was the asset updated?
if($asset->save())
{
$logaction = new Actionlog();
$logaction->asset_id = $asset->id;
//$logaction->user_id = $loggedin->user_id ;
$logaction->location_id = NULL;
$logaction->user_id = Sentry::getUser()->id;
$log = $logaction->logaction('checkin');
// Redirect to the new asset page
return Redirect::to("admin")->with('success', Lang::get('admin/assets/message.checkin.success'));
}