Merge remote-tracking branch 'origin/develop'

Set default to not seed DB

.gitignore

@@ -10,6 +10,7 @@ composer.phar
 /app/config/*/session.php
 /app/config/*/database.php
 /app/config/*/app.php
+/app/config/*/ldap.php
 public/packages/*
 public/uploads/models/*
 public/uploads/avatars/*
@@ -25,10 +26,7 @@ public/uploads/logo.png
 public/assets/.siteflow
 app/config/local/session.php
 .couscous
+app/storage/dumps/*
 tests/_support/_generated/*
 tests/_data/scenarios
-nbproject/*
-app/config/local/ldap.php
-app/storage/dumps/*
-app/config/packages/schickling/backup/config.php
-app/config/app.backup.php
+public/uploads/assets/*

Dockerfile

@@ -33,12 +33,10 @@ RUN a2enmod rewrite
 
 ############ INITIAL APPLICATION SETUP #####################
 
-COPY docker/app_start.patch /tmp/app_start.patch
-
 WORKDIR /var/www/html
 
-#Patch bootstrap file
-RUN patch -p1 < /tmp/app_start.patch
+#Append to bootstrap file (less brittle than 'patch')
+RUN sed -i 's/return $app;/$env="production";\nreturn $app;/' bootstrap/start.php
 
 #copy all configuration files
 COPY docker/*.php /var/www/html/app/config/production/

README.md

@@ -9,7 +9,7 @@ This is a FOSS project for asset management in IT Operations. Knowing who has wh
 
 It is built on [Laravel 4.2](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
 
-This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](http://snipeitapp.com/demo/).)
+This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)
 
 __This is web-based software__. This means there there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows.
 

app/commands/AppCommand.php

@@ -32,7 +32,7 @@ class AppCommand extends Command
         'password'   => null
     );
 
-	protected $dummyData = true;
+	protected $dummyData = false;
 
     /**
      * Create a new command instance.
@@ -222,12 +222,23 @@ class AppCommand extends Command
     {
         do {
             // Ask the user to input the user password
-            $password = $this->ask('Please enter your user password (at least 8 characters): ');
+            $password = $this->secret('Please enter your user password (at least 8 characters): ');
+            $password1 = $this->secret('Please confirm your user password: ');
 
             // Check if password is valid
-            if ($password == '') {
+            if ($password == '' || $password1 == '') {
                 // Return an error message
                 $this->error('Password is invalid. Please try again.');
+                $password = '';
+                $password1 = '';
+            }
+            else{
+                // Verify the user password
+                if ($password != $password1){
+                    $this->error('Password do not match. Please try again.');
+                    $password = '';
+                    $password1 = '';
+                }
             }
 
             // Store the password
@@ -235,19 +246,19 @@ class AppCommand extends Command
         } while( ! $password);
     }
 
-	/**
-	 * Asks the user to create dummy data
-	 *
-	 * @return void
-	 * @todo   Use the Laravel Validator
-	 */
-	protected function askUserDummyData()
-	{
-		// Ask the user to input the user password
-		$dummydata = $this->ask('Do you want to seed your database with dummy data? Y/n (default is yes): ');
+    /**
+     * Asks the user to create dummy data
+     *
+     * @return void
+     * @todo   Use the Laravel Validator
+     */
+    protected function askUserDummyData()
+    {
+        // Ask the user to input the user password
+        $dummydata = $this->ask('Do you want to seed your database with dummy data? y/N (default is no): ');
 
-		$this->dummyData = ( strstr($dummydata, 'Y' ) || empty($dummydata) ) ? true : false;
-	}
+        $this->dummyData = ( strstr($dummydata, 'N' ) || empty($dummydata) ) ? true : false;
+    }
 
     /**
      * Runs all the necessary Sentry commands.

app/commands/AssetImportCommand.php

@@ -77,66 +77,80 @@ class AssetImportCommand extends Command {
 				$user_email = '';
 			}
 
-			// Asset Category
+			// User's email
 			if (array_key_exists('2',$row)) {
-				$user_asset_category = trim($row[2]);
+				$user_username = trim($row[2]);
+			} else {
+				$user_username = '';
+			}
+
+			// Asset Name
+			if (array_key_exists('3',$row)) {
+				$user_asset_asset_name = trim($row[3]);
+			} else {
+				$user_asset_asset_name = '';
+			}
+
+			// Asset Category
+			if (array_key_exists('4',$row)) {
+				$user_asset_category = trim($row[4]);
 			} else {
 				$user_asset_category = '';
 			}
 
 			// Asset Name
-			if (array_key_exists('3',$row)) {
-				$user_asset_name = trim($row[3]);
+			if (array_key_exists('5',$row)) {
+				$user_asset_name = trim($row[5]);
 			} else {
 				$user_asset_name = '';
 			}
 
 			// Asset Manufacturer
-			if (array_key_exists('4',$row)) {
-				$user_asset_mfgr = trim($row[4]);
+			if (array_key_exists('6',$row)) {
+				$user_asset_mfgr = trim($row[6]);
 			} else {
 				$user_asset_mfgr = '';
 			}
 
 			// Asset model number
-			if (array_key_exists('5',$row)) {
-				$user_asset_modelno = trim($row[5]);
+			if (array_key_exists('7',$row)) {
+				$user_asset_modelno = trim($row[7]);
 			} else {
 				$user_asset_modelno = '';
 			}
 
 			// Asset serial number
-			if (array_key_exists('6',$row)) {
-				$user_asset_serial = trim($row[6]);
+			if (array_key_exists('8',$row)) {
+				$user_asset_serial = trim($row[8]);
 			} else {
 				$user_asset_serial = '';
 			}
 
 			// Asset tag
-			if (array_key_exists('7',$row)) {
-				$user_asset_tag = trim($row[7]);
+			if (array_key_exists('9',$row)) {
+				$user_asset_tag = trim($row[9]);
 			} else {
 				$user_asset_tag = '';
 			}
 
 			// Asset location
-			if (array_key_exists('8',$row)) {
-				$user_asset_location = trim($row[8]);
+			if (array_key_exists('10',$row)) {
+				$user_asset_location = trim($row[10]);
 			} else {
 				$user_asset_location = '';
 			}
 
 			// Asset notes
-			if (array_key_exists('9',$row)) {
-				$user_asset_notes = trim($row[9]);
+			if (array_key_exists('11',$row)) {
+				$user_asset_notes = trim($row[11]);
 			} else {
 				$user_asset_notes = '';
 			}
 
 			// Asset purchase date
-			if (array_key_exists('10',$row)) {
-				if ($row[10]!='') {
-					$user_asset_purchase_date = date("Y-m-d 00:00:01", strtotime($row[10]));
+			if (array_key_exists('12',$row)) {
+				if ($row[12]!='') {
+					$user_asset_purchase_date = date("Y-m-d 00:00:01", strtotime($row[12]));
 				} else {
 					$user_asset_purchase_date = '';
 				}
@@ -144,6 +158,17 @@ class AssetImportCommand extends Command {
 				$user_asset_purchase_date = '';
 			}
 
+			// Asset purchase cost
+			if (array_key_exists('13',$row)) {
+				if ($row[13]!='') {
+					$user_asset_purchase_cost = trim($row[13]);
+				} else {
+					$user_asset_purchase_cost = '';
+				}
+			} else {
+				$user_asset_purchase_cost = '';
+			}
+
 			// A number was given instead of a name
 			if (is_numeric($user_name)) {
 				$this->comment('User '.$user_name.' is not a name - assume this user already exists');
@@ -157,46 +182,24 @@ class AssetImportCommand extends Command {
 				$user_username = '';
 
 			} else {
+				$user_email_array = User::generateFormattedNameFromFullName($this->option('email_format'), $user_name);
+				$first_name = $user_email_array['first_name'];
+				$last_name = $user_email_array['last_name'];
 
-					$name = explode(" ", $user_name);
-					$first_name = $name[0];
-					$email_last_name = '';
-					$email_prefix = $first_name;
+				if ($user_email=='') {
+					$user_email = $user_email_array['username'].'@'.Config::get('app.domain');
+				}
 
-					if (!array_key_exists(1, $name)) {
-						$last_name='';
-						$email_last_name = $last_name;
-						$email_prefix = $first_name;
+				if ($user_username=='') {
+					if ($this->option('username_format')=='email') {
+						$user_username = $user_email;
 					} else {
-						$last_name = str_replace($first_name,'',$user_name);
-
-						if ($this->option('email_format')=='filastname') {
-							$email_last_name.=str_replace(' ','',$last_name);
-							$email_prefix = $first_name[0].$email_last_name;
-
-						} elseif ($this->option('email_format')=='firstname.lastname') {
-							$email_last_name.=str_replace(' ','',$last_name);
-							$email_prefix = $first_name.'.'.$email_last_name;
-
-						} elseif ($this->option('email_format')=='firstname') {
-							$email_last_name.=str_replace(' ','',$last_name);
-							$email_prefix = $first_name;
-						}
-
-
+						$user_name_array = User::generateFormattedNameFromFullName($this->option('username_format'), $user_name);
+						$user_username = $user_name_array['username'];
 					}
 
+				}
 
-					$user_username = $email_prefix;
-
-					// Generate an email based on their name if no email address is given
-					if ($user_email=='') {
-						if ($first_name=='Unknown') {
-							$status_id = 7;
-						}
-						$email = strtolower($email_prefix).'@'.$this->option('domain');
-						$user_email = str_replace("'",'',$email);
-					}
 			}
 
 			$this->comment('Full Name: '.$user_name);
@@ -212,12 +215,14 @@ class AssetImportCommand extends Command {
 			$this->comment('Asset Tag: '.$user_asset_tag);
 			$this->comment('Location: '.$user_asset_location);
 			$this->comment('Purchase Date: '.$user_asset_purchase_date);
+			$this->comment('Purchase Cost: '.$user_asset_purchase_cost);
 			$this->comment('Notes: '.$user_asset_notes);
 
 			$this->comment('------------- Action Summary ----------------');
 
 			if ($user_username!='') {
-				if ($user = User::where('username', $user_username)->whereNotNull('username')->first()) {
+				if ($user = User::MatchEmailOrUsername($user_username, $user_email)
+					->whereNotNull('username')->first()) {
 					$this->comment('User '.$user_username.' already exists');
 				} else {
 					// Create the user
@@ -226,7 +231,7 @@ class AssetImportCommand extends Command {
 						'last_name' => $last_name,
 						'email'     => $user_email,
 						'username'     => $user_username,
-						'password'  => substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10),
+						'password'  => substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 12),
 						'activated' => true,
 						'permissions' => array(
 							'admin' => 0,
@@ -250,24 +255,32 @@ class AssetImportCommand extends Command {
 			if ($location = Location::where('name', $user_asset_location)->first()) {
 				$this->comment('Location '.$user_asset_location.' already exists');
 			} else {
-				$location = new Location();
-				$location->name = e($user_asset_location);
-				$location->address = '';
-				$location->city = '';
-				$location->state = '';
-				$location->country = '';
-				$location->user_id = 1;
 
-				if (!$this->option('testrun')=='true') {
+        $location = new Location();
 
-					if ($location->save()) {
-						$this->comment('Location '.$user_asset_location.' was created');
-		            } else {
-						$this->comment('Something went wrong! Location '.$user_asset_location.' was NOT created');
+				if ($user_asset_location!='') {
+
+
+					$location->name = e($user_asset_location);
+					$location->address = '';
+					$location->city = '';
+					$location->state = '';
+					$location->country = '';
+					$location->user_id = 1;
+
+					if (!$this->option('testrun')=='true') {
+
+						if ($location->save()) {
+							$this->comment('Location '.$user_asset_location.' was created');
+			            } else {
+							$this->comment('Something went wrong! Location '.$user_asset_location.' was NOT created');
+						}
+
+					} else {
+						$this->comment('Location '.$user_asset_location.' was (not) created - test run only');
 					}
-
 				} else {
-					$this->comment('Location '.$user_asset_location.' was (not) created - test run only');
+					$this->comment('No location given, so none created.');
 				}
 
 			}
@@ -327,12 +340,17 @@ class AssetImportCommand extends Command {
 			// Check for the asset match and create it if it doesn't exist
 
 				$asset = new Asset();
-				$asset->name = e($user_asset_name);
+				$asset->name = e($user_asset_asset_name);
 				if ($user_asset_purchase_date!='') {
 					$asset->purchase_date = $user_asset_purchase_date;
 				} else {
 					$asset->purchase_date = NULL;
 				}
+				if ($user_asset_purchase_cost!='') {
+					$asset->purchase_cost = ParseFloat(e($user_asset_purchase_cost));
+				} else {
+					$asset->purchase_cost = 0.00;
+				}
 				$asset->serial = e($user_asset_serial);
 				$asset->asset_tag = e($user_asset_tag);
 				$asset->model_id = $asset_model->id;
@@ -383,11 +401,11 @@ class AssetImportCommand extends Command {
 	 */
 	protected function getOptions()
 	{
-		return array(
-			array('domain', null, InputOption::VALUE_REQUIRED, 'Email domain for generated email addresses.', null),
-			array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null),
-			array('testrun', null, InputOption::VALUE_REQUIRED, 'Test the output without writing to the database or not.', null),
-		);
+	return array(
+		array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null),
+		array('username_format', null, InputOption::VALUE_REQUIRED, 'The format of the username that should be generated. Options are firstname.lastname, firstname, filastname, email', null),
+		array('testrun', null, InputOption::VALUE_REQUIRED, 'Test the output without writing to the database or not.', null),
+	);
 	}
 
 

app/config/local/app.example.php

