diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index b0947b610d..c84152db20 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -1056,30 +1056,32 @@ class AssetsController extends AdminController }); - $inout = new \Chumper\Datatable\Columns\FunctionColumn('inout', function ($assets) + $inout = new \Chumper\Datatable\Columns\FunctionColumn('inout', function ($assets) { - if (($assets->assigned_to !='') && ($assets->assigned_to > 0)) { - return ''.Lang::get('general.checkin').''; - } else { - return ''.Lang::get('general.checkout').''; - } + if ($assets->assetstatus->deployable != 0) { + if (($assets->assigned_to !='') && ($assets->assigned_to > 0)) { + return ''.Lang::get('general.checkin').''; + } else { + return ''.Lang::get('general.checkout').''; + } + } }); - return Datatable::collection($assets) - ->addColumn('',function($assets) - { - return ''; - }) - ->addColumn('name',function($assets) - { - return ''.$assets->name.''; - }) - ->addColumn('asset_tag',function($assets) - { - return ''.$assets->asset_tag.''; - }) + return Datatable::collection($assets) + ->addColumn('',function($assets) + { + return ''; + }) + ->addColumn('name',function($assets) + { + return ''.$assets->name.''; + }) + ->addColumn('asset_tag',function($assets) + { + return ''.$assets->asset_tag.''; + }) ->showColumns('serial')