From 7f77f1e0b131558acaee18e0bfe259783a1c2833 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 05:55:18 -0500
Subject: [PATCH 01/26] Better handling for displaying assets that have been
 soft-deleted so you don't lose their history

---
 app/models/Actionlog.php               | 2 +-
 app/views/backend/users/view.blade.php | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/models/Actionlog.php b/app/models/Actionlog.php
index 018fe50fc3..d7c4402697 100644
--- a/app/models/Actionlog.php
+++ b/app/models/Actionlog.php
@@ -7,7 +7,7 @@ class ActionLog extends Eloquent {
 
 
 	public function assetlog() {
-		return $this->belongsTo('Asset','asset_id');
+		return $this->belongsTo('Asset','asset_id')->withTrashed();
 	}
 
 	public function adminlog() {
diff --git a/app/views/backend/users/view.blade.php b/app/views/backend/users/view.blade.php
index e17e4e810e..bd62f0d418 100644
--- a/app/views/backend/users/view.blade.php
+++ b/app/views/backend/users/view.blade.php
@@ -90,10 +90,12 @@ View User {{ $user->fullName() }} ::
 										<td>{{ $log->added_on }}</td>
 										<td>{{ $log->action_type }}</td>
 										<td>
-										@if (isset($log->assetlog->name))
-										<a href="{{ route('view/asset', $log->asset_id) }}">{{ $log->assetlog->name }}</a>
+										@if ((isset($log->assetlog->name)) && ($log->assetlog->deleted_at==''))
+											<a href="{{ route('view/asset', $log->asset_id) }}">{{ $log->assetlog->name }}</a>
+										@elseif ((isset($log->assetlog->name)) && ($log->assetlog->deleted_at!=''))
+											<del>{{ $log->assetlog->name }}</del> (deleted)
 										@else
-										missing asset
+										missing asset ({{ $log->assetlog->name }}) ({{ $log->assetlog->deleted_at }})
 										@endif
 										</td>
 										<td>{{ $log->adminlog->fullName() }}</td>

From d46556a83d5335913b8b7fe8558f416540290343 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 05:56:22 -0500
Subject: [PATCH 02/26] Fixed phone display if no value set

---
 app/views/backend/users/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/backend/users/view.blade.php b/app/views/backend/users/view.blade.php
index bd62f0d418..119f1b5e69 100644
--- a/app/views/backend/users/view.blade.php
+++ b/app/views/backend/users/view.blade.php
@@ -128,7 +128,7 @@ View User {{ $user->fullName() }} ::
 						<ul>
                         <li>{{ $user->userloc->address }} {{ $user->userloc->address2 }}</li>
                         <li>{{ $user->userloc->city }}, {{ $user->userloc->state }} {{ $user->userloc->zip }}<br /><br /></li>
-                        @if (isset($user->phone))
+                        @if ($user->phone)
                         	<li><i class="icon-phone"></i>{{ $user->phone }}</li>
                         @endif
 	                    	<li><i class="icon-envelope-alt"></i><a href="mailto:{{ $user->email }}">{{ $user->email }}</a></li>

From f3114dec7ad59d16cda93e334c4297a72d57a8e2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 06:48:25 -0500
Subject: [PATCH 03/26] Prevent licenses, models and assets from being deleted
 if they are assigned to something else

---
 app/controllers/admin/AssetsController.php   | 16 ++++++++++++----
 app/controllers/admin/LicensesController.php | 15 +++++++++++----
 app/controllers/admin/ModelsController.php   | 17 +++++++++++++----
 app/lang/en/admin/assets/message.php         |  1 +
 app/lang/en/admin/licenses/message.php       |  2 ++
 app/lang/en/admin/models/message.php         |  2 ++
 app/models/License.php                       |  4 ++--
 7 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index ca33e3815d..b21ef96279 100644
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -202,11 +202,19 @@ class AssetsController extends AdminController {
 			return Redirect::to('admin')->with('error', Lang::get('admin/assets/message.not_found'));
 		}
 
-		// Delete the asset
-		$asset->delete();
+		if (isset($asset->assigneduser->id) && ($asset->assigneduser->id!=0)) {
+			// Redirect to the asset management page
+			return Redirect::to('admin')->with('error', Lang::get('admin/assets/message.assoc_users'));
+		} else {
+			// Delete the asset
+			$asset->delete();
+
+			// Redirect to the asset management page
+			return Redirect::to('admin')->with('success', Lang::get('admin/assets/message.delete.success'));
+		}
+
+
 
-		// Redirect to the asset management page
-		return Redirect::to('admin')->with('success', Lang::get('admin/assets/message.delete.success'));
 	}
 
 	/**
diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php
index 4a3d7c7148..99a7c099d6 100644
--- a/app/controllers/admin/LicensesController.php
+++ b/app/controllers/admin/LicensesController.php
@@ -187,11 +187,18 @@ class LicensesController extends AdminController {
 			return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
 		}
 
-		// Delete the license
-		$license->delete();
+		if (isset($license->assigneduser->id) && ($license->assigneduser->id!=0)) {
+			// Redirect to the asset management page
+			return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.assoc_users'));
+		} else {
+			// Delete the license
+			$license->delete();
+
+			// Redirect to the licenses management page
+			return Redirect::to('admin/licenses')->with('success', Lang::get('admin/licenses/message.delete.success'));
+		}
+
 
-		// Redirect to the licenses management page
-		return Redirect::to('admin/licenses')->with('success', Lang::get('admin/licenses/message.delete.success'));
 	}
 
 
diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php
index 406f53d292..dcaa7f31ad 100644
--- a/app/controllers/admin/ModelsController.php
+++ b/app/controllers/admin/ModelsController.php
@@ -168,11 +168,20 @@ class ModelsController extends AdminController {
 			return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.not_found'));
 		}
 
-		// Delete the model
-		$model->delete();
+		if ($model->assets->count() > 0) {
+			// Throw an error that this model is associated with assets
+			return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.assoc_users'));
+
+		} else {
+			// Delete the model
+			$model->delete();
+
+			// Redirect to the models management page
+			return Redirect::to('assets/models')->with('success', Lang::get('admin/models/message.delete.success'));
+		}
+
+
 
-		// Redirect to the models management page
-		return Redirect::to('assets/models')->with('success', Lang::get('admin/models/message.delete.success'));
 	}
 
 
diff --git a/app/lang/en/admin/assets/message.php b/app/lang/en/admin/assets/message.php
index d6164f1df0..5a0c37d686 100755
--- a/app/lang/en/admin/assets/message.php
+++ b/app/lang/en/admin/assets/message.php
@@ -3,6 +3,7 @@
 return array(
 
 	'does_not_exist' => 'Asset does not exist.',
+	'assoc_users'	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
 
 	'create' => array(
 		'error'   => 'Asset was not created, please try again. :(',
diff --git a/app/lang/en/admin/licenses/message.php b/app/lang/en/admin/licenses/message.php
index 0ba7afe8d8..943ede9494 100755
--- a/app/lang/en/admin/licenses/message.php
+++ b/app/lang/en/admin/licenses/message.php
@@ -4,6 +4,8 @@ return array(
 
 	'does_not_exist' => 'License does not exist.',
 	'user_does_not_exist' => 'User does not exist.',
+	'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
+
 
 	'create' => array(
 		'error'   => 'License was not created, please try again.',
diff --git a/app/lang/en/admin/models/message.php b/app/lang/en/admin/models/message.php
index 497fd2bd12..3b87420f8e 100755
--- a/app/lang/en/admin/models/message.php
+++ b/app/lang/en/admin/models/message.php
@@ -3,6 +3,8 @@
 return array(
 
 	'does_not_exist' => 'Model does not exist.',
+	'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
+
 
 	'create' => array(
 		'error'   => 'Model was not created, please try again.',
diff --git a/app/models/License.php b/app/models/License.php
index 85325e3f57..e6be056409 100644
--- a/app/models/License.php
+++ b/app/models/License.php
@@ -30,7 +30,7 @@ class License extends Elegant {
   	}
 
   	/**
-	* Get action logs for this asset
+	* Get asset logs for this asset
 	*/
 	public function assetlog()
 	{
@@ -38,7 +38,7 @@ class License extends Elegant {
 	}
 
 	/**
-	* Get action logs for this asset
+	* Get admin user for this asset
 	*/
 	public function adminuser()
 	{

From 53e6d22f834101057233340d654c882076a1848a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 07:26:39 -0500
Subject: [PATCH 04/26] Soft delete for locations

---
 app/models/Location.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/models/Location.php b/app/models/Location.php
index 2030057631..b72c2417c0 100644
--- a/app/models/Location.php
+++ b/app/models/Location.php
@@ -2,6 +2,8 @@
 
 class Location extends Elegant {
 
+
+	protected $softDelete = true;
 	protected $table = 'locations';
 	protected $rules = array(
 			'name'  		=> 'required|min:3',
@@ -10,4 +12,9 @@ class Location extends Elegant {
 			'country'   	=> 'required|alpha|min:2|max:2',
 		);
 
+	public function has_users()
+	{
+		return $this->hasMany('User', 'location_id')->count();
+	}
+
 }

From ed3fd129bfc1d4ba4f052d7f69d3d04af17fc156 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 07:27:10 -0500
Subject: [PATCH 05/26] Get the number of models for the depreciation

---
 app/models/Depreciation.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/models/Depreciation.php b/app/models/Depreciation.php
index 8413364801..940dd35b5b 100644
--- a/app/models/Depreciation.php
+++ b/app/models/Depreciation.php
@@ -8,5 +8,9 @@ class Depreciation extends Elegant {
 			'months'   => 'required|min:1|integer',
 		);
 
+	public function has_models()
+	{
+		return $this->hasMany('Model', 'depreciation_id')->count();
+	}
 
 }

From 1d042355209237053dd1f7343e94809d6cfdfb92 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 07:27:27 -0500
Subject: [PATCH 06/26] Associated error messages

---
 app/lang/en/admin/depreciations/message.php | 2 ++
 app/lang/en/admin/locations/message.php     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/lang/en/admin/depreciations/message.php b/app/lang/en/admin/depreciations/message.php
index faf054b2fe..0fc9b07301 100755
--- a/app/lang/en/admin/depreciations/message.php
+++ b/app/lang/en/admin/depreciations/message.php
@@ -3,6 +3,8 @@
 return array(
 
 	'does_not_exist' => 'Depreciation class does not exist.',
+	'assoc_users'	 => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ',
+
 
 	'create' => array(
 		'error'   => 'Depreciation class was not created, please try again. :(',
diff --git a/app/lang/en/admin/locations/message.php b/app/lang/en/admin/locations/message.php
index b7a346098a..626fb6bbfb 100755
--- a/app/lang/en/admin/locations/message.php
+++ b/app/lang/en/admin/locations/message.php
@@ -3,6 +3,8 @@
 return array(
 
 	'does_not_exist' => 'Location does not exist.',
+	'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+
 
 	'create' => array(
 		'error'   => 'Location was not created, please try again.',

From aa34c4a4dd049e2d537dd63d4f1fb34f20320ec7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 07:28:24 -0500
Subject: [PATCH 07/26] Add checks to prevent orphaned records

---
 .../admin/DepreciationsController.php          | 15 +++++++++++----
 app/controllers/admin/LocationsController.php  | 18 ++++++++++++++----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/controllers/admin/DepreciationsController.php b/app/controllers/admin/DepreciationsController.php
index bc1842c9c8..72aee62e87 100644
--- a/app/controllers/admin/DepreciationsController.php
+++ b/app/controllers/admin/DepreciationsController.php
@@ -170,11 +170,18 @@ class DepreciationsController extends AdminController {
 			return Redirect::to('admin/settings/depreciations')->with('error', Lang::get('admin/depreciations/message.not_found'));
 		}
 
-		// Delete the depreciation
-		$depreciation->delete();
+		if ($depreciation->has_models() > 0) {
+
+			// Redirect to the asset management page
+			return Redirect::to('admin/settings/depreciations')->with('error', Lang::get('admin/depreciations/message.assoc_users'));
+		} else {
+
+			$depreciation->delete();
+
+			// Redirect to the depreciations management page
+			return Redirect::to('admin/settings/depreciations')->with('success', Lang::get('admin/depreciations/message.delete.success'));
+		}
 
-		// Redirect to the depreciations management page
-		return Redirect::to('admin/settings/depreciations')->with('success', Lang::get('admin/depreciations/message.delete.success'));
 	}
 
 
diff --git a/app/controllers/admin/LocationsController.php b/app/controllers/admin/LocationsController.php
index 42c202e824..a139ce4610 100644
--- a/app/controllers/admin/LocationsController.php
+++ b/app/controllers/admin/LocationsController.php
@@ -175,11 +175,21 @@ class LocationsController extends AdminController {
 			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.not_found'));
 		}
 
-		// Delete the location
-		$location->delete();
 
-		// Redirect to the locations management page
-		return Redirect::to('admin/settings/locations')->with('success', Lang::get('admin/locations/message.delete.success'));
+		if ($location->has_users() > 0) {
+
+			// Redirect to the asset management page
+			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users'));
+		} else {
+
+			$location->delete();
+
+			// Redirect to the locations management page
+			return Redirect::to('admin/settings/locations')->with('success', Lang::get('admin/locations/message.delete.success'));
+		}
+
+
+
 	}
 
 

From 595f151ff9cc06db06d92819d66b0dce49bfdc1f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 07:28:34 -0500
Subject: [PATCH 08/26] Add soft delete to locations - migration

---
 ...20_121404_add_soft_delete_on_locations.php | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 app/database/migrations/2013_11_20_121404_add_soft_delete_on_locations.php

diff --git a/app/database/migrations/2013_11_20_121404_add_soft_delete_on_locations.php b/app/database/migrations/2013_11_20_121404_add_soft_delete_on_locations.php
new file mode 100644
index 0000000000..12883989e4
--- /dev/null
+++ b/app/database/migrations/2013_11_20_121404_add_soft_delete_on_locations.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddSoftDeleteOnLocations extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('locations', function($table)
+		{
+			$table->softDeletes();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}
\ No newline at end of file

From 1b5f0e1dd1da4b71019346a0f9c28680c22abbb4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 07:33:41 -0500
Subject: [PATCH 09/26] Add check to prevent orphaned models

---
 .../admin/ManufacturersController.php         | 19 ++++++++++++++++---
 app/lang/en/admin/manufacturers/message.php   |  1 +
 app/models/Manufacturer.php                   |  5 +++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/ManufacturersController.php b/app/controllers/admin/ManufacturersController.php
index 01221a423e..d7f0056f39 100644
--- a/app/controllers/admin/ManufacturersController.php
+++ b/app/controllers/admin/ManufacturersController.php
@@ -159,11 +159,24 @@ class ManufacturersController extends AdminController {
 			return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.not_found'));
 		}
 
-		// Delete the manufacturer
-		$manufacturer->delete();
+		if ($manufacturer->has_models() > 0) {
 
-		// Redirect to the manufacturers management page
+			// Redirect to the asset management page
+			return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.assoc_users'));
+		} else {
+
+			// Delete the manufacturer
+			$manufacturer->delete();
+
+			// Redirect to the manufacturers management page
 		return Redirect::to('admin/settings/manufacturers')->with('success', Lang::get('admin/manufacturers/message.delete.success'));
+		}
+
+
+
+
+
+
 	}
 
 
diff --git a/app/lang/en/admin/manufacturers/message.php b/app/lang/en/admin/manufacturers/message.php
index 5ae15966b8..e292c39599 100755
--- a/app/lang/en/admin/manufacturers/message.php
+++ b/app/lang/en/admin/manufacturers/message.php
@@ -3,6 +3,7 @@
 return array(
 
 	'does_not_exist' => 'Manufacturer does not exist.',
+	'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
 
 	'create' => array(
 		'error'   => 'Manufacturer was not created, please try again.',
diff --git a/app/models/Manufacturer.php b/app/models/Manufacturer.php
index e9bf470d17..fbca1df387 100644
--- a/app/models/Manufacturer.php
+++ b/app/models/Manufacturer.php
@@ -6,4 +6,9 @@ class Manufacturer extends Elegant {
 		'name'   => 'required|min:2',
 	);
 
+	public function has_models()
+	{
+		return $this->hasMany('Model', 'manufacturer_id')->count();
+	}
+
 }

From 7ada2cc021680c8fc2d2109465f704f5c185fbfa Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 07:33:54 -0500
Subject: [PATCH 10/26] Adding soft-delete to manufacturers

---
 ...23137_add_soft_delete_on_manufacturers.php | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 app/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php

diff --git a/app/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php b/app/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php
new file mode 100644
index 0000000000..342b6bdacd
--- /dev/null
+++ b/app/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddSoftDeleteOnManufacturers extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}
\ No newline at end of file

From 261690986a9ef4cd5b133cb2e44e64ad64e99911 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 07:43:18 -0500
Subject: [PATCH 11/26] Prevent orphans in categories

---
 .../admin/CategoriesController.php            | 17 ++++++++---
 ...23137_add_soft_delete_on_manufacturers.php |  5 +++-
 ...0_123725_add_soft_delete_on_categories.php | 30 +++++++++++++++++++
 app/lang/en/admin/categories/message.php      |  1 +
 app/models/Category.php                       |  6 ++++
 app/models/Manufacturer.php                   |  1 +
 6 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 app/database/migrations/2013_11_20_123725_add_soft_delete_on_categories.php

diff --git a/app/controllers/admin/CategoriesController.php b/app/controllers/admin/CategoriesController.php
index 803f380c1a..54e7e46b1b 100644
--- a/app/controllers/admin/CategoriesController.php
+++ b/app/controllers/admin/CategoriesController.php
@@ -169,11 +169,20 @@ class CategoriesController extends AdminController {
 			return Redirect::to('admin/settings/categories')->with('error', Lang::get('admin/categories/message.not_found'));
 		}
 
-		// Delete the blog post
-		$category->delete();
 
-		// Redirect to the blog posts management page
-		return Redirect::to('admin/settings/categories')->with('success', Lang::get('admin/categories/message.delete.success'));
+		if ($category->has_models() > 0) {
+
+			// Redirect to the asset management page
+			return Redirect::to('admin/settings/categories')->with('error', Lang::get('admin/categories/message.assoc_users'));
+		} else {
+
+			$category->delete();
+
+			// Redirect to the locations management page
+			return Redirect::to('admin/settings/categories')->with('success', Lang::get('admin/categories/message.delete.success'));
+		}
+
+
 	}
 
 
diff --git a/app/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php b/app/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php
index 342b6bdacd..edad42e584 100644
--- a/app/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php
+++ b/app/database/migrations/2013_11_20_123137_add_soft_delete_on_manufacturers.php
@@ -11,7 +11,10 @@ class AddSoftDeleteOnManufacturers extends Migration {
 	 */
 	public function up()
 	{
-		//
+		Schema::table('manufacturers', function($table)
+		{
+			$table->softDeletes();
+		});
 	}
 
 	/**
diff --git a/app/database/migrations/2013_11_20_123725_add_soft_delete_on_categories.php b/app/database/migrations/2013_11_20_123725_add_soft_delete_on_categories.php
new file mode 100644
index 0000000000..3ba4868d64
--- /dev/null
+++ b/app/database/migrations/2013_11_20_123725_add_soft_delete_on_categories.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddSoftDeleteOnCategories extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('categories', function($table)
+		{
+			$table->softDeletes();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}
\ No newline at end of file
diff --git a/app/lang/en/admin/categories/message.php b/app/lang/en/admin/categories/message.php
index 9a08c18cb5..82fc4f4018 100755
--- a/app/lang/en/admin/categories/message.php
+++ b/app/lang/en/admin/categories/message.php
@@ -3,6 +3,7 @@
 return array(
 
 	'does_not_exist' => 'Category does not exist.',
+	'assoc_users'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
 
 	'create' => array(
 		'error'   => 'Category was not created, please try again.',
diff --git a/app/models/Category.php b/app/models/Category.php
index 449880f467..fc5e117358 100644
--- a/app/models/Category.php
+++ b/app/models/Category.php
@@ -2,6 +2,8 @@
 
 class Category extends Elegant {
 
+	protected $softDelete = true;
+
 	/**
 	* Category validation rules
 	*/
@@ -19,6 +21,10 @@ class Category extends Elegant {
 		return $this->belongsTo('Category','parent');
 	}
 
+	public function has_models()
+	{
+		return $this->hasMany('Model', 'category_id')->count();
+	}
 
 
 
diff --git a/app/models/Manufacturer.php b/app/models/Manufacturer.php
index fbca1df387..6d53c1018d 100644
--- a/app/models/Manufacturer.php
+++ b/app/models/Manufacturer.php
@@ -1,6 +1,7 @@
 <?php
 class Manufacturer extends Elegant {
 
+	protected $softDelete = true;
 	// Declare the rules for the form validation
 	protected $rules = array(
 		'name'   => 'required|min:2',

From 904a024636305c7d4483455e00c861cde003ca78 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 08:10:49 -0500
Subject: [PATCH 12/26] Status table for non-deployed

---
 ...2013_11_20_130248_create_status_labels.php | 34 +++++++++++++++++++
 ...0_130830_add_status_id_on_assets_table.php | 33 ++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 app/database/migrations/2013_11_20_130248_create_status_labels.php
 create mode 100644 app/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php

diff --git a/app/database/migrations/2013_11_20_130248_create_status_labels.php b/app/database/migrations/2013_11_20_130248_create_status_labels.php
new file mode 100644
index 0000000000..40b851b299
--- /dev/null
+++ b/app/database/migrations/2013_11_20_130248_create_status_labels.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class CreateStatusLabels extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('status_labels', function($table)
+		{
+			$table->increments('id');
+			$table->string('name',100);
+			$table->integer('user_id');
+			$table->timestamps();
+			$table->softDeletes();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('status_labels');
+	}
+
+}
\ No newline at end of file
diff --git a/app/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php b/app/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php
new file mode 100644
index 0000000000..f4d8bed9a1
--- /dev/null
+++ b/app/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddStatusIdOnAssetsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('locations', function($table)
+		{
+			$table->integer('status_id')->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('locations', function($table)
+		{
+			$table->dropColumn('status_id');
+		});
+	}
+
+}
\ No newline at end of file

From de98f20b9c5ce0dd7893da42db263074266f556f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 08:22:36 -0500
Subject: [PATCH 13/26] Added status label table

---
 ...0_130830_add_status_id_on_assets_table.php |  4 +-
 ...31544_add_status_type_on_status_labels.php | 33 ++++++++++
 app/database/seeds/DatabaseSeeder.php         |  1 +
 app/database/seeds/StatusesSeeder.php         | 62 +++++++++++++++++++
 4 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 app/database/migrations/2013_11_20_131544_add_status_type_on_status_labels.php
 create mode 100644 app/database/seeds/StatusesSeeder.php

diff --git a/app/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php b/app/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php
index f4d8bed9a1..d52fafb0a8 100644
--- a/app/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php
+++ b/app/database/migrations/2013_11_20_130830_add_status_id_on_assets_table.php
@@ -11,7 +11,7 @@ class AddStatusIdOnAssetsTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::table('locations', function($table)
+		Schema::table('assets', function($table)
 		{
 			$table->integer('status_id')->nullable();
 		});
@@ -24,7 +24,7 @@ class AddStatusIdOnAssetsTable extends Migration {
 	 */
 	public function down()
 	{
-		Schema::table('locations', function($table)
+		Schema::table('assets', function($table)
 		{
 			$table->dropColumn('status_id');
 		});
diff --git a/app/database/migrations/2013_11_20_131544_add_status_type_on_status_labels.php b/app/database/migrations/2013_11_20_131544_add_status_type_on_status_labels.php
new file mode 100644
index 0000000000..c5f51e39f8
--- /dev/null
+++ b/app/database/migrations/2013_11_20_131544_add_status_type_on_status_labels.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddStatusTypeOnStatusLabels extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('status_labels', function($table)
+		{
+			$table->boolean('deployable');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('status_labels', function($table)
+		{
+			$table->dropColumn('deployable');
+		});
+	}
+
+}
\ No newline at end of file
diff --git a/app/database/seeds/DatabaseSeeder.php b/app/database/seeds/DatabaseSeeder.php
index 0e309f1c27..3c13ab7f77 100755
--- a/app/database/seeds/DatabaseSeeder.php
+++ b/app/database/seeds/DatabaseSeeder.php
@@ -17,6 +17,7 @@ class DatabaseSeeder extends Seeder {
 		$this->call('ManufacturersSeeder');
 		$this->call('ModelsSeeder');
 		$this->call('DepreciationsSeeder');
+		$this->call('StatusesSeeder');
 	}
 
 }
diff --git a/app/database/seeds/StatusesSeeder.php b/app/database/seeds/StatusesSeeder.php
new file mode 100644
index 0000000000..c0a350a635
--- /dev/null
+++ b/app/database/seeds/StatusesSeeder.php
@@ -0,0 +1,62 @@
+<?php
+class LocationsSeeder extends Seeder {
+
+
+	public function run()
+	{
+
+
+		// Initialize empty array
+		$status = array();
+
+		$date = new DateTime;
+		$status[] = array(
+			'name'      => 'Ready to Deploy',
+			'deployable' => '1',
+			'created_at' => $date->modify('-10 day'),
+			'updated_at' => $date->modify('-3 day'),
+			'user_id' => 1,
+		);
+
+		$status[] = array(
+			'name'      => 'Out for Diagnostics',
+			'deployable' => '0',
+			'created_at' => $date->modify('-10 day'),
+			'updated_at' => $date->modify('-3 day'),
+			'user_id' => 1,
+		);
+
+
+		$status[] = array(
+			'name'      => 'Out for Repair',
+			'deployable' => '0',
+			'created_at' => $date->modify('-10 day'),
+			'updated_at' => $date->modify('-3 day'),
+			'user_id' => 1,
+		);
+
+
+		$status[] = array(
+			'name'      => 'Broken - Not Fixable',
+			'deployable' => '0',
+			'created_at' => $date->modify('-10 day'),
+			'updated_at' => $date->modify('-3 day'),
+			'user_id' => 1,
+		);
+
+
+
+
+
+
+
+		// Delete all the old data
+		DB::table('status')->truncate();
+
+		// Insert the new posts
+		Location::insert($status);
+	}
+
+}
+
+

From f7cdc8d5c0e741044afa3a0e25e418fb4d74f473 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 16:57:45 -0500
Subject: [PATCH 14/26] Status addition, seeder stuff

---
 .../admin/StatuslabelsController.php          | 197 ++++++++++++++++++
 ...13_11_20_134103_add_archived_to_assets.php |  33 +++
 app/database/seeds/AssetsSeeder.php           |  92 ++++++++
 app/database/seeds/DatabaseSeeder.php         |   2 +-
 ...tusesSeeder.php => StatuslabelsSeeder.php} |  16 +-
 app/models/Statuslabel.php                    |   6 +
 6 files changed, 339 insertions(+), 7 deletions(-)
 create mode 100644 app/controllers/admin/StatuslabelsController.php
 create mode 100644 app/database/migrations/2013_11_20_134103_add_archived_to_assets.php
 rename app/database/seeds/{StatusesSeeder.php => StatuslabelsSeeder.php} (75%)
 create mode 100644 app/models/Statuslabel.php

diff --git a/app/controllers/admin/StatuslabelsController.php b/app/controllers/admin/StatuslabelsController.php
new file mode 100644
index 0000000000..a139ce4610
--- /dev/null
+++ b/app/controllers/admin/StatuslabelsController.php
@@ -0,0 +1,197 @@
+<?php namespace Controllers\Admin;
+
+use AdminController;
+use Input;
+use Lang;
+use Location;
+use Redirect;
+use DB;
+use Sentry;
+use Str;
+use Validator;
+use View;
+
+class LocationsController extends AdminController {
+
+	/**
+	 * Show a list of all the locations.
+	 *
+	 * @return View
+	 */
+
+	public function getIndex()
+	{
+		// Grab all the locations
+		$locations = Location::orderBy('created_at', 'DESC')->paginate(10);
+
+		// Show the page
+		return View::make('backend/locations/index', compact('locations'));
+	}
+
+
+	/**
+	 * Location create.
+	 *
+	 * @return View
+	 */
+	public function getCreate()
+	{
+		// Show the page
+		$location_options = array('0' => 'Top Level') + Location::lists('name', 'id');
+		return View::make('backend/locations/edit')->with('location_options',$location_options)->with('location',new Location);
+	}
+
+
+	/**
+	 * Location create form processing.
+	 *
+	 * @return Redirect
+	 */
+	public function postCreate()
+	{
+
+		// get the POST data
+		$new = Input::all();
+
+		// create a new model instance
+		$location = new Location();
+
+		// attempt validation
+		if ($location->validate($new))
+		{
+
+			// Save the location data
+			$location->name            	= e(Input::get('name'));
+			$location->city    			= e(Input::get('city'));
+			$location->state    		= e(Input::get('state'));
+			$location->country    		= e(Input::get('country'));
+			$location->user_id          = Sentry::getId();
+
+			// Was the asset created?
+			if($location->save())
+			{
+				// Redirect to the new location  page
+				return Redirect::to("admin/settings/locations")->with('success', Lang::get('admin/locations/message.create.success'));
+			}
+		}
+		else
+		{
+			// failure
+			$errors = $location->errors();
+			return Redirect::back()->withInput()->withErrors($errors);
+		}
+
+		// Redirect to the location create page
+		return Redirect::to('admin/settings/locations/create')->with('error', Lang::get('admin/locations/message.create.error'));
+
+	}
+
+
+	/**
+	 * Location update.
+	 *
+	 * @param  int  $locationId
+	 * @return View
+	 */
+	public function getEdit($locationId = null)
+	{
+		// Check if the location exists
+		if (is_null($location = Location::find($locationId)))
+		{
+			// Redirect to the blogs management page
+			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.does_not_exist'));
+		}
+
+		// Show the page
+		//$location_options = array('' => 'Top Level') + Location::lists('name', 'id');
+
+		$location_options = array('' => 'Top Level') + DB::table('locations')->where('id', '!=', $locationId)->lists('name', 'id');
+		return View::make('backend/locations/edit', compact('location'))->with('location_options',$location_options);
+	}
+
+
+	/**
+	 * Location update form processing page.
+	 *
+	 * @param  int  $locationId
+	 * @return Redirect
+	 */
+	public function postEdit($locationId = null)
+	{
+		// Check if the location exists
+		if (is_null($location = Location::find($locationId)))
+		{
+			// Redirect to the blogs management page
+			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.does_not_exist'));
+		}
+
+
+
+		// get the POST data
+		$new = Input::all();
+
+
+		// attempt validation
+		if ($location->validate($new))
+		{
+
+			// Update the location data
+			$location->name            	= e(Input::get('name'));
+			$location->city    			= e(Input::get('city'));
+			$location->state    		= e(Input::get('state'));
+			$location->country    		= e(Input::get('country'));
+
+			// Was the asset created?
+			if($location->save())
+			{
+				// Redirect to the saved location page
+				return Redirect::to("admin/settings/locations/$locationId/edit")->with('success', Lang::get('admin/locations/message.update.success'));
+			}
+		}
+		else
+		{
+			// failure
+			$errors = $location->errors();
+			return Redirect::back()->withInput()->withErrors($errors);
+		}
+
+		// Redirect to the location management page
+		return Redirect::to("admin/settings/locations/$locationId/edit")->with('error', Lang::get('admin/locations/message.update.error'));
+
+	}
+
+	/**
+	 * Delete the given location.
+	 *
+	 * @param  int  $locationId
+	 * @return Redirect
+	 */
+	public function getDelete($locationId)
+	{
+		// Check if the location exists
+		if (is_null($location = Location::find($locationId)))
+		{
+			// Redirect to the blogs management page
+			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.not_found'));
+		}
+
+
+		if ($location->has_users() > 0) {
+
+			// Redirect to the asset management page
+			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users'));
+		} else {
+
+			$location->delete();
+
+			// Redirect to the locations management page
+			return Redirect::to('admin/settings/locations')->with('success', Lang::get('admin/locations/message.delete.success'));
+		}
+
+
+
+	}
+
+
+
+}
diff --git a/app/database/migrations/2013_11_20_134103_add_archived_to_assets.php b/app/database/migrations/2013_11_20_134103_add_archived_to_assets.php
new file mode 100644
index 0000000000..63df7b13db
--- /dev/null
+++ b/app/database/migrations/2013_11_20_134103_add_archived_to_assets.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddArchivedToAssets extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('assets', function($table)
+		{
+			$table->boolean('archived');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('assets', function($table)
+		{
+			$table->dropColumn('archived');
+		});
+	}
+
+}
\ No newline at end of file
diff --git a/app/database/seeds/AssetsSeeder.php b/app/database/seeds/AssetsSeeder.php
index dab589766d..e12a58ed73 100644
--- a/app/database/seeds/AssetsSeeder.php
+++ b/app/database/seeds/AssetsSeeder.php
@@ -23,8 +23,10 @@ class AssetsSeeder extends Seeder {
 			'user_id' 		=> 1,
 			'assigned_to' 	=> 1,
 			'physical' 		=> 1,
+			'archived' 		=> 0,
 			'license_name'	=> NULL,
 			'license_email'	=> NULL,
+			'status_id'	=> NULL,
 		);
 
 		$asset[] = array(
@@ -40,8 +42,10 @@ class AssetsSeeder extends Seeder {
 			'user_id' 		=> 1,
 			'assigned_to' 	=> 1,
 			'physical' 		=> 1,
+			'archived' 		=> 0,
 			'license_name'	=> NULL,
 			'license_email'	=> NULL,
+			'status_id'	=> NULL,
 		);
 
 		$asset[] = array(
@@ -57,8 +61,10 @@ class AssetsSeeder extends Seeder {
 			'user_id' 		=> 2,
 			'assigned_to' 	=> 2,
 			'physical' 		=> 1,
+			'archived' 		=> 0,
 			'license_name'	=> NULL,
 			'license_email'	=> NULL,
+			'status_id'	=> NULL,
 		);
 
 		$asset[] = array(
@@ -74,8 +80,10 @@ class AssetsSeeder extends Seeder {
 			'user_id' 		=> 2,
 			'assigned_to' 	=> 2,
 			'physical' 		=> 0,
+			'archived' 		=> 0,
 			'license_name'	=> 'Alison Giasnotto',
 			'license_email'	=> 'snipe@snipe.net',
+			'status_id'	=> NULL,
 		);
 
 		$asset[] = array(
@@ -91,8 +99,10 @@ class AssetsSeeder extends Seeder {
 			'user_id' 		=> 2,
 			'assigned_to' 	=> 2,
 			'physical' 		=> 0,
+			'archived' 		=> 0,
 			'license_name'	=> 'Alison Giasnotto',
 			'license_email'	=> 'me@example.com',
+			'status_id'	=> NULL,
 		);
 
 		$asset[] = array(
@@ -108,8 +118,10 @@ class AssetsSeeder extends Seeder {
 			'user_id' 		=> 2,
 			'assigned_to' 	=> 2,
 			'physical' 		=> 1,
+			'archived' 		=> 0,
 			'license_name'	=> NULL,
 			'license_email'	=> NULL,
+			'status_id'	=> NULL,
 		);
 
 		$asset[] = array(
@@ -125,10 +137,90 @@ class AssetsSeeder extends Seeder {
 			'user_id' 		=> 2,
 			'assigned_to' 	=> 2,
 			'physical' 		=> 1,
+			'archived' 		=> 0,
 			'license_name'	=> NULL,
 			'license_email'	=> NULL,
+			'status_id'	=> NULL,
 		);
 
+		$asset[] = array(
+			'name'      	=> 'Broke-Ass Laptop',
+			'asset_tag'     => 'NNY67567775',
+			'model_id'      => 2,
+			'serial'      	=> 'WS89080890',
+			'purchase_date' => '2012-01-02',
+			'purchase_cost' => '1999.99',
+			'order_number'  => '657756',
+			'created_at' 	=> $date->modify('-10 day'),
+			'updated_at' 	=> $date->modify('-3 day'),
+			'user_id' 		=> 2,
+			'assigned_to' 	=> NULL,
+			'physical' 		=> 1,
+			'archived' 		=> 0,
+			'license_name'	=> NULL,
+			'license_email'	=> NULL,
+			'status_id'	=> '3',
+		);
+
+		$asset[] = array(
+			'name'      	=> 'Maybe Broke-Ass Laptop',
+			'asset_tag'     => 'NNY6755667775',
+			'model_id'      => 2,
+			'serial'      	=> 'WS45689080890',
+			'purchase_date' => '2012-01-02',
+			'purchase_cost' => '1999.99',
+			'order_number'  => '657756',
+			'created_at' 	=> $date->modify('-10 day'),
+			'updated_at' 	=> $date->modify('-3 day'),
+			'user_id' 		=> 1,
+			'assigned_to' 	=> NULL,
+			'physical' 		=> 1,
+			'archived' 		=> 0,
+			'license_name'	=> NULL,
+			'license_email'	=> NULL,
+			'status_id'	=> '2',
+		);
+
+
+		$asset[] = array(
+			'name'      	=> 'Completely Facacta Laptop',
+			'asset_tag'     => 'NNY6564567775',
+			'model_id'      => 2,
+			'serial'      	=> 'WS99689080890',
+			'purchase_date' => '2012-01-02',
+			'purchase_cost' => '1999.99',
+			'order_number'  => '657756',
+			'created_at' 	=> $date->modify('-10 day'),
+			'updated_at' 	=> $date->modify('-3 day'),
+			'user_id' 		=> 1,
+			'assigned_to' 	=> NULL,
+			'physical' 		=> 1,
+			'archived' 		=> 1,
+			'license_name'	=> NULL,
+			'license_email'	=> NULL,
+			'status_id'	=> '4',
+		);
+
+		$asset[] = array(
+			'name'      	=> 'Drunken Shanenigans Laptop',
+			'asset_tag'     => 'NNY6564567775',
+			'model_id'      => 2,
+			'serial'      	=> 'WS99689080890',
+			'purchase_date' => '2012-01-02',
+			'purchase_cost' => '1999.99',
+			'order_number'  => '657756',
+			'created_at' 	=> $date->modify('-10 day'),
+			'updated_at' 	=> $date->modify('-3 day'),
+			'user_id' 		=> 1,
+			'assigned_to' 	=> NULL,
+			'physical' 		=> 1,
+			'archived' 		=> 1,
+			'license_name'	=> NULL,
+			'license_email'	=> NULL,
+			'status_id'	=> '5',
+		);
+
+
 
 
 		// Delete all the old data
diff --git a/app/database/seeds/DatabaseSeeder.php b/app/database/seeds/DatabaseSeeder.php
index 3c13ab7f77..aae2e7e4f1 100755
--- a/app/database/seeds/DatabaseSeeder.php
+++ b/app/database/seeds/DatabaseSeeder.php
@@ -17,7 +17,7 @@ class DatabaseSeeder extends Seeder {
 		$this->call('ManufacturersSeeder');
 		$this->call('ModelsSeeder');
 		$this->call('DepreciationsSeeder');
-		$this->call('StatusesSeeder');
+		$this->call('StatuslabelsSeeder');
 	}
 
 }
diff --git a/app/database/seeds/StatusesSeeder.php b/app/database/seeds/StatuslabelsSeeder.php
similarity index 75%
rename from app/database/seeds/StatusesSeeder.php
rename to app/database/seeds/StatuslabelsSeeder.php
index c0a350a635..635fc987f6 100644
--- a/app/database/seeds/StatusesSeeder.php
+++ b/app/database/seeds/StatuslabelsSeeder.php
@@ -1,5 +1,5 @@
 <?php
-class LocationsSeeder extends Seeder {
+class StatuslabelsSeeder extends Seeder {
 
 
 	public function run()
@@ -44,17 +44,21 @@ class LocationsSeeder extends Seeder {
 			'user_id' => 1,
 		);
 
-
-
-
+		$status[] = array(
+			'name'      => 'Lost/Stolen',
+			'deployable' => '0',
+			'created_at' => $date->modify('-10 day'),
+			'updated_at' => $date->modify('-3 day'),
+			'user_id' => 1,
+		);
 
 
 
 		// Delete all the old data
-		DB::table('status')->truncate();
+		DB::table('status_labels')->truncate();
 
 		// Insert the new posts
-		Location::insert($status);
+		Statuslabel::insert($status);
 	}
 
 }
diff --git a/app/models/Statuslabel.php b/app/models/Statuslabel.php
new file mode 100644
index 0000000000..3b534cfb21
--- /dev/null
+++ b/app/models/Statuslabel.php
@@ -0,0 +1,6 @@
+<?php
+
+class Statuslabel extends Elegant {
+protected $table = 'status_labels';
+
+}

From 5fae91d4e965d54639072abeb23f191b6ae9017d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Nov 2013 22:06:41 -0500
Subject: [PATCH 15/26] Added status label functionality

remember to run artisan DB migrations to make this work
---
 app/controllers/admin/AssetsController.php    |  17 ++-
 .../admin/StatuslabelsController.php          | 116 ++++++++----------
 .../2013_11_21_002321_add_uploads_table.php   |  36 ++++++
 ..._deployable_boolean_from_status_labels.php |  33 +++++
 app/database/seeds/StatuslabelsSeeder.php     |  11 --
 app/lang/en/admin/statuslabels/message.php    |  24 ++++
 app/lang/en/admin/statuslabels/table.php      |  11 ++
 app/models/Asset.php                          |   1 +
 app/models/Statuslabel.php                    |  12 +-
 app/routes.php                                |  12 ++
 app/views/backend/assets/edit.blade.php       |  16 ++-
 app/views/backend/assets/view.blade.php       |  12 --
 app/views/backend/layouts/default.blade.php   |  14 ++-
 app/views/backend/licenses/view.blade.php     |   2 -
 app/views/backend/locations/index.blade.php   |   2 +-
 app/views/backend/statuslabels/edit.blade.php |  74 +++++++++++
 .../backend/statuslabels/index.blade.php      |  65 ++++++++++
 public/assets/css/compiled/index.css          |   5 +
 public/assets/css/compiled/layout.css         |   4 +
 19 files changed, 371 insertions(+), 96 deletions(-)
 create mode 100644 app/database/migrations/2013_11_21_002321_add_uploads_table.php
 create mode 100644 app/database/migrations/2013_11_21_024531_remove_deployable_boolean_from_status_labels.php
 create mode 100755 app/lang/en/admin/statuslabels/message.php
 create mode 100755 app/lang/en/admin/statuslabels/table.php
 create mode 100755 app/views/backend/statuslabels/edit.blade.php
 create mode 100755 app/views/backend/statuslabels/index.blade.php

diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index b21ef96279..ec93eadbec 100644
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -4,6 +4,7 @@ use AdminController;
 use Input;
 use Lang;
 use Asset;
+use Statuslabel;
 use User;
 use Redirect;
 use DB;
@@ -48,7 +49,10 @@ class AssetsController extends AdminController {
 		$model_list = array('' => '') + Model::lists('name', 'id');
 		$depreciation_list = array('' => '') + Depreciation::lists('name', 'id');
 
-		return View::make('backend/assets/edit')->with('model_list',$model_list)->with('depreciation_list',$depreciation_list)->with('asset',new Asset);
+		// Grab the dropdown list of status
+		$statuslabel_list = array('' => 'Ready to Deploy') + Statuslabel::lists('name', 'id');
+
+		return View::make('backend/assets/edit')->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list)->with('depreciation_list',$depreciation_list)->with('asset',new Asset);
 
 	}
 
@@ -80,6 +84,7 @@ class AssetsController extends AdminController {
 			$asset->order_number            = e(Input::get('order_number'));
 			$asset->notes            		= e(Input::get('notes'));
 			$asset->asset_tag            	= e(Input::get('asset_tag'));
+			$asset->status_id            	= e(Input::get('status_id'));
 			$asset->user_id          		= Sentry::getId();
 			$asset->physical            		= '1';
 
@@ -122,9 +127,13 @@ class AssetsController extends AdminController {
 		// Grab the dropdown list of models
 		$model_list = array('' => '') + Model::lists('name', 'id');
 
+		// Grab the dropdown list of status
+		$statuslabel_list = array('' => '') + Statuslabel::lists('name', 'id');
+
 		// get depreciation list
 		$depreciation_list = array('' => '') + Depreciation::lists('name', 'id');
-		return View::make('backend/assets/edit', compact('asset'))->with('model_list',$model_list)->with('depreciation_list',$depreciation_list);
+
+		return View::make('backend/assets/edit', compact('asset'))->with('model_list',$model_list)->with('depreciation_list',$depreciation_list)->with('statuslabel_list',$statuslabel_list);
 	}
 
 
@@ -171,6 +180,7 @@ class AssetsController extends AdminController {
 			$asset->purchase_cost           = e(Input::get('purchase_cost'));
 			$asset->order_number            = e(Input::get('order_number'));
 			$asset->asset_tag           	= e(Input::get('asset_tag'));
+			$asset->status_id            	= e(Input::get('status_id'));
 			$asset->notes            		= e(Input::get('notes'));
 			$asset->physical            		= '1';
 
@@ -232,6 +242,9 @@ class AssetsController extends AdminController {
 		// Get the dropdown of users and then pass it to the checkout view
 		$users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->lists('full_name', 'id');
 
+
+
+
 		//print_r($users);
 		return View::make('backend/assets/checkout', compact('asset'))->with('users_list',$users_list);
 
diff --git a/app/controllers/admin/StatuslabelsController.php b/app/controllers/admin/StatuslabelsController.php
index a139ce4610..8479bc52d1 100644
--- a/app/controllers/admin/StatuslabelsController.php
+++ b/app/controllers/admin/StatuslabelsController.php
@@ -3,7 +3,7 @@
 use AdminController;
 use Input;
 use Lang;
-use Location;
+use Statuslabel;
 use Redirect;
 use DB;
 use Sentry;
@@ -11,39 +11,38 @@ use Str;
 use Validator;
 use View;
 
-class LocationsController extends AdminController {
+class StatuslabelsController extends AdminController {
 
 	/**
-	 * Show a list of all the locations.
+	 * Show a list of all the statuslabels.
 	 *
 	 * @return View
 	 */
 
 	public function getIndex()
 	{
-		// Grab all the locations
-		$locations = Location::orderBy('created_at', 'DESC')->paginate(10);
+		// Grab all the statuslabels
+		$statuslabels = Statuslabel::orderBy('created_at', 'DESC')->paginate(10);
 
 		// Show the page
-		return View::make('backend/locations/index', compact('locations'));
+		return View::make('backend/statuslabels/index', compact('statuslabels'));
 	}
 
 
 	/**
-	 * Location create.
+	 * Statuslabel create.
 	 *
 	 * @return View
 	 */
 	public function getCreate()
 	{
 		// Show the page
-		$location_options = array('0' => 'Top Level') + Location::lists('name', 'id');
-		return View::make('backend/locations/edit')->with('location_options',$location_options)->with('location',new Location);
+		return View::make('backend/statuslabels/edit')->with('statuslabel',new Statuslabel);
 	}
 
 
 	/**
-	 * Location create form processing.
+	 * Statuslabel create form processing.
 	 *
 	 * @return Redirect
 	 */
@@ -54,75 +53,69 @@ class LocationsController extends AdminController {
 		$new = Input::all();
 
 		// create a new model instance
-		$location = new Location();
+		$statuslabel = new Statuslabel();
 
 		// attempt validation
-		if ($location->validate($new))
+		if ($statuslabel->validate($new))
 		{
 
-			// Save the location data
-			$location->name            	= e(Input::get('name'));
-			$location->city    			= e(Input::get('city'));
-			$location->state    		= e(Input::get('state'));
-			$location->country    		= e(Input::get('country'));
-			$location->user_id          = Sentry::getId();
+			// Save the Statuslabel data
+			$statuslabel->name            	= e(Input::get('name'));
+			$statuslabel->user_id          = Sentry::getId();
 
 			// Was the asset created?
-			if($location->save())
+			if($statuslabel->save())
 			{
-				// Redirect to the new location  page
-				return Redirect::to("admin/settings/locations")->with('success', Lang::get('admin/locations/message.create.success'));
+				// Redirect to the new Statuslabel  page
+				return Redirect::to("admin/settings/statuslabels")->with('success', Lang::get('admin/statuslabels/message.create.success'));
 			}
 		}
 		else
 		{
 			// failure
-			$errors = $location->errors();
+			$errors = $statuslabel->errors();
 			return Redirect::back()->withInput()->withErrors($errors);
 		}
 
-		// Redirect to the location create page
-		return Redirect::to('admin/settings/locations/create')->with('error', Lang::get('admin/locations/message.create.error'));
+		// Redirect to the Statuslabel create page
+		return Redirect::to('admin/settings/statuslabels/create')->with('error', Lang::get('admin/statuslabels/message.create.error'));
 
 	}
 
 
 	/**
-	 * Location update.
+	 * Statuslabel update.
 	 *
-	 * @param  int  $locationId
+	 * @param  int  $statuslabelId
 	 * @return View
 	 */
-	public function getEdit($locationId = null)
+	public function getEdit($statuslabelId = null)
 	{
-		// Check if the location exists
-		if (is_null($location = Location::find($locationId)))
+		// Check if the Statuslabel exists
+		if (is_null($statuslabel = Statuslabel::find($statuslabelId)))
 		{
 			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.does_not_exist'));
+			return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.does_not_exist'));
 		}
 
-		// Show the page
-		//$location_options = array('' => 'Top Level') + Location::lists('name', 'id');
 
-		$location_options = array('' => 'Top Level') + DB::table('locations')->where('id', '!=', $locationId)->lists('name', 'id');
-		return View::make('backend/locations/edit', compact('location'))->with('location_options',$location_options);
+		return View::make('backend/statuslabels/edit', compact('statuslabel'));
 	}
 
 
 	/**
-	 * Location update form processing page.
+	 * Statuslabel update form processing page.
 	 *
-	 * @param  int  $locationId
+	 * @param  int  $statuslabelId
 	 * @return Redirect
 	 */
-	public function postEdit($locationId = null)
+	public function postEdit($statuslabelId = null)
 	{
-		// Check if the location exists
-		if (is_null($location = Location::find($locationId)))
+		// Check if the Statuslabel exists
+		if (is_null($statuslabel = Statuslabel::find($statuslabelId)))
 		{
 			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.does_not_exist'));
+			return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.does_not_exist'));
 		}
 
 
@@ -132,60 +125,57 @@ class LocationsController extends AdminController {
 
 
 		// attempt validation
-		if ($location->validate($new))
+		if ($statuslabel->validate($new))
 		{
 
-			// Update the location data
-			$location->name            	= e(Input::get('name'));
-			$location->city    			= e(Input::get('city'));
-			$location->state    		= e(Input::get('state'));
-			$location->country    		= e(Input::get('country'));
+			// Update the Statuslabel data
+			$statuslabel->name            	= e(Input::get('name'));
 
 			// Was the asset created?
-			if($location->save())
+			if($statuslabel->save())
 			{
-				// Redirect to the saved location page
-				return Redirect::to("admin/settings/locations/$locationId/edit")->with('success', Lang::get('admin/locations/message.update.success'));
+				// Redirect to the saved Statuslabel page
+				return Redirect::to("admin/settings/statuslabels/$statuslabelId/edit")->with('success', Lang::get('admin/statuslabels/message.update.success'));
 			}
 		}
 		else
 		{
 			// failure
-			$errors = $location->errors();
+			$errors = $statuslabel->errors();
 			return Redirect::back()->withInput()->withErrors($errors);
 		}
 
-		// Redirect to the location management page
-		return Redirect::to("admin/settings/locations/$locationId/edit")->with('error', Lang::get('admin/locations/message.update.error'));
+		// Redirect to the Statuslabel management page
+		return Redirect::to("admin/settings/statuslabels/$statuslabelId/edit")->with('error', Lang::get('admin/statuslabels/message.update.error'));
 
 	}
 
 	/**
-	 * Delete the given location.
+	 * Delete the given Statuslabel.
 	 *
-	 * @param  int  $locationId
+	 * @param  int  $statuslabelId
 	 * @return Redirect
 	 */
-	public function getDelete($locationId)
+	public function getDelete($statuslabelId)
 	{
-		// Check if the location exists
-		if (is_null($location = Location::find($locationId)))
+		// Check if the Statuslabel exists
+		if (is_null($statuslabel = Statuslabel::find($statuslabelId)))
 		{
 			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.not_found'));
+			return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.not_found'));
 		}
 
 
-		if ($location->has_users() > 0) {
+		if ($statuslabel->has_assets() > 0) {
 
 			// Redirect to the asset management page
-			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users'));
+			return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.assoc_users'));
 		} else {
 
-			$location->delete();
+			$statuslabel->delete();
 
-			// Redirect to the locations management page
-			return Redirect::to('admin/settings/locations')->with('success', Lang::get('admin/locations/message.delete.success'));
+			// Redirect to the statuslabels management page
+			return Redirect::to('admin/settings/statuslabels')->with('success', Lang::get('admin/statuslabels/message.delete.success'));
 		}
 
 
diff --git a/app/database/migrations/2013_11_21_002321_add_uploads_table.php b/app/database/migrations/2013_11_21_002321_add_uploads_table.php
new file mode 100644
index 0000000000..2a0e10c5a3
--- /dev/null
+++ b/app/database/migrations/2013_11_21_002321_add_uploads_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddUploadsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('asset_uploads', function($table)
+		{
+			$table->increments('id');
+			$table->integer('user_id');
+			$table->string('filename');
+			$table->integer('asset_id');
+			$table->string('filenotes')->nullable;
+			$table->timestamps();
+			$table->softDeletes();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('asset_uploads');
+	}
+
+}
\ No newline at end of file
diff --git a/app/database/migrations/2013_11_21_024531_remove_deployable_boolean_from_status_labels.php b/app/database/migrations/2013_11_21_024531_remove_deployable_boolean_from_status_labels.php
new file mode 100644
index 0000000000..966c5eb19d
--- /dev/null
+++ b/app/database/migrations/2013_11_21_024531_remove_deployable_boolean_from_status_labels.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class RemoveDeployableBooleanFromStatusLabels extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('status_labels', function($table)
+		{
+			$table->dropColumn('deployable');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('status_labels', function($table)
+		{
+			$table->boolean('deployable');
+		});
+	}
+
+}
\ No newline at end of file
diff --git a/app/database/seeds/StatuslabelsSeeder.php b/app/database/seeds/StatuslabelsSeeder.php
index 635fc987f6..b967c3db8b 100644
--- a/app/database/seeds/StatuslabelsSeeder.php
+++ b/app/database/seeds/StatuslabelsSeeder.php
@@ -10,17 +10,9 @@ class StatuslabelsSeeder extends Seeder {
 		$status = array();
 
 		$date = new DateTime;
-		$status[] = array(
-			'name'      => 'Ready to Deploy',
-			'deployable' => '1',
-			'created_at' => $date->modify('-10 day'),
-			'updated_at' => $date->modify('-3 day'),
-			'user_id' => 1,
-		);
 
 		$status[] = array(
 			'name'      => 'Out for Diagnostics',
-			'deployable' => '0',
 			'created_at' => $date->modify('-10 day'),
 			'updated_at' => $date->modify('-3 day'),
 			'user_id' => 1,
@@ -29,7 +21,6 @@ class StatuslabelsSeeder extends Seeder {
 
 		$status[] = array(
 			'name'      => 'Out for Repair',
-			'deployable' => '0',
 			'created_at' => $date->modify('-10 day'),
 			'updated_at' => $date->modify('-3 day'),
 			'user_id' => 1,
@@ -38,7 +29,6 @@ class StatuslabelsSeeder extends Seeder {
 
 		$status[] = array(
 			'name'      => 'Broken - Not Fixable',
-			'deployable' => '0',
 			'created_at' => $date->modify('-10 day'),
 			'updated_at' => $date->modify('-3 day'),
 			'user_id' => 1,
@@ -46,7 +36,6 @@ class StatuslabelsSeeder extends Seeder {
 
 		$status[] = array(
 			'name'      => 'Lost/Stolen',
-			'deployable' => '0',
 			'created_at' => $date->modify('-10 day'),
 			'updated_at' => $date->modify('-3 day'),
 			'user_id' => 1,
diff --git a/app/lang/en/admin/statuslabels/message.php b/app/lang/en/admin/statuslabels/message.php
new file mode 100755
index 0000000000..626fb6bbfb
--- /dev/null
+++ b/app/lang/en/admin/statuslabels/message.php
@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+	'does_not_exist' => 'Location does not exist.',
+	'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+
+
+	'create' => array(
+		'error'   => 'Location was not created, please try again.',
+		'success' => 'Location created successfully.'
+	),
+
+	'update' => array(
+		'error'   => 'Location was not updated, please try again',
+		'success' => 'Location updated successfully.'
+	),
+
+	'delete' => array(
+		'error'   => 'There was an issue deleting the location. Please try again.',
+		'success' => 'The location was deleted successfully.'
+	)
+
+);
diff --git a/app/lang/en/admin/statuslabels/table.php b/app/lang/en/admin/statuslabels/table.php
new file mode 100755
index 0000000000..09abfd2937
--- /dev/null
+++ b/app/lang/en/admin/statuslabels/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+	'id'      => 'ID',
+	'name'      => 'Name',
+	'city'   => 'City',
+	'state'   => 'State',
+	'country'   => 'Country',
+
+);
diff --git a/app/models/Asset.php b/app/models/Asset.php
index f45e1bc626..b7a356c6d0 100644
--- a/app/models/Asset.php
+++ b/app/models/Asset.php
@@ -94,6 +94,7 @@ class Asset extends Elegant {
 		return DB::table('assets')
                     ->where('physical', '=', '1')
                     ->where('assigned_to', '=', '0')
+                    ->whereNull('status_id','and')
                     ->whereNull('deleted_at','and')
                     ->count();
 
diff --git a/app/models/Statuslabel.php b/app/models/Statuslabel.php
index 3b534cfb21..e484d577ae 100644
--- a/app/models/Statuslabel.php
+++ b/app/models/Statuslabel.php
@@ -1,6 +1,16 @@
 <?php
 
 class Statuslabel extends Elegant {
-protected $table = 'status_labels';
+	protected $table = 'status_labels';
+	protected $softDelete = true;
+
+	protected $rules = array(
+		'name'  		=> 'required|min:2',
+	);
+
+	public function has_assets()
+	{
+		return $this->hasMany('Asset', 'status_id')->count();
+	}
 
 }
diff --git a/app/routes.php b/app/routes.php
index 2512d19b2d..e3f670801c 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -121,6 +121,18 @@ Route::group(array('prefix' => 'admin'), function()
 			Route::get('{locationId}/delete', array('as' => 'delete/location', 'uses' => 'Controllers\Admin\LocationsController@getDelete'));
 		});
 
+		# Status Labels
+		Route::group(array('prefix' => 'statuslabels'), function()
+		{
+			Route::get('/', array('as' => 'statuslabels', 'uses' => 'Controllers\Admin\StatuslabelsController@getIndex'));
+			Route::get('create', array('as' => 'create/statuslabel', 'uses' => 'Controllers\Admin\StatuslabelsController@getCreate'));
+			Route::post('create', 'Controllers\Admin\StatuslabelsController@postCreate');
+			Route::get('{statuslabelId}/edit', array('as' => 'update/statuslabel', 'uses' => 'Controllers\Admin\StatuslabelsController@getEdit'));
+			Route::post('{statuslabelId}/edit', 'Controllers\Admin\StatuslabelsController@postEdit');
+			Route::get('{statuslabelId}/delete', array('as' => 'delete/statuslabel', 'uses' => 'Controllers\Admin\StatuslabelsController@getDelete'));
+		});
+
+
 	});
 
 
diff --git a/app/views/backend/assets/edit.blade.php b/app/views/backend/assets/edit.blade.php
index ebf8d0f9cd..853565cf9a 100755
--- a/app/views/backend/assets/edit.blade.php
+++ b/app/views/backend/assets/edit.blade.php
@@ -105,8 +105,6 @@
 				 </div>
 			</div>
 
-
-
 			<!-- Depreciation -->
 			<div class="control-group {{ $errors->has('depreciation_id') ? 'error' : '' }}">
 				<label class="control-label" for="parent">Depreciation</label>
@@ -118,6 +116,18 @@
 				</div>
 			</div>
 
+			<!-- Depreciation -->
+			<div class="control-group {{ $errors->has('status_id') ? 'error' : '' }}">
+				<label class="control-label" for="parent">Status</label>
+				<div class="controls">
+					<div class="field-box">
+					{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:250px')) }}
+					{{ $errors->first('depreciation_id', '<span class="help-inline">:message</span>') }}
+					</div>
+				</div>
+			</div>
+
+
 			<!-- Notes -->
 			<div class="control-group {{ $errors->has('notes') ? 'error' : '' }}">
 				<label class="control-label" for="notes">Notes</label>
@@ -136,7 +146,7 @@
 	<div class="control-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('assets') }}">Cancel</a>
-			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> Save </button>
+			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> Save</button>
 		</div>
 	</div>
 </form>
diff --git a/app/views/backend/assets/view.blade.php b/app/views/backend/assets/view.blade.php
index cbb077d360..215b16be74 100644
--- a/app/views/backend/assets/view.blade.php
+++ b/app/views/backend/assets/view.blade.php
@@ -12,7 +12,6 @@ View Asset {{ $asset->asset_tag }} ::
                 <!-- header -->
 				<h3 class="name">History for {{ $asset->asset_tag }} ({{ $asset->name }})
 
-
 							<div class="btn-group pull-right">
                                 <button class="btn glow">Actions</button>
                                 <button class="btn glow dropdown-toggle" data-toggle="dropdown">
@@ -26,22 +25,11 @@ View Asset {{ $asset->asset_tag }} ::
 										<li><a href="{{ route('checkout/asset', $asset->id) }}" class="btn-flat success">Checkout</a></li>
 									@endif
                                     <li><a href="{{ route('update/asset', $asset->id) }}">Edit Asset</a></li>
-                                    <li><a href="#">Out for Disagnostics</a></li>
-                                    <li><a href="#">Out for Repair</a></li>
-                                    <li><a href="#">Mark as Lost/Stolen</a></li>
-
                                 </ul>
                             </div>
-
-
 				</h3>
 
 
-
-
-
-
-
                 <div class="row-fluid profile">
                     <!-- bio, new note & orders column -->
                     <div class="span9 bio">
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php
index 6c8a610c51..7430e62130 100755
--- a/app/views/backend/layouts/default.blade.php
+++ b/app/views/backend/layouts/default.blade.php
@@ -120,7 +120,12 @@
 							<a href="{{ URL::to('admin/groups') }}">
 								<i class="icon-group"></i> Groups
 							</a>
-							</li>
+						</li>
+						<li{{ (Request::is('admin/settings/statuslabels*') ? ' class="active"' : '') }}>
+							<a href="{{ URL::to('admin/settings/statuslabels') }}">
+								<i class="icon-list"></i> Status Labels
+							</a>
+						</li>
 						<li{{ (Request::is('admin/settings/manufacturers*') ? ' class="active"' : '') }}>
 							<a href="{{ URL::to('admin/settings/manufacturers') }}">
 								<i class="icon-briefcase"></i> Manufacturers
@@ -305,6 +310,10 @@
             // jQuery Knobs
             $(".knob").knob();
 
+
+			 $("#example").popover();
+
+
             // confirm delete modal
             $('.delete-asset').click(function(evnt) {
 			var href = $(this).attr('href');
@@ -327,6 +336,9 @@
 
 
 
+
+
+
     </script>
 
 
diff --git a/app/views/backend/licenses/view.blade.php b/app/views/backend/licenses/view.blade.php
index ea65162d96..6af5bddd5b 100644
--- a/app/views/backend/licenses/view.blade.php
+++ b/app/views/backend/licenses/view.blade.php
@@ -26,8 +26,6 @@ View License {{ $license->name }} ::
 										<li><a href="{{ route('checkout/license', $license->id) }}" class="btn-flat success">Checkout</a></li>
 									@endif
                                     <li><a href="{{ route('update/license', $license->id) }}">Edit License</a></li>
-                                    <li><a href="#">Mark as Lost/Stolen</a></li>
-
                                 </ul>
                             </div>
 
diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php
index 6a43a6c257..5d6c23593a 100755
--- a/app/views/backend/locations/index.blade.php
+++ b/app/views/backend/locations/index.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-Asset Depreciations ::
+Locations ::
 @parent
 @stop
 
diff --git a/app/views/backend/statuslabels/edit.blade.php b/app/views/backend/statuslabels/edit.blade.php
new file mode 100755
index 0000000000..3410ced6d7
--- /dev/null
+++ b/app/views/backend/statuslabels/edit.blade.php
@@ -0,0 +1,74 @@
+@extends('backend/layouts/default')
+
+{{-- Page title --}}
+@section('title')
+	@if ($statuslabel->id)
+		Update Status Label ::
+	@else
+		Create New Status Label ::
+	@endif
+@parent
+@stop
+
+{{-- Page content --}}
+@section('content')
+<div id="pad-wrapper" class="user-profile">
+                <!-- header -->
+				<h3 class="name">
+					@if ($statuslabel->id)
+						Update Status Label
+					@else
+						Create New Status Label
+					@endif
+
+				<div class="pull-right">
+					<a href="{{ route('statuslabels') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+				</div>
+
+				</h3>
+
+
+                <div class="row-fluid profile">
+                    <!-- bio, new note & orders column -->
+                    <div class="span9 bio">
+                        <div class="profile-box">
+                            <br>
+                            <!-- checked out assets table -->
+
+                            <form class="form-horizontal" method="post" action="" autocomplete="off">
+								<!-- CSRF Token -->
+								<input type="hidden" name="_token" value="{{ csrf_token() }}" />
+
+									<div class="control-group {{ $errors->has('name') ? 'error' : '' }}">
+										<label class="control-label" for="name">Status Label</label>
+										<div class="controls">
+											<input class="span9" type="text" name="name" id="name" value="{{ Input::old('name', $statuslabel->name) }}" />
+											{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
+										</div>
+									</div>
+
+									<!-- Form actions -->
+									<div class="control-group">
+										<div class="controls">
+											<a class="btn btn-link" href="{{ route('statuslabels') }}">@lang('general.cancel')</a>
+											<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
+										</div>
+									</div>
+							</form>
+
+					 	</div>
+</div>
+
+                    <!-- side address column -->
+                    <div class="span3 address pull-right">
+					<br /><br />
+						<h6>About Status Labels</h6>
+						<p>Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. </p>
+
+						<p>It could be broken, out for diagnostics, out for
+						repair, lost or stolen, etc. Status labels allow your team to show the progression.</p>
+
+                    </div>
+
+
+@stop
\ No newline at end of file
diff --git a/app/views/backend/statuslabels/index.blade.php b/app/views/backend/statuslabels/index.blade.php
new file mode 100755
index 0000000000..5e54640b55
--- /dev/null
+++ b/app/views/backend/statuslabels/index.blade.php
@@ -0,0 +1,65 @@
+@extends('backend/layouts/default')
+
+{{-- Page title --}}
+@section('title')
+Status Labels
+@parent
+@stop
+
+{{-- Page content --}}
+@section('content')
+<div id="pad-wrapper" class="user-profile">
+                <!-- header -->
+				<h3 class="name">Status Labels
+				<div class="pull-right">
+					<a href="{{ route('create/statuslabel') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i>  Create New</a>
+				</div>
+		</h3>
+
+
+                <div class="row-fluid profile">
+                    <!-- bio, new note & orders column -->
+                    <div class="span9 bio">
+                        <div class="profile-box">
+                            <br>
+                            <!-- checked out assets table -->
+
+                            <table class="table table-hover">
+							<thead>
+								<tr>
+									<th class="span4">@lang('admin/statuslabels/table.name')</th>
+									<th class="span2"><span class="line"></span>@lang('table.actions')</th>
+								</tr>
+							</thead>
+							<tbody>
+								@foreach ($statuslabels as $statuslabel)
+								<tr>
+									<td>{{ $statuslabel->name }}</td>
+									<td>
+										<a href="{{ route('update/statuslabel', $statuslabel->id) }}" class="btn-flat white"> @lang('button.edit')</a>
+										<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/statuslabel', $statuslabel->id) }}" data-content="Are you sure you wish to delete the  {{ $statuslabel->name }} status label?" data-title="Delete {{ $statuslabel->name }}?" onClick="return false;">@lang('button.delete')</a>
+									</td>
+								</tr>
+								@endforeach
+							</tbody>
+						</table>
+
+                        </div>
+                    </div>
+
+                    <!-- side address column -->
+                    <div class="span3 address pull-right">
+						<br><br>
+						<h6>About Status Labels</h6>
+						<p>Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. </p>
+
+						<p>It could be broken, out for diagnostics, out for
+						repair, lost or stolen, etc. Status labels allow your team to show the progression.</p>
+
+                    </div>
+@stop
+
+
+
+
+
diff --git a/public/assets/css/compiled/index.css b/public/assets/css/compiled/index.css
index 02402b787b..3ecbbf63da 100644
--- a/public/assets/css/compiled/index.css
+++ b/public/assets/css/compiled/index.css
@@ -44,6 +44,11 @@
 text-decoration: none;
 }
 
+#helpicon a:hover {
+text-decoration: none;
+}
+
+
 .section {
   border-top: 1px solid #edeff1;
   margin-top: 100px;
diff --git a/public/assets/css/compiled/layout.css b/public/assets/css/compiled/layout.css
index 6c55726383..c3593e4bba 100644
--- a/public/assets/css/compiled/layout.css
+++ b/public/assets/css/compiled/layout.css
@@ -8,6 +8,10 @@ body {
   /*-webkit-font-smoothing: antialiased;*/
 }
 
+div.popover-content {
+font-size: 12px;
+}
+
 h1, h2, h3, h4, h5 {
   margin: 0;
   line-height: inherit;

From fc8c3c086ca70a513cd3fff39275fcf035cead5a Mon Sep 17 00:00:00 2001
From: Mohamed Rashid <rashivkp@gmail.com>
Date: Thu, 21 Nov 2013 20:34:54 +0530
Subject: [PATCH 16/26] fixed #37

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cd4c7088fe..391e29e7d9 100644
--- a/README.md
+++ b/README.md
@@ -74,11 +74,11 @@ Use the following command to create your default user, user groups and run all t
 
 You'll need to make sure that the app/storage directory is writable by your webserver, since caches and log files get written there. You should use the minimum permissions available for writing, based on how you've got your webserver configured.
 
-	chown -R 755 app/storage
+	chmod -R 755 app/storage
 
 If you still run into a permissions error, you may need to increase the permissions to 775, or twiddle your user/group permissions on your server.
 
-	chown -R 775 app/storage
+	chmod -R 775 app/storage
 
 -----
 

From 7b9eebe51c540083a1964aa10f4890ac9709f13e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 22 Nov 2013 00:53:50 -0500
Subject: [PATCH 17/26] Settings table

---
 ...013_11_22_054126_create_settings_table.php | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 app/database/migrations/2013_11_22_054126_create_settings_table.php

diff --git a/app/database/migrations/2013_11_22_054126_create_settings_table.php b/app/database/migrations/2013_11_22_054126_create_settings_table.php
new file mode 100644
index 0000000000..dac4cdfc9d
--- /dev/null
+++ b/app/database/migrations/2013_11_22_054126_create_settings_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class CreateSettingsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('settings', function($table)
+		{
+			$table->increments('id');
+			$table->string('name',100);
+			$table->string('option_name');
+			$table->string('option_value');
+			$table->timestamps();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		public function down()
+		{
+			Schema::drop('settings');
+		}
+	}
+
+}
\ No newline at end of file

From 08db7fbb38e8c591e1c493359d3f86a4dffb004c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 22 Nov 2013 01:07:41 -0500
Subject: [PATCH 18/26] Hurr. Already had a settings table.

---
 ...013_11_17_055126_create_settings_table.php |  2 +-
 ...013_11_22_054126_create_settings_table.php | 37 -------------------
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 app/database/migrations/2013_11_22_054126_create_settings_table.php

diff --git a/app/database/migrations/2013_11_17_055126_create_settings_table.php b/app/database/migrations/2013_11_17_055126_create_settings_table.php
index 0ba18031be..c253da5c18 100644
--- a/app/database/migrations/2013_11_17_055126_create_settings_table.php
+++ b/app/database/migrations/2013_11_17_055126_create_settings_table.php
@@ -29,7 +29,7 @@ class CreateSettingsTable extends Migration {
 	 */
 	public function down()
 	{
-		//
+		Schema::drop('settings');
 	}
 
 }
\ No newline at end of file
diff --git a/app/database/migrations/2013_11_22_054126_create_settings_table.php b/app/database/migrations/2013_11_22_054126_create_settings_table.php
deleted file mode 100644
index dac4cdfc9d..0000000000
--- a/app/database/migrations/2013_11_22_054126_create_settings_table.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-
-class CreateSettingsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('settings', function($table)
-		{
-			$table->increments('id');
-			$table->string('name',100);
-			$table->string('option_name');
-			$table->string('option_value');
-			$table->timestamps();
-		});
-	}
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		public function down()
-		{
-			Schema::drop('settings');
-		}
-	}
-
-}
\ No newline at end of file

From a3db6ba99cbca73e2e5472340c8eb951429d45f4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 22 Nov 2013 03:16:44 -0500
Subject: [PATCH 19/26] Comment typo

---
 app/controllers/admin/LocationsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/LocationsController.php b/app/controllers/admin/LocationsController.php
index a139ce4610..9a3760318b 100644
--- a/app/controllers/admin/LocationsController.php
+++ b/app/controllers/admin/LocationsController.php
@@ -53,7 +53,7 @@ class LocationsController extends AdminController {
 		// get the POST data
 		$new = Input::all();
 
-		// create a new model instance
+		// create a new location instance
 		$location = new Location();
 
 		// attempt validation

From da93fb18b8d0fa002de8db302b4a461244a8e74e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 22 Nov 2013 03:16:58 -0500
Subject: [PATCH 20/26] Added settings controller

---
 app/controllers/admin/SettingsController.php | 89 ++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 app/controllers/admin/SettingsController.php

diff --git a/app/controllers/admin/SettingsController.php b/app/controllers/admin/SettingsController.php
new file mode 100644
index 0000000000..fe355729ae
--- /dev/null
+++ b/app/controllers/admin/SettingsController.php
@@ -0,0 +1,89 @@
+<?php namespace Controllers\Admin;
+
+use AdminController;
+use Input;
+use Lang;
+use Setting;
+use Redirect;
+use DB;
+use Sentry;
+use Str;
+use Validator;
+use View;
+
+class SettingsController extends AdminController {
+
+	/**
+	 * Show a list of all the settings.
+	 *
+	 * @return View
+	 */
+
+	public function getIndex()
+	{
+		// Grab all the settings
+		$settings = Setting::orderBy('created_at', 'DESC')->paginate(10);
+
+		// Show the page
+		return View::make('backend/settings/index', compact('settings'));
+	}
+
+
+	/**
+	 * Setting update.
+	 *
+	 * @param  int  $settingId
+	 * @return View
+	 */
+	public function getEdit()
+	{
+		$settings = Setting::orderBy('created_at', 'DESC')->paginate(10);
+		return View::make('backend/settings/edit', compact('settings'));
+	}
+
+
+	/**
+	 * Setting update form processing page.
+	 *
+	 * @param  int  $settingId
+	 * @return Redirect
+	 */
+	public function postEdit()
+	{
+
+		$new = Input::all();
+
+		// create a new model instance
+		$setting = new Location();
+
+		// attempt validation
+		if ($setting->validate($new))
+		{
+
+			// Update the setting data
+			$setting->option_value = e(Input::get('name'));
+
+
+			// Was the asset created?
+			if($setting->save())
+			{
+				// Redirect to the saved setting page
+				return Redirect::to("admin/settings/app/$settingId/edit")->with('success', Lang::get('admin/settings/message.update.success'));
+			}
+		}
+		else
+		{
+			// failure
+			$errors = $setting->errors();
+			return Redirect::back()->withInput()->withErrors($errors);
+		}
+
+		// Redirect to the setting management page
+		return Redirect::to("admin/settings/app/$settingId/edit")->with('error', Lang::get('admin/settings/message.update.error'));
+
+	}
+
+
+
+
+}

From 60b577166a1cd2db9bd0de1b82bea6682de2bcb9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 22 Nov 2013 03:17:19 -0500
Subject: [PATCH 21/26] Added label for setting readability

---
 ...308_add_option_label_to_settings_table.php | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 app/database/migrations/2013_11_22_075308_add_option_label_to_settings_table.php

diff --git a/app/database/migrations/2013_11_22_075308_add_option_label_to_settings_table.php b/app/database/migrations/2013_11_22_075308_add_option_label_to_settings_table.php
new file mode 100644
index 0000000000..97b45288da
--- /dev/null
+++ b/app/database/migrations/2013_11_22_075308_add_option_label_to_settings_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddOptionLabelToSettingsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('settings', function($table)
+		{
+			$table->string('option_label','80')->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('settings', function($table)
+		{
+			$table->dropColumn('option_label');
+		});
+	}
+
+}
\ No newline at end of file

From 7b2cf64d7f79a021bbf2659d5c8bc7f0894cd4e2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 22 Nov 2013 03:17:32 -0500
Subject: [PATCH 22/26] DB seed info

---
 app/database/seeds/DatabaseSeeder.php |  1 +
 app/database/seeds/SettingsSeeder.php | 41 +++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 app/database/seeds/SettingsSeeder.php

diff --git a/app/database/seeds/DatabaseSeeder.php b/app/database/seeds/DatabaseSeeder.php
index aae2e7e4f1..e2e075090a 100755
--- a/app/database/seeds/DatabaseSeeder.php
+++ b/app/database/seeds/DatabaseSeeder.php
@@ -18,6 +18,7 @@ class DatabaseSeeder extends Seeder {
 		$this->call('ModelsSeeder');
 		$this->call('DepreciationsSeeder');
 		$this->call('StatuslabelsSeeder');
+		$this->call('SettingsSeeder');
 	}
 
 }
diff --git a/app/database/seeds/SettingsSeeder.php b/app/database/seeds/SettingsSeeder.php
new file mode 100644
index 0000000000..cc16064825
--- /dev/null
+++ b/app/database/seeds/SettingsSeeder.php
@@ -0,0 +1,41 @@
+<?php
+class SettingsSeeder extends Seeder {
+
+
+	public function run()
+	{
+
+
+		// Initialize empty array
+		$setting = array();
+
+		$date = new DateTime;
+		$setting[] = array(
+			'option_name'      	=> 'per_page',
+			'option_label'      	=> 'Results Per Page',
+			'option_value'     => '50',
+			'created_at' 	=> $date->modify('-10 day'),
+			'updated_at' 	=> $date->modify('-3 day'),
+			'user_id' 		=> 1,
+		);
+
+		$setting[] = array(
+			'option_name'      	=> 'site_name',
+			'option_label'      	=> 'Site Name',
+			'option_value'     => 'Snipe IT Asset Management System',
+			'created_at' 	=> $date->modify('-10 day'),
+			'updated_at' 	=> $date->modify('-3 day'),
+			'user_id' 		=> 1,
+		);
+
+
+		// Delete all the old data
+		DB::table('settings')->truncate();
+
+		// Insert the new posts
+		Setting::insert($setting);
+	}
+
+}
+
+

From 8dd57046972036a2381f3549a8efff5167e0988d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 22 Nov 2013 03:17:55 -0500
Subject: [PATCH 23/26] Added settings

---
 app/models/Setting.php                      | 17 ++++++
 app/routes.php                              | 10 ++++
 app/views/backend/layouts/default.blade.php |  2 +-
 app/views/backend/settings/edit.blade.php   | 63 +++++++++++++++++++++
 app/views/backend/settings/index.blade.php  | 55 ++++++++++++++++++
 5 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 app/models/Setting.php
 create mode 100755 app/views/backend/settings/edit.blade.php
 create mode 100755 app/views/backend/settings/index.blade.php

diff --git a/app/models/Setting.php b/app/models/Setting.php
new file mode 100644
index 0000000000..98d9c43b6e
--- /dev/null
+++ b/app/models/Setting.php
@@ -0,0 +1,17 @@
+<?php
+
+class Setting extends Elegant {
+
+	protected $table = 'settings';
+	protected $rules = array(
+			"option_value['site_name']" 	=> 'required|min:3',
+			"option_value['per_page']"   		=> 'required|min:1|numeric',
+		);
+
+	public function getsettings()
+	{
+		$foo = Setting::all();
+		print_r($foo);
+	}
+
+}
diff --git a/app/routes.php b/app/routes.php
index e3f670801c..7ac1b6ee6f 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -54,6 +54,7 @@ Route::group(array('prefix' => 'assets'), function()
 Route::group(array('prefix' => 'admin'), function()
 {
 
+
 	# Licenses
 	Route::group(array('prefix' => 'licenses'), function()
 	{
@@ -77,6 +78,15 @@ Route::group(array('prefix' => 'admin'), function()
 	# Admin Settings Routes (for categories, maufactureres, etc)
 	Route::group(array('prefix' => 'settings'), function()
 	{
+
+		# Settings
+		Route::group(array('prefix' => 'app'), function()
+		{
+			Route::get('/', array('as' => 'app', 'uses' => 'Controllers\Admin\SettingsController@getIndex'));
+			Route::get('edit', array('as' => 'edit/settings', 'uses' => 'Controllers\Admin\SettingsController@getEdit'));
+			Route::post('edit', 'Controllers\Admin\SettingsController@postEdit');
+		});
+
 		# Manufacturers
 		Route::group(array('prefix' => 'manufacturers'), function()
 		{
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php
index 7430e62130..7d3a77a869 100755
--- a/app/views/backend/layouts/default.blade.php
+++ b/app/views/backend/layouts/default.blade.php
@@ -92,7 +92,7 @@
                     <ul class="dropdown-menu">
                        @if(Sentry::getUser()->hasAccess('admin'))
 						<li>
-							<a href="{{ route('admin') }}">
+							<a href="{{ route('app') }}">
 								<i class="icon-cog"></i> Settings
 							</a>
 						</li>
diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
new file mode 100755
index 0000000000..4cb50ff827
--- /dev/null
+++ b/app/views/backend/settings/edit.blade.php
@@ -0,0 +1,63 @@
+@extends('backend/layouts/default')
+
+{{-- Page title --}}
+@section('title')
+		Update Settings ::
+@parent
+@stop
+
+{{-- Page content --}}
+@section('content')
+<div id="pad-wrapper" class="user-profile">
+                <!-- header -->
+				<h3 class="name">Update Settings
+				<div class="pull-right">
+					<a href="{{ route('app') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+				</div>
+
+				</h3>
+
+
+                <div class="row-fluid profile">
+                    <!-- bio, new note & orders column -->
+                    <div class="span9 bio">
+                        <div class="profile-box">
+                            <br>
+                            <!-- checked out assets table -->
+
+                            <form class="form-horizontal" method="post" action="" autocomplete="off">
+								<!-- CSRF Token -->
+								<input type="hidden" name="_token" value="{{ csrf_token() }}" />
+								@foreach ($settings as $setting)
+									<div class="control-group {{ $errors->has('name') ? 'error' : '' }}">
+										<label class="control-label" for="option_value">{{ $setting->option_label }}</label>
+										<div class="controls">
+											<input class="span9" type="text" name="option_value['{{ $setting->option_name }}']" id="option_value" value="{{ Input::old('option_value', $setting->option_value) }}" />
+											{{ $errors->first('option_value', '<span class="help-inline">:message</span>') }}
+										</div>
+									</div>
+
+
+								@endforeach
+
+								<!-- Form actions -->
+									<div class="control-group">
+										<div class="controls">
+											<a class="btn btn-link" href="{{ route('app') }}">@lang('general.cancel')</a>
+											<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
+										</div>
+								</div>
+							</form>
+
+					 	</div>
+</div>
+
+                    <!-- side address column -->
+                    <div class="span3 address pull-right">
+					<br /><br />
+						<p>These settings let you customize certain aspects of your installation. </p>
+
+                    </div>
+
+
+@stop
\ No newline at end of file
diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php
new file mode 100755
index 0000000000..301957f7c7
--- /dev/null
+++ b/app/views/backend/settings/index.blade.php
@@ -0,0 +1,55 @@
+@extends('backend/layouts/default')
+
+{{-- Page title --}}
+@section('title')
+Settings ::
+@parent
+@stop
+
+{{-- Page content --}}
+@section('content')
+<div id="pad-wrapper" class="user-profile">
+                <!-- header -->
+				<h3 class="name">Settings
+						<div class="pull-right">
+							<!-- <a href="{{ route('edit/settings') }}" class="btn-flat white"> @lang('button.edit') Settings</a> -->
+						</div>
+		</h3>
+
+
+                <div class="row-fluid profile">
+                    <!-- bio, new note & orders column -->
+                    <div class="span9 bio">
+                        <div class="profile-box">
+                            <br>
+                            <!-- checked out assets table -->
+
+                            <table class="table table-hover">
+							<thead>
+								<tr>
+									<th class="span4">Setting</th>
+									<th class="span2"><span class="line"></span>Value</th>
+								</tr>
+							</thead>
+							<tbody>
+								@foreach ($settings as $setting)
+								<tr>
+									<td>{{ $setting->option_label }}</td>
+									<td>{{ $setting->option_value }}  </td>
+
+								</tr>
+								@endforeach
+							</tbody>
+						</table>
+
+                        </div>
+                    </div>
+
+                    <!-- side address column -->
+                    <div class="span3 address pull-right">
+						<br /><br />
+
+						<p>These settings let you customize certain aspects of your installation. </p>
+
+                    </div>
+@stop
\ No newline at end of file

From 52020d09f034c9de78b798725c0f3700d0253beb Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 22 Nov 2013 03:18:11 -0500
Subject: [PATCH 24/26] Fixed bomb when asset is unassigned

---
 app/views/backend/assets/index.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/backend/assets/index.blade.php b/app/views/backend/assets/index.blade.php
index aa490f45d0..940a834678 100755
--- a/app/views/backend/assets/index.blade.php
+++ b/app/views/backend/assets/index.blade.php
@@ -42,15 +42,15 @@ Assets ::
 			<td><a href="{{ route('view/asset', $asset->id) }}">{{ $asset->name }}</a></td>
 			<td>{{ $asset->serial }}</td>
 			<td>
-			@if ($asset->assigned_to != 0)
+			@if ($asset->assigneduser)
 				<a href="{{ route('view/user', $asset->assigned_to) }}">
 				{{ $asset->assigneduser->fullName() }}
 				</a>
 			@endif
 			</td>
 			<td>
-			@if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0))
-					{{ Location::find($asset->assigneduser->location_id)->name }}
+			@if ($asset->assigneduser && $asset->assetloc)
+					{{ $asset->assetloc->name }}
 			@endif
 			</td>
 			<td>

From 1b1efec858e8e0cfc5cfafc63bfb537e45191cd1 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 22 Nov 2013 03:24:34 -0500
Subject: [PATCH 25/26] Fixed foreign key in assets

---
 app/models/Asset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/Asset.php b/app/models/Asset.php
index b7a356c6d0..ae239f8db5 100644
--- a/app/models/Asset.php
+++ b/app/models/Asset.php
@@ -71,7 +71,7 @@ class Asset extends Elegant {
 	*/
 	public function adminuser()
 	{
-		return $this->belongsTo('User','id');
+		return $this->belongsTo('User','user_id');
 	}
 
 	/**

From b7251d9992401c04a5da1771af0fcddad2754362 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 22 Nov 2013 03:24:48 -0500
Subject: [PATCH 26/26] Fixed potential bug in blade

---
 app/views/backend/assets/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/backend/assets/view.blade.php b/app/views/backend/assets/view.blade.php
index 215b16be74..cdd83df4a7 100644
--- a/app/views/backend/assets/view.blade.php
+++ b/app/views/backend/assets/view.blade.php
@@ -78,7 +78,7 @@ View Asset {{ $asset->asset_tag }} ::
 										<td></td>
 										<td>{{ $asset->created_at }}</td>
 										<td>
-										@if (isset($asset->adminuser->id))
+										@if ($asset->adminuser->id)
 										{{ $asset->adminuser->fullName() }}
 										@else
 										Unknown Admin