Merge remote-tracking branch 'origin/develop'

Depreciation refactor

app/controllers/account/ViewAssetsController.php

@@ -7,6 +7,7 @@ use Sentry;
 use Validator;
 use Location;
 use View;
+use Asset;
 
 class ViewAssetsController extends AuthorizedController
 {
@@ -33,4 +34,27 @@ class ViewAssetsController extends AuthorizedController
 	}
 
 
+	public function getRequestableIndex() {
+
+		$assets = Asset::with('model','defaultLoc')->Hardware()->RequestableAssets()->get();
+        return View::make('frontend/account/requestable-assets', compact('user','assets'));
+    }
+
+
+    public function getRequestAsset($assetId = null) {
+
+    	// Check if the asset exists
+        if (is_null($asset = Asset::find($assetId))) {
+            // Redirect to the asset management page
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
+        } else {
+
+
+			 return View::make('frontend/account/view-asset', compact('asset'));
+        }
+
+
+    }
+
+
 }

app/controllers/admin/AssetsController.php

@@ -46,8 +46,14 @@ class AssetsController extends AdminController
         	$assets->RTD();
         } elseif (Input::get('Undeployable')) {
         	$assets->Undeployable();
+        } elseif (Input::get('Archived')) {
+        	$assets->Archived();
+        } elseif (Input::get('Requestable')) {
+        	$assets->RequestableAssets();
         } elseif (Input::get('Deployed')) {
         	$assets->Deployed();
+        } elseif (Input::get('Deleted')) {
+        	$assets->withTrashed()->Deleted();
         }
 
         $assets = $assets->orderBy('asset_tag', 'ASC')->get();
@@ -93,7 +99,7 @@ class AssetsController extends AdminController
 
 
         // Grab the dropdown list of status
-        $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
+        $statuslabel_list = Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
 
         $view = View::make('backend/hardware/edit');
         $view->with('supplier_list',$supplier_list);
@@ -187,7 +193,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->mac_address 			= e(Input::get('mac_address'));
             $asset->user_id          		= Sentry::getId();
             $asset->archived          			= '0';
             $asset->physical            		= '1';
@@ -238,7 +244,7 @@ class AssetsController extends AdminController
         $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id');
 
         // Grab the dropdown list of status
-        $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
+        $statuslabel_list = Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
 
         return View::make('backend/hardware/edit', compact('asset'))->with('model_list',$model_list)->with('supplier_list',$supplier_list)->with('location_list',$location_list)->with('statuslabel_list',$statuslabel_list);
     }
@@ -300,7 +306,7 @@ class AssetsController extends AdminController
                 $asset->supplier_id        = e(Input::get('supplier_id'));
             }
 
-             if (e(Input::get('requestable')) == '') {
+            if (e(Input::get('requestable')) == '') {
                 $asset->requestable =  0;
             } else {
                 $asset->requestable        = e(Input::get('requestable'));
@@ -316,10 +322,11 @@ class AssetsController extends AdminController
             $asset->name            		= e(Input::get('name'));
             $asset->serial            		= e(Input::get('serial'));
             $asset->model_id           		= e(Input::get('model_id'));
-            $asset->order_number                = e(Input::get('order_number'));
+            $asset->order_number            = e(Input::get('order_number'));
             $asset->asset_tag           	= e(Input::get('asset_tag'));
             $asset->notes            		= e(Input::get('notes'));
             $asset->physical            	= '1';
+            $asset->mac_address 			= e(Input::get('mac_address'));
 
             // Was the asset updated?
             if($asset->save()) {
@@ -357,6 +364,12 @@ class AssetsController extends AdminController
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.assoc_users'));
         } else {
             // Delete the asset
+
+            DB::table('assets')
+            ->where('id', $asset->id)
+            ->update(array('assigned_to' => NULL));
+
+
             $asset->delete();
 
             // Redirect to the asset management page
@@ -484,7 +497,7 @@ class AssetsController extends AdminController
         $logaction->checkedout_to = $asset->assigned_to;
 
         // Update the asset data to null, since it's being checked in
-        $asset->assigned_to            		= '0';
+        $asset->assigned_to            		= NULL;
 
         // Was the asset updated?
         if($asset->save()) {
@@ -513,7 +526,7 @@ class AssetsController extends AdminController
     **/
     public function getView($assetId = null)
     {
-        $asset = Asset::find($assetId);
+        $asset = Asset::withTrashed()->find($assetId);
 
         if (isset($asset->id)) {
 
@@ -532,7 +545,7 @@ class AssetsController extends AdminController
             $error = Lang::get('admin/hardware/message.does_not_exist', compact('id'));
 
             // Redirect to the user management page
-            return Redirect::route('assets')->with('error', $error);
+            return Redirect::route('hardware')->with('error', $error);
         }
 
     }
@@ -589,9 +602,9 @@ class AssetsController extends AdminController
         $model_list = array('' => '') + Model::lists('name', 'id');
 
         // Grab the dropdown list of status
-        $statuslabel_list = array('' => 'Pending') + array('0' => 'Ready to Deploy') + Statuslabel::lists('name', 'id');
+        $statuslabel_list = Statuslabel::lists('name', 'id');
 
-         $location_list = array('' => '') + Location::lists('name', 'id');
+        $location_list = array('' => '') + Location::lists('name', 'id');
 
         // get depreciation list
         $depreciation_list = array('' => '') + Depreciation::lists('name', 'id');
@@ -604,4 +617,252 @@ class AssetsController extends AdminController
         return View::make('backend/hardware/edit')->with('supplier_list',$supplier_list)->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list)->with('assigned_to',$assigned_to)->with('asset',$asset)->with('location_list',$location_list);
 
     }
+
+
+    public function getRestore($assetId = null)
+    {
+
+		// Get user information
+		$asset = Asset::withTrashed()->find($assetId);
+
+		 if (isset($asset->id)) {
+
+			// Restore the user
+			$asset->restore();
+
+			// Prepare the success message
+			$success = Lang::get('admin/hardware/message.restore.success');
+
+			// Redirect to the user management page
+			return Redirect::route('hardware')->with('success', $success);
+
+		 } else {
+			 return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+		 }
+
+    }
+    
+    
+       /**
+    *  Upload the file to the server
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function postUpload($assetID = null)
+    {
+        $asset = Asset::find($assetID);
+
+		// the asset is valid
+		$destinationPath = app_path().'/private_uploads';
+
+        if (isset($asset->id)) {
+
+        	if (Input::hasFile('assetfile')) {
+
+				foreach(Input::file('assetfile') as $file) {
+
+				$rules = array(
+				   'assetfile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt|max:2000'
+				);
+				$validator = Validator::make(array('assetfile'=> $file), $rules);
+
+					if($validator->passes()){
+
+						$extension = $file->getClientOriginalExtension();
+						$filename = 'hardware-'.$asset->id.'-'.str_random(8);
+						$filename .= '-'.Str::slug($file->getClientOriginalName()).'.'.$extension;
+						$upload_success = $file->move($destinationPath, $filename);
+
+						//Log the deletion of seats to the log
+						$logaction = new Actionlog();
+						$logaction->asset_id = $asset->id;
+						$logaction->asset_type = 'hardware';
+						$logaction->user_id = Sentry::getUser()->id;
+						$logaction->note = e(Input::get('notes'));
+						$logaction->checkedout_to =  NULL;
+						$logaction->created_at =  date("Y-m-d h:i:s");
+						$logaction->filename =  $filename;
+						$log = $logaction->logaction('uploaded');
+					} else {
+						 return Redirect::back()->with('error', Lang::get('admin/hardware/message.upload.invalidfiles'));
+					}
+
+
+				}
+
+				if ($upload_success) {
+				  	return Redirect::back()->with('success', Lang::get('admin/hardware/message.upload.success'));
+				} else {
+				   return Redirect::back()->with('success', Lang::get('admin/hardware/message.upload.error'));
+				}
+
+			} else {
+				 return Redirect::back()->with('success', Lang::get('admin/hardware/message.upload.nofiles'));
+			}
+
+
+
+
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/hardware/message.does_not_exist', compact('id'));
+
+            // Redirect to the hardware management page
+            return Redirect::route('hardware')->with('error', $error);
+        }
+    }
+
+
+    /**
+    *  Delete the associated file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getDeleteFile($assetID = null, $fileId = null)
+    {
+        $asset = Asset::find($assetID);
+        $destinationPath = app_path().'/private_uploads';
+
+		// the asset is valid
+        if (isset($asset->id)) {
+
+			$log = Actionlog::find($fileId);
+			$full_filename = $destinationPath.'/'.$log->filename;
+			if (file_exists($full_filename)) {
+				unlink($destinationPath.'/'.$log->filename);
+			}
+			$log->delete();
+			return Redirect::back()->with('success', Lang::get('admin/hardware/message.deletefile.success'));
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/hardware/message.does_not_exist', compact('id'));
+
+            // Redirect to the hardware management page
+            return Redirect::route('hardware')->with('error', $error);
+        }
+    }
+
+
+
+    /**
+    *  Display/download the uploaded file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function displayFile($assetID = null, $fileId = null)
+    {
+
+        $asset = Asset::find($assetID);
+
+		// the asset is valid
+        if (isset($asset->id)) {
+				$log = Actionlog::find($fileId);
+				$file = $log->get_src();
+				return Response::download($file);
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/hardware/message.does_not_exist', compact('id'));
+
+            // Redirect to the hardware management page
+            return Redirect::route('hardware')->with('error', $error);
+        }
+    }
+    
+    
+    
+    
+    /**
+    *  Display bulk edit screen
+    *
+    * @return View
+    **/
+    public function postBulkEdit($assets = null)
+    {
+
+		if (Input::has('edit_asset')) {
+			
+			$assets = Input::get('edit_asset');
+			
+			$supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+	        $statuslabel_list = array('' => '') + Statuslabel::lists('name', 'id');
+	        $location_list = array('' => '') + Location::lists('name', 'id');
+		}
+
+		return View::make('backend/hardware/bulk')->with('assets',$assets)->with('supplier_list',$supplier_list)->with('statuslabel_list',$statuslabel_list)->with('location_list',$location_list);
+			 
+    }
+    
+    
+     
+    /**
+    *  Save bulk edits
+    *
+    * @return View
+    **/
+    public function postBulkSave($assets = null)
+    {
+
+		if (Input::has('bulk_edit')) {
+			
+			$assets = Input::get('bulk_edit');
+			
+			if ( (Input::has('purchase_date')) ||  (Input::has('rtd_location_id')) ||  (Input::has('status_id')) )  {
+			
+				foreach ($assets as $key => $value) {
+					
+					$update_array = array();
+					
+					if (Input::has('purchase_date')) {				
+						$update_array['purchase_date'] =  e(Input::get('purchase_date'));
+					}
+					
+					if (Input::has('rtd_location_id')) {				
+						$update_array['rtd_location_id'] = e(Input::get('rtd_location_id'));
+					}
+					
+					if (Input::has('status_id')) {				
+						$update_array['status_id'] = e(Input::get('status_id'));
+					}
+								
+					
+					if (DB::table('assets')
+		            ->where('id', $key)
+		            ->update($update_array)) {		
+			            
+			            $logaction = new Actionlog();
+			            $logaction->asset_id = $key;
+			            $logaction->asset_type = 'hardware';
+			            $logaction->created_at =  date("Y-m-d h:i:s");
+			            
+			            if (Input::has('rtd_location_id')) {	
+			            	$logaction->location_id = e(Input::get('rtd_location_id'));
+			            }
+			            $logaction->user_id = Sentry::getUser()->id;
+			            $log = $logaction->logaction('update');
+	                        
+		            }
+			          					
+				} // endforeach
+				
+				return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.update.success'));
+
+			// no values given, nothing to update	
+			} else {
+				return Redirect::to("hardware")->with('info',Lang::get('admin/hardware/message.update.nothing_updated'));
+				
+			}
+
+
+		} // endif
+
+		return Redirect::to("hardware");	
+				 
+    }
+
+
 }

app/controllers/admin/CategoriesController.php

@@ -52,12 +52,12 @@ class CategoriesController extends AdminController
 
         // create a new model instance
         $category = new Category();
-        
+
         $validator = Validator::make(Input::all(), $category->rules);
 
         if ($validator->fails())
         {
-            // The given data did not pass validation            
+            // The given data did not pass validation
             return Redirect::back()->withInput()->withErrors($validator->messages());
         }
         else{
@@ -71,7 +71,7 @@ class CategoriesController extends AdminController
                 // Redirect to the new category  page
                 return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.create.success'));
             }
-        } 
+        }
 
         // Redirect to the category create page
         return Redirect::to('admin/settings/categories/create')->with('error', Lang::get('admin/categories/message.create.error'));