@@ -28,6 +28,19 @@ return array(
 
     'url' => 'http://snipe-it-laravel.local:8888',
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | Organization Domain Name
+    |--------------------------------------------------------------------------
+    |
+    | The domain name of the organization, used when generating email addresses
+    | through the import tools.
+    |
+    */
+
+    'domain' => 'yourserver.com',
+
     /*
     |--------------------------------------------------------------------------
     | Encryption Key
@@ -37,7 +50,7 @@ return array(
     | to a random, 32 character string, otherwise these encrypted strings
     | will not be safe. Please do this before deploying an application!
     |
-    | Run a php artisan key:generate to create a random one
+    | Run a php artisan key:generate --env=staging to create a random one
     */
 
     'key' => 'Change_this_key_or_snipe_will_get_ya',

app/config/production/app.example.php

@@ -28,6 +28,19 @@ return array(
 
     'url' => 'https://production.yourserver.com',
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | Organization Domain Name
+    |--------------------------------------------------------------------------
+    |
+    | The domain name of the organization, used when generating email addresses
+    | through the import tools.
+    |
+    */
+
+    'domain' => 'yourserver.com',
+
     /*
     |--------------------------------------------------------------------------
     | Encryption Key

app/config/staging/app.example.php

@@ -13,7 +13,7 @@ return array(
     |
     */
 
-    'debug' => true,
+    'debug' => false,
 
     /*
     |--------------------------------------------------------------------------
@@ -28,6 +28,19 @@ return array(
 
     'url' => 'http://staging.yourserver.com',
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | Organization Domain Name
+    |--------------------------------------------------------------------------
+    |
+    | The domain name of the organization, used when generating email addresses
+    | through the import tools.
+    |
+    */
+
+    'domain' => 'yourserver.com',
+
     /*
     |--------------------------------------------------------------------------
     | Encryption Key

app/config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-95',
-  'hash_version' => 'v2.0-95-ge05baf1',
+  'app_version' => 'v2.0.5-pre',
+  'hash_version' => 'v2.0.5-pre-57-g5ebb267',
 );

app/controllers/AuthController.php

@@ -22,11 +22,14 @@ class AuthController extends BaseController
     /**
      * Authenticates a user to LDAP
      *
-     * @return  true    if the username and/or password provided are valid
-     *          false   if the username and/or password provided are invalid
-     *
+     * @param $username
+     * @param $password
+     * @param bool|false $returnUser
+     * @return bool true    if the username and/or password provided are valid
+     *              false   if the username and/or password provided are invalid
+     *         array of ldap_attributes if $returnUser is true
      */
-    function ldap($username, $password) {
+    function ldap($username, $password, $returnUser = false) {
 
         $ldaphost    = Config::get('ldap.url');
         $ldaprdn     = Config::get('ldap.username');
@@ -35,21 +38,23 @@ class AuthController extends BaseController
         $filterQuery = Config::get('ldap.authentication.filter.query') . $username;
         $ldapversion = Config::get('ldap.version');
 
-	// Connecting to LDAP
-	$connection = ldap_connect($ldaphost) or die("Could not connect to {$ldaphost}");
-    // Needed for AD
-    ldap_set_option($connection, LDAP_OPT_REFERRALS, 0);
-    ldap_set_option($connection, LDAP_OPT_PROTOCOL_VERSION,$ldapversion);
+	    // Connecting to LDAP
+        $connection = ldap_connect($ldaphost) or die("Could not connect to {$ldaphost}");
+        // Needed for AD
+        ldap_set_option($connection, LDAP_OPT_REFERRALS, 0);
+        ldap_set_option($connection, LDAP_OPT_PROTOCOL_VERSION,$ldapversion);
 
         try {
             if ($connection) {
                 // binding to ldap server
                 $ldapbind = ldap_bind($connection, $ldaprdn, $ldappass);
-                if ( ($results = @ldap_search($connection, $baseDn, $filterQuery)) !==false ) {
+                if ( ($results = @ldap_search($connection, $baseDn, $filterQuery)) != false ) {
                     $entry = ldap_first_entry($connection, $results);
                     if ( ($userDn = @ldap_get_dn($connection, $entry)) !== false ) {
                         if( ($isBound = ldap_bind($connection, $userDn, $password)) == "true") {
-                            return true;
+                            return $returnUser ?
+                                array_change_key_case(ldap_get_attributes($connection, $entry),CASE_LOWER)
+                                : true;
                         }
                     }
                 }
@@ -61,6 +66,65 @@ class AuthController extends BaseController
 	return false;
     }
 
+    /**
+     * Create user from LDAP attributes
+     *
+     * @param $ldapatttibutes
+     * @return array|bool
+     */
+    function createUserFromLdap($ldapatttibutes){
+        //Get LDAP attribute config
+        $ldap_result_username = Config::get('ldap.result.username');
+        $ldap_result_emp_num = Config::get('ldap.result.emp.num');
+        $ldap_result_last_name = Config::get('ldap.result.last.name');
+        $ldap_result_first_name = Config::get('ldap.result.first.name');
+        $ldap_result_email = Config::get('ldap.result.email');
+
+        //Get LDAP user data
+        $item = array();
+        $item["username"] = isset( $ldapatttibutes[$ldap_result_username][0] ) ? $ldapatttibutes[$ldap_result_username][0] : "";
+        $item["employee_number"] = isset( $ldapatttibutes[$ldap_result_emp_num][0] ) ? $ldapatttibutes[$ldap_result_emp_num][0] : "";
+        $item["lastname"] = isset( $ldapatttibutes[$ldap_result_last_name][0] ) ? $ldapatttibutes[$ldap_result_last_name][0] : "";
+        $item["firstname"] = isset( $ldapatttibutes[$ldap_result_first_name][0] ) ? $ldapatttibutes[$ldap_result_first_name][0] : "";
+        $item["email"] = isset( $ldapatttibutes[$ldap_result_email][0] ) ? $ldapatttibutes[$ldap_result_email][0] : "" ;
+
+        //create user
+        if(!empty($item["username"]) && !empty($item['email'])) {
+            $pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10);
+
+            $newuser = array(
+                'first_name' => $item["firstname"],
+                'last_name' => $item["lastname"],
+                'username' => $item["username"],
+                'email' => $item["email"],
+                'employee_num' => $item["employee_number"],
+                'password' => $pass,
+                'activated' => 1,
+                'location_id' => null,
+                'permissions' => '{"user":1}',
+                'notes' => 'Imported from LDAP'
+            );
+
+            DB::table('users')->insert($newuser);
+            $updateuser = Sentry::findUserByLogin($item["username"]);
+
+            // Update the user details
+            $updateuser->password = $pass;
+
+            // Update the user
+            $updateuser->save();
+        } else {
+            throw new Cartalyst\Sentry\Users\UserNotFoundException();
+        }
+
+        //$item["note"] = "<strong>created</strong>";
+        $credentials = array(
+            'username' => $item["username"],
+            'password' => $pass,
+        );
+        return $credentials;
+    }
+
 
     /**
      * Account sign in form processing.
@@ -83,7 +147,6 @@ class AuthController extends BaseController
             // Ooops.. something went wrong
             return Redirect::back()->withInput()->withErrors($validator);
         }
-
         try {
 
             /**
@@ -93,8 +156,18 @@ class AuthController extends BaseController
 
             // Try to get the user from the database.
             $user = (array) DB::table('users')->where('username', Input::get('username'))->first();
+            //If user does not exist and authenticates sucessfully with LDAP we will create it onf the fly and sign in with default permissions
+            if(!$user){
+                if($userattr = $this->ldap(Input::get('username'), Input::get('password'),true) ){
+                    LOG::debug("Creating LDAP authenticated user.");
+                    $credentials = $this->createUserFromLdap($userattr);
+                    Sentry::authenticate($credentials, Input::get('remember-me', 0));
 
-            if ($user && strpos($user["notes"],'LDAP') !== false) {
+
+                }
+            }
+
+            else if ($user && strpos($user["notes"],'LDAP') !== false) {
                 LOG::debug("Authenticating user against LDAP.");
                 if( $this->ldap(Input::get('username'), Input::get('password')) ) {
                         LOG::debug("valid login");

app/controllers/account/ViewAssetsController.php

@@ -208,11 +208,12 @@ class ViewAssetsController extends AuthorizedController
 		$log = $logaction->logaction($logaction_msg);
 
 		$update_checkout = DB::table('asset_logs')
-			->where('id',$findlog->id)
-			->update(array('accepted_id' => $logaction->id));
-    $affected_asset=$logaction->assetlog;
-    $affected_asset->accepted=$accepted;
-    $affected_asset->save();
+		->where('id',$findlog->id)
+		->update(array('accepted_id' => $logaction->id));
+
+            $affected_asset=$logaction->assetlog;
+            $affected_asset->accepted=$accepted;
+            $affected_asset->save();
 
 		if ($update_checkout ) {
 			return Redirect::to('account/view-assets')->with('success', $return_msg);

app/controllers/admin/AccessoriesController.php

@@ -68,6 +68,20 @@ class AccessoriesController extends AdminController
             // Update the accessory data
             $accessory->name            		= e(Input::get('name'));
             $accessory->category_id            	= e(Input::get('category_id'));
+            $accessory->order_number            = e(Input::get('order_number'));
+
+            if (e(Input::get('purchase_date')) == '') {
+                $accessory->purchase_date       =  NULL;
+            } else {
+                $accessory->purchase_date       = e(Input::get('purchase_date'));
+            }
+
+            if (e(Input::get('purchase_cost')) == '0.00') {
+                $accessory->purchase_cost       =  NULL;
+            } else {
+                $accessory->purchase_cost       = ParseFloat(e(Input::get('purchase_cost')));
+            }
+
             $accessory->qty            			= e(Input::get('qty'));
             $accessory->user_id          		= Sentry::getId();
 
@@ -136,6 +150,20 @@ class AccessoriesController extends AdminController
             // Update the accessory data
             $accessory->name            		= e(Input::get('name'));
             $accessory->category_id            	= e(Input::get('category_id'));
+            $accessory->order_number            = e(Input::get('order_number'));
+
+            if (e(Input::get('purchase_date')) == '') {
+                $accessory->purchase_date       =  NULL;
+            } else {
+                $accessory->purchase_date       = e(Input::get('purchase_date'));
+            }
+
+            if (e(Input::get('purchase_cost')) == '0.00') {
+                $accessory->purchase_cost       =  NULL;
+            } else {
+                $accessory->purchase_cost       = ParseFloat(e(Input::get('purchase_cost')));
+            }
+
             $accessory->qty            			= e(Input::get('qty'));
 
             // Was the accessory created?
@@ -432,7 +460,7 @@ class AccessoriesController extends AdminController
 
 
             $log = $logaction->logaction('checkin from');
-            
+
             if(!is_null($accessory_user->assigned_to)) {
                 $user = User::find($accessory_user->assigned_to);
             }
@@ -465,52 +493,77 @@ class AccessoriesController extends AdminController
 
     public function getDatatable()
     {
-        $accessories = Accessory::select(array('id','name','qty'))
-        ->whereNull('deleted_at')
-        ->orderBy('created_at', 'DESC');
+        $accessories = Accessory::with('category')
+        ->whereNull('deleted_at');
 
-        $accessories = $accessories->get();
+        if (Input::has('search')) {
+            $accessories = $accessories->TextSearch(Input::get('search'));
+        }
 
-        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions',function($accessories)
-            {
-                return '<a href="'.route('checkout/accessory', $accessories->id).'" style="margin-right:5px;" class="btn btn-info btn-sm" '.(($accessories->numRemaining() > 0 ) ? '' : ' disabled').'>'.Lang::get('general.checkout').'</a><a href="'.route('update/accessory', $accessories->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/accessory', $accessories->id).'" data-content="'.Lang::get('admin/accessories/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($accessories->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-            });
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
 
-        return Datatable::collection($accessories)
-        ->addColumn('name',function($accessories)
-            {
-                return link_to('admin/accessories/'.$accessories->id.'/view', $accessories->name);
-            })
-        ->addColumn('qty',function($accessories)
-            {
-                return $accessories->qty;
-            })
-        ->addColumn('numRemaining',function($accessories)
-            {
-                return $accessories->numRemaining();
-            })
-        ->addColumn($actions)
-        ->searchColumns('name','qty','numRemaining','actions')
-        ->orderColumns('name','qty','numRemaining','actions')
-        ->make();
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+
+        $allowed_columns = ['name','order_number','purchase_date','purchase_cost'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        $accessories = $accessories->orderBy($sort, $order);
+
+        $accessCount = $accessories->count();
+        $accessories = $accessories->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach ($accessories as $accessory) {
+            $actions = '<a href="'.route('checkout/accessory', $accessory->id).'" style="margin-right:5px;" class="btn btn-info btn-sm" '.(($accessory->numRemaining() > 0 ) ? '' : ' disabled').'>'.Lang::get('general.checkout').'</a><a href="'.route('update/accessory', $accessory->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/accessory', $accessory->id).'" data-content="'.Lang::get('admin/accessories/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($accessory->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+
+            $rows[] = array(
+                'name'          => link_to('admin/accessories/'.$accessory->id.'/view', $accessory->name),
+                'category'      => link_to('admin/settings/categories/'.$accessory->category->id.'/view', $accessory->category->name),
+                'qty'           => $accessory->qty,
+                'order_number'  => $accessory->order_number,
+                'purchase_date'  => $accessory->purchase_date,
+                'purchase_cost'  => $accessory->purchase_cost,
+                'numRemaining'  => $accessory->numRemaining(),
+                'actions'       => $actions
+                );
+        }
+
+        $data = array('total'=>$accessCount, 'rows'=>$rows);
+
+        return $data;
     }
 
 	public function getDataView($accessoryID)
 	{
 		$accessory = Accessory::find($accessoryID);
         $accessory_users = $accessory->users;
+        $count = $accessory_users->count();
 
-		$actions = new \Chumper\Datatable\Columns\FunctionColumn('actions',function($accessory_users){
-			return '<a href="'.route('checkin/accessory', $accessory_users->pivot->id).'" class="btn-flat info">Checkin</a>';
-		});
+        $rows = array();
 
-		return Datatable::collection($accessory_users)
-		->addColumn('name',function($accessory_users)
-			{
-				return link_to('/admin/users/'.$accessory_users->id.'/view', $accessory_users->fullName());
-			})
-		->addColumn($actions)
-		->make();
+        foreach ($accessory_users as $user) {
+            $actions = '<a href="'.route('checkin/accessory', $user->pivot->id).'" class="btn-flat info">Checkin</a>';
+
+            $rows[] = array(
+                'name'          => link_to('/admin/users/'.$user->id.'/view', $user->fullName()),
+                'actions'       => $actions
+                );
+        }
+
+        $data = array('total'=>$count, 'rows'=>$rows);
+
+        return $data;
     }
 
 }

app/controllers/admin/AssetMaintenancesController.php

@@ -5,7 +5,6 @@
     use AdminController;
     use AssetMaintenance;
     use Carbon\Carbon;
-    use Datatable;
     use DB;
     use Input;
     use Lang;
@@ -20,6 +19,7 @@
     use TCPDF;
     use Validator;
     use View;
+    use Setting;
 
     class AssetMaintenancesController extends AdminController
     {
@@ -45,71 +45,72 @@
          * @author  Vincent Sposato <vincent.sposato@gmail.com>
          * @version v1.0
          */
-        public function getDatatable()
-        {
 
-            $assetMaintenances = AssetMaintenance::orderBy( 'created_at', 'DESC' )
-                                            ->get();
+     public function getDatatable()
+     {
 
-            $actions = new \Chumper\Datatable\Columns\FunctionColumn( 'actions', function ( $assetMaintenances ) {
 
-                return '<a href="' . route( 'update/asset_maintenance', $assetMaintenances->id )
-                       . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'
-                       . route( 'delete/asset_maintenance', $assetMaintenances->id ) . '" data-content="'
-                       . Lang::get( 'admin/asset_maintenances/message.delete.confirm' ) . '" data-title="'
-                       . Lang::get( 'general.delete' ) . ' ' . htmlspecialchars( $assetMaintenances->title )
-                       . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-            } );
+        $maintenances = AssetMaintenance::with('asset','supplier')
+         ->whereNull('deleted_at');
 
-            return Datatable::collection( $assetMaintenances )
-                            ->addColumn( 'asset', function ( $assetMaintenances ) {
+         if (Input::has('search')) {
+             $maintenances = $maintenances->TextSearch(e(Input::get('search')));
+         }
 
-                                return link_to( '/hardware/' . $assetMaintenances->asset_id . '/view',
-                                    mb_strimwidth( $assetMaintenances->asset->name, 0, 50, "..." ) );
-                            } )
-                            ->addColumn( 'supplier', function ( $assetMaintenances ) {
+         if (Input::has('offset')) {
+             $offset = e(Input::get('offset'));
+         } else {
+             $offset = 0;
+         }
 
-                                return link_to( '/admin/settings/suppliers/' . $assetMaintenances->supplier_id
-                                                . '/view',
-                                    mb_strimwidth( $assetMaintenances->supplier->name, 0, 50, "..." ) );
-                            } )
-                            ->addColumn( 'asset_maintenance_type', function ( $assetMaintenances ) {
+         if (Input::has('limit')) {
+             $limit = e(Input::get('limit'));
+         } else {
+             $limit = 50;
+         }
 
-                                return $assetMaintenances->asset_maintenance_type;
-                            } )
-                            ->addColumn( 'title', function ( $assetMaintenances ) {
+         $allowed_columns = ['id','title','asset_maintenance_time','asset_maintenance_type','cost','start_date','completion_date','notes'];
+         $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+         $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
 
-                                return link_to( '/admin/asset_maintenances/' . $assetMaintenances->id . '/view',
-                                    mb_strimwidth( $assetMaintenances->title, 0, 50, "..." ) );
-                            } )
-                            ->addColumn( 'start_date', function ( $assetMaintenances ) {
+         $maintenances->orderBy($sort, $order);
 
-                                return $assetMaintenances->start_date;
-                            } )
-                            ->addColumn( 'completion_date', function ( $assetMaintenances ) {
+         $maintenancesCount = $maintenances->count();
+         $maintenances = $maintenances->skip($offset)->take($limit)->get();
 
-                                return $assetMaintenances->completion_date;
-                            } )
-                            ->addColumn( 'asset_maintenance_time', function ( $assetMaintenances ) {
+         $rows = array();
+         $settings = Setting::getSettings();
 
-                                if (is_null( $assetMaintenances->asset_maintenance_time )) {
-                                    $assetMaintenances->asset_maintenance_time = Carbon::now()
-                                                                                       ->diffInDays( Carbon::parse( $assetMaintenances->start_date ) );
-                                }
+         foreach($maintenances as $maintenance) {
 
-                                return intval( $assetMaintenances->asset_maintenance_time );
-                            } )
-                            ->addColumn( 'cost', function ( $assetMaintenances ) {
+             $actions = '<nobr><a href="'.route('update/asset_maintenance', $maintenance->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/statuslabel', $maintenance->id).'" data-content="'.Lang::get('admin/asset_maintenances/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($maintenance->title).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></nobr>';
 
-                                return sprintf( Lang::get( 'general.currency' ) . '%01.2f', $assetMaintenances->cost );
-                            } )
-                            ->addColumn( $actions )
-                            ->searchColumns( 'asset', 'supplier', 'asset_maintenance_type', 'title', 'start_date',
-                                'completion_date', 'asset_maintenance_time', 'cost', 'actions' )
-                            ->orderColumns( 'asset', 'supplier', 'asset_maintenance_type', 'title', 'start_date',
-                                'completion_date', 'asset_maintenance_time', 'cost', 'actions' )
-                            ->make();
-        }
+            if (($maintenance->cost) && ($maintenance->asset->assetloc) &&  ($maintenance->asset->assetloc->currency!='')) {
+                $maintenance_cost = $maintenance->asset->assetloc->currency.$maintenance->cost;
+            } else {
+                $maintenance_cost = $settings->default_currency.$maintenance->cost;
+            }
+
+             $rows[] = array(
+                 'id'            => $maintenance->id,
+                 'asset_name'    =>  link_to('/hardware/'.$maintenance->asset->id.'/view', $maintenance->asset->showAssetName()) ,
+                 'title'         => $maintenance->title,
+                 'notes'         => $maintenance->notes,
+                 'supplier'      => $maintenance->supplier->name,
+                 'cost'          => $maintenance_cost,
+                 'asset_maintenance_type'          => e($maintenance->asset_maintenance_type),
+                 'start_date'         => $maintenance->start_date,
+                 'time'          => $maintenance->asset_maintenance_time,
+                 'completion_date'     => $maintenance->completion_date,
+                 'actions'       => $actions
+             );
+         }
+
+         $data = array('total' => $maintenancesCount, 'rows' => $rows);
+
+         return $data;
+
+     }
 
         /**
          * getCreate
@@ -461,4 +462,4 @@
             return View::make( 'backend/asset_maintenances/view')->with('assetMaintenance', $assetMaintenance);
         }
 
-    }
+    }

app/controllers/admin/AssetsController.php

@@ -2,6 +2,7 @@
 
 use AdminController;
 use Input;
+use Image;
 use Lang;
 use Asset;
 use Supplier;
@@ -23,10 +24,14 @@ use Config;
 use Location;
 use Log;
 use Mail;
-use Datatable;
 use TCPDF;
 use Slack;
+use Paginator;
 use Manufacturer; //for embedded-create
+use Artisan;
+use Symfony\Component\Console\Output\BufferedOutput;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
 
 class AssetsController extends AdminController
 {
@@ -166,6 +171,19 @@ class AssetsController extends AdminController
             $asset->physical            		= '1';
             $asset->depreciate          		= '0';
 
+	    // Create the image (if one was chosen.)
+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/assets/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $asset->image = $file_name;
+
+            }
+
             // Was the asset created?
             if($asset->save()) {
 
@@ -178,7 +196,6 @@ class AssetsController extends AdminController
 					$logaction->note = e(Input::get('note'));
 					$log = $logaction->logaction('checkout');
 				}
-
                 // Redirect to the asset listing page
                 return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.create.success'));
             }
@@ -203,7 +220,6 @@ class AssetsController extends AdminController
             // Redirect to the asset management page
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
-
         // Grab the dropdown lists
         $model_list = modelList();
         $statuslabel_list = statusLabelList();
@@ -306,6 +322,20 @@ class AssetsController extends AdminController
             $asset->notes            		= e(Input::get('notes'));
             $asset->physical            	= '1';
 
+	    // Update the image
+            if (Input::file('image')) {
+                $image = Input::file('image');
+		  $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/assets/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $asset->image = $file_name;
+            }
+
+
+
             // Was the asset updated?
             if($asset->save()) {
                 // Redirect to the new asset page
@@ -334,7 +364,7 @@ class AssetsController extends AdminController
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
             // Redirect to the asset management page with error
-            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
         if (isset($asset->assigneduser->id) && ($asset->assigneduser->id!=0)) {
@@ -366,7 +396,7 @@ class AssetsController extends AdminController
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
             // Redirect to the asset management page with error
-            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
         // Get the dropdown of users and then pass it to the checkout view
@@ -384,7 +414,7 @@ class AssetsController extends AdminController
 
         // Check if the asset exists
         if (!$asset = Asset::find($assetId)) {
-            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
         // Declare the rules for the form validation
@@ -413,13 +443,13 @@ class AssetsController extends AdminController
     	if (Input::get('checkout_at')!= date("Y-m-d")){
 			$checkout_at = e(Input::get('checkout_at')).' 00:00:00';
     	} else {
-            $checkout_at = date("Y-m-d h:i:s");
+            $checkout_at = date("Y-m-d H:i:s");
         }
 
         if (Input::has('expected_checkin')) {
         	if (Input::get('expected_checkin')!= date("Y-m-d")){
-				$expected_checkin = e(Input::get('expected_checkin')).' 00:00:00';
-			}
+			$expected_checkin = e(Input::get('expected_checkin'));
+		}
     	} else {
             $expected_checkin = null;
         }
@@ -446,7 +476,7 @@ class AssetsController extends AdminController
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
             // Redirect to the asset management page with error
-            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
         return View::make('backend/hardware/checkin', compact('asset'))->with('backto', $backto);
@@ -464,7 +494,7 @@ class AssetsController extends AdminController
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
             // Redirect to the asset management page with error
-            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
         // Check for a valid user to checkout fa-random
@@ -492,7 +522,7 @@ class AssetsController extends AdminController
         	 if (Input::has('checkin_at')) {
 
         	 	if (!strtotime(Input::get('checkin_at'))) {
-					$logaction->created_at = date("Y-m-d h:i:s");
+					$logaction->created_at = date("Y-m-d H:i:s");
         	 	} elseif (Input::get('checkin_at')!= date("Y-m-d")) {
 					$logaction->created_at = e(Input::get('checkin_at')).' 00:00:00';
 				}
@@ -575,17 +605,34 @@ class AssetsController extends AdminController
     public function getView($assetId = null)
     {
         $asset = Asset::withTrashed()->find($assetId);
+        $settings = Setting::getSettings();
+
+
+        if ($asset->userloc) {
+            $use_currency = $asset->userloc->currency;
+        } elseif ($asset->assetloc) {
+            $use_currency = $asset->assetloc->currency;
+        } else {
+          $default_currency = Setting::first()->default_currency;
+
+          if ($settings->default_currency!='') {
+            $use_currency = $settings->default_currency;
+          } else {
+            $use_currency = Lang::get('general.currency');
+          }
+
+        }
 
         if (isset($asset->id)) {
 
-            $settings = Setting::getSettings();
+
 
             $qr_code = (object) array(
                 'display' => $settings->qr_code == '1',
                 'url' => route('qr_code/hardware', $asset->id)
             );
 
-            return View::make('backend/hardware/view', compact('asset', 'qr_code'));
+            return View::make('backend/hardware/view', compact('asset', 'qr_code','settings'))->with('use_currency',$use_currency);
         } else {
             // Prepare the error message
             $error = Lang::get('admin/hardware/message.does_not_exist', compact('id'));
@@ -619,6 +666,102 @@ class AssetsController extends AdminController
 
     }
 
+
+    public function getImportUpload() {
+
+        $path = app_path().'/private_uploads/imports/assets';
+        $files = array();
+
+        if ($handle = opendir($path)) {
+
+            /* This is the correct way to loop over the directory. */
+            while (false !== ($entry = readdir($handle))) {
+                clearstatcache();
+                if (substr(strrchr($entry,'.'),1)=='csv') {
+                    $files[] = array(
+                            'filename' => $entry,
+                            'filesize' => Setting::fileSizeConvert(filesize($path.'/'.$entry)),
+                            'modified' => filemtime($path.'/'.$entry)
+                        );
+                }
+
+            }
+            closedir($handle);
+            $files = array_reverse($files);
+        }
+
+        return View::make('backend/hardware/import')->with('files',$files);
+    }
+
+
+
+    public function postAPIImportUpload() {
+
+        if (!Config::get('app.lock_passwords')) {
+
+            $rules = array(
+                'files' => 'required'
+            );
+
+            $validator = Validator::make(Input::all(), $rules);
+
+            if ($validator->fails()) {
+                $messages = $validator->messages();
+                $results['error']=$messages->first('files');
+                return $results;
+
+            } else {
+                    $files = Input::file('files');
+                    $path = app_path().'/private_uploads/imports/assets';
+                    $results = array();
+
+                    foreach ($files as $file) {
+
+                        if (!in_array($file->getMimeType(), array(
+                            'application/vnd.ms-excel',
+                            'text/csv',
+                            'text/plain',
+                            'text/comma-separated-values',
+                            'text/tsv'))) {
+                            $results['error']='File type must be CSV';
+                            return $results;
+                        }
+
+                        $fixed_filename = str_replace(' ','-',$file->getClientOriginalName());
+                        $file->move($path, date('Y-m-d-his').'-'.$file->getClientOriginalName());
+                        $name = date('Y-m-d-his').'-'.$fixed_filename;
+                        $filesize = Setting::fileSizeConvert(filesize($path.'/'.$name));
+                        $results[] = compact('name', 'filesize');
+                    }
+            }
+
+        } else {
+
+            $results['error']=Lang::get('general.feature_disabled');
+            return $results;
+        }
+
+        return array(
+            'files' => $results
+        );
+
+
+    }
+
+    public function getProcessImportFile($filename) {
+        // php artisan asset-import:csv path/to/your/file.csv --domain=yourdomain.com --email_format=firstname.lastname
+
+        $output = new BufferedOutput;
+        Artisan::call('asset-import:csv', ['filename'=> app_path().'/private_uploads/imports/assets/'.$filename, '--email_format'=>'firstname.lastname', '--username_format'=>'firstname.lastname'], $output);
+        $display_output =  $output->fetch();
+        $file = app_path().'/private_uploads/imports/assets/'.str_replace('.csv','',$filename).'-output-'.date("Y-m-d-his").'.txt';
+        file_put_contents($file, $display_output);
+
+
+        return View::make('backend/hardware/import-status');
+
+    }
+
     /**
      * Asset clone.
      *
@@ -681,7 +824,7 @@ class AssetsController extends AdminController
 			return Redirect::route('hardware')->with('success', $success);
 
 		 } else {
-			 return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+			 return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
 		 }
 
     }
@@ -725,7 +868,7 @@ class AssetsController extends AdminController
 						$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->created_at =  date("Y-m-d H:i:s");
 						$logaction->filename =  $filename;
 						$log = $logaction->logaction('uploaded');
 					} else {
@@ -805,9 +948,23 @@ class AssetsController extends AdminController
 
 		// the asset is valid
         if (isset($asset->id)) {
-				$log = Actionlog::find($fileId);
-				$file = $log->get_src();
-				return Response::download($file);
+
+		$log = Actionlog::find($fileId);
+		$file = $log->get_src();
+
+            $filetype = Asset::checkUploadIsImage($file);
+
+            if ($filetype) {
+
+                  $contents = file_get_contents($file);
+                  $response = Response::make($contents);
+                  $response->header('Content-Type', $filetype);
+                  return $response;
+
+            } else {
+                  return Response::download($file);
+            }
+
         } else {
             // Prepare the error message
             $error = Lang::get('admin/hardware/message.does_not_exist', compact('id'));
@@ -936,7 +1093,7 @@ class AssetsController extends AdminController
 			            $logaction = new Actionlog();
 			            $logaction->asset_id = $key;
 			            $logaction->asset_type = 'hardware';
-			            $logaction->created_at =  date("Y-m-d h:i:s");
+			            $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'));
@@ -967,8 +1124,29 @@ class AssetsController extends AdminController
     public function getDatatable($status = null)
     {
 
-       $assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware()->select(array('id', 'name','model_id','assigned_to','asset_tag','serial','status_id','purchase_date','deleted_at','rtd_location_id','notes','order_number','mac_address'));
 
+       $assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category','assetstatus','assetloc')
+       ->Hardware();
+
+       if (Input::has('search')) {
+             $assets = $assets->TextSearch(Input::get('search'));
+       }
+
+       if (Input::has('offset')) {
+             $offset = e(Input::get('offset'));
+       } else {
+             $offset = 0;
+       }
+
+       if (Input::has('limit')) {
+             $limit = e(Input::get('limit'));
+       } else {
+             $limit = 50;
+       }
+
+       if (Input::has('order_number')) {
+           $assets->where('order_number','=',e(Input::get('order_number')));
+       }
 
       switch ($status) {
       case 'Deleted':
@@ -995,127 +1173,90 @@ class AssetsController extends AdminController
 
       }
 
-      if (Input::has('order_number')) {
-          $assets->where('order_number','=',e(Input::get('order_number')));
+    $allowed_columns = [
+      'id',
+      'name',
+      'asset_tag',
+      'serial',
+      'model',
+      'last_checkout',
+      'category',
+      'notes',
+      'expected_checkin',
+      'order_number',
+      'location',
+      'image',
+    ];
+
+    $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+    $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'asset_tag';
+
+    switch ($sort)
+    {
+        case 'model':
+            $assets = $assets->OrderModels($order);
+            break;
+        case 'category':
+            $assets = $assets->OrderCategory($order);
+            break;
+        case 'location':
+            $assets = $assets->OrderLocation($order);
+            break;
+        case 'status':
+            $assets = $assets->OrderCategory($order);
+           break;
+        default:
+            $assets = $assets->orderBy($sort, $order);
+            break;
+    }
+
+     $assetCount = $assets->count();
+     $assets = $assets->skip($offset)->take($limit)->get();
+
+
+      $rows = array();
+      foreach ($assets as $asset) {
+        $inout = '';
+        $actions = '';
+        if ($asset->deleted_at=='') {
+            $actions = '<div style=" white-space: nowrap;"><a href="'.route('clone/hardware', $asset->id).'" class="btn btn-info btn-sm" title="Clone asset"><i class="fa fa-files-o"></i></a> <a href="'.route('update/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/hardware', $asset->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($asset->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
+        } elseif ($asset->model->deleted_at=='') {
+            $actions = '<a href="'.route('restore/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
+        }
+
+        if ($asset->assetstatus) {
+            if ($asset->assetstatus->deployable != 0) {
+                if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
+                    $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
+                } else {
+                    $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
+                }
+            }
+        }
+
+        $rows[] = array(
+            'checkbox'      =>'<div class="text-center"><input type="checkbox" name="edit_asset['.$asset->id.']" class="one_required"></div>',
+            'id'        => $asset->id,
+            'image' => ($asset->image!='') ? '<img src="'.Config::get('app.url').'/uploads/assets/'.$asset->image.'" height=50 width=50>' : (($asset->model->image!='') ? '<img src="'.Config::get('app.url').'/uploads/models/'.$asset->model->image.'" height=40 width=50>' : ''),
+            'name'          => '<a title="'.$asset->name.'" href="hardware/'.$asset->id.'/view">'.$asset->name.'</a>',
+            'asset_tag'     => '<a title="'.$asset->asset_tag.'" href="hardware/'.$asset->id.'/view">'.$asset->asset_tag.'</a>',
+            'serial'        => $asset->serial,
+            'model'         => ($asset->model) ? link_to('/hardware/models/'.$asset->model->id.'/view', $asset->model->name) : 'No model',
+            'status'        => ($asset->assigneduser) ? link_to('../admin/users/'.$asset->assigned_to.'/view', $asset->assigneduser->fullName()) : (($asset->assetstatus) ? $asset->assetstatus->name : ''),
+            'location'      => (($asset->assigneduser) && ($asset->assigneduser->userloc!='')) ? link_to('admin/settings/locations/'.$asset->assigneduser->userloc->id.'/edit', $asset->assigneduser->userloc->name) : (($asset->defaultLoc!='') ? link_to('admin/settings/locations/'.$asset->defaultLoc->id.'/edit', $asset->defaultLoc->name) : ''),
+            'category'      => (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : '',
+            'eol'           => ($asset->eol_date()) ? $asset->eol_date() : '',
+            'notes'         => $asset->notes,
+            'order_number'  => ($asset->order_number!='') ? '<a href="../hardware/?order_number='.$asset->order_number.'">'.$asset->order_number.'</a>' : '',
+            'last_checkout' => ($asset->last_checkout!='') ? $asset->last_checkout : '',
+            'expected_checkin' => ($asset->expected_checkin!='')  ? $asset->expected_checkin : '',
+            'change'        => ($inout) ? $inout : '',
+            'actions'       => ($actions) ? $actions : ''
+            );
       }
 
-      $assets = $assets->orderBy('asset_tag', 'ASC')->get();
+      $data = array('total'=>$assetCount, 'rows'=>$rows);
 
-
-      $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($assets)
-      	{
-        	if ($assets->deleted_at=='') {
-        		return '<div style=" white-space: nowrap;"><a href="'.route('clone/hardware', $assets->id).'" class="btn btn-info btn-sm" title="Clone asset"><i class="fa fa-files-o"></i></a> <a href="'.route('update/hardware', $assets->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/hardware', $assets->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($assets->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
-        	} elseif ($assets->deleted_at!='') {
-        		return '<a href="'.route('restore/hardware', $assets->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
-        	}
-
-        });
-
-	   $inout = new \Chumper\Datatable\Columns\FunctionColumn('inout', function ($assets)
-      	{
-
-            if ($assets->assetstatus) {
-
-                if ($assets->assetstatus->deployable != 0) {
-                    if (($assets->assigned_to !='') && ($assets->assigned_to > 0)) {
-                        return '<a href="'.route('checkin/hardware', $assets->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
-                    } else {
-                        return '<a href="'.route('checkout/hardware', $assets->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
-                    }
-                }
-            }
-        });
-
-
-
-        return Datatable::collection($assets)
-        ->addColumn('',function($assets)
-            {
-                return '<div class="text-center"><input type="checkbox" name="edit_asset['.$assets->id.']" class="one_required"></div>';
-            })
-        ->addColumn('name',function($assets)
-	        {
-		        return '<a title="'.$assets->name.'" href="hardware/'.$assets->id.'/view">'.$assets->name.'</a>';
-	        })
-	    ->addColumn('asset_tag',function($assets)
-	        {
-		        return '<a title="'.$assets->asset_tag.'" href="hardware/'.$assets->id.'/view">'.$assets->asset_tag.'</a>';
-	        })
-
-      ->showColumns('serial')
-
-		->addColumn('model',function($assets)
-			{
-				if ($assets->model) {
-			    	return $assets->model->name;
-			    } else {
-				    return 'No model';
-				}
-			})
-
-      ->addColumn('status',function($assets)
-        {
-          	if ($assets->assigned_to!='') {
-            	return link_to(Config::get('app.url').'/admin/users/'.$assets->assigned_to.'/view', $assets->assigneduser->fullName());
-            } else {
-                if ($assets->assetstatus) {
-                    return $assets->assetstatus->name;
-                }
-
-            }
-
-	        })
-		->addColumn('location',function($assets)
-            {
-                if ($assets->assigned_to && ($assets->assigneduser->userloc!='')) {
-                    return link_to('admin/settings/locations/'.$assets->assigneduser->userloc->id.'/edit', $assets->assigneduser->userloc->name);
-                } elseif ($assets->defaultLoc){
-                    return link_to('admin/settings/locations/'.$assets->defaultLoc->id.'/edit', $assets->defaultLoc->name);
-                }
-            })
-		->addColumn('category',function($assets)
-			{
-				if (isset($assets->model->category)) {
-			    	return $assets->model->category->name;
-			    } else {
-				    return 'No category';
-				}
-
-      })
-
-      ->addColumn('eol',function($assets)
-      {
-        return $assets->eol_date();
-      })
-
-      ->addColumn('notes',function($assets)
-      {
-        return $assets->notes;
-      })
-      ->addColumn('mac_address',function($assets)
-      {
-        return $assets->mac_address;
-      })
-
-      ->addColumn('order_number',function($assets)
-      {
-        return '<a href="../hardware/?order_number='.$assets->order_number.'">'.$assets->order_number.'';
-      })
-
-
-      ->addColumn('checkout_date',function($assets)
-        {
-            if (($assets->assigned_to!='') && ($assets->assetlog->first())) {
-            	return $assets->assetlog->first()->created_at->format('Y-m-d');
-            }
-
-        })
-      ->addColumn($inout)
-      ->addColumn($actions)
-      ->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','category','notes','order_number','mac_address')
-      ->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','notes','order_number','checkout_date', 'inout','mac_address')
-      ->make();
-
-		}
+      return $data;
+  }
 }

app/controllers/admin/CategoriesController.php

@@ -11,7 +11,6 @@ use Sentry;
 use Str;
 use Validator;
 use View;
-use Datatable;
 
 class CategoriesController extends AdminController
 {
@@ -218,61 +217,122 @@ class CategoriesController extends AdminController
     public function getDatatable()
     {
         // Grab all the categories
-        $categories = Category::orderBy('created_at', 'DESC')->get();
+        $categories = Category::with('assets', 'accessories');
 
-        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function($categories) {
-            return '<a href="'.route('update/category', $categories->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/category', $categories->id).'" data-content="'.Lang::get('admin/categories/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($categories->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-        });
+        if (Input::has('search')) {
+            $categories = $categories->TextSearch(e(Input::get('search')));
+        }
 
-        return Datatable::collection($categories)
-        ->showColumns('name')
-        ->addColumn('category_type', function($categories) {
-            return ucwords($categories->category_type);
-        })
-        ->addColumn('count', function($categories) {
-            return ($categories->category_type=='asset') ? link_to('/admin/settings/categories/'.$categories->id.'/view', $categories->assetscount()) : $categories->accessoriescount();
-        })
-        ->addColumn('acceptance', function($categories) {
-            return ($categories->require_acceptance=='1') ? '<i class="fa fa-check" style="margin-right:50%;margin-left:50%;"></i>' : '';
-        })
-        ->addColumn('eula', function($categories) {
-            return ($categories->getEula()) ? '<i class="fa fa-check" style="margin-right:50%;margin-left:50%;"></i></a>' : '';
-        })
-        ->addColumn($actions)
-        ->searchColumns('name','category_type','count','acceptance','eula','actions')
-        ->orderColumns('name','category_type','count','acceptance','eula','actions')
-        ->make();
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+
+        $allowed_columns = ['id','name','category_type'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        $categories = $categories->orderBy($sort, $order);
+
+        $catCount = $categories->count();
+        $categories = $categories->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach ($categories as $category) {
+            $actions = '<a href="'.route('update/category', $category->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/category', $category->id).'" data-content="'.Lang::get('admin/categories/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($category->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+
+            $rows[] = array(
+                'id'      => $category->id,
+                'name'  => link_to('/admin/settings/categories/'.$category->id.'/view', $category->name) ,
+                'category_type' => ucwords($category->category_type),
+                'count'         => ($category->category_type=='asset') ?  $category->assetscount() : $category->accessoriescount(),
+                'acceptance'    => ($category->require_acceptance=='1') ? '<i class="fa fa-check"></i>' : '',
+                //EULA is still not working correctly
+                'eula'          => ($category->getEula()) ? '<i class="fa fa-check"></i>' : '',
+                'actions'       => $actions
+            );
+        }
+
+        $data = array('total' => $catCount, 'rows' => $rows);
+
+        return $data;
     }
 
     public function getDataView($categoryID) {
-        $category = Category::find($categoryID);
-        $categoryassets = $category->assets;
 
-        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($categoryassets)
-            {
-                if (($categoryassets->assigned_to !='') && ($categoryassets->assigned_to > 0)) {
-                    return '<a href="'.route('checkin/hardware', $categoryassets->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
+      $category = Category::find($categoryID);
+      $category_assets = $category->assets;
+
+      if (Input::has('search')) {
+          $category_assets = $category_assets->TextSearch(e(Input::get('search')));
+      }
+
+      if (Input::has('offset')) {
+          $offset = e(Input::get('offset'));
+      } else {
+          $offset = 0;
+      }
+
+      if (Input::has('limit')) {
+          $limit = e(Input::get('limit'));
+      } else {
+          $limit = 50;
+      }
+
+      $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+
+      $allowed_columns = ['id','name','serial','asset_tag'];
+      $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+      $count = $category_assets->count();
+
+      $rows = array();
+
+      foreach ($category_assets as $asset) {
+
+        $actions = '';
+        $inout='';
+        
+        if ($asset->deleted_at=='') {
+            $actions = '<div style=" white-space: nowrap;"><a href="'.route('clone/hardware', $asset->id).'" class="btn btn-info btn-sm" title="Clone asset"><i class="fa fa-files-o"></i></a> <a href="'.route('update/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/hardware', $asset->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($asset->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
+        } elseif ($asset->deleted_at!='') {
+            $actions = '<a href="'.route('restore/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
+        }
+
+        if ($asset->assetstatus) {
+            if ($asset->assetstatus->deployable != 0) {
+                if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
+                    $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
                 } else {
-                    return '<a href="'.route('checkout/hardware', $categoryassets->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
+                    $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
                 }
-            });
-
-        return Datatable::collection($categoryassets)
-        ->addColumn('name', function ($categoryassets) {
-            return link_to('/hardware/'.$categoryassets->id.'/view', $categoryassets->name);
-        })
-        ->addColumn('asset_tag', function ($categoryassets) {
-            return link_to('/hardware/'.$categoryassets->id.'/view', $categoryassets->asset_tag);
-        })
-        ->addColumn('assigned_to', function ($categoryassets) {
-            if ($categoryassets->assigned_to) {
-                return link_to('/admin/users/'.$categoryassets->assigned_to.'/view', $categoryassets->assigneduser->fullName());
             }
-        })
-        ->addColumn($actions)
-        ->searchColumns('name','asset_tag','assigned_to','actions')
-        ->orderColumns('name','asset_tag','assigned_to','actions')
-        ->make();
+        }
+
+        $rows[] = array(
+          'id' => $asset->id,
+          'name' => link_to('/hardware/'.$asset->id.'/view', $asset->showAssetName()),
+          'model' => $asset->model->name,
+          'asset_tag' => $asset->asset_tag,
+          'serial' => $asset->serial,
+          'assigned_to' => ($asset->assigneduser) ? link_to('/admin/users/'.$asset->assigneduser->id.'/view', $asset->assigneduser->fullName()): '',
+          'change' => $inout,
+          'actions' => $actions,
+
+
+        );
+      }
+
+      $data = array('total' => $count, 'rows' => $rows);
+      return $data;
     }
 
 

app/controllers/admin/ConsumablesController.php

@@ -66,10 +66,24 @@ class ConsumablesController extends AdminController
         else{
 
             // Update the consumable data
-            $consumable->name            		= e(Input::get('name'));
-            $consumable->category_id            	= e(Input::get('category_id'));
-            $consumable->qty            			= e(Input::get('qty'));
-            $consumable->user_id          		= Sentry::getId();
+            $consumable->name                   = e(Input::get('name'));
+            $consumable->category_id            = e(Input::get('category_id'));
+            $consumable->order_number           = e(Input::get('order_number'));
+
+            if (e(Input::get('purchase_date')) == '') {
+                $consumable->purchase_date       =  NULL;
+            } else {
+                $consumable->purchase_date       = e(Input::get('purchase_date'));
+            }
+
+            if (e(Input::get('purchase_cost')) == '0.00') {
+                $consumable->purchase_cost       =  NULL;
+            } else {
+                $consumable->purchase_cost       = ParseFloat(e(Input::get('purchase_cost')));
+            }
+
+            $consumable->qty                    = e(Input::get('qty'));
+            $consumable->user_id                = Sentry::getId();
 
             // Was the consumable created?
             if($consumable->save()) {
@@ -134,9 +148,23 @@ class ConsumablesController extends AdminController
         else {
 
             // Update the consumable data
-            $consumable->name            		= e(Input::get('name'));
-            $consumable->category_id            	= e(Input::get('category_id'));
-            $consumable->qty            			= e(Input::get('qty'));
+            $consumable->name                   = e(Input::get('name'));
+            $consumable->category_id            = e(Input::get('category_id'));
+            $consumable->order_number           = e(Input::get('order_number'));
+
+            if (e(Input::get('purchase_date')) == '') {
+                $consumable->purchase_date       =  NULL;
+            } else {
+                $consumable->purchase_date       = e(Input::get('purchase_date'));
+            }
+
+            if (e(Input::get('purchase_cost')) == '0.00') {
+                $consumable->purchase_cost       =  NULL;
+            } else {
+                $consumable->purchase_cost       = ParseFloat(e(Input::get('purchase_cost')));
+            }
+
+            $consumable->qty                    = e(Input::get('qty'));
 
             // Was the consumable created?
             if($consumable->save()) {
@@ -164,21 +192,11 @@ class ConsumablesController extends AdminController
             return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
         }
 
-
-		if ($consumable->hasUsers() > 0) {
-			 return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.assoc_users', array('count'=> $consumable->hasUsers())));
-		} else {
 			$consumable->delete();
 
             // Redirect to the locations management page
             return Redirect::to('admin/consumables')->with('success', Lang::get('admin/consumables/message.delete.success'));
 
-		}
-
-
-
-
-
     }
 
 
@@ -348,47 +366,70 @@ class ConsumablesController extends AdminController
     public function getDatatable()
     {
         $consumables = Consumable::select(array('id','name','qty'))
-        ->whereNull('deleted_at')
-        ->orderBy('created_at', 'DESC');
+        ->whereNull('deleted_at');
 
-        $consumables = $consumables->get();
+        if (Input::has('search')) {
+            $consumables = $consumables->TextSearch(Input::get('search'));
+        }
 
-        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions',function($consumables)
-            {
-                return '<a href="'.route('checkout/consumable', $consumables->id).'" style="margin-right:5px;" class="btn btn-info btn-sm" '.(($consumables->numRemaining() > 0 ) ? '' : ' disabled').'>'.Lang::get('general.checkout').'</a><a href="'.route('update/consumable', $consumables->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/consumable', $consumables->id).'" data-content="'.Lang::get('admin/consumables/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($consumables->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-            });
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+        $allowed_columns = ['id','name'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        $consumables->orderBy($sort, $order);
+
+        $consumCount = $consumables->count();
+        $consumables = $consumables->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach($consumables as $consumable) {
+            $actions = '<a href="'.route('checkout/consumable', $consumable->id).'" style="margin-right:5px;" class="btn btn-info btn-sm" '.(($consumable->numRemaining() > 0 ) ? '' : ' disabled').'>'.Lang::get('general.checkout').'</a><a href="'.route('update/consumable', $consumable->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/consumable', $consumable->id).'" data-content="'.Lang::get('admin/consumables/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($consumable->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+
+            $rows[] = array(
+                'id'          => $consumable->id,
+                'name'          => link_to('admin/consumables/'.$consumable->id.'/view', $consumable->name),
+                'qty'           => $consumable->qty,
+                'numRemaining'  => $consumable->numRemaining(),
+                'actions'       => $actions
+            );
+        }
+
+        $data = array('total' => $consumCount, 'rows' => $rows);
+
+        return $data;
 
-        return Datatable::collection($consumables)
-        ->addColumn('name',function($consumables)
-            {
-                return link_to('admin/consumables/'.$consumables->id.'/view', $consumables->name);
-            })
-        ->addColumn('qty',function($consumables)
-            {
-                return $consumables->qty;
-            })
-        ->addColumn('numRemaining',function($consumables)
-            {
-                return $consumables->numRemaining();
-            })
-        ->addColumn($actions)
-        ->searchColumns('name','qty','numRemaining','actions')
-        ->orderColumns('name','qty','numRemaining','actions')
-        ->make();
     }
 
 	public function getDataView($consumableID)
 	{
 		$consumable = Consumable::find($consumableID);
         $consumable_users = $consumable->users;
+        $count = $consumable_users->count();
 
+        $rows = array();
 
-		return Datatable::collection($consumable_users)
-		->addColumn('name',function($consumable_users)
-			{
-				return link_to('/admin/users/'.$consumable_users->id.'/view', $consumable_users->fullName());
-			})
-		->make();
+        foreach ($consumable_users as $user) {
+            $rows[] = array(
+                'name' => link_to('/admin/users/'.$user->id.'/view', $user->fullName())
+                );
+        }
+
+        $data = array('total' => $count, 'rows' => $rows);
+
+        return $data;
     }
 
 }

app/controllers/admin/DepreciationsController.php

@@ -22,9 +22,6 @@ class DepreciationsController extends AdminController
 
     public function getIndex()
     {
-        // Grab all the depreciations
-        $depreciations = Depreciation::orderBy('created_at', 'DESC')->get();
-
         // Show the page
         return View::make('backend/depreciations/index', compact('depreciations'));
     }
@@ -123,7 +120,7 @@ class DepreciationsController 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
@@ -137,7 +134,7 @@ class DepreciationsController extends AdminController
                 // Redirect to the depreciation page
                 return Redirect::to("admin/settings/depreciations/")->with('success', Lang::get('admin/depreciations/message.update.success'));
             }
-        } 
+        }
 
         // Redirect to the depreciation management page
         return Redirect::to("admin/settings/depreciations/$depreciationId/edit")->with('error', Lang::get('admin/depreciations/message.update.error'));
@@ -174,5 +171,55 @@ class DepreciationsController extends AdminController
     }
 
 
+    public function getDatatable()
+    {
+        $depreciations = Depreciation::select(array('id','name','months'));
+
+        if (Input::has('search')) {
+            $depreciations = $depreciations->TextSearch(e(Input::get('search')));
+        }
+
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+        $allowed_columns = ['id','name','months'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        $depreciations->orderBy($sort, $order);
+
+        $depreciationsCount = $depreciations->count();
+        $depreciations = $depreciations->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach($depreciations as $depreciation) {
+            $actions = '<a href="'.route('update/depreciations', $depreciation->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/depreciations', $depreciation->id).'" data-content="'.Lang::get('admin/depreciations/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($depreciation->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+
+            $rows[] = array(
+                'id'            => $depreciation->id,
+                'name'          => $depreciation->name,
+                'months'        => $depreciation->months,
+                'actions'       => $actions
+            );
+        }
+
+        $data = array('total' => $depreciationsCount, 'rows' => $rows);
+
+        return $data;
+
+    }
+
+
+
 
 }

app/controllers/admin/GroupsController.php

@@ -163,7 +163,7 @@ class GroupsController extends AdminController
 
         if (!Config::get('app.lock_passwords')) {
 
-                try {
+            try {
                 // Update the group data
                 $group->name        = Input::get('name');
                 $group->permissions = Input::get('permissions');
@@ -196,18 +196,22 @@ class GroupsController extends AdminController
      */
     public function getDelete($id = null)
     {
-        try {
-            // Get group information
-            $group = Sentry::getGroupProvider()->findById($id);
+        if (!Config::get('app.lock_passwords')) {
+            try {
+                // Get group information
+                $group = Sentry::getGroupProvider()->findById($id);
 
-            // Delete the group
-            $group->delete();
+                // Delete the group
+                $group->delete();
 
-            // Redirect to the group management page
-            return Redirect::route('groups')->with('success', Lang::get('admin/groups/message.success.delete'));
-        } catch (GroupNotFoundException $e) {
-            // Redirect to the group management page
-            return Redirect::route('groups')->with('error', Lang::get('admin/groups/message.group_not_found', compact('id')));
+                // Redirect to the group management page
+                return Redirect::route('groups')->with('success', Lang::get('admin/groups/message.success.delete'));
+            } catch (GroupNotFoundException $e) {
+                // Redirect to the group management page
+                return Redirect::route('groups')->with('error', Lang::get('admin/groups/message.group_not_found', compact('id')));
+            }
+        } else {
+            return Redirect::route('groups')->with('error',  Lang::get('general.feature_disabled'));
         }
     }
 

app/controllers/admin/LicensesController.php

@@ -887,35 +887,40 @@ class LicensesController extends AdminController
     }
 
     public function getDatatable() {
-        $licenses = License::orderBy('created_at', 'DESC')->get();
+        $licenses = License::select('id','name','serial','purchase_date','seats');
 
-        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function($licenses) {
-            return '<span style="white-space: nowrap;"><a href="'.route('freecheckout/license', $licenses->id).'" class="btn btn-primary btn-sm" style="margin-right:5px;" '.(($licenses->remaincount() > 0) ? '' : 'disabled').'>'.Lang::get('general.checkout').'</a> <a href="'.route('clone/license', $licenses->id).'" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a><a href="'.route('update/license', $licenses->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/license', $licenses->id).'" data-content="'.Lang::get('admin/licenses/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($licenses->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></span>';
-        });
+        if (Input::has('search')) {
+            $licenses = $licenses->TextSearch(Input::get('search'));
+        }
 
-        return Datatable::collection($licenses)
-        ->addColumn('name', function($licenses) {
-            return link_to('/admin/licenses/'.$licenses->id.'/view', $licenses->name);
-        })
-        ->addColumn('serial', function($licenses) {
-            return link_to('/admin/licenses/'.$licenses->id.'/view', mb_strimwidth($licenses->serial, 0, 50, "..."));
-        })
-        ->addColumn('totalSeats', function($licenses) {
-            return $licenses->totalSeatsByLicenseID();
-        })
-        ->addColumn('remaining', function($licenses) {
-            return $licenses->remaincount();
-        })
-        ->addColumn('purchase_date', function($licenses) {
-            return $licenses->purchase_date;
-        })
-        ->addColumn('notes', function($licenses) {
-            return $licenses->notes;
-        })
-        ->addColumn($actions)
-        ->searchColumns('name','serial','totalSeats','remaining','purchase_date','actions','notes')
-        ->orderColumns('name','serial','totalSeats','remaining','purchase_date','actions','notes')
-        ->make();
+        $allowed_columns = ['id','name'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        $licenses = $licenses->orderBy($sort, $order);
+
+        $licenseCount = $licenses->count();
+        $licenses = $licenses->skip(Input::get('offset'))->take(Input::get('limit'))->get();
+
+        $rows = array();
+
+        foreach ($licenses as $license) {
+            $actions = '<span style="white-space: nowrap;"><a href="'.route('freecheckout/license', $license->id).'" class="btn btn-primary btn-sm" style="margin-right:5px;" '.(($license->remaincount() > 0) ? '' : 'disabled').'>'.Lang::get('general.checkout').'</a> <a href="'.route('clone/license', $license->id).'" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a><a href="'.route('update/license', $license->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/license', $license->id).'" data-content="'.Lang::get('admin/licenses/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($license->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></span>';
+
+            $rows[] = array(
+                'id'                => $license->id,
+                'name'              => link_to('/admin/licenses/'.$license->id.'/view', $license->name),
+                'serial'            => link_to('/admin/licenses/'.$license->id.'/view', mb_strimwidth($license->serial, 0, 50, "...")),
+                'totalSeats'        => $license->totalSeatsByLicenseID(),
+                'remaining'         => $license->remaincount(),
+                'purchase_date'     => ($license->purchase_date) ? $license->purchase_date : '',
+                'actions'           => $actions
+                );
+        }
+
+        $data = array('total' => $licenseCount, 'rows' => $rows);
+
+        return $data;
     }
 
     public function getFreeLicense($licenseId) {

app/controllers/admin/LocationsController.php

@@ -255,5 +255,159 @@ class LocationsController extends AdminController
     }
 
 
+    /**
+    *  Get the location page detail page
+    *
+    * @param  int  $locationID
+    * @return View
+    **/
+    public function getView($locationId = null)
+    {
+        $location = Location::find($locationId);
+
+        if (isset($location->id)) {
+                return View::make('backend/locations/view', compact('location'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/locations/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('locations')->with('error', $error);
+        }
+
+
+    }
+
+
+    /**
+    *  Get the locations API information to present to the location view page
+    *
+    * @param  int  $locationID
+    * @return JSON
+    **/
+    public function getDatatable()
+    {
+        $locations = Location::select(array('locations.id','locations.name','locations.address','locations.address2','locations.city','locations.state','locations.zip','locations.country','locations.parent_id','locations.currency'))->with('assets');
+
+
+        if (Input::has('search')) {
+            $locations = $locations->TextSearch(e(Input::get('search')));
+        }
+
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+
+
+
+        switch (Input::get('sort'))
+        {
+            case 'parent':
+              $locations = $locations->OrderParent($order);
+              break;
+            default:
+              $allowed_columns = ['id','name','address','city','state','country','currency'];
+
+              $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+              $locations = $locations->orderBy($sort, $order);
+            break;
+        }
+
+
+        $locationsCount = $locations->count();
+        $locations = $locations->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach($locations as $location) {
+            $actions = '<nobr><a href="'.route('update/location', $location->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/location', $location->id).'" data-content="'.Lang::get('admin/locations/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($location->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></nobr>';
+
+            $rows[] = array(
+                'id'            => $location->id,
+                'name'          => link_to('admin/settings/locations/'.$location->id.'/view', $location->name),
+                'parent'        => ($location->parent) ? $location->parent->name : '',
+              //  'assets'        => ($location->assets->count() + $location->assignedassets->count()),
+                'assets_default' => $location->assignedassets->count(),
+                'assets_checkedout' => $location->assets->count(),
+                'address'       => ($location->address) ? $location->address: '',
+                'city'          => $location->city,
+                'state'         => $location->state,
+                'country'       => $location->country,
+                'currency'      => $location->currency,
+                'actions'       => $actions
+            );
+        }
+
+        $data = array('total' => $locationsCount, 'rows' => $rows);
+
+        return $data;
+
+    }
+
+
+    /**
+    *  Get the location user listing information to present to the location details page
+    *
+    * @param  int  $locationID
+    * @return JSON
+    **/
+    public function getDataViewUsers($locationID)
+  	{
+  		$location = Location::find($locationID);
+      $location_users = $location->users;
+      $count = $location_users->count();
+
+      $rows = array();
+
+      foreach ($location_users as $user) {
+          $rows[] = array(
+              'name' => link_to('/admin/users/'.$user->id.'/view', $user->fullName())
+              );
+      }
+
+      $data = array('total' => $count, 'rows' => $rows);
+
+      return $data;
+  }
+
+
+  /**
+  *  Get the location asset information to present to the location details page
+  *
+  * @param  int  $locationID
+  * @return JSON
+  **/
+  public function getDataViewAssets($locationID)
+  {
+    $location = Location::find($locationID);
+    $count = $location->assets->count();
+
+    $rows = array();
+
+    foreach ($location->assets as $asset) {
+        $rows[] = array(
+          'name' => link_to('/hardware/'.$asset->id.'/view', $asset->showAssetName()),
+          'asset_tag' => $asset->asset_tag,
+          'serial' => $asset->serial,
+          'model' => $asset->model->name,
+
+        );
+    }
+
+    $data = array('total' => $count, 'rows' => $rows);
+    return $data;
+
+  }
+
 
 }

app/controllers/admin/ManufacturersController.php

@@ -20,9 +20,6 @@ class ManufacturersController extends AdminController
      */
     public function getIndex()
     {
-        // Grab all the manufacturers
-        $manufacturers = Manufacturer::orderBy('created_at', 'DESC')->get();
-
         // Show the page
         return View::make('backend/manufacturers/index', compact('manufacturers'));
     }
@@ -192,7 +189,122 @@ class ManufacturersController extends AdminController
 
     }
 
+    public function getDatatable()
+    {
+        $manufacturers = Manufacturer::select(array('id','name'))->with('assets')
+        ->whereNull('deleted_at');
 
+        if (Input::has('search')) {
+            $manufacturers = $manufacturers->TextSearch(e(Input::get('search')));
+        }
+
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+        $allowed_columns = ['id','name'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        $manufacturers->orderBy($sort, $order);
+
+        $manufacturersCount = $manufacturers->count();
+        $manufacturers = $manufacturers->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach($manufacturers as $manufacturer) {
+            $actions = '<a href="'.route('update/manufacturer', $manufacturer->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/location', $manufacturer->id).'" data-content="'.Lang::get('admin/manufacturers/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($manufacturer->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+
+            $rows[] = array(
+                'id'              => $manufacturer->id,
+                'name'          => link_to('admin/settings/manufacturers/'.$manufacturer->id.'/view', $manufacturer->name),
+                'assets'              => $manufacturer->assetscount(),
+                'actions'       => $actions
+            );
+        }
+
+        $data = array('total' => $manufacturersCount, 'rows' => $rows);
+
+        return $data;
+
+    }
+
+
+
+    public function getDataView($manufacturerID) {
+
+      $manufacturer = Manufacturer::find($manufacturerID);
+      $manufacturer_assets = $manufacturer->assets;
+
+      if (Input::has('search')) {
+          $manufacturer_assets = $manufacturer_assets->TextSearch(e(Input::get('search')));
+      }
+
+      if (Input::has('offset')) {
+          $offset = e(Input::get('offset'));
+      } else {
+          $offset = 0;
+      }
+
+      if (Input::has('limit')) {
+          $limit = e(Input::get('limit'));
+      } else {
+          $limit = 50;
+      }
+
+      $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+
+      $allowed_columns = ['id','name','serial','asset_tag'];
+      $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+      $count = $manufacturer_assets->count();
+
+      $rows = array();
+
+      foreach ($manufacturer_assets as $asset) {
+
+        $actions = '';
+        if ($asset->deleted_at=='') {
+            $actions = '<div style=" white-space: nowrap;"><a href="'.route('clone/hardware', $asset->id).'" class="btn btn-info btn-sm" title="Clone asset"><i class="fa fa-files-o"></i></a> <a href="'.route('update/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/hardware', $asset->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($asset->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
+        } elseif ($asset->deleted_at!='') {
+            $actions = '<a href="'.route('restore/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
+        }
+
+        if ($asset->assetstatus) {
+            if ($asset->assetstatus->deployable != 0) {
+                if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
+                    $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
+                } else {
+                    $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
+                }
+            }
+        }
+
+        $rows[] = array(
+          'id' => $asset->id,
+          'name' => link_to('/hardware/'.$asset->id.'/view', $asset->showAssetName()),
+          'model' => $asset->model->name,
+          'asset_tag' => $asset->asset_tag,
+          'serial' => $asset->serial,
+          'assigned_to' => ($asset->assigneduser) ? link_to('/admin/users/'.$asset->assigneduser->id.'/view', $asset->assigneduser->fullName()): '',
+          'change' => $inout,
+          'actions' => $actions,
+
+
+        );
+      }
+
+      $data = array('total' => $count, 'rows' => $rows);
+      return $data;
+    }
 
 
 }

app/controllers/admin/ModelsController.php

@@ -15,6 +15,7 @@ use Str;
 use Validator;
 use View;
 use Datatable;
+use Asset;
 
 //use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -317,7 +318,7 @@ class ModelsController extends AdminController
 
 
     /**
-    *  Get the asset information to present to the model view page
+    *  Get the model information to present to the model view page
     *
     * @param  int  $assetId
     * @return View
@@ -339,7 +340,14 @@ class ModelsController extends AdminController
 
     }
 
-        public function getClone($modelId = null)
+    /**
+    *  Get the clone page to clone a model
+    *
+    * @param  int  $modelId
+    * @return View
+    **/
+
+    public function getClone($modelId = null)
     {
         // Check if the model exists
         if (is_null($model_to_clone = Model::find($modelId))) {
@@ -364,79 +372,131 @@ class ModelsController extends AdminController
 
     }
 
+
+    /**
+    *  Get the JSON response for the bootstrap table list view
+    *
+    * @param  string  $status
+    * @return JSON
+    **/
+
     public function getDatatable($status = null)
     {
-        $models = Model::orderBy('created_at', 'DESC')->with('category','assets','depreciation');
+        $models = Model::with('category','assets','depreciation');
         ($status != 'Deleted') ?: $models->withTrashed()->Deleted();;
-        $models = $models->get();
 
-        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function($models) {
-            if($models->deleted_at=='') {
-                return '<a href="'.route('update/model', $models->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/model', $models->id).'" data-content="'.Lang::get('admin/models/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($models->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+        if (Input::has('search')) {
+            $models = $models->TextSearch(Input::get('search'));
+        }
+
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+
+        $allowed_columns = ['id','name','modelno'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        $models = $models->orderBy($sort, $order);
+
+        $modelCount = $models->count();
+        $models = $models->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach ($models as $model) {
+            if ($model->deleted_at == '') {
+                $actions = '<div style=" white-space: nowrap;"><a href="'.route('update/model', $model->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/model', $model->id).'" data-content="'.Lang::get('admin/models/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($model->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
             } else {
-                return '<a href="'.route('restore/model', $models->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
+                $actions = '<a href="'.route('restore/model', $model->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
             }
-        });
 
-        return Datatable::collection($models)
-        ->addColumn('manufacturer', function($models) {
-            return $models->manufacturer->name;
-        })
-        ->addColumn('name', function ($models) {
-            return link_to('/hardware/models/'.$models->id.'/view', $models->name);
-        })
-        ->showColumns('modelno')
-        ->addColumn('asset_count', function($models) {
-            return $models->assets->count();
-        })
-        ->addColumn('depreciation', function($models) {
-            return (($models->depreciation)&&($models->depreciation->id > 0)) ? $models->depreciation->name.' ('.$models->depreciation->months.')' : Lang::get('general.no_depreciation');
-        })
-        ->addColumn('category', function($models) {
-            return ($models->category) ? $models->category->name : '';
-        })
-        ->addColumn('eol', function($models) {
-            return ($models->eol) ? $models->eol.' '.Lang::get('general.months') : '';
-        })
-        ->addColumn($actions)
-        ->searchColumns('name','modelno','asset_count','depreciation','category','eol','actions')
-        ->orderColumns('name','modelno','asset_count','depreciation','category','eol','actions')
-        ->make();
+            $rows[] = array(
+                'id'      => $model->id,
+                'manufacturer'      => link_to('/admin/settings/manufacturers/'.$model->manufacturer->id.'/view', $model->manufacturer->name),
+                'name'              => link_to('/hardware/models/'.$model->id.'/view', $model->name),
+                'modelnumber'       => $model->modelno,
+                'numassets'         => $model->assets->count(),
+                'depreciation'      => (($model->depreciation)&&($model->depreciation->id > 0)) ? $model->depreciation->name.' ('.$model->depreciation->months.')' : Lang::get('general.no_depreciation'),
+                'category'          => ($model->category) ? $model->category->name : '',
+                'eol'               => ($model->eol) ? $model->eol.' '.Lang::get('general.months') : '',
+                'actions'           => $actions
+                );
+        }
+
+        $data = array('total' => $modelCount, 'rows' => $rows);
+
+        return $data;
     }
 
 
+    /**
+    *  Get the asset information to present to the model view page
+    *
+    * @param  int  $modelID
+    * @return View
+    **/
     public function getDataView($modelID)
     {
-        $model = Model::withTrashed()->find($modelID);
-        $modelassets = $model->assets;
+        $assets = Asset::where('model_id','=',$modelID)->withTrashed();
 
-        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($modelassets)
-            {
-                if (($modelassets->assigned_to !='') && ($modelassets->assigned_to > 0)) {
-                    return '<a href="'.route('checkin/hardware', $modelassets->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
-                } else {
-                    return '<a href="'.route('checkout/hardware', $modelassets->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
-                }
-            });
+        if (Input::has('search')) {
+            $assets = $assets->TextSearch(Input::get('search'));
+        }
 
-        return Datatable::collection($modelassets)
-        ->addColumn('name', function ($modelassets) {
-           return link_to('/hardware/'.$modelassets->id.'/view', $modelassets->showAssetName());
-          // return $modelassets->name;
-        })
-        ->addColumn('asset_tag', function ($modelassets) {
-            return link_to('/hardware/'.$modelassets->id.'/view', $modelassets->asset_tag);
-        })
-        ->showColumns('serial')
-        ->addColumn('assigned_to', function ($modelassets) {
-            if ($modelassets->assigned_to) {
-                return link_to('/admin/users/'.$modelassets->assigned_to.'/view', $modelassets->assigneduser->fullName());
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+
+        $allowed_columns = ['name', 'serial','asset_tag'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        $assets = $assets->orderBy($sort, $order);
+
+        $assetsCount = $assets->count();
+        $assets = $assets->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach ($assets as $asset) {
+            if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
+                $actions = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
+            } else {
+                $actions = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
             }
-        })
-        ->addColumn($actions)
-        ->searchColumns('name','asset_tag','serial','assigned_to','actions')
-        ->orderColumns('name','asset_tag','serial','assigned_to','actions')
-        ->make();
+
+            $rows[] = array(
+                'id'            => $asset->id,
+                'name'          => link_to('/hardware/'.$asset->id.'/view', $asset->showAssetName()),
+                'asset_tag'     => link_to('hardware/'.$asset->id.'/view', $asset->asset_tag),
+                'serial'        => $asset->serial,
+                'assigned_to'   => ($asset->assigned_to) ? link_to('/admin/users/'.$asset->assigned_to.'/view', $asset->assigneduser->fullName()) : '',
+                'actions'       => $actions
+                );
+        }
+
+        $data = array('total' => $assetsCount, 'rows' => $rows);
+
+        return $data;
     }
 
 }

app/controllers/admin/ReportsController.php

@@ -405,7 +405,7 @@ class ReportsController extends AdminController
         if (e( Input::get( 'purchase_date' ) ) == '1') {
             $header[] = 'Purchase Date';
         }
-        if (( e( Input::get( 'purchase_cost' ) ) == '1' ) && ( e( Input::get( 'depreciation' ) ) == '0' )) {
+        if (( e( Input::get( 'purchase_cost' ) ) == '1' ) && ( e( Input::get( 'depreciation' ) ) != '1' )) {
             $header[] = 'Purchase Cost';
         }
         if (e( Input::get( 'order' ) ) == '1') {
@@ -461,7 +461,7 @@ class ReportsController extends AdminController
             if (e( Input::get( 'purchase_date' ) ) == '1') {
                 $row[] = $asset->purchase_date;
             }
-            if (e( Input::get( 'purchase_cost' ) ) == '1') {
+            if (e( Input::get( 'purchase_cost' ) ) == '1' && ( e( Input::get( 'depreciation' ) ) != '1' )) {
                 $row[] = '"' . number_format( $asset->purchase_cost ) . '"';
             }
             if (e( Input::get( 'order' ) ) == '1') {

app/controllers/admin/SettingsController.php

@@ -13,6 +13,7 @@ use View;
 use Image;
 use Config;
 use Response;
+use Artisan;
 
 class SettingsController extends AdminController
 {
@@ -67,7 +68,8 @@ class SettingsController extends AdminController
         // Declare the rules for the form validation
 
         $rules = array(
-	        "per_page"   	=> 'required|min:1|numeric',
+	        "brand"     => 'required|min:1|numeric',
+            "per_page"   	=> 'required|min:1|numeric',
 	        "qr_text"		=> 'min:1|max:31',
 	        "logo"   		=> 'mimes:jpeg,bmp,png,gif',
             "custom_css"   => 'alpha_space',
@@ -114,6 +116,7 @@ class SettingsController extends AdminController
 
              if (Config::get('app.lock_passwords')==false) {
 	             $setting->site_name = e(Input::get('site_name'));
+                 $setting->brand = e(Input::get('brand'));
                  $setting->custom_css = e(Input::get('custom_css'));
              }
 
@@ -172,12 +175,34 @@ class SettingsController extends AdminController
 
             }
             closedir($handle);
+            $files = array_reverse($files);
         }
 
 
         return View::make('backend/settings/backups', compact('path','files'));
     }
 
+
+    /**
+    * Generate the backup page
+    *
+    * @return View
+    **/
+
+    public function postBackups()
+    {
+        if (!Config::get('app.lock_passwords')) {
+            Artisan::call('snipe:backup');
+            return Redirect::to("admin/settings/backups")->with('success', Lang::get('admin/settings/message.backup.generated'));
+        } else {
+            Artisan::call('snipe:backup');
+            return Redirect::to("admin/settings/backups")->with('error', Lang::get('general.feature_disabled'));
+        }
+
+
+    }
+
+
     /**
     * Download the dump file
     *
@@ -186,20 +211,45 @@ class SettingsController extends AdminController
     **/
     public function downloadFile($filename = null)
     {
+        if (!Config::get('app.lock_passwords')) {
+            $file = Config::get('backup::path').'/'.$filename;
+            if (file_exists($file)) {
+    				return Response::download($file);
+            } else {
 
-        $file = Config::get('backup::path').'/'.$filename;
-
-
-		// the license is valid
-        if (file_exists($file)) {
-				return Response::download($file);
+                // Redirect to the backup page
+                return Redirect::route('settings/backups')->with('error',  Lang::get('admin/settings/message.backup.file_not_found'));
+            }
         } else {
-            // Prepare the error message
-            $error = Lang::get('admin/settings/message.does_not_exist');
-
-            // Redirect to the licence management page
-            return Redirect::route('settings/backups')->with('error', $error);
+            // Redirect to the backup page
+            return Redirect::route('settings/backups')->with('error',  Lang::get('general.feature_disabled'));
         }
+
+
+    }
+
+    /**
+    * Download the dump file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function deleteFile($filename = null)
+    {
+
+        if (!Config::get('app.lock_passwords')) {
+
+            $file = Config::get('backup::path').'/'.$filename;
+            if (file_exists($file)) {
+    			unlink($file);
+                return Redirect::route('settings/backups')->with('success', Lang::get('admin/settings/message.backup.file_deleted'));
+            } else {
+                return Redirect::route('settings/backups')->with('error', Lang::get('admin/settings/message.backup.file_not_found'));
+            }
+        } else {
+            return Redirect::route('settings/backups')->with('error',  Lang::get('general.feature_disabled'));
+        }
+
     }
 
 

app/controllers/admin/StatuslabelsController.php

@@ -24,9 +24,6 @@ class StatuslabelsController extends AdminController
 
     public function getIndex()
     {
-        // Grab all the statuslabels
-        $statuslabels = Statuslabel::orderBy('created_at', 'DESC')->get();
-
         // Show the page
         return View::make('backend/statuslabels/index', compact('statuslabels'));
     }
@@ -230,5 +227,67 @@ class StatuslabelsController extends AdminController
     }
 
 
+    public function getDatatable()
+    {
+        $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived'))
+        ->whereNull('deleted_at');
+
+        if (Input::has('search')) {
+            $statuslabels = $statuslabels->TextSearch(e(Input::get('search')));
+        }
+
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+        $allowed_columns = ['id','name'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        $statuslabels->orderBy($sort, $order);
+
+        $statuslabelsCount = $statuslabels->count();
+        $statuslabels = $statuslabels->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach($statuslabels as $statuslabel) {
+
+            if ($statuslabel->deployable == 1) {
+			$label_type = Lang::get('admin/statuslabels/table.deployable');
+            } elseif ($statuslabel->pending == 1) {
+			$label_type = Lang::get('admin/statuslabels/table.pending');
+            } elseif ($statuslabel->archived == 1) {
+		      $label_type = Lang::get('admin/statuslabels/table.archived');
+		} else {
+                  $label_type = Lang::get('admin/statuslabels/table.undeployable');
+            }
+
+            $actions = '<a href="'.route('update/statuslabel', $statuslabel->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/statuslabel', $statuslabel->id).'" data-content="'.Lang::get('admin/statuslabels/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($statuslabel->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+
+            $rows[] = array(
+                'id'            => $statuslabel->id,
+                'type'          => $label_type,
+                'name'          => e($statuslabel->name),
+                'actions'       => $actions
+            );
+        }
+
+        $data = array('total' => $statuslabelsCount, 'rows' => $rows);
+
+        return $data;
+
+    }
+
+
+
 
 }

app/controllers/admin/SuppliersController.php

@@ -103,7 +103,7 @@ class SuppliersController extends AdminController
         return Redirect::to('admin/settings/suppliers/create')->with('error', Lang::get('admin/suppliers/message.create.error'));
 
     }
-    
+
     public function store()
     {
       $supplier=new Supplier;
@@ -115,7 +115,7 @@ class SuppliersController extends AdminController
         //$supplier->fill($new);
         $supplier->name=$new['name'];
         $supplier->user_id              = Sentry::getId();
-      
+
         if($supplier->save()) {
           return JsonResponse::create($supplier);
         } else {
@@ -163,7 +163,7 @@ class SuppliersController 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
@@ -204,7 +204,7 @@ class SuppliersController extends AdminController
                 // Redirect to the new supplier page
                 return Redirect::to("admin/settings/suppliers")->with('success', Lang::get('admin/suppliers/message.update.success'));
             }
-        } 
+        }
 
         // Redirect to the supplier management page
         return Redirect::to("admin/settings/suppliers/$supplierId/edit")->with('error', Lang::get('admin/suppliers/message.update.error'));
@@ -264,6 +264,61 @@ class SuppliersController extends AdminController
 
     }
 
+    public function getDatatable()
+    {
+        $suppliers = Supplier::select(array('id','name','address','address2','city','state','country','fax', 'phone','email','contact'))
+        ->whereNull('deleted_at');
+
+        if (Input::has('search')) {
+            $suppliers = $suppliers->TextSearch(e(Input::get('search')));
+        }
+
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+        $allowed_columns = ['id','name','address','phone','contact','fax','email'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        $suppliers->orderBy($sort, $order);
+
+        $suppliersCount = $suppliers->count();
+        $suppliers = $suppliers->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach($suppliers as $supplier) {
+            $actions = '<a href="'.route('update/supplier', $supplier->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/location', $supplier->id).'" data-content="'.Lang::get('admin/suppliers/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($supplier->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+
+            $rows[] = array(
+                'id'                => $supplier->id,
+                'name'              => link_to('admin/settings/suppliers/'.$supplier->id.'/view', $supplier->name),
+                'contact'           => $supplier->contact,
+                'address'           => $supplier->address.' '.$supplier->address2.' '.$supplier->city.' '.$supplier->state.' '.$supplier->country,
+                'phone'             => $supplier->phone,
+                'fax'             => $supplier->fax,
+                'email'             => ($supplier->email!='') ? '<a href="mailto:'.$supplier->email.'">'.$supplier->email.'</a>' : '',
+                'assets'            => $supplier->num_assets(),
+                'licenses'          => $supplier->num_licenses(),
+                'actions'           => $actions
+            );
+        }
+
+        $data = array('total' => $suppliersCount, 'rows' => $rows);
+
+        return $data;
+
+    }
+
 
 
 }

app/controllers/admin/UsersController.php

@@ -43,7 +43,7 @@ class UsersController extends AdminController {
         'first_name' => 'required|alpha_space|min:2',
         'last_name' => 'required|alpha_space|min:2',
         'location_id' => 'numeric',
-        'username' => 'required|min:2|unique:users,username',
+        'username' => 'required|min:2|unique:users,username, ',
         'email' => 'email|unique:users,email',
         'password' => 'required|min:6',
         'password_confirm' => 'required|min:6|same:password',
@@ -486,8 +486,8 @@ class UsersController extends AdminController {
         if ((!Input::has('edit_user')) || (count(Input::has('edit_user')) == 0)) {
             return Redirect::back()->with('error', 'No users selected');
         } else {
-            $statuslabel_list = array('' => Lang::get('general.select_statuslabel')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
-            $user_raw_array = Input::get('edit_user');
+            $statuslabel_list = statusLabelList();
+            $user_raw_array = array_keys(Input::get('edit_user'));
             $users = User::whereIn('id', $user_raw_array)->with('groups')->get();
             return View::make('backend/users/confirm-bulk-delete', compact('users', 'statuslabel_list'));
         }
@@ -530,7 +530,7 @@ class UsersController extends AdminController {
                     $update_assets = Asset::whereIn('id', $asset_array)->update(
                             array(
                                 'status_id' => e(Input::get('status_id')),
-                                'assigned_to' => '',
+                                'assigned_to' => null,
                     ));
                 }
 
@@ -545,9 +545,9 @@ class UsersController extends AdminController {
                     $logaction->note = 'Bulk checkin';
                     $log = $logaction->logaction('checkin from');
 
-                    $update_assets = DB::table('accessories_users')->whereIn('id', $accessory_array)->update(
+                    $update_accessories = DB::table('accessories_users')->whereIn('id', $accessory_array)->update(
                             array(
-                                'assigned_to' => '',
+                                'assigned_to' => null,
                     ));
                 }
 
@@ -824,91 +824,115 @@ class UsersController extends AdminController {
         return Redirect::route('users')->with('duplicates', $duplicates)->with('success', 'Success');
     }
 
-    public function getDatatable($status = null) {
+    public function getDatatable($status = null)
+    {
 
-        $users = User::with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'sentryThrottle', 'groups', 'userloc');
-
-        switch ($status) {
-            case 'deleted':
-                $users->GetDeleted();
-                break;
-            case '':
-                $users->GetNotDeleted();
-                break;
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
         }
 
-        $users = $users->orderBy('created_at', 'DESC')->get();
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
 
-        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($users) {
-            $action_buttons = '';
+        if (Input::get('sort')=='name') {
+            $sort = 'first_name';
+        } else {
+            $sort = e(Input::get('sort'));
+        }
+
+        $users = User::select(array('users.id','users.email','users.username','users.location_id','users.manager_id','users.first_name','users.last_name','users.created_at','users.notes'))->with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'sentryThrottle', 'groups', 'userloc');
+
+        switch ($status) {
+        case 'deleted':
+          $users = $users->withTrashed()->Deleted();
+          break;
+        }
+
+         if (Input::has('search')) {
+             $users = $users->TextSearch(Input::get('search'));
+         }
+
+         $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+
+         switch (Input::get('sort'))
+         {
+             case 'manager':
+               $users = $users->OrderManager($order);
+               break;
+             default:
+                $allowed_columns =
+                [
+                  'last_name','first_name','email','username','location',
+                  'assets','accessories', 'consumables','licenses','groups'
+                ];
+
+                $sort = in_array($sort, $allowed_columns) ? $sort : 'first_name';
+                $users = $users->orderBy($sort, $order);
+             break;
+         }
+
+        $userCount = $users->count();
+        $users = $users->skip($offset)->take($limit)->get();
+        $rows = array();
+
+        foreach ($users as $user)
+        {
+
+            $group_names = '';
+            $inout = '';
+            $actions = '<nobr>';
+
+            foreach ($user->groups as $group) {
+                $group_names .= '<a href="' . Config::get('app.url') . '/admin/groups/' . $group->id . '/edit" class="label  label-default">' . $group->name . '</a> ';
+            }
 
 
-            if (!is_null($users->deleted_at)) {
-                $action_buttons .= '<a href="' . route('restore/user', $users->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-share icon-white"></i></a> ';
+            if (!is_null($user->deleted_at)) {
+
+                $actions .= '<a href="' . route('restore/user', $user->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-share icon-white"></i></a> ';
             } else {
-                if ($users->accountStatus() == 'suspended') {
-                    $action_buttons .= '<a href="' . route('unsuspend/user', $users->id) . '" class="btn btn-default btn-sm"><span class="fa fa-clock-o"></span></a> ';
+
+                if ($user->accountStatus() == 'suspended') {
+                    $actions .= '<a href="' . route('unsuspend/user', $user->id) . '" class="btn btn-default btn-sm"><span class="fa fa-clock-o"></span></a> ';
                 }
 
-                $action_buttons .= '<a href="' . route('update/user', $users->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> ';
+                $actions .= '<a href="' . route('update/user', $user->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> ';
 
-                if ((Sentry::getId() !== $users->id) && (!Config::get('app.lock_passwords'))) {
-                    $action_buttons .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/user', $users->id) . '" data-content="Are you sure you wish to delete this user?" data-title="Delete ' . htmlspecialchars($users->first_name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a> ';
+                if ((Sentry::getId() !== $user->id) && (!Config::get('app.lock_passwords'))) {
+                    $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/user', $user->id) . '" data-content="Are you sure you wish to delete this user?" data-title="Delete ' . htmlspecialchars($user->first_name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a> ';
                 } else {
-                    $action_buttons .= ' <span class="btn delete-asset btn-danger btn-sm disabled"><i class="fa fa-trash icon-white"></i></span>';
+                    $actions .= ' <span class="btn delete-asset btn-danger btn-sm disabled"><i class="fa fa-trash icon-white"></i></span>';
                 }
             }
-            return $action_buttons;
-        });
+            $actions .= '</nobr>';
 
+            $rows[] = array(
+                'checkbox'      =>'<div class="text-center hidden-xs hidden-sm"><input type="checkbox" name="edit_user['.$user->id.']" class="one_required"></div>',
+                'name'          => '<a title="'.$user->fullName().'" href="../admin/users/'.$user->id.'/view">'.$user->fullName().'</a>',
+                'email'         => ($user->email!='') ?
+                            '<a href="mailto:'.$user->email.'" class="hidden-md hidden-lg">'.$user->email.'</a>'
+                            .'<a href="mailto:'.$user->email.'" class="hidden-xs hidden-sm"><i class="fa fa-envelope"></i></a>'
+                            .'</span>' : '',
+                'username'         => $user->username,
+                'location'      => ($user->userloc) ? $user->userloc->name : '',
+                'manager'         => ($user->manager) ? '<a title="' . $user->manager->fullName() . '" href="users/' . $user->manager->id . '/view">' . $user->manager->fullName() . '</a>' : '',
+                'assets'        => $user->assets->count(),
+                'licenses'        => $user->licenses->count(),
+                'accessories'        => $user->accessories->count(),
+                'consumables'        => $user->consumables->count(),
+                'groups'        => $group_names,
+                'notes'         => $user->notes,
+                'actions'       => ($actions) ? $actions : ''
+            );
+        }
 
-        return Datatable::collection($users)
-                        ->addColumn('', function($users) {
-                            return '<div class="text-center"><input type="checkbox" name="edit_user[]" value="' . $users->id . '" class="one_required"></div>';
-                        })
-                        ->addColumn('name', function($users) {
-                            return '<a title="' . $users->fullName() . '" href="users/' . $users->id . '/view">' . $users->fullName() . '</a>';
-                        })
-                        ->addColumn('email', function($users) {
-                            if ($users->email) {
-                                return '<div class="text-center"><a title="' . $users->email . '" href="mailto:' . $users->email . '"><i class="fa fa-envelope fa-lg"></i></div>';
-                            } else {
-                                return '';
-                            }
-                        })
-                        ->addColumn('manager', function($users) {
-                            if ($users->manager) {
-                                return '<a title="' . $users->manager->fullName() . '" href="users/' . $users->manager->id . '/view">' . $users->manager->fullName() . '</a>';
-                            }
-                        })
-                        ->addColumn('location', function($users) {
-                            if ($users->userloc) {
-                                return $users->userloc->name;
-                            }
-                        })
-                        ->addColumn('assets', function($users) {
-                            return $users->assets->count();
-                        })
-                        ->addColumn('licenses', function($users) {
-                            return $users->licenses->count();
-                        })
-                        ->addColumn('accessories', function($users) {
-                            return $users->accessories->count();
-                        })
-                        ->addColumn('consumables', function($users) {
-                            return $users->consumables->count();
-                        })
-                        ->addColumn('groups', function($users) {
-                            $group_names = '';
-                            foreach ($users->groups as $group) {
-                                $group_names .= '<a href="' . Config::get('app.url') . '/admin/groups/' . $group->id . '/edit" class="label  label-default">' . $group->name . '</a> ';
-                            }
-                            return $group_names;
-                        })
-                        ->addColumn($actions)
-                        ->searchColumns('name', 'email', 'manager', 'activated', 'groups', 'location')
-                        ->orderColumns('name', 'email', 'manager', 'activated', 'licenses', 'assets', 'accessories', 'consumables', 'groups', 'location')
-                        ->make();
+        $data = array('total'=>$userCount, 'rows'=>$rows);
+        return $data;
     }
 
     /**
@@ -1043,13 +1067,13 @@ class UsersController extends AdminController {
         // Selected permissions
         $selectedPermissions = Input::old('permissions', array('superuser' => -1));
         $this->encodePermissions($selectedPermissions);
-        
+
         $location_list = locationsList();
-                        
+
         // Show the page
         return View::make('backend/users/ldap', compact('groups', 'selectedGroups', 'permissions', 'selectedPermissions'))
                         ->with('location_list', $location_list);
-        
+
     }
 
     /**
@@ -1064,7 +1088,7 @@ class UsersController extends AdminController {
         'username' => 'required|min:2|unique:users,username',
         'email' => 'email|unique:users,email',
     );
-    
+
     /**
      * Declare the rules for the form validation.
      *
@@ -1083,14 +1107,14 @@ class UsersController extends AdminController {
     public function postLDAP() {
 
         $location_id = Input::get('location_id');
-        
+
         $formValidator = Validator::make(Input::all(), $this->ldapFormInputValidationRules);
         // If validation fails, we'll exit the operation now.
         if ($formValidator->fails()) {
             // Ooops.. something went wrong
             return Redirect::back()->withInput()->withErrors($formValidator);
         }
-        
+
         $ldap_version = Config::get('ldap.version');
         $url = Config::get('ldap.url');
         $username = Config::get('ldap.username');

app/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php

@@ -63,13 +63,16 @@
         public function up()
         {
 
-            Schema::table( 'asset_logs', function ( Blueprint $table ) {
+            if (!Schema::hasColumn('asset_logs', 'thread_id')) {
 
-                $table->integer( 'thread_id' )
-                      ->nullable()
-                      ->default( null );
-                $table->index( 'thread_id' );
-            } );
+                Schema::table( 'asset_logs', function ( Blueprint $table ) {
+
+                    $table->integer( 'thread_id' )
+                          ->nullable()
+                          ->default( null );
+                    $table->index( 'thread_id' );
+                } );
+            }
 
             $this->actionlog = new Actionlog();
             $this->assetLogs = $this->actionlog->getListingOfActionLogsChronologicalOrder();
@@ -93,9 +96,10 @@
                 }
 
             }
-
         }
 
+
+
         /**
          * Reverse the migrations.
          *

app/database/migrations/2015_09_28_003314_fix_default_purchase_order.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FixDefaultPurchaseOrder extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		DB::statement('ALTER TABLE `'.DB::getTablePrefix().'licenses` MODIFY `purchase_order` varchar(255) DEFAULT NULL;');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		DB::statement('ALTER TABLE `'.DB::getTablePrefix().'licenses` MODIFY `purchase_order` varchar(255);');
+	}
+
+}

app/database/migrations/2015_10_01_024551_add_accessory_consumable_price_info.php

@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAccessoryConsumablePriceInfo extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('accessories', function ($table) {
+			$table->date('purchase_date')->nullable();
+            $table->decimal('purchase_cost', 13, 4)->nullable();
+            $table->string('order_number');
+		});
+		
+		Schema::table('consumables', function ($table) {
+			$table->date('purchase_date')->nullable();
+            $table->decimal('purchase_cost', 13, 4)->nullable();
+            $table->string('order_number');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('accessories', function ($table) {
+			$table->dropColumn('purchase_date');
+            $table->dropColumn('purchase_cost');
+            $table->dropColumn('order_number');
+		});
+		
+		Schema::table('consumables', function ($table) {
+			$table->dropColumn('purchase_date');
+            $table->dropColumn('purchase_cost');
+            $table->dropColumn('order_number');
+		});
+	}
+
+}

app/database/migrations/2015_10_12_192706_add_brand_to_settings.php

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

app/database/migrations/2015_10_22_003314_fix_defaults_accessories.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FixDefaultsAccessories extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		DB::statement('ALTER TABLE `'.DB::getTablePrefix().'accessories` MODIFY `order_number` varchar(255) DEFAULT NULL;');
+
+		DB::statement('ALTER TABLE `'.DB::getTablePrefix().'consumables` MODIFY `order_number` varchar(255) DEFAULT NULL;');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		DB::statement('ALTER TABLE `'.DB::getTablePrefix().'accessories` MODIFY `order_number` varchar(255);');
+		DB::statement('ALTER TABLE `'.DB::getTablePrefix().'consumables` MODIFY `order_number` varchar(255);');
+	}
+
+}

app/database/migrations/2015_10_23_182625_add_checkout_time_and_expected_checkout_date_to_assets.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddCheckoutTimeAndExpectedCheckoutDateToAssets extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('assets', function(Blueprint $table)
+		{
+			//
+			$answer=$table->dateTime('last_checkout')->nullable();
+			$table->date('expected_checkin')->nullable();
+		});
+		DB::statement("UPDATE assets SET last_checkout=(SELECT MAX(created_at) FROM asset_logs WHERE asset_logs.id=assets.id AND action_type='checkout') WHERE assigned_to IS NOT NULL");
+		DB::statement("UPDATE assets SET expected_checkin=(SELECT expected_checkin FROM asset_logs WHERE asset_logs.id=assets.id AND action_type='checkout' ORDER BY id DESC limit 1) WHERE assigned_to IS NOT NULL");
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('assets', function(Blueprint $table)
+		{
+			//
+			$table->dropColumn('last_checkout');
+			$table->dropColumn('expected_checkin');
+		});
+	}
+
+}

app/database/migrations/2015_11_05_183749_image.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class Image extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('assets', function(Blueprint $table)
+		{
+			$table->text('image')->after('notes')->nullable()->default(NULL);
+			//
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+  public function down()
+   {
+       Schema::table('assets', function ($table) {
+           $table->dropColumn('image');
+       });
+   }
+
+}

app/database/seeds/AccessoriesSeeder.php

@@ -0,0 +1,39 @@
+<?php
+class AccessoriesSeeder extends Seeder
+{
+    public function run()
+    {
+
+
+        // Initialize empty array
+        $accessory = array();
+
+        $date = new DateTime;
+
+
+        $accessory[] = array(
+            'name'      	=> 'Cisco Desktop Phone',
+            'category_id'      => 4,
+            'qty'      	=> '20',
+            'requestable' => '0',
+            'user_id' => 1,
+        );
+
+        $accessory[] = array(
+            'name'      	=> 'ASUS 23-inch',
+            'category_id'      => 5,
+            'qty'      	=> '20',
+            'requestable' => '0',
+            'user_id' => 1,
+        );
+
+
+
+        // Delete all the old data
+        DB::table('accessories')->truncate();
+
+        // Insert the new posts
+        Accessory::insert($accessory);
+    }
+
+}

app/database/seeds/ActionlogSeeder.php

@@ -30,7 +30,7 @@ class ActionlogSeeder extends Seeder
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '1',
             'location_id'  		=> NULL,
-            'created_at' 			=> $date->modify('-10 day'),
+            'created_at' 		=> $date->modify('-10 day'),
             'asset_type' 		=> 'hardware',
             'note'				=> NULL,
             'filename'			=> NULL,

app/database/seeds/AssetMaintenancesSeeder.php

@@ -0,0 +1,35 @@
+<?php
+class AssetMaintenancesSeeder extends Seeder
+{
+    public function run()
+    {
+
+
+        // Initialize empty array
+        $asset_maintenances = array();
+
+        $date = new DateTime;
+
+
+        $asset_maintenances[] = array(
+            'asset_id'      	=> 1,
+            'supplier_id'      => 1,
+            'asset_maintenance_type' => 'Maintenance',
+            'title'      	=> 'Test Maintenance',
+            'start_date' 	=> $date->modify('-10 day'),
+            'cost'  => '200.99',
+            'is_warranty'  => '0',
+            'created_at' 	=> $date->modify('-10 day'),
+            'updated_at' 	=> $date->modify('-3 day'),
+        );
+
+
+
+        // Delete all the old data
+        DB::table('asset_maintenances')->truncate();
+
+        // Insert the new posts
+        AssetMaintenance::insert($asset_maintenances);
+    }
+
+}

app/database/seeds/AssetsSeeder.php

@@ -15,6 +15,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Shanen MBP',
             'asset_tag'     => 'NNY2878796',
             'model_id'      => 1,
+            'supplier_id'      => 1,
             'serial'      	=> 'WS90585666669',
             'purchase_date' => '2013-10-02',
             'purchase_cost' => '2435.99',
@@ -38,6 +39,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Michael MBP',
             'asset_tag'     => 'NNY28633396',
             'model_id'      => 1,
+            'supplier_id'      => 1,
             'serial'      	=> 'WS905823226669',
             'purchase_date' => '2013-10-02',
             'purchase_cost' => '2435.99',
@@ -62,6 +64,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Alison MBP',
             'asset_tag'     => 'NNY287958796',
             'model_id'      => 1,
+            'supplier_id'      => 1,
             'serial'      	=> 'WS905869046069',
             'purchase_date' => '2013-10-02',
             'purchase_cost' => '2435.99',
@@ -85,6 +88,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Brady MBP',
             'asset_tag'     => 'NNY78795566',
             'model_id'      => 2,
+            'supplier_id'      => 2,
             'serial'      	=> 'WS9078686069',
             'purchase_date' => '2012-01-02',
             'purchase_cost' => '1999.99',
@@ -108,6 +112,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Deborah MBP',
             'asset_tag'     => 'NNY65756756775',
             'model_id'      => 2,
+            'supplier_id'      => 2,
             'serial'      	=> 'WS9078686069',
             'purchase_date' => '2012-01-02',
             'purchase_cost' => '699.99',
@@ -132,6 +137,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Sara MBP',
             'asset_tag'     => 'NNY6897856775',
             'model_id'      => 2,
+            'supplier_id'      => 2,
             'serial'      	=> 'WS87897998Q',
             'purchase_date' => '2012-01-02',
             'purchase_cost' => '1999.99',
@@ -155,6 +161,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Ben MBP',
             'asset_tag'     => 'NNY67567775',
             'model_id'      => 2,
+            'supplier_id'      => 2,
             'serial'      	=> 'WS89080890',
             'purchase_date' => '2012-01-02',
             'purchase_cost' => '1999.99',
@@ -178,6 +185,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Broken Laptop',
             'asset_tag'     => 'NNY6756756775',
             'model_id'      => 2,
+            'supplier_id'      => 2,
             'serial'      	=> 'WS89080890',
             'purchase_date' => '2012-01-02',
             'purchase_cost' => '1999.99',
@@ -201,6 +209,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Maybe Broke-Ass Laptop',
             'asset_tag'     => 'NNY6755667775',
             'model_id'      => 2,
+            'supplier_id'      => 1,
             'serial'      	=> 'WS45689080890',
             'purchase_date' => '2012-01-02',
             'purchase_cost' => '1999.99',
@@ -224,6 +233,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Completely Facacta Laptop',
             'asset_tag'     => 'NNY6564567775',
             'model_id'      => 2,
+            'supplier_id'      => 2,
             'serial'      	=> 'WS99689080890',
             'purchase_date' => '2012-01-02',
             'purchase_cost' => '1999.99',
@@ -247,6 +257,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Borked Laptop',
             'asset_tag'     => 'NNY656456778975',
             'model_id'      => 2,
+            'supplier_id'      => 1,
             'serial'      	=> 'WS99689080890',
             'purchase_date' => '2012-01-02',
             'purchase_cost' => '1999.99',
@@ -270,6 +281,7 @@ class AssetsSeeder extends Seeder
             'name'      	=> 'Noah MBP',
             'asset_tag'     => 'NNY98056775',
             'model_id'      => 2,
+            'supplier_id'      => 1,
             'serial'      	=> 'WS909098888',
             'purchase_date' => '2011-12-20',
             'purchase_cost' => '699.99',

app/database/seeds/CategoriesSeeder.php

@@ -16,6 +16,7 @@ class CategoriesSeeder extends Seeder
             'require_acceptance'	=> 0,
             'deleted_at' => NULL,
             'eula_text'	=> NULL,
+            'category_type' => 'asset',
         );
 
         $date = new DateTime;
@@ -28,6 +29,7 @@ class CategoriesSeeder extends Seeder
             'require_acceptance'	=> 0,
             'deleted_at' => NULL,
             'eula_text'	=> NULL,
+            'category_type' => 'asset',
         );
 
         $date = new DateTime;
@@ -40,6 +42,7 @@ class CategoriesSeeder extends Seeder
             'require_acceptance'	=> 0,
             'deleted_at' => NULL,
             'eula_text'	=> NULL,
+            'category_type' => 'asset',
         );
 
         $date = new DateTime;
@@ -52,6 +55,7 @@ class CategoriesSeeder extends Seeder
             'require_acceptance'	=> 0,
             'deleted_at' => NULL,
             'eula_text'	=> NULL,
+            'category_type' => 'accessory',
         );
 
         $date = new DateTime;
@@ -64,6 +68,20 @@ class CategoriesSeeder extends Seeder
             'require_acceptance'	=> 0,
             'deleted_at' => NULL,
             'eula_text'	=> NULL,
+            'category_type' => 'accessory',
+        );
+
+        $date = new DateTime;
+        $category[] = array(
+            'name'      => 'Printer Ink',
+            'created_at' => $date->modify('-10 day'),
+            'updated_at' => $date->modify('-3 day'),
+            'user_id' => 1,
+            'use_default_eula'	=>	0,
+            'require_acceptance'	=> 0,
+            'deleted_at' => NULL,
+            'eula_text'	=> NULL,
+            'category_type' => 'consumable',
         );
 
 

app/database/seeds/DatabaseSeeder.php

@@ -22,6 +22,9 @@ class DatabaseSeeder extends Seeder
         $this->call('LicensesSeeder');
         $this->call('LicenseSeatsSeeder');
         $this->call('ActionlogSeeder');
+        $this->call('AccessoriesSeeder');
+        $this->call('AssetMaintenancesSeeder');
+        $this->call('SuppliersSeeder');
     }
 
 }

app/database/seeds/LocationsSeeder.php

@@ -17,6 +17,7 @@ class LocationsSeeder extends Seeder
             'state'      		=> 'NY',
             'country'      		=> 'US',
             'zip'      			=> '10004',
+            'currency'      => '$',
             'created_at' 		=> $date->modify('-10 day'),
             'updated_at' 		=> $date->modify('-3 day'),
             'user_id' 			=> 1,
@@ -31,6 +32,7 @@ class LocationsSeeder extends Seeder
             'state'      		=> 'NY',
             'country'      		=> 'US',
             'zip'      			=> '10004',
+            'currency'      => '$',
             'created_at' 		=> $date->modify('-10 day'),
             'updated_at' 		=> $date->modify('-3 day'),
             'user_id' 			=> 1,
@@ -45,6 +47,7 @@ class LocationsSeeder extends Seeder
             'state'      		=> 'CA',
             'country'      		=> 'US',
             'zip'      			=> '94111',
+            'currency'      => '$',
             'created_at' 		=> $date->modify('-10 day'),
             'updated_at' 		=> $date->modify('-3 day'),
             'user_id' 			=> 1,
@@ -59,6 +62,7 @@ class LocationsSeeder extends Seeder
             'state'      		=> 'CA',
             'country'      		=> 'US',
             'zip'      			=> '90028',
+            'currency'      => '$',
             'created_at' 		=> $date->modify('-10 day'),
             'updated_at' 		=> $date->modify('-3 day'),
             'user_id' 			=> 1,

app/database/seeds/SuppliersSeeder.php

@@ -0,0 +1,37 @@
+<?php
+class SuppliersSeeder extends Seeder
+{
+    public function run()
+    {
+
+
+        // Initialize empty array
+        $supplier = array();
+
+        $date = new DateTime;
+
+
+        $supplier[] = array(
+            'name'      	=> 'New Egg',
+            'created_at' 	=> $date->modify('-10 day'),
+            'updated_at' 	=> $date->modify('-3 day'),
+            'user_id'       => 1,
+        );
+
+        $supplier[] = array(
+            'name'      	=> 'Microsoft',
+            'created_at' 	=> $date->modify('-10 day'),
+            'updated_at' 	=> $date->modify('-3 day'),
+            'user_id'       => 1,
+        );
+
+
+
+        // Delete all the old data
+        DB::table('suppliers')->truncate();
+
+        // Insert the new posts
+        Supplier::insert($supplier);
+    }
+
+}

app/helpers.php

@@ -39,7 +39,7 @@ function suppliersList() {
 }
 
 function statusLabelList() {
-    $statuslabel_list = Statuslabel::orderBy('name', 'asc')
+    $statuslabel_list = array('' => Lang::get('general.select_statuslabel')) + Statuslabel::orderBy('name', 'asc')
     ->lists('name', 'id');
     return $statuslabel_list;
 }

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

@@ -5,11 +5,14 @@ return array(
     'about_accessories_text'  			=> 'الملحقات هي أي شيء تقوم بتسليمه للمستخدمين لكنه لا يحتوي على رقم تسلسلي (أو أنك لست بحاجة إلى تتبعه بشكل خاص). مثال: فأرة الحاسوب أو لوحة المفاتيح.',
     'accessory_category' 				=> 'فئة الملحق',
     'accessory_name'  					=> 'اسم الملحق',
+    'cost'					=> 'Purchase Cost',
     'create'  							=> 'Create Accessory',
+    'date'					=> 'Purchase Date',
     'eula_text'							=> 'إنشاء اتفاقية جديدة',
     'eula_text_help'					=> 'يسمح لك هذا الحقل بتخصيص الاتفاقيات لأنواع معينة من الأصول. اذا كنت تمتلك اتفاقية واحدة لجميع أصولك يمكنك أن تقوم بتأشير المربع في الأسفل لاستخدام الاتفاقية الافتراضية.',
     'require_acceptance'				=> 'مطالبة المستخدمين بتأكيد قبولهم الأصول في هذه الفئة.',
     'no_default_eula'					=> 'ليس هناك اتفاقيات. قم باضافة واحدة من "الاعدادات".',
+    'order'					=> 'Order Number',
     'qty'  								=> 'الكمية',
     'total'  							=> 'المجموع',
     'remaining'  						=> 'المتاح',

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

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Asset Maintenance Type',
+        'asset_maintenance_type' => 'Maintenance Type',
         'title'                  => 'Title',
-        'start_date'             => 'Start Date',
-        'completion_date'        => 'Completion Date',
+        'start_date'             => 'Started',
+        'completion_date'        => 'Completed',
         'cost'                   => 'Cost',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
+        'asset_maintenance_time' => 'Days',
         'notes'                  => 'Notes',
-        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Create Asset Maintenance'
+        'update'                 => 'Update',
+        'create'                 => 'Create'
     ];

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

@@ -2,8 +2,8 @@
 
     return [
         'title'         => 'Asset Maintenance',
-        'asset_name'    => 'Asset Name',
-        'supplier_name' => 'Supplier Name',
+        'asset_name'    => 'Asset',
+        'supplier_name' => 'Supplier',
         'is_warranty'   => 'Warranty',
         'dl_csv'        => 'Download CSV'
-    ];
+    ];

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

@@ -4,7 +4,10 @@ return array(
     'about_consumables_title' 			=> 'About Consumables',
     'about_consumables_text'  			=> 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
     'consumable_name'                  => 'Consumable Name',
+    'cost'				=> 'Purchase Cost',
     'create'                             => 'Create Consumable',
+    'date'					=> 'Purchase Date',
+    'order'					=> 'Order Number',
     'remaining' 			             => 'Remaining',
     'total' 			                 => 'Total',
     'update'                            => 'Update Consumable',

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

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'assets_rtd'		=> 'Assets RTD',
+    'assets_checkedout'		=> 'Assets Assigned',
     'id'      		=> 'ID',
     'city'   		=> 'City',
     'state'   		=> 'State',
@@ -13,5 +14,5 @@ return array(
     'zip'			=> 'Postal Code',
     'locations'		=> 'Locations',
     'parent'		=> 'Parent',
-    'currency'  	=> 'Location Currency', // this is deprecated
+    'currency'  	=> 'Location Currency',
 );

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

@@ -22,10 +22,12 @@ return array(
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'general_settings'			=> 'General Settings',
+	'generate_backup'			=> 'Generate Backup',
     'header_color'              => 'Header Color',
     '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.',
+    'load_remote_text'          => 'Remote Scripts',
+    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
     'logo'                    	=> 'Logo',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
@@ -46,4 +48,7 @@ return array(
     'system'                    => 'System Information',
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
+    'brand'                     => 'Branding',
+    'about_settings_title'      => 'About Settings',
+    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',    
 );

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

@@ -4,8 +4,14 @@ return array(
 
 
     'update' => array(
-        'error'   => 'An error has occurred while updating. ',
-        'success' => 'Settings updated successfully.'
+        'error'                 => 'An error has occurred while updating. ',
+        'success'               => 'Settings updated successfully.'
+    ),
+    'backup' => array(
+        'delete_confirm'        => 'Are you sure you would like to delete this backup file? This action cannot be undone. ',
+        'file_deleted'          => 'The backup file was successfully deleted. ',
+        'generated'             => 'A new backup file was successfully created.',
+        'file_not_found'        => 'That backup file could not be found on the server.',
     ),
 
 );

app/lang/ar/general.php

@@ -43,6 +43,7 @@
     'date'					=> 'التاريخ',
     'delete'  				=> 'حذف',
     'deleted'  				=> 'تم حذفها',
+    'delete_seats'  		=> 'Deleted Seats',
     'deployed'				=> 'مُوزعة',
     'depreciation_report'	=> 'تقرير الإستهلاك',
     'download'				=> 'Download',

app/lang/bg/admin/accessories/general.php

@@ -1,20 +1,23 @@
 <?php
 
 return array(
-    'about_accessories_title' 			=> 'About Accessories',
-    'about_accessories_text'  			=> 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
-    'accessory_category' 				=> 'Accessory Category',
-    'accessory_name'  					=> 'Accessory Name',
-    'create'  							=> 'Create Accessory',
-    'eula_text'							=> 'Category EULA',
-    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
-    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
-    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
-    'qty'  								=> 'QTY',
+    'about_accessories_title' 			=> 'Относно аксесоарите',
+    'about_accessories_text'  			=> 'Аксесоарите са всички неща, които се изписват на потребителите, но нямат сериен номер (или няма нужда да бъдат конкретно проследявани). Например, това са мишки, клавиатури и др.',
+    'accessory_category' 				=> 'Категория аксесоари',
+    'accessory_name'  					=> 'Аксесоар',
+    'cost'					=> 'Purchase Cost',
+    'create'  							=> 'Създаване на аксесоар',
+    'date'					=> 'Purchase Date',
+    'eula_text'							=> 'EULA на категорията',
+    'eula_text_help'					=> 'Това поле позволява да задавате различни EULA за всеки тип активи. Ако имате обща EULA за всички активи, можете да използвате кутийката по-долу за да използвате една обща по подразбиране.',
+    'require_acceptance'				=> 'Задължаване на потребителите да потвърждават приемането на активи от тази категория.',
+    'no_default_eula'					=> 'Няма EULA по подразбиране. Добавете я в Настройки.',
+    'order'					=> 'Order Number',
+    'qty'  								=> 'Количество',
     'total'  							=> 'Oбщо',
-    'remaining'  						=> 'Avail',
-    'update'  							=> 'Update Accessory',
-    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
-    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'remaining'  						=> 'Наличност',
+    'update'  							=> 'Обновяване на аксесоар',
+    'use_default_eula'					=> 'Използване на <a href="#" data-toggle="modal" data-target="#eulaModal">EULA по подразбиране</a>.',
+    'use_default_eula_disabled'			=> '<del>Използване на EULA по подразбиране</del> Няма EULA по подразбиране. Добавете я в Настройки.',
 
 );

app/lang/bg/admin/accessories/message.php

@@ -3,34 +3,34 @@
 return array(
 
     'does_not_exist' => 'Няма такава категория.',
-    'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
+    'assoc_users'	 => 'От този аксесоар са предадени :count броя на потребителите. Моля впишете обратно нови или върнати и опитайте отново.',
 
     'create' => array(
-        'error'   => 'Category was not created, please try again.',
+        'error'   => 'Категорията не беше създадена. Моля опитайте отново.',
         'success' => 'Категорията е създадена.'
     ),
 
     'update' => array(
-        'error'   => 'Category was not updated, please try again',
+        'error'   => 'Категорията не беше обновена. Моля опитайте отново.',
         'success' => 'Категорията е обновена.'
     ),
 
     'delete' => array(
         'confirm'   => 'Сигурни ли сте, че желаете изтриване на категорията?',
-        'error'   => 'There was an issue deleting the category. Please try again.',
+        'error'   => 'Проблем при изтриване на категорията. Моля опитайте отново.',
         'success' => 'Категорията бе изтрита успешно.'
     ),
     
      'checkout' => array(
-        'error'   		=> 'Accessory was not checked out, please try again',
-        'success' 		=> 'Accessory checked out successfully.',
+        'error'   		=> 'Аксесоарът не беше изписан. Моля опитайте отново.',
+        'success' 		=> 'Аксесоарът изписан успешно.',
         'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
     ),
 
     'checkin' => array(
-        'error'   		=> 'Accessory was not checked in, please try again',
-        'success' 		=> 'Accessory checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Аксесоарът не беше вписан. Моля опитайте отново.',
+        'success' 		=> 'Аксесоарът вписан успешно.',
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
     )
 
 

app/lang/bg/admin/accessories/table.php

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-	'dl_csv'      				=> 'Download CSV',
+	'dl_csv'      				=> 'Сваляне на CSV',
 	'eula_text'      			=> 'EULA',
     'id'      					=> 'ID',
-    'require_acceptance'      	=> 'Acceptance',
-    'title'      				=> 'Accessory Name',
+    'require_acceptance'      	=> 'Утвърждаване',
+    'title'      				=> 'Аксесоар',
 
 
 );

app/lang/bg/admin/asset_maintenances/message.php

@@ -1,15 +1,15 @@
 <?php
 
     return [
-        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'not_found'                    => 'Поддръжката на актив, която търсите не бе открита!',
         'delete'                       => [
-            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
-            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
-            'success' => 'The asset maintenance was deleted successfully.'
+            'confirm' => 'Потвърдете изтриването на поддръжката на актив.',
+            'error'   => 'Проблем при изтриването на поддръжка на актив. Моля опитайте отново.',
+            'success' => 'Поддръжката на актив изтрита успешно.'
         ],
         'create'                       => [
-            'error'   => 'Asset Maintenance was not created, please try again.',
-            'success' => 'Asset Maintenance created successfully.'
+            'error'   => 'Поддръжката на актив не бе създадена. Моля опитайте отново.',
+            'success' => 'Поддръжката на актив създадена успешно.'
         ],
         'asset_maintenance_incomplete' => 'Все още неприключила',
         'warranty'                     => 'Гаранция',

app/lang/bg/admin/asset_maintenances/table.php

@@ -6,4 +6,4 @@
         'supplier_name' => 'Доставчик',
         'is_warranty'   => 'Гаранция',
         'dl_csv'        => 'Сваляне на CSV'
-    ];
+    ];

app/lang/bg/admin/categories/general.php

@@ -1,22 +1,22 @@
 <?php
 
 return array(
-    'about_asset_categories' 			=> 'About Asset Categories',
-    'about_categories'  				=> 'Asset categories help you organize your assets. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use asset categories any way that makes sense for you.',
-    'asset_categories' 					=> 'Asset Categories',
+    'about_asset_categories' 			=> 'Относно категориите на активи',
+    'about_categories'  				=> 'Категориите помагат организирането на активите. Примерни категории могат да бъдат &quot;Стационарни PC&quot;, &quot;Лаптопи&quot;, &quot;Мобилни телефони&quot;, &quot;Таблети&quot; и т.н., но можете да използвате всяка категория, имаща смисъл за организацията Ви.',
+    'asset_categories' 					=> 'Категории на активи',
     'category_name'  					=> 'Име на категория',
-    'checkin_email'                     => 'Send email to user on checkin.',
+    'checkin_email'                     => 'Изпращане на email до потребителя при вписване на активи.',
     'clone'                             => 'Копиране на категория',
     'create'  							=> 'Създаване на категория',
     'edit'                              => 'Редакция на категория',
     'eula_text'							=> 'Категория EULA',
-    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
-    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
-    'required_acceptance'				=> 'This user will be emailed with a link to confirm acceptance of this item.',
-    'required_eula'						=> 'This user will be emailed a copy of the EULA',
-    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
+    'eula_text_help'					=> 'Това поле позволява да задавате различни EULA за всеки тип активи. Ако имате обща EULA за всички активи, можете да използвате кутийката по-долу за да използвате една обща по подразбиране.',
+    'require_acceptance'				=> 'Задължаване на потребителите да потвърждават приемането на активи от тази категория.',
+    'required_acceptance'				=> 'Потребителят ще получи email с връзка за потвърждаване получаването на актива.',
+    'required_eula'						=> 'Потребителят ще получи копие на EULA.',
+    'no_default_eula'					=> 'Няма EULA по подразбиране. Добавете я в Настройки.',
     'update'  							=> 'Обновяване на категория',
-    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
-    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula'					=> 'Използване на <a href="#" data-toggle="modal" data-target="#eulaModal">EULA по подразбиране</a>.',
+    'use_default_eula_disabled'			=> '<del>Използване на EULA по подразбиране</del> Няма EULA по подразбиране. Добавете я в Настройки.',
 
 );

app/lang/bg/admin/categories/message.php

@@ -3,15 +3,15 @@
 return array(
 
     'does_not_exist' => 'Категорията не съществува.',
-    'assoc_users'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
+    'assoc_users'	 => 'Тази категория е асоциирана с поне един модел и не може да бъде изтрита. Моля обновете връзките с моделите и опитайте отново.',
 
     'create' => array(
-        'error'   => 'Category was not created, please try again.',
-        'success' => 'Category created successfully.'
+        'error'   => 'Категорията не беше създадена. Моля опитайте отново.',
+        'success' => 'Категорията е създадена.'
     ),
 
     'update' => array(
-        'error'   => 'Category was not updated, please try again',
+        'error'   => 'Категорията не беше обновена. Моля опитайте отново',
         'success' => 'Категорията е обновена успешно.'
     ),
 

app/lang/bg/admin/categories/table.php

@@ -3,7 +3,7 @@
 return array(
 	'eula_text'      			=> 'EULA',
     'id'      					=> 'ID',
-    'parent'   					=> 'Parent',
+    'parent'   					=> 'Горна категория',
     'require_acceptance'      	=> 'Утвърждаване',
     'title'      				=> 'Категория на актива',
 

app/lang/bg/admin/consumables/general.php

@@ -4,7 +4,10 @@ return array(
     'about_consumables_title' 			=> 'Относно консумативите',
     'about_consumables_text'  			=> 'Консумативите са всички неща, купувани във времето. Например тонер за принтер или хартия.',
     'consumable_name'                  => 'Консуматив',
+    'cost'				=> 'Purchase Cost',
     'create'                             => 'Създаване на консуматив',
+    'date'					=> 'Purchase Date',
+    'order'					=> 'Order Number',
     'remaining' 			             => 'Остава',
     'total' 			                 => 'Oбщо',
     'update'                            => 'Обновяване на консуматив',

app/lang/bg/admin/consumables/message.php

@@ -2,34 +2,34 @@
 
 return array(
 
-    'does_not_exist' => 'Consumable does not exist.',
+    'does_not_exist' => 'Консуматива не съществува.',
 
     'create' => array(
-        'error'   => 'Consumable was not created, please try again.',
-        'success' => 'Consumable created successfully.'
+        'error'   => 'Консумативът не беше създаден. Моля опитайте отново.',
+        'success' => 'Консумативът създаден успешно.'
     ),
 
     'update' => array(
-        'error'   => 'Consumable was not updated, please try again',
-        'success' => 'Consumable updated successfully.'
+        'error'   => 'Консумативът не беше обновен. Моля опитайте отново.',
+        'success' => 'Консумативът обновен успешно.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
-        'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'confirm'   => 'Желаете ли изтриване на консуматива?',
+        'error'   => 'Проблем при изтриването на консуматива. Моля опитайте отново.',
+        'success' => 'Консумативът изтрит успешно.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'Consumable was not checked out, please try again',
-        'success' 		=> 'Consumable checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Консумативът не беше изписан. Моля опитайте отново.',
+        'success' 		=> 'Консумативът изписан успешно.',
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
     ),
 
     'checkin' => array(
-        'error'   		=> 'Consumable was not checked in, please try again',
-        'success' 		=> 'Consumable checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Консумативът не беше вписан. Моля опитайте отново.',
+        'success' 		=> 'Консумативът вписан успешно.',
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
     )
 
 

app/lang/bg/admin/consumables/table.php

@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Consumable Name',
+    'title'      				=> 'Консуматив',
 );

app/lang/bg/admin/depreciations/general.php

@@ -2,11 +2,11 @@
 
 return array(
     'about_asset_depreciations'  			=> 'Относно амортизацията на активи',
-    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
-    'asset_depreciations'  					=> 'Asset Depreciations',
-    'create_depreciation'  					=> 'Create Depreciation',
-    'depreciation_name'  					=> 'Depreciation Name',
-    'number_of_months'  					=> 'Number of Months',
-    'update_depreciation'  					=> 'Update Depreciation',
+    'about_depreciations'  					=> 'Тук можете да конфигурирате линейна амортизация на активи във времето.',
+    'asset_depreciations'  					=> 'Амортизация на активи',
+    'create_depreciation'  					=> 'Създаване на амортизация',
+    'depreciation_name'  					=> 'Амортизация',
+    'number_of_months'  					=> 'Брой месеци',
+    'update_depreciation'  					=> 'Обновяване на амортизация',
 
 );

app/lang/bg/admin/depreciations/message.php

@@ -2,24 +2,24 @@
 
 return array(
 
-    'does_not_exist' => 'Depreciation class does not exist.',
-    'assoc_users'	 => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ',
+    'does_not_exist' => 'Амортизацията не съществува.',
+    'assoc_users'	 => 'Тази амортизация е асоциирана с един или повече модели и не може да бъде изтрита. Моля изтрийте моделите и опитайте отново.',
 
 
     'create' => array(
-        'error'   => 'Depreciation class was not created, please try again. :(',
-        'success' => 'Depreciation class created successfully. :)'
+        'error'   => 'Класът на амортизация не беше създаден. Моля опитайте отново.',
+        'success' => 'Класът на амортизация създаден успешно.'
     ),
 
     'update' => array(
-        'error'   => 'Depreciation class was not updated, please try again',
-        'success' => 'Depreciation class updated successfully.'
+        'error'   => 'Класът на амортизация не беше обновен. Моля опитайте отново.',
+        'success' => 'Класът на амортизация обновен успешно.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this depreciation class?',
-        'error'   => 'There was an issue deleting the depreciation class. Please try again.',
-        'success' => 'The depreciation class was deleted successfully.'
+        'confirm'   => 'Сигурни ли сте, че желаете изтриване на класът на амортизация?',
+        'error'   => 'Проблем при изтриването на класа на амортизация. Моля опитайте отново.',
+        'success' => 'Класът на амортизация изтрит успешно.'
     )
 
 );

app/lang/bg/admin/groups/message.php

@@ -2,21 +2,21 @@
 
 return array(
 
-    'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
-    'group_name_required' => 'The name field is required',
+    'group_exists'        => 'Групата вече съществува!',
+    'group_not_found'     => 'Групата [:id] не съществува.',
+    'group_name_required' => 'Полето име е задължително',
 
     'success' => array(
-        'create' => 'Group was successfully created.',
-        'update' => 'Group was successfully updated.',
-        'delete' => 'Group was successfully deleted.',
+        'create' => 'Групата създадена успешно.',
+        'update' => 'Групата обновена успешно.',
+        'delete' => 'Групата изтрита успешно.',
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this group?',
-        'create' => 'There was an issue creating the group. Please try again.',
-        'update' => 'There was an issue updating the group. Please try again.',
-        'delete' => 'There was an issue deleting the group. Please try again.',
+        'confirm'   => 'Сигурни ли сте, че желаете да изтриете групата?',
+        'create' => 'Проблем при създаване на групата. Моля опитайте отново.',
+        'update' => 'Проблем при обновяването на групата. Моля опитайте отново.',
+        'delete' => 'Проблем при изтриване на групата. Моля опитайте отново.',
     ),
 
 );

app/lang/bg/admin/groups/table.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'id'         => 'Id',
-    'name'       => 'Name',
-    'users'      => '# of Users',
+    'id'         => 'ID',
+    'name'       => 'Име',
+    'users'      => 'Брой потребители',
 
 );

app/lang/bg/admin/groups/titles.php

@@ -2,12 +2,12 @@
 
 return array(
 
-    'group_management' 	 	=> 'Group Management',
-    'create_group' 	 		=> 'Create New Group',
-    'edit_group' 	 		=> 'Edit Group',
-    'group_name' 	 		=> 'Group Name',
-    'group_admin' 	 		=> 'Group Admin',
-    'allow' 	 			=> 'Allow',
-    'deny' 	 				=> 'Deny',
+    'group_management' 	 	=> 'Управление на групи',
+    'create_group' 	 		=> 'Нова група',
+    'edit_group' 	 		=> 'Редакция на група',
+    'group_name' 	 		=> 'Име на група',
+    'group_admin' 	 		=> 'Администратор на група',
+    'allow' 	 			=> 'Разрешаване',
+    'deny' 	 				=> 'Отказ',
 
 );

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

@@ -2,41 +2,41 @@
 
 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_date'		=> 'Checkout Date',
-    'checkin_date'		=> 'Checkin Date',
-    'checkout_to'		=> 'Checkout to',
-    'cost'				=> 'Purchase Cost',
-    'create'			=> 'Create Asset',
-    'date'				=> 'Purchase Date',
-    'depreciates_on'	=> 'Depreciates On',
-    'depreciation'		=> 'Depreciation',
-    'default_location'	=> 'Default Location',
-    'eol_date'			=> 'EOL Date',
-    'eol_rate'			=> 'EOL Rate',
-    'expected_checkin'  => 'Expected Checkin Date',
-    'expires'			=> 'Expires',
-    'fully_depreciated'	=> 'Fully Depreciated',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
-    'mac_address'		=> 'MAC Address',
-    'manufacturer'		=> 'Manufacturer',
-    'model'				=> 'Model',
-    'months'			=> 'months',
-    'name'				=> 'Asset Name',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order Number',
-    'qr'				=> 'QR Code',
-    'requestable'		=> 'Users may request this asset',
-    'select_statustype'	=> 'Select Status Type',
-    'serial'			=> 'Serial',
-    'status'			=> 'Status',
-    'supplier'			=> 'Supplier',
-    'tag'				=> 'Asset Tag',
-    'update'			=> 'Asset Update',
-    'warranty'			=> 'Warranty',
-    'years'				=> 'years',
+	'bulk_update'		=> 'Масово обновяване на активи',
+	'bulk_update_help'	=> 'Тук можете да обновите множество активи едновременно. Попълнете единствено полетата, които желаете да промените. Всички празни полета няма да бъдат променени.',
+	'bulk_update_warn'	=> 'Ще бъдат променени записите за :asset_count актива.',
+    'checkedout_to'		=> 'Изписано на',
+    'checkout_date'		=> 'Дата на изписване',
+    'checkin_date'		=> 'Дата на вписване',
+    'checkout_to'		=> 'Изпиши на',
+    'cost'				=> 'Стойност на закупуване',
+    'create'			=> 'Създаване на актив',
+    'date'				=> 'Дата на закупуване',
+    'depreciates_on'	=> 'Амортизира се на',
+    'depreciation'		=> 'Амортизация',
+    'default_location'	=> 'Местоположение по подразбиране',
+    'eol_date'			=> 'EOL дата',
+    'eol_rate'			=> 'EOL съотношение',
+    'expected_checkin'  => 'Очаквана дата на вписване',
+    'expires'			=> 'Изтича',
+    'fully_depreciated'	=> 'Напълно амортизиран',
+    'help_checkout'		=> 'Ако желаете да присвоите актив на момента, изберете "Готово за предаване" от списъка по-горе.',
+    'mac_address'		=> 'MAC адрес',
+    'manufacturer'		=> 'Производител',
+    'model'				=> 'Модел',
+    'months'			=> 'месеца',
+    'name'				=> 'Име на актив',
+    'notes'				=> 'Бележки',
+    'order'				=> 'Номер на поръчка',
+    'qr'				=> 'QR код',
+    'requestable'		=> 'Потребителите могат да изписват актива',
+    'select_statustype'	=> 'Избиране на тип на статуса',
+    'serial'			=> 'Сериен номер',
+    'status'			=> 'Статус',
+    'supplier'			=> 'Доставчик',
+    'tag'				=> 'Инвентарен номер',
+    'update'			=> 'Обновяване на актив',
+    'warranty'			=> 'Гаранция',
+    'years'				=> 'години',
 )
 ;

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

@@ -1,19 +1,19 @@
 <?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',
-	'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
-    'requestable'				=> 'Requestable',
-    'restore'  					=> 'Restore Asset',
-    'pending'  					=> 'Pending',
-    'undeployable'  			=> 'Undeployable',
-    'view'  					=> 'View Asset',
+	'archived'  				=> 'Архивиран',
+    'asset'  					=> 'Актив',
+    'checkin'  					=> 'Връщане на актив',
+    'checkout'  				=> 'Изписване на актив към потребител',
+    'clone'  					=> 'Копиране на актив',
+    'deployable'  				=> 'Може да бъде предоставен',
+    'deleted'  					=> 'Активът беше изтрит. <a href="/hardware/:asset_id/restore">Възстановяване</a>.',
+    'edit'  					=> 'Редакция на актив',
+	'filetype_info'				=> 'Позволените типове файлове са png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.',
+    'model_deleted'  			=> 'Моделът актив беше изтрит.Необходимо е да възстановите моделът, преди да възстановите актива.<br/> <a href="/hardware/models/:model_id/restore">Възстановяване на модел</a>.',
+    'requestable'				=> 'Може да бъде изискван',
+    'restore'  					=> 'Възстановяване на актив',
+    'pending'  					=> 'Предстоящ',
+    'undeployable'  			=> 'Не може да бъде предоставян',
+    'view'  					=> 'Преглед на актив',
 );

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

@@ -2,57 +2,56 @@
 
 return array(
 
-    '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.',
-    'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.',
-    '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. ',
+    'undeployable' 		=> '<strong>Внимание:</strong> Този актив е маркиран като невъзможен за предоставяне. Ако статусът е променен, моля обновете актива.',
+    'does_not_exist' 	=> 'Активът не съществува.',
+    'does_not_exist_or_not_requestable' => 'Добър опит. Активът не съществува или не може а бъде предоставян.',
+    'assoc_users'	 	=> 'Активът е изписан на потребител и не може да бъде изтрит. Моля впишете го обратно и след това опитайте да го изтриете отново.',
 
     'create' => array(
-        'error'   		=> 'Asset was not created, please try again. :(',
-        'success' 		=> 'Asset created successfully. :)'
+        'error'   		=> 'Активът не беше създаден. Моля опитайте отново.',
+        'success' 		=> 'Активът създаден успешно.'
     ),
 
     'update' => array(
-        'error'   			=> 'Asset was not updated, please try again',
-        'success' 			=> 'Asset updated successfully.',
-        'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
+        'error'   			=> 'Активът не беше обновен. Моля опитайте отново.',
+        'success' 			=> 'Активът обновен успешно.',
+        'nothing_updated'	=>  'Няма избрани полета, съответно нищо не беше обновено.',
     ),
 
     'restore' => array(
-        'error'   		=> 'Asset was not restored, please try again',
-        'success' 		=> 'Asset restored successfully.'
+        'error'   		=> 'Активът не беше възстановен. Моля опитайте отново.',
+        'success' 		=> 'Активът възстановен успешно.'
     ),
 
     'deletefile' => array(
-        'error'   => 'File not deleted. Please try again.',
-        'success' => 'File successfully deleted.',
+        'error'   => 'Файлът не беше изтрит. Моля опитайте отново.',
+        'success' => 'Файлът изтрит успешно.',
     ),
 
     'upload' => array(
-        'error'   => 'File(s) not uploaded. Please try again.',
-        'success' => 'File(s) successfully uploaded.',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
-        '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.',
+        'error'   => 'Качването неуспешно. Моля опитайте отново.',
+        'success' => 'Качването успешно.',
+        'nofiles' => 'Не сте избрали файлове за качване или са твърде големи.',
+        'invalidfiles' => 'Един или повече файлове са твърде големи или с непозволен тип. Разрешените файлови типове за качване са png, gif, jpg, doc, docx, pdf и txt.',
     ),
 
 
     'delete' => array(
-        'confirm'   	=> 'Are you sure you wish to delete this asset?',
-        'error'   		=> 'There was an issue deleting the asset. Please try again.',
-        'success' 		=> 'The asset was deleted successfully.'
+        'confirm'   	=> 'Сигурни ли сте, че желаете изтриване на актива?',
+        'error'   		=> 'Проблем при изтриване на актива. Моля опитайте отново.',
+        'success' 		=> 'Активът е изтрит успешно.'
     ),
 
     'checkout' => array(
-        'error'   		=> 'Asset was not checked out, please try again',
-        'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Активът не беше изписан. Моля опитайте отново.',
+        'success' 		=> 'Активът изписан успешно.',
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
     ),
 
     'checkin' => array(
-        'error'   		=> 'Asset was not checked in, please try again',
-        'success' 		=> 'Asset checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Активът не беше вписан. Моля опитайте отново.',
+        'success' 		=> 'Активът вписан успешно.',
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
     )
 
 );

app/lang/bg/admin/hardware/table.php

@@ -2,22 +2,22 @@
 
 return array(
 
-    'asset_tag'   	=> 'Asset Tag',
-    'asset_model'       => 'Model',
-    'book_value'  	=> 'Value',
-    'change' 		=> 'In/Out',
-    'checkout_date' => 'Checkout Date',
-    'checkoutto' 	=> 'Checked Out',
-    'diff' 			=> 'Diff',
-    'dl_csv' 		=> 'Download CSV',
+    'asset_tag'   	=> 'Инвентарен номер',
+    'asset_model'       => 'Модел',
+    'book_value'  	=> 'Стойност',
+    'change' 		=> 'Предоставяне',
+    'checkout_date' => 'Дата на изписване',
+    'checkoutto' 	=> 'Изписан',
+    'diff' 			=> 'Разлика',
+    'dl_csv' 		=> 'Сваляне на CSV',
     'eol' 			=> 'EOL',
     'id'      		=> 'ID',
-    'location' 		=> 'Location',
-    'purchase_cost'	=> 'Cost',
-    'purchase_date'	=> 'Purchased',
-    'serial'   		=> 'Serial',
-    'status'   		=> 'Status',
-    'title'      	=> 'Asset ',
-    'days_without_acceptance' => 'Days Without Acceptance'
+    'location' 		=> 'Местоположение',
+    'purchase_cost'	=> 'Стойност',
+    'purchase_date'	=> 'Закупен',
+    'serial'   		=> 'Сериен номер',
+    'status'   		=> 'Статус',
+    'title'      	=> 'Актив ',
+    'days_without_acceptance' => 'Дни без да е предаден'
 
 );

app/lang/bg/admin/licenses/form.php

@@ -2,27 +2,27 @@
 
 return array(
 
-    'asset'             => 'Asset',
-    'checkin'           => 'Checkin',
-    'cost'              => 'Purchase Cost',
-    'create'            => 'Create License',
-    'date'              => 'Purchase Date',
-    'depreciation'      => 'Depreciation',
-    'expiration'        => 'Expiration Date',
-    'maintained'        => 'Maintained',
-    'name'              => 'Software Name',
-    'no_depreciation'   => 'Do Not Depreciate',
-    'notes'             => 'Notes',
-    'order'             => 'Order No.',
-    'purchase_order'    => 'Purchase Order Number',
-    'reassignable'      => 'Reassignable',
-    'remaining_seats'   => 'Remaining Seats',
-    'seats'             => 'Seats',
-    'serial'            => 'Serial',
-    'supplier'          => 'Supplier',
-    'termination_date'  => 'Termination Date',
-    'to_email'          => 'Licensed to Email',
-    'to_name'           => 'Licensed to Name',
-    'update'            => 'Update License',
-    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+    'asset'             => 'Актив',
+    'checkin'           => 'Вписване',
+    'cost'              => 'Стойност на закупуване',
+    'create'            => 'Добавяне на лиценз',
+    'date'              => 'Дата на закупуване',
+    'depreciation'      => 'Амортизация',
+    'expiration'        => 'Срок на валидност',
+    'maintained'        => 'В поддръжка',
+    'name'              => 'Софтуерен продукт',
+    'no_depreciation'   => 'Без амортизация',
+    'notes'             => 'Бележки',
+    'order'             => 'Номер на заявка',
+    'purchase_order'    => 'Номер на заявка за закупуване',
+    'reassignable'      => 'Може да бъде сменян ползвателя',
+    'remaining_seats'   => 'Оставащи потребителски лицензи',
+    'seats'             => 'Потребителски лицензи',
+    'serial'            => 'Сериен номер',
+    'supplier'          => 'Доставчик',
+    'termination_date'  => 'Дата на валидност',
+    'to_email'          => 'Лиценз към e-mail',
+    'to_name'           => 'Лиценз към име',
+    'update'            => 'Обновяване на лиценз',
+    'checkout_help'     => 'Можете да изпишете лиценз към конкретен хардуер или потребител. Един лиценз може да бъде изписан едновременно и на хардуер и на потребител, но потребителя трябва да бъде собственик на съответния хардуерен актив.'
 );

app/lang/bg/admin/licenses/general.php

@@ -2,19 +2,19 @@
 
 return array(
 
-    'checkin'  					=> 'Checkin License Seat',
-    'checkout_history'  		=> 'Checkout History',
-    'checkout'  				=> 'Checkout License Seat',
-    'edit'  					=> 'Edit License',
-    'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
-    'clone'  					=> 'Clone License',
-    'history_for'  				=> 'History for ',
-    'in_out'  					=> 'In/Out',
-    'info'  					=> 'License Info',
-    'license_seats'  			=> 'License Seats',
-    'seat'  					=> 'Seat',
-    'seats'  					=> 'Seats',
-    'software_licenses'  		=> 'Software Licenses',
-    'user'  					=> 'User',
-    'view'  					=> 'View License',
+    'checkin'  					=> 'Вписване на потребителски лиценз',
+    'checkout_history'  		=> 'История на изписванията',
+    'checkout'  				=> 'Изписване на потребителски лиценз',
+    'edit'  					=> 'Редакция на лиценз',
+    'filetype_info'				=> 'Позволените типове файлове са png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.',
+    'clone'  					=> 'Копиране на лиценз',
+    'history_for'  				=> 'История за ',
+    'in_out'  					=> 'Предоставяне',
+    'info'  					=> 'Информация за лиценз',
+    'license_seats'  			=> 'Потребителски лицензи',
+    'seat'  					=> 'Потребителски лиценз',
+    'seats'  					=> 'Потребителски лицензи',
+    'software_licenses'  		=> 'Софтуерни лицензи',
+    'user'  					=> 'Потребител',
+    'view'  					=> 'Преглед на лиценз',
 );

app/lang/bg/admin/licenses/message.php

@@ -2,49 +2,49 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist.',
-    'user_does_not_exist' => 'User does not exist.',
-    'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
-    'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
-    'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
+    'does_not_exist' => 'Лицензът не съществува.',
+    'user_does_not_exist' => 'Потребителят не съществува.',
+    'asset_does_not_exist' 	=> 'Активът, който се опитвате да свържете с този лиценз не съществува.',
+    'owner_doesnt_match_asset' => 'Активът, който се опитвате да свържете с този лиценз е притежание на друго лице, различно от това, което е определено в падащия списък.',
+    'assoc_users'	 => 'Този лиценз понастоящем е изписан на потребител и не може да бъде изтрит. Моля, първо впишете лиценза и тогава опитайте отново да го изтриете. ',
 
 
     'create' => array(
-        'error'   => 'License was not created, please try again.',
-        'success' => 'License created successfully.'
+        'error'   => 'Лицензът не беше създаден. Моля, опитайте отново.',
+        'success' => 'Лицензът е създаден.'
     ),
 
     'deletefile' => array(
-        'error'   => 'File not deleted. Please try again.',
-        'success' => 'File successfully deleted.',
+        'error'   => 'Файлът не е изтрит. Моля, опитайте отново.',
+        'success' => 'Файлът е изтрит.',
     ),
 
     'upload' => array(
-        'error'   => 'File(s) not uploaded. Please try again.',
-        'success' => 'File(s) successfully uploaded.',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
-        '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.',
+        'error'   => 'Файлът (файловете) не е качен. Моля, опитайте отново.',
+        'success' => 'Файлът (файловете) е качен.',
+        'nofiles' => 'Не сте избрали файл за качване или файлът, който се опитвате да качите е твърде голям',
+        'invalidfiles' => 'Един или повече файлове са твърде големи или с неразрешен тип. Разрешените типове файлове са png, gif, jpg, doc, docx, pdf, и txt.',
     ),
 
     'update' => array(
-        'error'   => 'License was not updated, please try again',
-        'success' => 'License updated successfully.'
+        'error'   => 'Лицензът не беше обновен. Моля, опитайте отново',
+        'success' => 'Лицензът е обновен.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this license?',
-        'error'   => 'There was an issue deleting the license. Please try again.',
-        'success' => 'The license was deleted successfully.'
+        'confirm'   => 'Сигурни ли сте, че искате да изтриете този лиценз?',
+        'error'   => 'Възникна проблем при изтриването на този лиценз. Моля, опитайте отново.',
+        'success' => 'Лицензът е изтрит.'
     ),
 
     'checkout' => array(
-        'error'   => 'There was an issue checking out the license. Please try again.',
-        'success' => 'The license was checked out successfully'
+        'error'   => 'Възникна проблем при изписването на лиценза. Моля, опитайте отново.',
+        'success' => 'Лицензът е изписан'
     ),
 
     'checkin' => array(
-        'error'   => 'There was an issue checking in the license. Please try again.',
-        'success' => 'The license was checked in successfully'
+        'error'   => 'Възникна проблем при вписването на лиценза. Моля, опитайте отново.',
+        'success' => 'Лицензът е вписан'
     ),
 
 );

app/lang/bg/admin/licenses/table.php

@@ -2,16 +2,16 @@
 
 return array(
 
-    'assigned_to'   	=> 'Assigned To',
-    'checkout'   		=> 'In/Out',
+    'assigned_to'   	=> 'Предоставен на',
+    'checkout'   		=> 'Предоставяне',
     'id'      			=> 'ID',
-    'license_email'   	=> 'License Email',
-    'license_name'   	=> 'Licensed To',
-    'purchase_date'   	=> 'Purchase Date',
-    'purchased'   		=> 'Purchased',
-    'seats'   			=> 'Seats',
-    'hardware'   		=> 'Hardware',
-    'serial'   			=> 'Serial',
-    'title'      		=> 'License',
+    'license_email'   	=> 'Лицензиран на Email',
+    'license_name'   	=> 'Лицензиран на',
+    'purchase_date'   	=> 'Дата на закупуване',
+    'purchased'   		=> 'Закупен',
+    'seats'   			=> 'Потребителски лицензи',
+    'hardware'   		=> 'Хардуер',
+    'serial'   			=> 'Сериен номер',
+    'title'      		=> 'Лиценз',
 
 );

app/lang/bg/admin/locations/message.php

@@ -2,26 +2,26 @@
 
 return array(
 
-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
-    'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
-    'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
+    'does_not_exist' => 'Местоположението не съществува.',
+    'assoc_users'	 => 'Местоположението е свързано с поне един потребител и не може да бъде изтрито. Моля, актуализирайте потребителите, така че да не са свързани с това местоположение и опитайте отново. ',
+    'assoc_assets'	 => 'Местоположението е свързано с поне един актив и не може да бъде изтрито. Моля, актуализирайте активите, така че да не са свързани с това местоположение и опитайте отново. ',
+    'assoc_child_loc'	 => 'В избраното местоположение е присъединено едно или повече местоположения. Моля преместете ги в друго и опитайте отново.',
 
 
     'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Местоположението не е създадено. Моля, опитайте отново.',
+        'success' => 'Местоположението е създадено.'
     ),
 
     'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Местоположението не е обновено. Моля, опитайте отново',
+        'success' => 'Местоположението е обновено.'
     ),
 
     'delete' => array(
-        'confirm'   	=> 'Are you sure you wish to delete this location?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   	=> 'Сигурни ли сте, че искате да изтриете това местоположение?',
+        'error'   => 'Възникна проблем при изтриване на местоположението. Моля, опитайте отново.',
+        'success' => 'Местоположението е изтрито.'
     )
 
 );

app/lang/bg/admin/locations/table.php

@@ -1,17 +1,18 @@
 <?php
 
 return array(
-
+    'assets_rtd'		=> 'Assets RTD',
+    'assets_checkedout'		=> 'Assets Assigned',
     'id'      		=> 'ID',
     'city'   		=> 'Град',
     'state'   		=> 'Област',
     'country'   	=> 'Държава',
-    'create'		=> 'Create Location',
-    'update'		=> 'Update Location',
-    'name'			=> 'Location Name',
+    'create'		=> 'Създаване на местоположение',
+    'update'		=> 'Обновяване на местоположение',
+    'name'			=> 'Местоположение',
     'address'		=> 'Aдрес',
     'zip'			=> 'Пощенски код',
-    'locations'		=> 'Locations',
-    'parent'		=> 'Parent',
-    'currency'  	=> 'Location Currency', // this is deprecated
+    'locations'		=> 'Местоположения',
+    'parent'		=> 'Присъединено към',
+    'currency'  	=> 'Валута на местоположението',
 );

app/lang/bg/admin/manufacturers/message.php

@@ -2,23 +2,23 @@
 
 return array(
 
-    'does_not_exist' => 'Manufacturer does not exist.',
-    'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
+    'does_not_exist' => 'Несъществуващ производител.',
+    'assoc_users'	 => 'Този производител е асоцииран с поне един от моделите и не може да бъде изтрит. Моля, променете връзките на моделите по отношение на този производител и опитайте отново. ',
 
     'create' => array(
-        'error'   => 'Manufacturer was not created, please try again.',
-        'success' => 'Manufacturer created successfully.'
+        'error'   => 'Производителят не беше създаден. Моля, опитайте отново.',
+        'success' => 'Производителят е създаден.'
     ),
 
     'update' => array(
-        'error'   => 'Manufacturer was not updated, please try again',
-        'success' => 'Manufacturer updated successfully.'
+        'error'   => 'Производителят не е обновен. Моля, опитайте отново',
+        'success' => 'Производителят е обновен.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this manufacturer?',
-        'error'   => 'There was an issue deleting the manufacturer. Please try again.',
-        'success' => 'The Manufacturer was deleted successfully.'
+        'confirm'   => 'Сигурни ли сте, че искате да изтриете този производител?',
+        'error'   => 'Възникна проблем при изтриването на проиводителя. Моля, опитайте отново.',
+        'success' => 'Производителят е изтрит.'
     )
 
 );

app/lang/bg/admin/manufacturers/table.php

@@ -2,10 +2,10 @@
 
 return array(
 
-    'asset_manufacturers'	=> 'Asset Manufacturers',
-    'create'				=> 'Create Manufacturer',
+    'asset_manufacturers'	=> 'Производители',
+    'create'				=> 'Създаване на производител',
     'id'   					=> 'ID',
-    'name'      			=> 'Manufacturer Name',
-    'update'				=> 'Update Manufacturer',
+    'name'      			=> 'Име на производител',
+    'update'				=> 'Обновяване на производител',
 
 );

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

@@ -2,10 +2,10 @@
 
 return array(
 
-    'deleted'  					=> 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
-    'restore'                   => 'Restore Model',
-	'show_mac_address'			=> 'Show MAC address field in assets in this model',
-    'view_deleted'              => 'View Deleted',
-    'view_models'               => 'View Models',
+    'deleted'  					=> 'Моделът беше изтрит. <a href="/hardware/models/:model_id/restore">Възстановяване</a>.',
+    'restore'                   => 'Възстановяване на модел',
+	'show_mac_address'			=> 'Визуализиране на поле за MAC адрес в активите за този модел',
+    'view_deleted'              => 'Преглед на изтритите',
+    'view_models'               => 'Преглед на моделите',
 
 );

app/lang/bg/admin/models/message.php

@@ -2,30 +2,30 @@
 
 return array(
 
-    'does_not_exist' => 'Model does not exist.',
-    'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
+    'does_not_exist' => 'Моделът не съществува.',
+    'assoc_users'	 => 'Този модел е асоцииран с един или повече активи и не може да бъде изтрит. Моля изтрийте активите и опитайте отново.',
 
 
     'create' => array(
-        'error'   => 'Model was not created, please try again.',
-        'success' => 'Model created successfully.',
-        'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.',
+        'error'   => 'Моделът не беше създаден. Моля опитайте отново.',
+        'success' => 'Моделът създаден успешно.',
+        'duplicate_set' => 'Актив с това име, производител и номер на модел вече е въведен.',
     ),
 
     'update' => array(
-        'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'error'   => 'Моделът не беше обновен. Моля опитайте отново.',
+        'success' => 'Моделът обновен успешно.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this asset model?',
-        'error'   => 'There was an issue deleting the model. Please try again.',
-        'success' => 'The model was deleted successfully.'
+        'confirm'   => 'Желаете ли изтриване на модела?',
+        'error'   => 'Проблем при изтриване на модела. Моля опитайте отново.',
+        'success' => 'Моделът изтрит успешно.'
     ),
 
     'restore' => array(
-        'error'   		=> 'Model was not restored, please try again',
-        'success' 		=> 'Model restored successfully.'
+        'error'   		=> 'Моделът не беше възстановен. Моля опитайте отново.',
+        'success' 		=> 'Моделът възстановен успешно.'
     ),
 
 );

app/lang/bg/admin/models/table.php

@@ -2,16 +2,16 @@
 
 return array(
 
-    'create'				=> 'Create Asset Model',
-    'created_at' 			=> 'Created at',
+    'create'				=> 'Създаване на модел на актив',
+    'created_at' 			=> 'Създаден в',
     'eol'	 				=> 'EOL',
     'modelnumber'   		=> 'Модел №',
-    'name'      			=> 'Asset Model Name',
+    'name'      			=> 'Модел на актив',
     'numassets' 			=> 'Активи',
     'title'					=> 'Модели на активи',
-    'update'				=> 'Update Asset Model',
-    'view'					=> 'View Asset Model',
-    'update'				=> 'Update Asset Model',
-    'clone'				=> 'Clone Model',
-    'edit'				=> 'Edit Model',
+    'update'				=> 'Обновяване на модел на актив',
+    'view'					=> 'Преглед на модел на актив',
+    'update'				=> 'Обновяване на модел на актив',
+    'clone'				=> 'Копиране на модел',
+    'edit'				=> 'Редакция на модел',
 );

app/lang/bg/admin/reports/general.php

@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'info'   => 'Select the options you want for your asset report.'
+    'info'   => 'Изберете опциите, които желаете за справката за активи.'
 );

app/lang/bg/admin/reports/message.php

@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'error'   => 'You must select at least ONE option.'
+    'error'   => 'Трябва да изберете поне една опция.'
 );

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

@@ -1,49 +1,54 @@
 <?php
 
 return array(
-	'alert_email'				=> 'Send alerts to',
+	'alert_email'				=> 'Изпращане на нотификации към',
 	'alerts_enabled'			=> 'Алармите включени',
-	'asset_ids'					=> 'Asset IDs',
-	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
-	'auto_increment_prefix'		=> 'Prefix (optional)',
-	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
-	'backups'					=> 'Backups',
+	'asset_ids'					=> 'ID на активи',
+	'auto_increment_assets'		=> 'Автоматично генериране на инвентарни номера на активите',
+	'auto_increment_prefix'		=> 'Префикс (незадължително)',
+	'auto_incrementing_help'    => 'Първо включете автоматично генериране на инвентарни номера, за да включите тази опция.',
+	'backups'					=> 'Архивиране',
 	'barcode_type'				=> 'Тип на баркод',
 	'barcode_settings'			=> 'Настройки на баркод',
-	'custom_css'				=> 'Custom CSS',
-	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
+	'custom_css'				=> 'Потребителски CSS',
+	'custom_css_help'			=> 'Включете вашите CSS правила тук. Не използвайте &lt;style&gt;&lt;/style&gt; тагове.',
 	'default_currency'  		=> 'Валута по подразбиране',
 	'default_eula_text'			=> 'EULA по подразбиране',
-	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
+	'default_eula_help_text'	=> 'Можете да асоциирате специфична EULA към всяка избрана категория.',
     'display_asset_name'        => 'Визуализиране на актив',
     'display_checkout_date'     => 'Визуализиране на дата на изписване',
     'display_eol'               => 'Визуализиране на EOL в таблиците',
     'display_qr'                => 'Визуализиране на QR кодове',
     'eula_settings'				=> 'Настройки на EULA',
-    'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'eula_markdown'				=> 'Съдържанието на EULA може да бъде форматирано с <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'general_settings'			=> 'Общи настройки',
-    'header_color'              => 'Header Color',
-    'info'                      => 'These settings let you customize certain aspects of your installation.',
+	'generate_backup'			=> 'Създаване на архив',
+    'header_color'              => 'Цвят на хедъра',
+    'info'                      => 'Тези настройки позволяват да конфигурирате различни аспекти на Вашата инсталация.',
     'laravel'                   => 'Версия на Laravel',
-    'load_remote'				=> 'This Snipe-IT install can load scripts from the outside world.',
+    'load_remote_text'          => 'Remote Scripts',
+    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
     'logo'                    	=> 'Лого',
-    'optional'					=> 'optional',
-    'per_page'                  => 'Results Per Page',
+    'optional'					=> 'незадължително',
+    'per_page'                  => 'Резултати на страница',
     'php'                       => 'PHP версия',
-    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
-    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
-    'qr_help'                   => 'Enable QR Codes first to set this',
+    'php_gd_info'               => 'Необходимо е да инсталирате php-gd, за да визуализирате QR кодове. Моля прегледайте инструкцията за инсталация.',
+    'php_gd_warning'            => 'php-gd НЕ е инсталиран.',
+    'qr_help'                   => 'Първо включете QR кодовете, за да извършите тези настройки.',
     'qr_text'                   => 'Съдържание на QR код',
     'setting'                   => 'Настройка',
     'settings'                  => 'Настройки',
-    'site_name'                 => 'Site Name',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
+    'site_name'                 => 'Име на системата',
+    'slack_botname'             => 'Име на Slack bot',
+    'slack_channel'             => 'Slack канал',
     'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new">create an incoming webhook</a> on your Slack account.',
-    'snipe_version'  			=> 'Snipe-IT version',
-    'system'                    => 'System Information',
+    'slack_integration'         => 'Slack настройки',
+    'slack_integration_help'    => 'Интеграцията със Slack е незадължителна. Ако желаете да я използвате е необходимо да настроите endpoint и канал. За да конфигурирате Slack интеграцията, първо <a href=":slack_link" target="_new">създайте входящ webhook</a> във Вашия Slack акаунт.',
+    'snipe_version'  			=> 'Snipe-IT версия',
+    'system'                    => 'Информация за системата',
     'update'                    => 'Обновяване на настройките',
     'value'                     => 'Стойност',
+    'brand'                     => 'Branding',
+    'about_settings_title'      => 'About Settings',
+    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',    
 );

app/lang/bg/admin/settings/message.php

@@ -4,8 +4,14 @@ return array(
 
 
     'update' => array(
-        'error'   => 'An error has occurred while updating. ',
-        'success' => 'Settings updated successfully.'
+        'error'                 => 'Възникна грешка по време на актуализацията. ',
+        'success'               => 'Настройките са актуализирани успешно.'
+    ),
+    'backup' => array(
+        'delete_confirm'        => 'Желаете ли изтриването на този архивен файл? Действието е окончателно.',
+        'file_deleted'          => 'Архивният файл беше изтрит успешно.',
+        'generated'             => 'Нов архивен файл беше създаден успешно.',
+        'file_not_found'        => 'Архивният файл не беше открит на сървъра.',
     ),
 
 );

app/lang/bg/admin/statuslabels/message.php

@@ -2,24 +2,24 @@
 
 return array(
 
-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Местоположението не съществува.',
+    'assoc_users'	 => 'Местоположението е свързано с поне един потребител и не може да бъде изтрито. Моля, актуализирайте потребителите, така че да не са свързани с това местоположение и опитайте отново. ',
 
 
     'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Местоположението не беше създадено. Моля опитайте отново.',
+        'success' => 'Местоположението създадено успешно.'
     ),
 
     'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Местоположението не беше обновено. Моля опитайте отново.',
+        'success' => 'Местоположението обновено успешно.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this status label?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   => 'Сигурни ли сте, че желаете изтриване на този статус етикет?',
+        'error'   => 'Проблем при изтриване на местоположението. Моля опитайте отново.',
+        'success' => 'Местоположението изтрито успешно.'
     )
 
 );

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

@@ -1,15 +1,15 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
-    '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',
+    'about'      	=> 'Относно статус етикетите',
+    'archived'      	=> 'Архивирани',
+    'create'      	=> 'Създаване на статус етикет',
+    'deployable'      	=> 'Може да бъде предоставен',
+    'info'      	=> 'Статусите се използват за описване на различните състояния на Вашите активи. Например, това са Предаден за ремонт, Изгубен/откраднат и др. Можете да създавате нови статуси за активите, които могат да бъдат предоставяни, очакващи набавяне и архивирани.',
+    'name'      	=> 'Статус',
+    'pending'      	=> 'Изчакване',
+    'status_type'   => 'Тип на статуса',
+    'title'      	=> 'Заглавия на статуси',
+    'undeployable'  => 'Не може да бъде предоставян',
+    'update'      	=> 'Обновяване на статус',
 );

app/lang/bg/admin/suppliers/message.php

@@ -2,23 +2,23 @@
 
 return array(
 
-    'does_not_exist' => 'Supplier does not exist.',
-    'assoc_users'	 => 'This supplier is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this supplier and try again. ',
+    'does_not_exist' => 'Несъществуващ доставчик.',
+    'assoc_users'	 => 'Този доставчик е асоцииран с поне един от моделите и не може да бъде изтрит. Моля, променете връзките на моделите по отношение на този доставчик и опитайте отново. ',
 
     'create' => array(
-        'error'   => 'Supplier was not created, please try again.',
-        'success' => 'Supplier created successfully.'
+        'error'   => 'Доставчикът не беше създаден. Моля, опитайте отново.',
+        'success' => 'Доставчикът е създаден.'
     ),
 
     'update' => array(
-        'error'   => 'Supplier was not updated, please try again',
-        'success' => 'Supplier updated successfully.'
+        'error'   => 'Достъвчикът не беше обновен. Моля, опитайте отново',
+        'success' => 'Доставчикът е обновен.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this supplier?',
-        'error'   => 'There was an issue deleting the supplier. Please try again.',
-        'success' => 'Supplier was deleted successfully.'
+        'confirm'   => 'Сигурни ли сте, че искате да изтриете този доставчик?',
+        'error'   => 'Възникна проблем при изтриване на доставчика. Моля, опитайте отново.',
+        'success' => 'Доставчикът е изтрит.'
     )
 
 );

app/lang/bg/admin/suppliers/table.php

@@ -1,25 +1,25 @@
 <?php
 
 return array(
-    'address'               => 'Supplier Address',
-    'assets'                => 'Assets',
-    'city'                  => 'City',
-    'contact'               => 'Contact Name',
-    'country'               => 'Country',
-    'create'                => 'Create Supplier',
+    'address'               => 'Адрес на доставчика',
+    'assets'                => 'Активи',
+    'city'                  => 'Град',
+    'contact'               => 'Лице за връзка',
+    'country'               => 'Държава',
+    'create'                => 'Създаване на доставчик',
     'email'                 => 'Email',
-    'fax'                   => 'Fax',
+    'fax'                   => 'Факс',
     'id'                    => 'ID',
-    'licenses'              => 'Licenses',
-    'name'                  => 'Supplier Name',
-    'notes'                 => 'Notes',
-    'phone'                 => 'Phone',
-    'state'                 => 'State',
-    'suppliers'             => 'Suppliers',
-    'update'                => 'Update Supplier',
-    'url'                   => 'URL',
-    'view'                  => 'View Supplier',
-    'view_assets_for'       => 'View Assets for',
-    'zip'                   => 'Postal Code',
+    'licenses'              => 'Лицензи',
+    'name'                  => 'Доставчик',
+    'notes'                 => 'Бележки',
+    'phone'                 => 'Телефон',
+    'state'                 => 'Област',
+    'suppliers'             => 'Доставчици',
+    'update'                => 'Обновяване на доставчик',
+    'url'                   => 'URL адрес',
+    'view'                  => 'Преглед на доставчик',
+    'view_assets_for'       => 'Преглед на активите за',
+    'zip'                   => 'Пощенски код',
 
 );

app/lang/bg/admin/users/general.php

@@ -10,7 +10,7 @@ return array(
     'filetype_info'     => 'Позволените типове файлове са png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.',
     'history_user'      => 'История за :name',
     'last_login'        => 'Последен достъп до системата',
-    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
+    'ldap_config_text'  => 'Конфигурационните настройки за LDAP са в директорията app/config във файла ldap.php. Избраното местоположение ще бъде асоциирано с всички заредени от LDAP потребители. Необходимо е да имате създадено поне едно местоположение, за да използвате тази функционалност.',
     'ldap_text'         => 'Връзка с LDAP и създаване на потребители. Паролите ще бъдат генерирани автоматично.',
     'software_user'     => 'Софтуерни продукти, изписани на :name',
     'view_user'         => 'Преглед на потребител :name',

app/lang/bg/admin/users/message.php

@@ -2,53 +2,53 @@
 
 return array(
 
-    'accepted'                  => 'You have successfully accepted this asset.',
-    'declined'                  => 'You have successfully declined this asset.',
-    'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User [:id] does not exist.',
-    'user_login_required'       => 'The login field is required',
-    'user_password_required'    => 'The password is required.',
-    'insufficient_permissions'  => 'Insufficient Permissions.',
-    'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
-    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
+    'accepted'                  => 'Активът беше приет.',
+    'declined'                  => 'Активът беше отказан.',
+    'user_exists'               => 'Потребителят вече съществува!',
+    'user_not_found'            => 'Потребител [:id] не съществува.',
+    'user_login_required'       => 'Полето за вход е задължително',
+    'user_password_required'    => 'Паролата е задължителна.',
+    'insufficient_permissions'  => 'Нямате необходимите права.',
+    'user_deleted_warning'      => 'Този потребител е изтрит. За да редактирате данните за него или да му зададете актив, трябва първо да възстановите потребителя.',
+    'ldap_not_configured'        => 'Интеграцията с LDAP не е конфигурирана за тази инсталация.',
 
 
     'success' => array(
-        'create'    => 'User was successfully created.',
-        'update'    => 'User was successfully updated.',
-        'delete'    => 'User was successfully deleted.',
-        'ban'       => 'User was successfully banned.',
-        'unban'     => 'User was successfully unbanned.',
-        'suspend'   => 'User was successfully suspended.',
-        'unsuspend' => 'User was successfully unsuspended.',
-        'restored'  => 'User was successfully restored.',
-        'import'    => 'Users imported successfully.',
+        'create'    => 'Потребителят е създаден.',
+        'update'    => 'Потребителят е обновен.',
+        'delete'    => 'Потребителят е изтрит.',
+        'ban'       => 'Потребителят беше забранен успешно.',
+        'unban'     => 'Потребителят възстановен успешно.',
+        'suspend'   => 'Потребителят бе временно спрян.',
+        'unsuspend' => 'Потребителят активиран успешно.',
+        'restored'  => 'Потребителят е възстановен.',
+        'import'    => 'Потребителите заредени успешно.',
     ),
 
     'error' => array(
-        'create' => 'There was an issue creating the user. Please try again.',
-        'update' => 'There was an issue updating the user. Please try again.',
-        'delete' => 'There was an issue deleting the user. Please try again.',
-        'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
-        'import'    => 'There was an issue importing users. Please try again.',
-        'asset_already_accepted' => 'This asset has already been accepted.',
-        'accept_or_decline' => 'You must either accept or decline this asset.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'create' => 'Възникна проблем при създаването на този потребител. Моля, опитайте отново.',
+        'update' => 'Възникна проблем при обновяването на този потребител. Моля, опитайте отново.',
+        'delete' => 'Възникна проблем при изтриването на този потребител. Моля, опитайте отново.',
+        'unsuspend' => 'Проблем при активирането на потребителя. Моля опитайте отново.',
+        'import'    => 'Проблем при зареждането на потребителите. Моля опитайте отново.',
+        'asset_already_accepted' => 'Този актив е вече приет.',
+        'accept_or_decline' => 'Трябва да приемете или да откажете този актив.',
+        'ldap_could_not_connect' => 'Проблем при комуникацията с LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
+        'ldap_could_not_bind' => 'Проблем при връзката с LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
+        'ldap_could_not_search' => 'Проблем при търсенето в LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
+        'ldap_could_not_get_entries' => 'Проблем при извличането на резултат от LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра:',
     ),
 
     'deletefile' => array(
-        'error'   => 'File not deleted. Please try again.',
-        'success' => 'File successfully deleted.',
+        'error'   => 'Файлът не е изтрит. Моля, опитайте отново.',
+        'success' => 'Файлът е изтрит.',
     ),
 
     '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.',
+        'error'   => 'Проблем при качването на файл/овете. Моля опитайте отново.',
+        'success' => 'Файл/овете качени успешно.',
+        'nofiles' => 'Не сте избрали файлове за качване',
+        'invalidfiles' => 'Един или повече файлове са твърде големи или с неразрешен тип. Разрешените типове файлове са png, gif, jpg, doc, docx, pdf, и txt.',
     ),
 
 );

app/lang/bg/admin/users/table.php

@@ -2,35 +2,35 @@
 
 return array(
 
-    'activated'  			=> 'Active',
-    'allow'  				=> 'Allow',
-    'checkedout'  			=> 'Assets',
-    'created_at' 			=> 'Created',
-    'createuser' 			=> 'Create User',
-    'deny'  				=> 'Deny',
+    'activated'  			=> 'Активен',
+    'allow'  				=> 'Разрешаване',
+    'checkedout'  			=> 'Активи',
+    'created_at' 			=> 'Създаден',
+    'createuser' 			=> 'Нов потребител',
+    'deny'  				=> 'Отказ',
     'email'      			=> 'Email',
-    'employee_num'      	=> 'Employee No.',
-    'first_name' 			=> 'First Name',
-    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned.',
-    'id'         			=> 'Id',
-    'inherit'  				=> 'Inherit',
-    'job' 					=> 'Job Title',
-    'last_login'  			=> 'Last Login',
-    'last_name'  			=> 'Last Name',
-    'location'  			=> 'Location',
-    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
-    'manager' 				=> 'Manager',
-    'name' 					=> 'Name',
-    'notes'                 => 'Notes',
-    'password_confirm' 		=> 'Confirm Password',
-    'password' 				=> 'Password',
-    'phone'  				=> 'Phone',
-    'show_current'          => 'Show Current Users',
-    'show_deleted'          => 'Show Deleted Users',
-    'title' 				=> 'Title',
-    'updateuser' 			=> 'Update User',
-    'username' 				=> 'Username',
-    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
-    'cloneuser'             => 'Clone User',
-    'viewusers' 			=> 'View Users',
+    'employee_num'      	=> 'Номер на служител',
+    'first_name' 			=> 'Собствено име',
+    'groupnotes'			=> 'Изберете група на потребителя. Той ще наследи правата, присвоени на групата.',
+    'id'         			=> 'ID',
+    'inherit'  				=> 'Наследяване',
+    'job' 					=> 'Длъжност',
+    'last_login'  			=> 'Последен вход',
+    'last_name'  			=> 'Фамилия',
+    'location'  			=> 'Местоположение',
+    'lock_passwords'		=> 'Настройките за вход не могат да бъдат променяни в текущата инсталация.',
+    'manager' 				=> 'Ръководител',
+    'name' 					=> 'Име',
+    'notes'                 => 'Бележки',
+    'password_confirm' 		=> 'Потвърждение на паролата',
+    'password' 				=> 'Парола',
+    'phone'  				=> 'Телефон',
+    'show_current'          => 'Преглед на текущите потребители',
+    'show_deleted'          => 'Преглед на изтритите потребители',
+    'title' 				=> 'Титла',
+    'updateuser' 			=> 'Обновяване на потребител',
+    'username' 				=> 'Потребителско име',
+    'username_note' 		=> '(Използва се за достъп до Active Directory, а не за вход.)',
+    'cloneuser'             => 'Копиране на потребител',
+    'viewusers' 			=> 'Преглед на потребителите',
 );

app/lang/bg/auth/message.php

@@ -2,35 +2,35 @@
 
 return array(
 
-    'account_already_exists' => 'An account with the this email already exists.',
-    'account_not_found'      => 'The username or password is incorrect.',
-    'account_not_activated'  => 'This user account is not activated.',
-    'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
+    'account_already_exists' => 'Потребител с този email вече е регистриран.',
+    'account_not_found'      => 'Невалиден потребител или парола.',
+    'account_not_activated'  => 'Потребителят все още не е активиран.',
+    'account_suspended'      => 'Потребителят е временно спрян.',
+    'account_banned'         => 'Потребителят е неактивен.',
 
     'signin' => array(
-        'error'   => 'There was a problem while trying to log you in, please try again.',
-        'success' => 'You have successfully logged in.',
+        'error'   => 'Проблем при входа в системата. Моля опитайте отново.',
+        'success' => 'Успешен вход в системата.',
     ),
 
     'signup' => array(
-        'error'   => 'There was a problem while trying to create your account, please try again.',
-        'success' => 'Account sucessfully created.',
+        'error'   => 'Проблем при създаването на потребителя. Моля опитайте отново.',
+        'success' => 'Потребителят създаден успешно.',
     ),
 
         'forgot-password' => array(
-            'error'   => 'There was a problem while trying to get a reset password code, please try again.',
-            'success' => 'Password recovery email successfully sent.',
+            'error'   => 'Проблем при извличането на код за възстановяване на паролата. Моля опитайте отново.',
+            'success' => 'Връзка за възстановяване на паролата беше изпратена на електронната поща.',
         ),
 
         'forgot-password-confirm' => array(
-            'error'   => 'There was a problem while trying to reset your password, please try again.',
-            'success' => 'Your password has been successfully reset.',
+            'error'   => 'Проблем при промяна на паролата. Моля опитайте отново.',
+            'success' => 'Паролата променена успешно.',
         ),
 
     'activate' => array(
-        'error'   => 'There was a problem while trying to activate your account, please try again.',
-        'success' => 'Your account has been successfully activated.',
+        'error'   => 'Проблем при активиране на потребителя. Моля опитайте отново.',
+        'success' => 'Потребителят активиран успешно.',
     ),
 
 );

app/lang/bg/general.php

@@ -1,142 +1,143 @@
 <?php
 
     return [
-    'accessories'			=> 'Accessories',
-    'accessory'				=> 'Accessory',
-    'accessory_report'			=> 'Accessory Report',
-    'action'                => 'Action',
-    'activity_report'		=> 'Activity Report',
-    'address'				=> 'Address',
-    'admin'					=> 'Admin',
-    'all_assets'			=> 'All Assets',
-    'all'       			=> 'All',
-    'archived'              => 'Archived',
-    'asset_models'			=> 'Asset Models',
-    'asset'					=> 'Asset',
-    'asset_report'          => 'Asset Report',
-    'asset_tag'				=> 'Asset Tag',
-    'assets_available'		=> 'assets available',
-    'assets'				=> 'Assets',
-    'avatar_delete'         => 'Delete Avatar',
-    'avatar_upload'         => 'Upload Avatar',
-    'back'      			=> 'Back',
-    'bad_data'      		=> 'Nothing found. Maybe bad data?',
-    'cancel'  				=> 'Cancel',
-    'categories'			=> 'Categories',
-    'category'				=> 'Category',
-    'changeemail'  			=> 'Change Email Address',
-    'changepassword'  		=> 'Change Password',
-    'checkin'  				=> 'Checkin',
-    'checkin_from'  		=> 'Checkin from',
-    'checkout'  			=> 'Checkout',
-    'city'  				=> 'City',
-    'consumable'			=> 'Consumable',
-    'consumables'			=> 'Consumables',
-    'country'  				=> 'Country',
-    'create'				=> 'Create New',
-    'created_asset'			=> 'created asset',
-    'created_at' 			=> 'Created at',
+    'accessories'			=> 'Аксесоари',
+    'accessory'				=> 'Аксесоар',
+    'accessory_report'			=> 'Справка за аксесоарите',
+    'action'                => 'Действие',
+    'activity_report'		=> 'Справка за дейностите',
+    'address'				=> 'Aдрес',
+    'admin'					=> 'Администриране',
+    'all_assets'			=> 'Всички активи',
+    'all'       			=> 'Всички',
+    'archived'              => 'Архивирани',
+    'asset_models'			=> 'Модели на активи',
+    'asset'					=> 'Актив',
+    'asset_report'          => 'Справка за активите',
+    'asset_tag'				=> 'Инвентарен номер',
+    'assets_available'		=> 'налични активи',
+    'assets'				=> 'Активи',
+    'avatar_delete'         => 'Изтриване на аватар',
+    'avatar_upload'         => 'Качване на аватар',
+    'back'      			=> 'Назад',
+    'bad_data'      		=> 'Няма резултати.',
+    'cancel'  				=> 'Отказ',
+    'categories'			=> 'Категории',
+    'category'				=> 'Категория',
+    'changeemail'  			=> 'Промяна на email адрес',
+    'changepassword'  		=> 'Смяна на паролата',
+    'checkin'  				=> 'Вписване',
+    'checkin_from'  		=> 'Форма за вписване',
+    'checkout'  			=> 'Изписване',
+    'city'  				=> 'Град',
+    'consumable'			=> 'Консуматив',
+    'consumables'			=> 'Консумативи',
+    'country'  				=> 'Държава',
+    'create'				=> 'Създаване на нов',
+    'created_asset'			=> 'създадени активи',
+    'created_at' 			=> 'Създаден на',
     'currency'  			=> '$', // this is deprecated
-    'current'  				=> 'Current',
-    'custom_report'         => 'Custom Asset Report',
-    'dashboard'				=> 'Dashboard',
-    'date'					=> 'Date',
-    'delete'  				=> 'Delete',
-    'deleted'  				=> 'Deleted',
-    'deployed'				=> 'Deployed',
-    'depreciation_report'	=> 'Depreciation Report',
-    'download'				=> 'Download',
-    'depreciation'			=> 'Depreciation',
-    'editprofile'  			=> 'Edit Your Profile',
+    'current'  				=> 'Текущи',
+    'custom_report'         => 'Потребителски справки за активи',
+    'dashboard'				=> 'Табло',
+    'date'					=> 'Дата',
+    'delete'  				=> 'Изтриване',
+    'deleted'  				=> 'Изтрито',
+    'delete_seats'  		=> 'Deleted Seats',
+    'deployed'				=> 'Изписани',
+    'depreciation_report'	=> 'Справка за амортизации',
+    'download'				=> 'Изтегляне',
+    'depreciation'			=> 'Амортизация',
+    'editprofile'  			=> 'Редакция на профила',
     'eol'					=> 'EOL',
-    'first'					=> 'First',
-    'first_name'			=> 'First Name',
-    'file_name'				=> 'File',
-    'file_uploads'			=> 'File Uploads',
-    'generate'				=> 'Generate',
-    'groups'				=> 'Groups',
-    'gravatar_email'        => 'Gravatar Email Address',
-    'history_for'  			=> 'History for',
+    'first'					=> 'Първа',
+    'first_name'			=> 'Собствено име',
+    'file_name'				=> 'Файл',
+    'file_uploads'			=> 'Качени файлове',
+    'generate'				=> 'Генериране',
+    'groups'				=> 'Групи',
+    'gravatar_email'        => 'Gravatar email адрес',
+    'history_for'  			=> 'История за',
     'id'  					=> 'ID',
-    'image_delete'         	=> 'Delete Image',
-    'image_upload'         	=> 'Upload Image',
-    'import'         	    => 'Import',
-    'asset_maintenance'        => 'Asset Maintenance',
-    'asset_maintenance_report' => 'Asset Maintenance Report',
-    'asset_maintenances'       => 'Asset Maintenances',
-    'item'  				=> 'Item',
-    'last'					=> 'Last',
-    'last_name'				=> 'Last Name',
-    'license'				=> 'License',
-    'license_report'        => 'License Report',
-    'licenses_available'	=> 'licenses available',
-    'licenses'				=> 'Licenses',
-    'list_all'				=> 'List All',
-    'loading'				=> 'Loading',
-    'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
-    'location'              => 'Location',
-    'locations'				=> 'Locations',
-    'logout'				=> 'Logout',
-    'manufacturer'			=> 'Manufacturer',
-    'manufacturers'			=> 'Manufacturers',
-    'model_no'				=> 'Model No.',
-    'months'				=> 'months',
-    'moreinfo'				=> 'More Info',
-    'name'					=> 'Name',
-    'next'					=> 'Next',
-    'no_depreciation'		=> 'No Depreciation',
-    'no_results'			=> 'No Results.',
-    'no'  					=> 'No',
-    'notes'  				=> 'Notes',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
-    'pending'				=> 'Pending',
-    'people'				=> 'People',
-    'per_page'				=> 'Results Per Page',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
-    'profile'				=> 'Your profile',
-    'qty'		            => 'QTY',
-    'quanitity'		        => 'Quanitity',
-    'ready_to_deploy'		=> 'Ready to Deploy',
-    'recent_activity'		=> 'Recent Activity',
-    'reports'				=> 'Reports',
-    'requested'				=> 'Requested',
-    'save'  				=> 'Save',
-    'select'				=> 'Select',
-    'search'				=> 'Search',
-    'select_depreciation'	=> 'Select a Depreciation Type',
-    'select_location'		=> 'Select a Location',
-    'select_manufacturer'	=> 'Select a Manufacturer',
-    'select_model'			=> 'Select a Model',
-    'select_supplier'		=> 'Select a Supplier',
-    'select_user'			=> 'Select a User',
-    'select_date'			=> 'Select Date',
-    'select_statuslabel'	=> 'Select Status',
-    'settings'				=> 'Settings',
-    'sign_in'				=> 'Sign in',
-    'site_name'				=> 'Site Name',
-    'state'  				=> 'State',
-    'status_labels'			=> 'Status Labels',
-    'status'    			=> 'Status',
-    'suppliers'  			=> 'Suppliers',
-    'total_assets'			=> 'total assets',
-    'total_licenses'		=> 'total licenses',
-    'type'  				=> 'Type',
-    'undeployable'			=> 'Un-deployable',
-    'unknown_admin'			=> 'Unknown Admin',
-    'update'                => 'Update',
-    'uploaded'              => 'Uploaded',
-    'user'					=> 'User',
-    'accepted'			    => 'accepted',
-    'declined'			    => 'declined',
-    'unaccepted_asset_report' => 'Unaccepted Assets',
-    'users'                 => 'Users',
-    'viewassets'  			=> 'View Assigned Assets',
-    'website'               => 'Website',
-    'welcome'				=> 'Welcome, :name',
-    'years'					=> 'years',
-    'yes' 					=> 'Yes',
-    'zip'  					=> 'Zip',
+    'image_delete'         	=> 'Изтриване на изображението',
+    'image_upload'         	=> 'Качване на изображение',
+    'import'         	    => 'Зареждане',
+    'asset_maintenance'        => 'Поддръжка на активи',
+    'asset_maintenance_report' => 'Справка за поддръжка на активи',
+    'asset_maintenances'       => 'Поддръжки на активи',
+    'item'  				=> 'Информация',
+    'last'					=> 'Последна',
+    'last_name'				=> 'Фамилия',
+    'license'				=> 'Лиценз',
+    'license_report'        => 'Справка за лицензите',
+    'licenses_available'	=> 'налични лицензи',
+    'licenses'				=> 'Лицензи',
+    'list_all'				=> 'Преглед на всички',
+    'loading'				=> 'Зареждане',
+    'lock_passwords'        => 'Полето не може да бъде редактирано в тази конфигурация.',
+    'feature_disabled'      => 'Функционалността е неактивна в тази конфигурация.',
+    'location'              => 'Местоположение',
+    'locations'				=> 'Местоположения',
+    'logout'				=> 'Изход',
+    'manufacturer'			=> 'Производител',
+    'manufacturers'			=> 'Производители',
+    'model_no'				=> 'Модел №.',
+    'months'				=> 'месеци',
+    'moreinfo'				=> 'Повече информация',
+    'name'					=> 'Име',
+    'next'					=> 'Следващ',
+    'no_depreciation'		=> 'Без амортизация',
+    'no_results'			=> 'Няма резултат.',
+    'no'  					=> 'Не',
+    'notes'  				=> 'Бележки',
+    'page_menu'				=> 'Показване на _MENU_ записа',
+    'pagination_info'		=> 'Показване на _START_ до _END_ от _TOTAL_ елемента',
+    'pending'				=> 'Изчакване',
+    'people'				=> 'Потребители',
+    'per_page'				=> 'Резултати на страница',
+    'previous'				=> 'Предишен',
+    'processing'			=> 'Обработка',
+    'profile'				=> 'Вашият профил',
+    'qty'		            => 'Количество',
+    'quanitity'		        => 'Количество',
+    'ready_to_deploy'		=> 'Готово за предоставяне',
+    'recent_activity'		=> 'Последни действия',
+    'reports'				=> 'Справки',
+    'requested'				=> 'Изискан',
+    'save'  				=> 'Запис',
+    'select'				=> 'Избор',
+    'search'				=> 'Търсене',
+    'select_depreciation'	=> 'Избор на вид амортизация',
+    'select_location'		=> 'Избор на местоположение',
+    'select_manufacturer'	=> 'Избор на производител',
+    'select_model'			=> 'Избор на модел',
+    'select_supplier'		=> 'Избор на доставчик',
+    'select_user'			=> 'Избор на потребител',
+    'select_date'			=> 'Избор на дата',
+    'select_statuslabel'	=> 'Избор на статус',
+    'settings'				=> 'Настройки',
+    'sign_in'				=> 'Вход',
+    'site_name'				=> 'Име на системата',
+    'state'  				=> 'Област',
+    'status_labels'			=> 'Статус етикети',
+    'status'    			=> 'Статус',
+    'suppliers'  			=> 'Доставчици',
+    'total_assets'			=> 'общо активи',
+    'total_licenses'		=> 'общо лицензи',
+    'type'  				=> 'Тип',
+    'undeployable'			=> 'Не може да бъде предоставян',
+    'unknown_admin'			=> 'Непознат администратор',
+    'update'                => 'Обновяване',
+    'uploaded'              => 'Качен',
+    'user'					=> 'Потребител',
+    'accepted'			    => 'приет',
+    'declined'			    => 'отказан',
+    'unaccepted_asset_report' => 'Неприети активи',
+    'users'                 => 'Потребители',
+    'viewassets'  			=> 'Преглед на изписаните активи',
+    'website'               => 'Страница',
+    'welcome'				=> 'Добре дошли, :name',
+    'years'					=> 'години',
+    'yes' 					=> 'Да',
+    'zip'  					=> 'Пощенски код',
     ];

app/lang/bg/pagination.php

@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'previous' => '« Previous',
+    'previous' => '« Предишна',
 
-    'next'     => 'Next »',
+    'next'     => 'Следваща »',
 
 );

app/lang/bg/reminders.php

@@ -13,12 +13,12 @@ return array(
     |
     */
 
-    "password" => "Passwords must be six characters and match the confirmation.",
+    "password" => "Паролата трябва да бъде поне 6 символа и да съвпада с потвърждението.",
 
-    "user"     => "Username or email address is incorrect",
+    "user"     => "Грешно потребителско име или имейл адрес",
 
-    "token"    => "This password reset token is invalid.",
+    "token"    => "Връзката за възстановяване на паролата е невалидна.",
 
-    "sent" => "If a matching email address was found, a password reminder has been sent!",
+    "sent" => "Ако е зададен email, на потребителя ще бъде изпратена връзка за възстановяване на паролата.",
 
 );

app/lang/bg/table.php

@@ -5,6 +5,6 @@ return array(
     'actions'	 	=> 'Действия',
     'action' 		=> 'Действие',
     'by'      		=> 'От',
-    'item' 			=> 'Item',
+    'item' 			=> 'Информация',
 
 );