diff --git a/app/lang/en/admin/assets/table.php b/app/lang/en/admin/assets/table.php index 019a54eb57..4def3fcfa3 100755 --- a/app/lang/en/admin/assets/table.php +++ b/app/lang/en/admin/assets/table.php @@ -8,9 +8,10 @@ return array( 'serial' => 'Serial', 'purchase_date' => 'Purchased', 'purchase_cost' => 'Cost', - 'book_value' => 'Book Value', + 'book_value' => 'Value', 'status' => 'Status', 'checkoutto' => 'Checked Out', 'change' => 'In/Out', + 'location' => 'Location', ); diff --git a/app/models/Asset.php b/app/models/Asset.php index df3cdf0377..eb95826b9c 100644 --- a/app/models/Asset.php +++ b/app/models/Asset.php @@ -49,4 +49,10 @@ class Asset extends Elegant { return $this->belongsTo('User', 'assigned_to'); } + public function assetloc($locationId) + { + return Location::find($locationId); + + } + } diff --git a/app/views/backend/assets/index.blade.php b/app/views/backend/assets/index.blade.php index 4c542a0617..2fa2a77463 100755 --- a/app/views/backend/assets/index.blade.php +++ b/app/views/backend/assets/index.blade.php @@ -26,9 +26,10 @@ Assets :: @lang('admin/assets/table.asset_tag') - @lang('admin/assets/table.title') + @lang('admin/assets/table.title') @lang('admin/assets/table.serial') @lang('admin/assets/table.checkoutto') + @lang('admin/assets/table.location') @lang('admin/assets/table.change') @lang('admin/assets/table.purchase_date') @lang('admin/assets/table.purchase_cost') @@ -47,10 +48,16 @@ Assets :: @if ($asset->assigned_to != 0) {{ $asset->assigneduser->fullName() }} + @endif + @if ($asset->assigneduser->location_id) + {{ $asset->assetloc($asset->assigneduser->location_id)->name }} + @endif + + @if ($asset->assigned_to != 0) Checkin @else