@@ -119,9 +119,9 @@ class CategoriesController extends AdminController
         // get the POST data
         $new = Input::all();
 
-        // attempt validation       
+        // attempt validation
         $validator = Validator::make(Input::all(), $category->validationRules($categoryId));
-       
+
 
         if ($validator->fails())
         {
@@ -139,7 +139,7 @@ class CategoriesController extends AdminController
                 // Redirect to the new category page
                 return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.update.success'));
             }
-        } 
+        }
 
         // Redirect to the category management page
         return Redirect::to("admin/settings/categories/$categoryID/edit")->with('error', Lang::get('admin/categories/message.update.error'));
@@ -178,4 +178,30 @@ class CategoriesController extends AdminController
 
 
 
+    /**
+    *  Get the asset information to present to the category view page
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getView($categoryID = null)
+    {
+        $category = Category::find($categoryID);
+
+        if (isset($category->id)) {
+                return View::make('backend/categories/view', compact('category'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/categories/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('categories')->with('error', $error);
+        }
+
+
+    }
+
+
+
+
 }

app/controllers/admin/LicensesController.php

@@ -116,10 +116,8 @@ class LicensesController extends AdminController
             $license->seats             = e(Input::get('seats'));
             $license->purchase_date     = e(Input::get('purchase_date'));
             $license->purchase_order    = e(Input::get('purchase_order'));
-            //$license->purchase_cost   = e(Input::get('purchase_cost'));
             $license->depreciation_id   = e(Input::get('depreciation_id'));
             $license->expiration_date   = e(Input::get('expiration_date'));
-            //$license->asset_id            = e(Input::get('asset_id'));
             $license->user_id           = Sentry::getId();
 
             if (($license->purchase_date == "") || ($license->purchase_date == "0000-00-00")) {
@@ -142,7 +140,7 @@ class LicensesController extends AdminController
                     $license_seat = new LicenseSeat();
                     $license_seat->license_id       = $insertedId;
                     $license_seat->user_id          = Sentry::getId();
-                    $license_seat->assigned_to      = 0;
+                    $license_seat->assigned_to      = NULL;
                     $license_seat->notes            = NULL;
                     $license_seat->save();
                 }
@@ -316,7 +314,7 @@ class LicensesController extends AdminController
                         $license_seat = new LicenseSeat();
                         $license_seat->license_id       = $license->id;
                         $license_seat->user_id          = Sentry::getId();
-                        $license_seat->assigned_to      = 0;
+                        $license_seat->assigned_to      = NULL;
                         $license_seat->notes            = NULL;
                         $license_seat->save();
                     }
@@ -370,11 +368,17 @@ class LicensesController extends AdminController
         } else {
 
             // Delete the license and the associated license seats
+            DB::table('license_seats')
+            ->where('id', $license->id)
+            ->update(array('assigned_to' => NULL,'asset_id' => NULL));
+
             $licenseseats = $license->licenseseats();
             $licenseseats->delete();
             $license->delete();
 
 
+
+
             // Redirect to the licenses management page
             return Redirect::to('admin/licenses')->with('success', Lang::get('admin/licenses/message.delete.success'));
         }
@@ -574,7 +578,7 @@ class LicensesController extends AdminController
         $logaction->checkedout_to = $licenseseat->assigned_to;
 
         // Update the asset data
-        $licenseseat->assigned_to                   = '0';
+        $licenseseat->assigned_to                   = NULL;
         $licenseseat->asset_id                      = NULL;
 
         // Was the asset updated?

app/controllers/admin/ManufacturersController.php

@@ -113,7 +113,7 @@ class ManufacturersController extends AdminController
 
         if ($validator->fails())
         {
-            // The given data did not pass validation           
+            // The given data did not pass validation
             return Redirect::back()->withInput()->withErrors($validator->messages());
         }
         // attempt validation
@@ -126,7 +126,7 @@ class ManufacturersController extends AdminController
                 // Redirect to the new manufacturer page
                 return Redirect::to("admin/settings/manufacturers")->with('success', Lang::get('admin/manufacturers/message.update.success'));
             }
-        } 
+        }
 
         // Redirect to the manufacturer management page
         return Redirect::to("admin/settings/manufacturers/$manufacturerId/edit")->with('error', Lang::get('admin/manufacturers/message.update.error'));
@@ -169,5 +169,30 @@ class ManufacturersController extends AdminController
 
 
 
+    /**
+    *  Get the asset information to present to the category view page
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getView($manufacturerID = null)
+    {
+        $manufacturer = Manufacturer::find($manufacturerID);
+
+        if (isset($manufacturer->id)) {
+                return View::make('backend/manufacturers/view', compact('manufacturer'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/manufacturers/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('manufacturers')->with('error', $error);
+        }
+
+
+    }
+
+
+
 
 }

app/controllers/admin/ModelsController.php

@@ -67,13 +67,13 @@ class ModelsController extends AdminController
 
         // attempt validation
         if ($model->validate($new)) {
-             
+
             if ( e(Input::get('depreciation_id')) == '') {
                 $model->depreciation_id =  0;
             } else {
                 $model->depreciation_id = e(Input::get('depreciation_id'));
             }
-            
+
              if ( e(Input::get('eol')) == '') {
                 $model->eol =  0;
             } else {
@@ -83,11 +83,11 @@ class ModelsController extends AdminController
             // Save the model data
             $model->name            	= e(Input::get('name'));
             $model->modelno            	= e(Input::get('modelno'));
-            //$model->depreciation_id    	= e(Input::get('depreciation_id'));
             $model->manufacturer_id    	= e(Input::get('manufacturer_id'));
             $model->category_id    		= e(Input::get('category_id'));
             $model->user_id          	= Sentry::getId();
-            //$model->eol    				= e(Input::get('eol'));
+            $model->show_mac_address 	= e(Input::get('show_mac_address', '0'));
+
 
             if (Input::file('image')) {
                 $image = Input::file('image');
@@ -160,18 +160,18 @@ class ModelsController extends AdminController
 
         if ($validator->fails())
         {
-            // The given data did not pass validation           
+            // The given data did not pass validation
             return Redirect::back()->withInput()->withErrors($validator->messages());
         }
         // attempt validation
         else {
-            
+
             if ( e(Input::get('depreciation_id')) == '') {
                 $model->depreciation_id =  0;
             } else {
                 $model->depreciation_id = e(Input::get('depreciation_id'));
             }
-            
+
              if ( e(Input::get('eol')) == '') {
                 $model->eol =  0;
             } else {
@@ -180,9 +180,10 @@ class ModelsController extends AdminController
 
             // Update the model data
             $model->name            	= e(Input::get('name'));
-            $model->modelno            	= e(Input::get('modelno'));           
+            $model->modelno            	= e(Input::get('modelno'));
             $model->manufacturer_id    	= e(Input::get('manufacturer_id'));
             $model->category_id    		= e(Input::get('category_id'));
+            $model->show_mac_address 	= e(Input::get('show_mac_address', '0'));
 
             if (Input::file('image')) {
                 $image = Input::file('image');
@@ -198,13 +199,13 @@ class ModelsController extends AdminController
             if (Input::get('image_delete') == 1 && Input::file('image') == "") {
                 $model->image = NULL;
             }
-      
+
             // Was it created?
             if($model->save()) {
                 // Redirect to the new model  page
                 return Redirect::to("hardware/models")->with('success', Lang::get('admin/models/message.update.success'));
             }
-        } 
+        }
 
         // Redirect to the model create page
         return Redirect::to("hardware/models/$modelId/edit")->with('error', Lang::get('admin/models/message.update.error'));
@@ -261,7 +262,7 @@ class ModelsController extends AdminController
 
 
     }
-    
+
         public function getClone($modelId = null)
     {
         // Check if the model exists
@@ -269,10 +270,10 @@ class ModelsController extends AdminController
             // Redirect to the model management page
             return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.does_not_exist'));
         }
-        
+
         $model = clone $model_to_clone;
         $model->id = null;
-        
+
         // Show the page
         $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
         $manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
@@ -284,7 +285,7 @@ class ModelsController extends AdminController
         $view->with('model',$model);
         $view->with('clone_model',$model_to_clone);
         return $view;
-        
+
     }
 
 

app/controllers/admin/SettingsController.php

@@ -86,6 +86,7 @@ class SettingsController extends AdminController
             $setting->per_page = e(Input::get('per_page'));
             $setting->qr_code = e(Input::get('qr_code', '0'));
             $setting->display_eol = e(Input::get('display_eol', '0'));
+            $setting->load_remote = e(Input::get('load_remote', '0'));
             $setting->qr_text = e(Input::get('qr_text'));
             $setting->auto_increment_prefix = e(Input::get('auto_increment_prefix'));
             $setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0'));

app/controllers/admin/StatuslabelsController.php

@@ -38,7 +38,12 @@ class StatuslabelsController extends AdminController
     public function getCreate()
     {
         // Show the page
-        return View::make('backend/statuslabels/edit')->with('statuslabel',new Statuslabel);
+		$statuslabel = new Statuslabel;
+		$use_statuslabel_type = $statuslabel->getStatuslabelType();
+
+    	$statuslabel_types = array('' => Lang::get('admin/hardware/form.select_statustype')) + array('undeployable' => Lang::get('admin/hardware/general.undeployable')) + array('pending' => Lang::get('admin/hardware/general.pending')) + array('archived' => Lang::get('admin/hardware/general.archived')) + array('deployable' => Lang::get('admin/hardware/general.deployable'));
+
+        return View::make('backend/statuslabels/edit', compact('statuslabel_types','statuslabel'))->with('use_statuslabel_type',$use_statuslabel_type);
     }
 
 
@@ -59,9 +64,15 @@ class StatuslabelsController extends AdminController
         // attempt validation
         if ($statuslabel->validate($new)) {
 
+        	$statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
+
             // Save the Statuslabel data
             $statuslabel->name            	= e(Input::get('name'));
             $statuslabel->user_id          = Sentry::getId();
+            $statuslabel->notes          =  e(Input::get('notes'));
+            $statuslabel->deployable          =  $statustype['deployable'];
+            $statuslabel->pending          =  $statustype['pending'];
+            $statuslabel->archived          =  $statustype['archived'];
 
             // Was the asset created?
             if($statuslabel->save()) {
@@ -94,8 +105,11 @@ class StatuslabelsController extends AdminController
             return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.does_not_exist'));
         }
 
+		$use_statuslabel_type = $statuslabel->getStatuslabelType();
 
-        return View::make('backend/statuslabels/edit', compact('statuslabel'));
+		$statuslabel_types = array('' => Lang::get('admin/hardware/form.select_statustype')) + array('undeployable' => Lang::get('admin/hardware/general.undeployable')) + array('pending' => Lang::get('admin/hardware/general.pending')) + array('archived' => Lang::get('admin/hardware/general.archived')) + array('deployable' => Lang::get('admin/hardware/general.deployable'));
+
+        return View::make('backend/statuslabels/edit', compact('statuslabel','statuslabel_types'))->with('use_statuslabel_type',$use_statuslabel_type);
     }
 
 
@@ -118,20 +132,27 @@ class StatuslabelsController extends AdminController
 
         if ($validator->fails())
         {
-            // The given data did not pass validation            
+            // The given data did not pass validation
             return Redirect::back()->withInput()->withErrors($validator->messages());
         }
         // attempt validation
         else {
             // Update the Statuslabel data
+            $statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
+
             $statuslabel->name            	= e(Input::get('name'));
+            $statuslabel->notes          =  e(Input::get('notes'));
+            $statuslabel->deployable          =  $statustype['deployable'];
+            $statuslabel->pending          =  $statustype['pending'];
+            $statuslabel->archived          =  $statustype['archived'];
+
 
             // Was the asset created?
             if($statuslabel->save()) {
                 // Redirect to the saved Statuslabel page
                 return Redirect::to("admin/settings/statuslabels/")->with('success', Lang::get('admin/statuslabels/message.update.success'));
             }
-        } 
+        }
 
         // Redirect to the Statuslabel management page
         return Redirect::to("admin/settings/statuslabels/$statuslabelId/edit")->with('error', Lang::get('admin/statuslabels/message.update.error'));

app/controllers/admin/UsersController.php

@@ -458,7 +458,7 @@ class UsersController extends AdminController
     public function getView($userId = null)
     {
 
-        $user = Sentry::getUserProvider()->createModel()->withTrashed()->find($userId);
+        $user = Sentry::getUserProvider()->createModel()->find($userId);
 
             if (isset($user->id)) {
                 return View::make('backend/users/view', compact('user'));

app/database/migrations/2015_02_10_040958_fix_bad_assigned_to_ids.php

@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FixBadAssignedToIds extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::update('update ' . DB::getTablePrefix() . 'assets SET assigned_to=NULL where assigned_to=0');
+
+		Schema::table('status_labels', function ($table) {
+			$table->boolean('deployable')->default(0);
+			$table->boolean('pending')->default(0);
+			$table->boolean('archived')->default(0);
+			$table->text('notes')->nullable();
+		});
+
+		DB::statement('INSERT into ' . DB::getTablePrefix() . 'status_labels (user_id, name, deployable, pending, archived, notes) VALUES (1,"Pending",0,1,0,"These assets are not yet ready to be deployed, usually because of configuration or waiting on parts.")');
+		DB::statement('INSERT into ' . DB::getTablePrefix() . 'status_labels (user_id, name, deployable, pending, archived, notes) VALUES (1,"Ready to Deploy",1,0,0,"These assets are ready to deploy.")');
+		DB::statement('INSERT into ' . DB::getTablePrefix() . 'status_labels (user_id, name, deployable, pending, archived, notes) VALUES (1,"Archived",0,0,1,"These assets are no longer in circulation or viable.")');
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('status_labels', function ($table) {
+			$table->dropColumn('deployable');
+			$table->dropColumn('pending');
+			$table->dropColumn('archived');
+			$table->dropColumn('notes');
+
+		});
+	}
+
+}

app/database/migrations/2015_02_10_053310_migrate_data_to_new_statuses.php

@@ -0,0 +1,60 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MigrateDataToNewStatuses extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		// get newly added statuses from last migration
+		$statuses = DB::select('select * from ' . DB::getTablePrefix() . 'status_labels where name="Pending" OR name="Ready to Deploy"');
+
+
+		foreach ($statuses as $status) {
+			if ($status->name =="Pending") {
+				$pending_id = array($status->id);
+			} elseif ($status->name =="Ready to Deploy") {
+				$rtd_id = array($status->id);
+			}
+		}
+
+		// Pending
+		$pendings = DB::select('select * from ' . DB::getTablePrefix() . 'assets where status_id IS NULL AND physical=1 ');
+
+			foreach ($pendings as $pending) {
+				DB::update('update ' . DB::getTablePrefix() . 'assets set status_id = ? where status_id IS NULL AND physical=1',$pending_id);
+
+			}
+
+
+		// Ready to Deploy
+		$rtds = DB::select('select * from ' . DB::getTablePrefix() . 'assets where status_id = 0 AND physical=1 ');
+
+		foreach ($rtds as $rtd) {
+				//DB::update('update users set votes = 100 where name = ?', array('John'));
+				DB::update('update ' . DB::getTablePrefix() . 'assets set status_id = ? where status_id = 0 AND physical=1',$rtd_id);
+
+			}
+
+
+
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}

app/database/migrations/2015_02_11_044104_migrate_make_license_assigned_null.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MigrateMakeLicenseAssignedNull extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::update('update ' . DB::getTablePrefix() . 'license_seats SET assigned_to=NULL where assigned_to=0');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}

app/database/migrations/2015_02_11_104406_migrate_create_requests_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MigrateCreateRequestsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::create('requests', function ($table) {
+            $table->increments('id');
+            $table->integer('asset_id');
+            $table->integer('user_id');
+            $table->text('request_code');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		 Schema::drop('requests');
+	}
+
+}

app/database/migrations/2015_02_12_001312_add_mac_address_to_asset.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddMacAddressToAsset extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('assets', function ($table) {
+			$table->string('mac_address')->nullable()->default(NULL);
+		});
+
+		Schema::table('models', function ($table) {
+			$table->boolean('show_mac_address')->default(0);
+		});
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('assets', function ($table) {
+			$table->dropColumn('mac_address');
+		});
+
+		Schema::table('models', function ($table) {
+			$table->dropColumn('show_mac_address');
+		});
+	}
+
+}

app/database/migrations/2015_02_12_024100_change_license_notes_type.php

@@ -0,0 +1,27 @@
+<?php
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+class ChangeLicenseNotesType extends Migration {
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		$prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN notes TEXT');
+	}
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		$prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN notes VARCHAR(255)');
+	}
+}

app/database/migrations/2015_02_17_231020_add_localonly_to_settings.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddLocalonlyToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->boolean('load_remote')->default(1);
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->dropColumn('load_remote');
+		});
+
+	}
+
+}

app/database/seeds/ActionlogSeeder.php

@@ -10,7 +10,7 @@ class ActionlogSeeder extends Seeder
 
         $date = new DateTime;
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $assetlog[] = array(
             'user_id'      		=> '1',
             'action_type'      	=> 'checkout',
@@ -23,7 +23,7 @@ class ActionlogSeeder extends Seeder
             'filename'			=> NULL,
         );
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $assetlog[] = array(
             'user_id'      		=> '1',
             'action_type'      	=> 'checkin from',
@@ -36,7 +36,7 @@ class ActionlogSeeder extends Seeder
             'filename'			=> NULL,
         );
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $assetlog[] = array(
             'user_id'      		=> '1',
             'action_type'      	=> 'checkout',
@@ -49,7 +49,7 @@ class ActionlogSeeder extends Seeder
             'filename'			=> NULL,
         );
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $assetlog[] = array(
             'user_id'      		=> '1',
             'action_type'      	=> 'checkin from',

app/database/seeds/AssetsSeeder.php

@@ -10,7 +10,7 @@ class AssetsSeeder extends Seeder
 
         $date = new DateTime;
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Shanen MBP',
             'asset_tag'     => 'NNY2878796',
@@ -22,10 +22,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'		=> NULL,
+            'status_id'		=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -45,10 +45,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> NULL,
+            'status_id'	=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -57,7 +57,7 @@ class AssetsSeeder extends Seeder
         );
 
 
-        // RTD (status_id =0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Alison MBP',
             'asset_tag'     => 'NNY287958796',
@@ -69,10 +69,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 2,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -80,7 +80,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // RTD (status_id =0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Brady MBP',
             'asset_tag'     => 'NNY78795566',
@@ -92,10 +92,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -103,7 +103,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // RTD (status_id =0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Deborah MBP',
             'asset_tag'     => 'NNY65756756775',
@@ -115,10 +115,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 2,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 2,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -127,7 +127,7 @@ class AssetsSeeder extends Seeder
         );
 
 
-        // Deployed (status_id =0, assigned_to > 0)
+
         $asset[] = array(
             'name'      	=> 'Sara MBP',
             'asset_tag'     => 'NNY6897856775',
@@ -142,7 +142,7 @@ class AssetsSeeder extends Seeder
             'assigned_to' 	=> 2,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -150,7 +150,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // Deployed (status_id =0, assigned_to > 0)
+
         $asset[] = array(
             'name'      	=> 'Ben MBP',
             'asset_tag'     => 'NNY67567775',
@@ -165,7 +165,7 @@ class AssetsSeeder extends Seeder
             'assigned_to' 	=> 2,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',
@@ -173,10 +173,10 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // Undeployable (status_id > 0, assigned_to = 0)
+
         $asset[] = array(
-            'name'      	=> 'Broke-Ass Laptop',
-            'asset_tag'     => 'NNY67567775',
+            'name'      	=> 'Broken Laptop',
+            'asset_tag'     => 'NNY6756756775',
             'model_id'      => 2,
             'serial'      	=> 'WS89080890',
             'purchase_date' => '2012-01-02',
@@ -185,7 +185,7 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 2,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
             'status_id'	=> '3',
@@ -196,7 +196,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // Undeployable (status_id > 0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Maybe Broke-Ass Laptop',
             'asset_tag'     => 'NNY6755667775',
@@ -208,7 +208,7 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
             'status_id'	=> '2',
@@ -219,7 +219,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // Undeployable (status_id > 0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Completely Facacta Laptop',
             'asset_tag'     => 'NNY6564567775',
@@ -231,7 +231,7 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 1,
             'status_id'	=> '4',
@@ -242,7 +242,7 @@ class AssetsSeeder extends Seeder
             'depreciate' 	=> '0',
         );
 
-        // Undeployable (status_id > 0, assigned_to = 0)
+
         $asset[] = array(
             'name'      	=> 'Drunken Shanenigans Laptop',
             'asset_tag'     => 'NNY6564567775',
@@ -254,7 +254,7 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 1,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 1,
             'status_id'	=> '3',
@@ -277,10 +277,10 @@ class AssetsSeeder extends Seeder
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
             'user_id' 		=> 2,
-            'assigned_to' 	=> 0,
+            'assigned_to' 	=> NULL,
             'physical' 		=> 1,
             'archived' 		=> 0,
-            'status_id'	=> 0,
+            'status_id'	=> 1,
             'notes'			=> '',
             'deleted_at' 	=> NULL,
             'archived' 	=> '0',

app/database/seeds/LicenseSeatsSeeder.php

@@ -10,7 +10,7 @@ class LicenseSeatsSeeder extends Seeder
 
         $date = new DateTime;
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $license_seats[] = array(
             'license_id'      	=> '1',
             'assigned_to'      	=> '1',
@@ -46,7 +46,7 @@ class LicenseSeatsSeeder extends Seeder
 
         $license_seats[] = array(
             'license_id'      	=> '1',
-            'assigned_to'      	=> '0',
+            'assigned_to'      	=> NULL,
             'created_at' 		=> $date->modify('-10 day')->format('Y-m-d H:i:s'),
             'updated_at' 		=> $date->modify('-3 day')->format('Y-m-d H:i:s'),
             'deleted_at' 		=> NULL,
@@ -77,10 +77,10 @@ class LicenseSeatsSeeder extends Seeder
             'asset_id' 			=> NULL,
         );
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $license_seats[] = array(
             'license_id'      	=> '2',
-            'assigned_to'      	=> '0',
+            'assigned_to'      	=> NULL,
             'created_at' 		=> $date->modify('-10 day')->format('Y-m-d H:i:s'),
             'updated_at' 		=> $date->modify('-3 day')->format('Y-m-d H:i:s'),
             'deleted_at' 		=> NULL,

app/database/seeds/LicensesSeeder.php

@@ -10,7 +10,7 @@ class LicensesSeeder extends Seeder
 
         $date = new DateTime;
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $license[] = array(
             'name'      		=> 'Adobe Photoshop CS6',
             'serial'      		=> 'ZOMG-WtF-BBQ-SRSLY',
@@ -31,7 +31,7 @@ class LicensesSeeder extends Seeder
             'depreciate' 		=> '0',
         );
 
-        // Pending (status_id is null, assigned_to = 0)
+
         $license[] = array(
             'name'      		=> 'Git Tower',
             'serial'      		=> '98049890394-340485934',

app/database/seeds/StatuslabelsSeeder.php

@@ -10,12 +10,53 @@ class StatuslabelsSeeder extends Seeder
 
         $date = new DateTime;
 
+		 $status[] = array(
+            'name'      => 'Ready to Deploy',
+            'created_at' => $date->modify('-10 day'),
+            'updated_at' => $date->modify('-3 day'),
+            'user_id' => 1,
+            'deleted_at' 		=> NULL,
+            'deployable'	=> 1,
+            'pending'	=> 0,
+            'archived' => 0,
+            'notes' => ''
+        );
+
+         $status[] = array(
+            'name'      => 'Pending',
+            'created_at' => $date->modify('-10 day'),
+            'updated_at' => $date->modify('-3 day'),
+            'user_id' => 1,
+            'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 1,
+            'archived' => 0,
+            'notes' => ''
+        );
+
+        $status[] = array(
+            'name'      => 'Archived',
+            'created_at' => $date->modify('-10 day'),
+            'updated_at' => $date->modify('-3 day'),
+            'user_id' => 1,
+            'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 0,
+            'archived' => 1,
+            'notes' => 'These assets are permanently undeployable'
+        );
+
+
         $status[] = array(
             'name'      => 'Out for Diagnostics',
             'created_at' => $date->modify('-10 day'),
             'updated_at' => $date->modify('-3 day'),
             'user_id' => 1,
             'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 0,
+            'archived' => 0,
+            'notes' => ''
         );
 
 
@@ -25,6 +66,10 @@ class StatuslabelsSeeder extends Seeder
             'updated_at' => $date->modify('-3 day'),
             'user_id' => 1,
             'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 0,
+            'archived' => 0,
+             'notes' => ''
         );
 
 
@@ -34,6 +79,10 @@ class StatuslabelsSeeder extends Seeder
             'updated_at' => $date->modify('-3 day'),
             'user_id' => 1,
             'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 0,
+            'archived' => 1,
+             'notes' => ''
         );
 
         $status[] = array(
@@ -42,6 +91,10 @@ class StatuslabelsSeeder extends Seeder
             'updated_at' => $date->modify('-3 day'),
             'user_id' => 1,
             'deleted_at' 		=> NULL,
+            'deployable'	=> 0,
+            'pending'	=> 0,
+            'archived' => 1,
+            'notes' => '',
         );
 
 

app/lang/ar/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Expires',
     'fully_depreciated'	=> 'Fully Depreciated',
     'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Manufacturer',
     'model'				=> 'Model',
     'months'			=> 'months',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Order Number',
     'qr'				=> 'QR Code',
     'requestable'		=> 'Users may request this asset',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serial',
     'status'			=> 'Status',
     'supplier'			=> 'Supplier',

app/lang/ar/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset to User',
     'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'View Asset',
 );

app/lang/ar/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     '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. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Asset updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/ar/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/ar/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
     'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
 );

app/lang/ar/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'الإدارة',
     'all_assets'			=> 'كل الأصول',
     'all'       			=> 'الكل',
+    'archived'              => 'Archived',
     'asset_models'			=> 'نماذج الأصول',
     'asset'					=> 'الأصول',
     'asset_report'          => 'Asset Report',

app/lang/cs/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Expiruje',
     'fully_depreciated'	=> 'Plně odepsané',
     'help_checkout'		=> 'Pokud si přejete přiřadit majetek okamžitě, měli by jste ze seznamu stavů zvolit "Připraveno k přiděleni", nebo se může něco pokazit. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Výrobce',
     'model'				=> 'Model',
     'months'			=> 'měsíce',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Č. objednávky',
     'qr'				=> 'QR kód',
     'requestable'		=> 'Uživatelé můžou požádat o tento majetek',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Sériové číslo',
     'status'			=> 'Stav',
     'supplier'			=> 'Dodavatel',

app/lang/cs/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Majetek',
     'checkin'  					=> 'Převzít majetek',
     'checkout'  				=> 'Předat majetek uživateli',
     'clone'  					=> 'Klonovat majetek',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Upravit majetek',
-    'pending'  					=> 'Nevyřízený majetek',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'Zobrazit majetek',
 );

app/lang/cs/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     '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. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Asset updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/cs/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/cs/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Název stavu',
-    'title'      	=> 'Označení stavu',
-    'update'      	=> 'Upravit označení stavu',
-    'create'      	=> 'Vytvořit označení stavu',
     'about'      	=> 'O označení stavu',
-    'info'      	=> 'Označení stavu se používá k popisu různých důvodů proč majetek <strong><em>nemůže</em></strong> být přidělen. Může být pokažený, pryč na opravě, na diagnostice, ztracený nebo ukradený, apod. Označení stavu umožňuje členům týmu zobrazovat postup.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Vytvořit označení stavu',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Název stavu',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Označení stavu',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Upravit označení stavu',
 );

app/lang/cs/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Admin',
     'all_assets'			=> 'Všechna zařízení',
     'all'       			=> 'Vše',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Modely majetku',
     'asset'					=> 'Zařízeni',
     'asset_report'          => 'Report majetku',

app/lang/da/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Udløber',
     'fully_depreciated'	=> 'Fully Depreciated',
     'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Producent',
     'model'				=> 'Model',
     'months'			=> 'måneder',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Order Number',
     'qr'				=> 'QR kode',
     'requestable'		=> 'Users may request this asset',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serienummer',
     'status'			=> 'Status',
     'supplier'			=> 'Leverandør',

app/lang/da/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset to User',
     'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'View Asset',
 );

app/lang/da/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     '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. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Asset updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/da/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/da/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Status navn',
-    'title'      	=> 'Status labels',
-    'update'      	=> 'Opdater status label',
-    'create'      	=> 'Opret status label',
     'about'      	=> 'Om status labels',
-    'info'      	=> 'Status labels bruges til at beskrive de forskellige grunde til, hvorfor et aktiv <strong><em>ikke</em></strong> kan blive anvendt. Det kan være i stykker, sendt til diagnose, sendt til reparation, mistet eller stjålet, osv. Status labels gør det muligt for dit team at vise udviklingen.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Opret status label',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Status navn',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Status labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Opdater status label',
 );

app/lang/da/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Admin',
     'all_assets'			=> 'Alle aktiver',
     'all'       			=> 'Alle',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Asset Models',
     'asset'					=> 'Asset',
     'asset_report'          => 'Asset Report',

app/lang/de/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Gültig bis',
     'fully_depreciated'	=> 'Komplett Abgeschrieben',
     'help_checkout'		=> 'Wenn du dieses Asset sofort zuweisen möchtest, solltest du "Ready to Deploy" im Statusfeld auswählen oder es könnten unerwartete Probleme auftreten. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Hersteller',
     'model'				=> 'Modell',
     'months'			=> 'Monate',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Bestellnummer',
     'qr'				=> 'QR-Code',
     'requestable'		=> 'Benutzer dürfen dieses Asset anfordern',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Seriennummer',
     'status'			=> 'Status',
     'supplier'			=> 'Lieferant',

app/lang/de/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Asset zurücknehmen',
     'checkout'  				=> 'Asset an Benutzer herausgeben',
     'clone'  					=> 'Asset duplizieren',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Asset editieren',
-    'pending'  					=> 'Unerledigter Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'Asset ansehen',
 );

app/lang/de/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<b>Warnung:</b> Dieses Asset wurde als nicht zur Herausgabe bereit markiert. Falls sich dieser Status geändert hat, aktualisieren Sie bitte den Asset Status.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Asset existiert nicht.',
     'assoc_users'	 	=> 'Dieses Asset ist im Moment an einen Benutzer herausgegeben und kann nicht entfernt werden. Bitte buchen sie das Asset wieder ein und versuchen Sie dann erneut es zu entfernen. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Asset wurde erfolgreich aktualisiert.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Sind Sie sicher, dass Sie dieses Asset entfernen möchten?',
         'error'   		=> 'Beim Entfernen dieses Assets ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',

app/lang/de/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/de/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Statusname',
-    'title'      	=> 'Statusbezeichnungen',
-    'update'      	=> 'Statusbezeichnung bearbeiten',
-    'create'      	=> 'Statusbezeichnung erstellen',
     'about'      	=> 'Info Statusbezeichnung',
-    'info'      	=> 'Status Label werden benutzt um die diversen Gründe zu beschreiben warum ein Asset <strong><em>nicht</em></strong> ausgerollt werden kann. Es könnte kaputt sein, in der Diagnose, in der Reparatur, verloren oder gestohlen, etc. Status Label ermöglichen es deinem Team den Fortschritt anzuzeigen.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Statusbezeichnung erstellen',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Statusname',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Statusbezeichnungen',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Statusbezeichnung bearbeiten',
 );

app/lang/de/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Administrator',
     'all_assets'			=> 'Alle Assets',
     'all'       			=> 'Alle',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Asset Modelle',
     'asset'					=> 'Asset',
     'asset_report'          => 'Asset Bericht',

app/lang/en-GB/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Expires',
     'fully_depreciated'	=> 'Fully Depreciated',
     'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Manufacturer',
     'model'				=> 'Model',
     'months'			=> 'months',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Order Number',
     'qr'				=> 'QR Code',
     'requestable'		=> 'Users may request this asset',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serial',
     'status'			=> 'Status',
     'supplier'			=> 'Supplier',

app/lang/en-GB/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset to User',
     'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'View Asset',
 );

app/lang/en-GB/admin/hardware/message.php

@@ -17,6 +17,11 @@ return array(
         'success' 		=> 'Asset updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/en-GB/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/en-GB/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
     'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
 );

app/lang/en-GB/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
     'all'       			=> 'All',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Asset Models',
     'asset'					=> 'Asset',
     'asset_report'          => 'Asset Report',

app/lang/en/admin/hardware/form.php

@@ -2,6 +2,9 @@
 
 return array(
 
+	'bulk_update'		=> 'Bulk Update Assets',
+	'bulk_update_help'	=> 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
+	'bulk_update_warn'	=> 'You are about to edit the properties of :asset_count assets.',
     'checkedout_to'		=> 'Checked Out To',
     'checkout_to'		=> 'Checkout to',
     'cost'				=> 'Purchase Cost',
@@ -15,6 +18,7 @@ return array(
     'expires'			=> 'Expires',
     'fully_depreciated'	=> 'Fully Depreciated',
     'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Manufacturer',
     'model'				=> 'Model',
     'months'			=> 'months',
@@ -23,6 +27,7 @@ return array(
     'order'				=> 'Order Number',
     'qr'				=> 'QR Code',
     'requestable'		=> 'Users may request this asset',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serial',
     'status'			=> 'Status',
     'supplier'			=> 'Supplier',

app/lang/en/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset to User',
     'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'View Asset',
 );

app/lang/en/admin/hardware/message.php

@@ -13,10 +13,29 @@ return array(
     ),
 
     'update' => array(
-        'error'   		=> 'Asset was not updated, please try again',
-        'success' 		=> 'Asset updated successfully.'
+        'error'   			=> 'Asset was not updated, please try again',
+        'success' 			=> 'Asset updated successfully.',
+        'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+    
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/en/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/en/admin/settings/general.php

@@ -10,6 +10,7 @@ return array(
     'display_qr'                => 'Display QR Codes',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
     'laravel'                   => 'Laravel Version',
+    'load_remote'				=> 'This Snipe-IT install can load scripts from the outside world.',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',

app/lang/en/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
     'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
 );

app/lang/en/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
     'all'       			=> 'All',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Asset Models',
     'asset'					=> 'Asset',
     'asset_report'          => 'Asset Report',
@@ -36,6 +37,7 @@ return array(
     'deleted'  				=> 'Deleted',
     'deployed'				=> 'Deployed',
     'depreciation_report'	=> 'Depreciation Report',
+    'download'				=> 'Download',
     'depreciation'			=> 'Depreciation',
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
@@ -47,8 +49,8 @@ return array(
     'gravatar_email'        => 'Gravatar Email Address',
     'history_for'  			=> 'History for',
     'id'  					=> 'ID',
-    'image_delete'         => 'Delete Image',
-    'image_upload'         => 'Upload Image',
+    'image_delete'         	=> 'Delete Image',
+    'image_upload'         	=> 'Upload Image',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',

app/lang/es-ES/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Expira',
     'fully_depreciated'	=> 'Totalmente amortizado',
     'help_checkout'		=> 'Si desea asignar a este activo inmediatamente, deberá seleccionar "Listo para desplegar" de la lista de estado anterior, o pueden ocurrir cosas inesperadas. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Fabricante',
     'model'				=> 'Modelo',
     'months'			=> 'meses',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Nº Pedido',
     'qr'				=> 'Código QR',
     'requestable'		=> 'Los usuarios pueden solicitarlo',
+    'select_statustype'	=> 'Selecciona estado',
     'serial'			=> 'N. Serie',
     'status'			=> 'Estado',
     'supplier'			=> 'Proveedor',

app/lang/es-ES/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archivado',
     'asset'  					=> 'Equipo',
     'checkin'  					=> 'Quitar Equipo',
     'checkout'  				=> 'Asignar a un usuario',
     'clone'  					=> 'Clonar Equipo',
+    'deployable'  				=> 'Desplegable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Editar Equipo',
-    'pending'  					=> 'Equipo Pendiente',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pendiente',
+    'undeployable'  			=> 'No desplegable',
     'view'  					=> 'Ver Equipo',
 );

app/lang/es-ES/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> 'Atención:  Este equipo está marcado como no isntalabre. Si no es correcto, actualiza su estado.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Equipo inexistente.',
     'assoc_users'	 	=> 'Equipo asignado a un usuario, no se puede eliminar.',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Equipo actualizado.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Estás seguro que quieres eliminar el equipo?',
         'error'   		=> 'Equipo no eliminado, intentalo de nuevo.',

app/lang/es-ES/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/es-ES/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Estado',
-    'title'      	=> 'Etiquetas Estado',
-    'update'      	=> 'Actualizar Etiqueta Estado',
-    'create'      	=> 'Crear Etiqueta Estado',
     'about'      	=> 'Info Etiquetas Estado',
-    'info'      	=> 'Las etiquetas de estado son usadas para describir las razobes por las que un equipo <strong><em>no puede</em></strong> ser instalado. Puede estar estropeado, en proceso de diagnóstico, en reparación, perdido o robado,etc.',
+    'archived'      	=> 'Archivado',
+    'create'      	=> 'Crear Etiqueta Estado',
+    'deployable'      	=> 'Desplegable',
+    'info'      	=> 'Las etiquetas de estado se utilizan para describir los diferentes estados en que pueden estar tus equipos. Pueden estar fuera en reparación, perdidos/robados, etc. Puedes crear nuevas etiquetas de estado para equipos desplegables, pendientes o archivados.',
+    'name'      	=> 'Estado',
+    'pending'      	=> 'Pendiente',
+    'status_type'   => 'Tipo de estado',
+    'title'      	=> 'Etiquetas Estado',
+    'undeployable'  => 'No desplegable',
+    'update'      	=> 'Actualizar Etiqueta Estado',
 );

app/lang/es-ES/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Admin',
     'all_assets'			=> 'Todos los Equipos',
     'all'       			=> 'Todos los',
+    'archived'              => 'Archivado',
     'asset_models'			=> 'Modelos',
     'asset'					=> 'Equipo',
     'asset_report'          => 'Reporte de Equipos',

app/lang/fi/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Vanhenee',
     'fully_depreciated'	=> 'Kokonaan Poistettu',
     'help_checkout'		=> 'Jos haluat määrittää laitteen käyttöön jollekulle samantien, sinun tulee valita laitteen tilaksi "luovutusvalmis" tai järjestelmä saattaa toimia odottamattomasti. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Valmistaja',
     'model'				=> 'Malli',
     'months'			=> 'kuukautta',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Tilausnumero',
     'qr'				=> 'QR-koodi',
     'requestable'		=> 'Käyttäjät voivat pyytää tätä laitetta',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Sarjanumero',
     'status'			=> 'Tila',
     'supplier'			=> 'Toimittaja',

app/lang/fi/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Laite',
     'checkin'  					=> 'Palauta Laite',
     'checkout'  				=> 'Luovuta Laite Käyttäjälle',
     'clone'  					=> 'Monista Laite',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Muokkaa Laitetta',
-    'pending'  					=> 'Odottavat Laitteet',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'Näytä Laite',
 );

app/lang/fi/admin/hardware/message.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Varoitus: </strong> Tämä laite on määritetty käyttökunnottomaksi.
-                        Jos laitteen tila on muuttunut, päivitä laitteen tila sen asetuksista.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Laitetta ei löydy.',
     'assoc_users'	 	=> 'Tämä laite on luovutettu käyttäjälle joten sitä ei voida poistaa. Palauta laite ensin käyttäjältä ja yritä uudelleen. ',
 
@@ -17,6 +17,11 @@ return array(
         'success' 		=> 'Laite päivitetty onnistuneesti.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Oletko varma että haluat poistaa tämän laitteen?',
         'error'   		=> 'Laitteen poistamisessa tapahtui virhe. Yritä uudelleen.',

app/lang/fi/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/fi/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Tilan Nimi',
-    'title'      	=> 'Tilamerkinnät',
-    'update'      	=> 'Päivitä Tilamerkinnät',
-    'create'      	=> 'Uusi Tilamerkintä',
     'about'      	=> 'Lisätietoja Tilamerkinnöistä',
-    'info'      	=> 'Tilamerkintöjä käytetään erilaisina syinä siihen miksi laitetta  <strong><em>ei voida</em></strong> ottaa käyttöön. Laite voi olla rikki, lähetetty vianhakuun, korjattavana, hävinnyt, varastettu jne. Tilamerkintöjen avulla tiimisi voi seurata laitteen edistymistä.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Uusi Tilamerkintä',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Tilan Nimi',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Tilamerkinnät',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Päivitä Tilamerkinnät',
 );

app/lang/fi/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Ylläpitäjä',
     'all_assets'			=> 'Kaikki Laitteet',
     'all'       			=> 'Kaikki',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Laitemallit',
     'asset'					=> 'Laite',
     'asset_report'          => 'Laiteraportti',

app/lang/fr/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Expire',
     'fully_depreciated'	=> 'Entièrement amortis',
     'help_checkout'		=> 'Si vous souhaitez assigner cet actif immédiatement, vous devez sélectionner « Prêt à déployer » dans la liste statut ci-dessus, ou des choses inattendues peuvent se produire. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Fabricant',
     'model'				=> 'Modèle',
     'months'			=> 'Mois',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Numéro de Commande',
     'qr'				=> 'Code QR',
     'requestable'		=> 'Les utilisateurs peuvent demander à cet actif',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Série ',
     'status'			=> 'Statut',
     'supplier'			=> 'Fournisseur',

app/lang/fr/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Biens',
     'checkin'  					=> 'Retour des Biens',
     'checkout'  				=> 'Sortie des Biens',
     'clone'  					=> 'Cloner le Bien',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Editer le Bien',
-    'pending'  					=> 'Bien en Attente',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'Voir le Bien',
 );

app/lang/fr/admin/hardware/message.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Attention: </strong> Ce bien a été marqué indisponible.
-                        Si ce statut a changé, veuillez l\'actualiser.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Ce bien n\'existe pas.',
     'assoc_users'	 	=> 'Ce bien est marqué sorti par un utilisateur et ne peut être supprimé. Veuillez d\'abord cliquer sur Retour de Biens, et réessayer.',
 
@@ -17,6 +17,11 @@ return array(
         'success' 		=> 'Bien actualisé correctement.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Etes-vous sûr de vouloir supprimer ce bien?',
         'error'   		=> 'Il y a eu un problème en supprimant ce bien. Veuillez réessayer.',

app/lang/fr/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/fr/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Nom du statut',
-    'title'      	=> 'Étiquette de statut',
-    'update'      	=> 'Mettre à jour l\'étiquette de statut',
-    'create'      	=> 'Créé une étiquette de statut',
     'about'      	=> 'À propos des étiquettes de statut',
-    'info'      	=> 'Les étiquettes de statut sont utilisées pour décrire les différentes raisons qui peuvent <strong><em>empêcher</em></strong> le déploiement d\'un actif. Il peut être cassé, en examen, en réparation, perdu ou volé, etc. Les étiquettes de statut permettent à votre équipe de suivre la progression de l’état de l\'actif.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Créé une étiquette de statut',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Nom du statut',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Étiquette de statut',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Mettre à jour l\'étiquette de statut',
 );

app/lang/fr/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Admin',
     'all_assets'			=> 'Tous les actifs',
     'all'       			=> 'Tous',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Modèles d\'actif',
     'asset'					=> 'Actif',
     'asset_report'          => 'Rapport d\'actif',

app/lang/hu/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Expires',
     'fully_depreciated'	=> 'Fully Depreciated',
     'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Manufacturer',
     'model'				=> 'Modell',
     'months'			=> 'months',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Order Number',
     'qr'				=> 'QR Code',
     'requestable'		=> 'Users may request this asset',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serial',
     'status'			=> 'Status',
     'supplier'			=> 'Supplier',

app/lang/hu/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset to User',
     'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'View Asset',
 );

app/lang/hu/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     '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. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Asset updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/hu/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/hu/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
     'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
 );

app/lang/hu/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
     'all'       			=> 'All',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Asset Models',
     'asset'					=> 'Asset',
     'asset_report'          => 'Asset Report',

app/lang/it/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Expires',
     'fully_depreciated'	=> 'Fully Depreciated',
     'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Manufacturer',
     'model'				=> 'Model',
     'months'			=> 'months',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Order Number',
     'qr'				=> 'QR Code',
     'requestable'		=> 'Users may request this asset',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serial',
     'status'			=> 'Status',
     'supplier'			=> 'Supplier',

app/lang/it/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset to User',
     'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'View Asset',
 );

app/lang/it/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     '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. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Asset updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/it/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/it/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
     'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
 );

app/lang/it/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
     'all'       			=> 'All',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Asset Models',
     'asset'					=> 'Asset',
     'asset_report'          => 'Asset Report',

app/lang/ja/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Expires',
     'fully_depreciated'	=> 'Fully Depreciated',
     'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Manufacturer',
     'model'				=> 'Model',
     'months'			=> 'months',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Order Number',
     'qr'				=> 'QR Code',
     'requestable'		=> 'Users may request this asset',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serial',
     'status'			=> 'Status',
     'supplier'			=> 'Supplier',

app/lang/ja/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset to User',
     'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'View Asset',
 );

app/lang/ja/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     '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. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Asset updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',

app/lang/ja/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/ja/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
     'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
 );

app/lang/ja/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
     'all'       			=> 'All',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Asset Models',
     'asset'					=> 'Asset',
     'asset_report'          => 'Asset Report',

app/lang/ms/admin/hardware/form.php

@@ -15,6 +15,7 @@ return array(
     'expires'			=> 'Luput',
     'fully_depreciated'	=> 'Susut Nilai Penuh',
     'help_checkout'		=> 'Jika anda mahu agihkan harta ini dengan segera, anda sepatunya pilih "Sedia Untuk Agihan" Dari senarai status diatas, atau sesuatu perkara yang tidak dijangka mungkin akan berlaku. ',
+    'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Pengeluar',
     'model'				=> 'Model',
     'months'			=> 'bulan',
@@ -23,6 +24,7 @@ return array(
     'order'				=> 'Nombor Pesanan',
     'qr'				=> 'Kod QR',
     'requestable'		=> 'Pengguna dibenarkan untuk memohon harta ini',
+    'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Siri',
     'status'			=> 'Status',
     'supplier'			=> 'Pembekal',

app/lang/ms/admin/hardware/general.php

@@ -1,11 +1,17 @@
 <?php
 
 return array(
+	'archived'  				=> 'Archived',
     'asset'  					=> 'Harta',
     'checkin'  					=> 'Terima Harta',
     'checkout'  				=> 'Agih Harta Kepada Pengguna',
     'clone'  					=> 'Pendua Harta',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Kemaskini Harta',
-    'pending'  					=> 'Harta Tergantung',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
     'view'  					=> 'Papar Harta',
 );

app/lang/ms/admin/hardware/message.php

@@ -2,7 +2,8 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Amaran: </strong> Harta ini sekarang ditanda sebagai tidak boleh agih. Jika statusnya telah berubah, sila kemaskini staus harta.',
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Harta tidak wujud.',
     'assoc_users'	 	=> 'Harta ini sekarang telah diagihkan kepada pengguna dan tidak boleh dihapuskan. Sila semak status harta ini dahulu, dan kemudian cuba semula. ',
 
@@ -16,6 +17,11 @@ return array(
         'success' 		=> 'Harta berjaya dikemaskini.'
     ),
 
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Anda pasti anda ingin hapuskan harta ini?',
         'error'   		=> 'Ada isu semasa menghapuskan harta. Sila cuba lagi.',

app/lang/ms/admin/models/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+
+);

app/lang/ms/admin/statuslabels/table.php

@@ -1,10 +1,15 @@
 <?php
 
 return array(
-    'name'      	=> 'Nama Status',
-    'title'      	=> 'Label Status',
-    'update'      	=> 'Kemaskini Label Status',
-    'create'      	=> 'Cipata Label Status',
     'about'      	=> 'Mengenai Label Status',
-    'info'      	=> 'Label status digunakan untuk menggambarkan perbagai alasan kenapa harta <strong><em>tidak boleh</em></strong>  di agihkan. Munking rosak, diagnos yang lari, sedang dibaiki, hilang, dicuri, dll. Label status boleh memaparkan situasi.',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Cipata Label Status',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Nama Status',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Label Status',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Kemaskini Label Status',
 );

app/lang/ms/general.php

@@ -7,6 +7,7 @@ return array(
     'admin'					=> 'Pentadbir',
     'all_assets'			=> 'Semua Harta',
     'all'       			=> 'Semua',
+    'archived'              => 'Archived',
     'asset_models'			=> 'Model Harta',
     'asset'					=> 'Harta',
     'asset_report'          => 'Laporan Harta',