From 5db853dbdd1f102c2484b90e40df444cefb6e842 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Sat, 14 Mar 2015 15:19:57 +1030
Subject: [PATCH] Move Model And Add Location

---
 app/controllers/admin/AssetsController.php | 29 +++++++++++++---------
 app/views/backend/hardware/index.blade.php |  5 ++--
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 0fa7dac6bc..5d7738098c 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -930,10 +930,15 @@ class AssetsController extends AdminController
 					return '<a href="'.route('checkout/hardware', $assets->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
 				}
 	        });
-       
-       
-       
-       
+			
+		$location = new \Chumper\Datatable\Columns\FunctionColumn('location', function ($assets)
+			{
+				if ($asset->assigneduser && $asset->assetloc)
+                    	<a href="{{ route('update/location', $asset->assetloc->id) }}">{{{ $asset->assetloc->name }}}</a>
+                } elseif ($asset->defaultLoc){
+                    	<a href="{{ route('update/location', $asset->defaultLoc->id) }}">{{{ $asset->defaultLoc->name }}}</a>
+                }
+			});
         
         return Datatable::collection($assets)
         ->addColumn('name',function($assets)
@@ -942,7 +947,12 @@ class AssetsController extends AdminController
 	        })	
 	        
         ->showColumns('asset_tag', 'serial')
-         	        
+        
+		->addColumn('model',function($assets)
+			{
+			    return $assets->model->name;
+			})
+		
 	    ->addColumn('status',function($assets)
 	        {	
 		        	if ($assets->assigned_to!='') {
@@ -951,13 +961,8 @@ class AssetsController extends AdminController
 				        return $assets->assetstatus->name;				        
 			        }
 	            
-	        })	
-	        	        
-		->addColumn('model',function($assets)
-			{
-			    return $assets->model->name;
-			})	
-			
+	        })
+		->addColumn($location)
 		->addColumn('category',function($assets)
 			{
 				return $assets->model->category->name;
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index 69947e0f12..8f4a7e887d 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -59,9 +59,10 @@
 {{ Datatable::table()
     ->addColumn(Lang::get('admin/hardware/form.name'), 
     	Lang::get('admin/hardware/table.asset_tag'), 
-    	Lang::get('admin/hardware/table.serial'), 
+    	Lang::get('admin/hardware/table.serial'),
+		Lang::get('admin/hardware/form.model'),
     	Lang::get('admin/hardware/table.status'),
-    	Lang::get('admin/hardware/form.model'),
+		Lang::get('admin/hardware/table.location'),
     	Lang::get('general.category'),
     	Lang::get('admin/hardware/table.eol'),
     	Lang::get('admin/hardware/table.checkout_date'),