Merge remote-tracking branch 'origin/develop'

This still works sorta wonky, and only exports 50 per page. Possibly related to https://github.com/wenzhixin/bootstrap-table/issues/1576

.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/*

CONTRIBUTING.md

@@ -1,31 +1,7 @@
 # Contribution Guidelines
 
-**Before opening an issue to report a bug or request help, make sure you've checked the [Common Issues](http://snipeitapp.com/documentation/common-issues/) and [Getting Help](http://snipeitapp.com/documentation/getting-help/) pages.**
+**Before opening an issue to report a bug or request help, make sure you've checked the [Common Issues](http://docs.snipeitapp.com/common-issues.html) and [Getting Help](http://docs.snipeitapp.com/getting-help.html) pages.**
 
 ## Developing on Snipe-IT
 
-Please submit all pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository in the `develop` branch!
-
-**As you're working on bug-fixes or features, please break them out into their own feature branches and open the pull request against your feature branch**. It makes it _much_ easier to decipher down the road, as you open multiple pull requests over time, and makes it much easier for me to approve pull requests quickly.
-
-If you don't have a feature in mind, but would like to contribute back to the project, check out the [open issues](https://github.com/snipe/snipe-it/issues?state=open) and see if there are any you can tackle.
-
-We use Waffle.io to help better communicate our roadmap with users. Our [project page there](http://waffle.io/snipe/snipe-it) will show you the backlog, what's ready to be worked on, what's in progress, and what's completed.
-
-[![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)
-
-The labels we use in GitHub Issues and Waffle.io indicate whether we've confirmed an issue as a bug, whether we're considering the issue as a potential feature, and whether it's ready for someone to work on it. We also provide labels such as "n00b", "intermediate" and "advanced" for the experience level we think it requires for contributors who want to help.
-
------
-
-## Translations!
-
-If you're not a coder but want to give back to the project and you're fluent in other languages, that's okay too. We use [CrowdIn](https://crowdin.com) to manage translations, and it makes it super-simple for you to add translations (or validate proposed translations) to the project without messing with code. __Check out [the Snipe-IT CrowdIn translation project here](https://crowdin.com/project/snipe-it/)__.
-
-Thanks!
-
------
-
-## Contributor Code of Conduct
-
-Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
+Please see the [Contributing guidelines in the documentation](http://docs.snipeitapp.com/contributing.html). 

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

@@ -256,9 +256,11 @@ class AssetImportCommand extends Command {
 				$this->comment('Location '.$user_asset_location.' already exists');
 			} else {
 
+        $location = new Location();
+
 				if ($user_asset_location!='') {
 
-					$location = new Location();
+
 					$location->name = e($user_asset_location);
 					$location->address = '';
 					$location->city = '';
@@ -283,12 +285,20 @@ class AssetImportCommand extends Command {
 
 			}
 
+      if (e($user_asset_category)=='') {
+        $category_name = 'Unnamed Category';
+      } else {
+        $category_name = e($user_asset_category);
+      }
+
 			// Check for the category match and create it if it doesn't exist
-			if ($category = Category::where('name', $user_asset_category)->where('category_type', 'asset')->first()) {
-				$this->comment('Category '.$user_asset_category.' already exists');
+			if ($category = Category::where('name', $category_name)->where('category_type', 'asset')->first()) {
+				$this->comment('Category '.$category_name.' already exists');
+
 			} else {
 				$category = new Category();
-				$category->name = e($user_asset_category);
+
+        $category->name = $category_name;
 				$category->category_type = 'asset';
 				$category->user_id = 1;
 
@@ -336,38 +346,43 @@ class AssetImportCommand extends Command {
 			}
 
 			// Check for the asset match and create it if it doesn't exist
+        if ($asset = Asset::where('asset_tag', $user_asset_tag)->first()) {
+          $this->comment('The Asset with asset tag '.$user_asset_tag.' already exists');
+        } else {
+          $asset = new Asset();
+          $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;
+  				$asset->assigned_to = $user->id;
+  				$asset->rtd_location_id = $location->id;
+  				$asset->user_id = 1;
+  				$asset->status_id = $status_id;
+  				if ($user_asset_purchase_date!='') {
+  					$asset->purchase_date = $user_asset_purchase_date;
+  				} else {
+  					$asset->purchase_date = NULL;
+  				}
+  				$asset->notes = e($user_asset_notes);
 
-				$asset = new Asset();
-				$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;
-				$asset->assigned_to = $user->id;
-				$asset->rtd_location_id = $location->id;
-				$asset->user_id = 1;
-				$asset->status_id = $status_id;
-				if ($user_asset_purchase_date!='') {
-					$asset->purchase_date = $user_asset_purchase_date;
-				} else {
-					$asset->purchase_date = NULL;
-				}
-				$asset->notes = e($user_asset_notes);
+  				if ($asset->save()) {
+  					$this->comment('Asset '.$user_asset_name.' with serial number '.$user_asset_serial.' was created');
+  	            } else {
+  					$this->comment('Something went wrong! Asset '.$user_asset_name.' was NOT created');
+  				}
+
+        }
 
-				if ($asset->save()) {
-					$this->comment('Asset '.$user_asset_name.' with serial number '.$user_asset_serial.' was created');
-	            } else {
-					$this->comment('Something went wrong! Asset '.$user_asset_name.' was NOT created');
-				}
 
 
 			$this->comment('=====================================');

app/config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-175',
-  'hash_version' => 'v2.0-175-gd0aab3e',
+  'app_version' => 'v2.0.5-pre',
+  'hash_version' => 'v2.0.5-pre-191-g948be5c',
 );

app/controllers/AdminController.php

@@ -14,6 +14,8 @@ class AdminController extends AuthorizedController
         // Apply the admin auth filter
         //$this->beforeFilter('admin-auth', array('except' => $this->whitelist));
 
+        // CSRF Protection
+        $this->beforeFilter('csrf', array('on' => 'post'));
     }
 
 

app/controllers/AuthController.php

@@ -22,34 +22,39 @@ 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');
-        $ldappass    = Config::get('ldap.password');
-        $baseDn      = Config::get('ldap.basedn');
-        $filterQuery = Config::get('ldap.authentication.filter.query') . $username;
-        $ldapversion = Config::get('ldap.version');
+        $ldaphost    = Setting::getSettings()->ldap_server;
+        $ldaprdn     = Setting::getSettings()->ldap_uname;
+        $ldappass    = Crypt::decrypt(Setting::getSettings()->ldap_pword);
+        $baseDn      = Setting::getSettings()->ldap_basedn;
+        $filterQuery = Setting::getSettings()->ldap_auth_filter_query . $username;
+        $ldapversion = Setting::getSettings()->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 = Setting::getSettings()->ldap_username_field;
+        $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num;
+        $ldap_result_last_name = Setting::getSettings()->ldap_lname_field;
+        $ldap_result_first_name = Setting::getSettings()->ldap_fname_field;
+        $ldap_result_email = Setting::getSettings()->ldap_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

@@ -9,6 +9,7 @@ use Location;
 use View;
 use Asset;
 use Actionlog;
+use Company;
 use Lang;
 use Accessory;
 use DB;
@@ -44,6 +45,7 @@ class ViewAssetsController extends AuthorizedController
 	public function getRequestableIndex() {
 
 		$assets = Asset::with('model','defaultLoc')->Hardware()->RequestableAssets()->get();
+
         return View::make('frontend/account/requestable-assets', compact('user','assets'));
     }
 
@@ -56,7 +58,11 @@ class ViewAssetsController extends AuthorizedController
         if (is_null($asset = Asset::RequestableAssets()->find($assetId))) {
             // Redirect to the asset management page
             return Redirect::route('requestable-assets')->with('error', Lang::get('admin/hardware/message.does_not_exist_or_not_requestable'));
-        } else {
+        }
+        else if (!Company::isCurrentUserHasAccess($asset)) {
+            return Redirect::route('requestable-assets')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+        else {
 
             $logaction = new Actionlog();
             $logaction->asset_id = $asset->id;
@@ -133,24 +139,28 @@ class ViewAssetsController extends AuthorizedController
             // Redirect to the asset management page
             return Redirect::to('account')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
-
-        return View::make('frontend/account/accept-asset', compact('item'))->with('findlog', $findlog);
-
-
-
-
+        else if (!Company::isCurrentUserHasAccess($item)) {
+            return Redirect::route('requestable-assets')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+        else {
+            return View::make('frontend/account/accept-asset', compact('item'))->with('findlog', $findlog);
+        }
     }
 
     // Save the acceptance
     public function postAcceptAsset($logID = null) {
 
-
 	  	// Check if the asset exists
         if (is_null($findlog = Actionlog::find($logID))) {
             // Redirect to the asset management page
             return Redirect::to('account/view-assets')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
+        // NOTE: make sure the global scope is applied
+        $is_unauthorized = is_null(Actionlog::where('id', '=', $logID)->first());
+        if ($is_unauthorized) {
+            return Redirect::route('requestable-assets')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         if ($findlog->accepted_id!='') {
             // Redirect to the asset management page
@@ -208,11 +218,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);
@@ -220,14 +231,5 @@ class ViewAssetsController extends AuthorizedController
 		} else {
 			return Redirect::to('account/view-assets')->with('error', 'Something went wrong ');
 		}
-
-
-
-
-
     }
-
-
-
-
 }

app/controllers/admin/AccessoriesController.php

@@ -13,6 +13,7 @@ use Validator;
 use View;
 use User;
 use Actionlog;
+use Company;
 use Mail;
 use Datatable;
 use Slack;
@@ -41,7 +42,13 @@ class AccessoriesController extends AdminController
     {
         // Show the page
         $category_list = array('' => '') + DB::table('categories')->where('category_type','=','accessory')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
-        return View::make('backend/accessories/edit')->with('accessory',new Accessory)->with('category_list',$category_list);
+        $company_list = Company::getSelectList();
+        $location_list = locationsList();
+        return View::make('backend/accessories/edit')
+            ->with('accessory', new Accessory)
+            ->with('category_list', $category_list)
+            ->with('company_list', $company_list)
+            ->with('location_list', $location_list);
     }
 
 
@@ -68,6 +75,22 @@ class AccessoriesController extends AdminController
             // Update the accessory data
             $accessory->name            		= e(Input::get('name'));
             $accessory->category_id            	= e(Input::get('category_id'));
+            $accessory->location_id            	= e(Input::get('location_id'));
+            $accessory->company_id              = Company::getIdForCurrentUser(Input::get('company_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();
 
@@ -97,9 +120,18 @@ class AccessoriesController extends AdminController
             // Redirect to the blogs management page
             return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($accessory)) {
+            return Redirect::to('admin/accessories')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
-		$category_list = array('' => '') + DB::table('categories')->where('category_type','=','accessory')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
-        return View::make('backend/accessories/edit', compact('accessory'))->with('category_list',$category_list);
+		    $category_list = array('' => '') + DB::table('categories')->where('category_type','=','accessory')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
+        $company_list = Company::getSelectList();
+        $location_list = locationsList();
+
+        return View::make('backend/accessories/edit', compact('accessory'))
+            ->with('category_list',$category_list)
+            ->with('company_list', $company_list)
+            ->with('location_list', $location_list);
     }
 
 
@@ -116,6 +148,9 @@ class AccessoriesController extends AdminController
             // Redirect to the blogs management page
             return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($accessory)) {
+            return Redirect::to('admin/accessories')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
 
         // get the POST data
@@ -135,7 +170,23 @@ class AccessoriesController extends AdminController
 
             // Update the accessory data
             $accessory->name            		= e(Input::get('name'));
+            $accessory->location_id            	= e(Input::get('location_id'));
             $accessory->category_id            	= e(Input::get('category_id'));
+            $accessory->company_id              = Company::getIdForCurrentUser(Input::get('company_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?
@@ -163,6 +214,9 @@ class AccessoriesController extends AdminController
             // Redirect to the blogs management page
             return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
         }
+        else if (!Company::isCurrentUserHasAccess($accessory)) {
+            return Redirect::to('admin/accessories')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
 
 		if ($accessory->hasUsers() > 0) {
@@ -194,7 +248,13 @@ class AccessoriesController extends AdminController
         $accessory = Accessory::find($accessoryID);
 
         if (isset($accessory->id)) {
+
+            if (!Company::isCurrentUserHasAccess($accessory)) {
+                return Redirect::to('admin/accessories')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+            else {
                 return View::make('backend/accessories/view', compact('accessory'));
+            }
         } else {
             // Prepare the error message
             $error = Lang::get('admin/accessories/message.does_not_exist', compact('id'));
@@ -216,6 +276,9 @@ class AccessoriesController extends AdminController
             // Redirect to the accessory management page with error
             return Redirect::to('accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
         }
+        else if (!Company::isCurrentUserHasAccess($accessory)) {
+            return Redirect::to('admin/accessories')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         // Get the dropdown of users and then pass it to the checkout view
         $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name," (",username,")") as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
@@ -234,6 +297,9 @@ class AccessoriesController extends AdminController
             // Redirect to the accessory management page with error
             return Redirect::to('accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
         }
+        else if (!Company::isCurrentUserHasAccess($accessory)) {
+            return Redirect::to('admin/accessories')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
 		$admin_user = Sentry::getUser();
         $assigned_to = e(Input::get('assigned_to'));
@@ -360,7 +426,13 @@ class AccessoriesController extends AdminController
         }
 
 		$accessory = Accessory::find($accessory_user->accessory_id);
-        return View::make('backend/accessories/checkin', compact('accessory'))->with('backto',$backto);
+
+        if (!Company::isCurrentUserHasAccess($accessory)) {
+            return Redirect::to('admin/accessories')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+        else {
+            return View::make('backend/accessories/checkin', compact('accessory'))->with('backto',$backto);
+        }
     }
 
 
@@ -380,6 +452,11 @@ class AccessoriesController extends AdminController
 
 
 		$accessory = Accessory::find($accessory_user->accessory_id);
+
+        if (!Company::isCurrentUserHasAccess($accessory)) {
+            return Redirect::to('admin/accessories')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+
         $logaction = new Actionlog();
         $logaction->checkedout_to = $accessory_user->assigned_to;
         $return_to = $accessory_user->assigned_to;
@@ -465,56 +542,96 @@ class AccessoriesController extends AdminController
 
     public function getDatatable()
     {
-        $accessories = Accessory::with('category')
-        ->whereNull('deleted_at')
-        ->orderBy('created_at', 'DESC');
+        $accessories = Accessory::select('accessories.*')->with('category', 'company')
+        ->whereNull('accessories.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('category',function($accessories)
-            {
-                return $accessories->category->name;
-            })
-        ->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('category','name','qty','numRemaining','actions')
-        ->orderColumns('category','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','companyName','category'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        switch ($sort)
+        {
+            case 'category':
+                $accessories = $accessories->OrderCategory($order);
+                break;
+            case 'companyName':
+                $accessories = $accessories->OrderCompany($order);
+                break;
+            default:
+                $accessories = $accessories->orderBy($sort, $order);
+                break;
+        }
+
+        $accessCount = $accessories->count();
+        $accessories = $accessories->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach ($accessories as $accessory) {
+            $actions = '<nobr><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></nobr>';
+            $company = $accessory->company;
+
+            $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,
+                'location'      => ($accessory->location) ? $accessory->location->name: '',
+                'purchase_date' => $accessory->purchase_date,
+                'purchase_cost' => $accessory->purchase_cost,
+                'numRemaining'  => $accessory->numRemaining(),
+                'actions'       => $actions,
+                'companyName'   => is_null($company) ? '' : e($company->name)
+            );
+        }
+
+        $data = array('total'=>$accessCount, 'rows'=>$rows);
+
+        return $data;
     }
 
 	public function getDataView($accessoryID)
 	{
 		$accessory = Accessory::find($accessoryID);
+
+        if (!Company::isCurrentUserHasAccess($accessory)) {
+            return ['total' => 0, 'rows' => []];
+        }
+
         $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,7 @@
     use AdminController;
     use AssetMaintenance;
     use Carbon\Carbon;
-    use Datatable;
+    use Company;
     use DB;
     use Input;
     use Lang;
@@ -20,9 +20,15 @@
     use TCPDF;
     use Validator;
     use View;
+    use Setting;
 
     class AssetMaintenancesController extends AdminController
     {
+        private static function getInsufficientPermissionsRedirect()
+        {
+            return Redirect::to( 'admin/asset_maintenances')
+                ->with('error', Lang::get( 'general.insufficient_permissions' ) );
+        }
 
         /**
          * getIndex
@@ -45,71 +51,73 @@
          * @author  Vincent Sposato <vincent.sposato@gmail.com>
          * @version v1.0
          */
-        public function getDatatable()
-        {
 
-            $assetMaintenances = AssetMaintenance::orderBy( 'created_at', 'DESC' )
-                                            ->get();
+     public function getDatatable()
+     {
+        $maintenances = AssetMaintenance::with('asset','supplier','asset.company')
+         ->whereNull('deleted_at');
 
-            $actions = new \Chumper\Datatable\Columns\FunctionColumn( 'actions', function ( $assetMaintenances ) {
+         if (Input::has('search')) {
+             $maintenances = $maintenances->TextSearch(e(Input::get('search')));
+         }
 
-                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>';
-            } );
+         if (Input::has('offset')) {
+             $offset = e(Input::get('offset'));
+         } else {
+             $offset = 0;
+         }
 
-            return Datatable::collection( $assetMaintenances )
-                            ->addColumn( 'asset', function ( $assetMaintenances ) {
+         if (Input::has('limit')) {
+             $limit = e(Input::get('limit'));
+         } else {
+             $limit = 50;
+         }
 
-                                return link_to( '/hardware/' . $assetMaintenances->asset_id . '/view',
-                                    mb_strimwidth( $assetMaintenances->asset->name, 0, 50, "..." ) );
-                            } )
-                            ->addColumn( 'supplier', 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/settings/suppliers/' . $assetMaintenances->supplier_id
-                                                . '/view',
-                                    mb_strimwidth( $assetMaintenances->supplier->name, 0, 50, "..." ) );
-                            } )
-                            ->addColumn( 'asset_maintenance_type', function ( $assetMaintenances ) {
+         $maintenances->orderBy($sort, $order);
 
-                                return $assetMaintenances->asset_maintenance_type;
-                            } )
-                            ->addColumn( 'title', function ( $assetMaintenances ) {
+         $maintenancesCount = $maintenances->count();
+         $maintenances = $maintenances->skip($offset)->take($limit)->get();
 
-                                return link_to( '/admin/asset_maintenances/' . $assetMaintenances->id . '/view',
-                                    mb_strimwidth( $assetMaintenances->title, 0, 50, "..." ) );
-                            } )
-                            ->addColumn( 'start_date', function ( $assetMaintenances ) {
+         $rows = array();
+         $settings = Setting::getSettings();
 
-                                return $assetMaintenances->start_date;
-                            } )
-                            ->addColumn( 'completion_date', function ( $assetMaintenances ) {
+         foreach($maintenances as $maintenance) {
 
-                                return $assetMaintenances->completion_date;
-                            } )
-                            ->addColumn( 'asset_maintenance_time', 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>';
 
-                                if (is_null( $assetMaintenances->asset_maintenance_time )) {
-                                    $assetMaintenances->asset_maintenance_time = Carbon::now()
-                                                                                       ->diffInDays( Carbon::parse( $assetMaintenances->start_date ) );
-                                }
+            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;
+            }
 
-                                return intval( $assetMaintenances->asset_maintenance_time );
-                            } )
-                            ->addColumn( 'cost', function ( $assetMaintenances ) {
+            $company = $maintenance->asset->company;
 
-                                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();
-        }
+             $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,
+                 'companyName'   => is_null($company) ? '' : $company->name
+             );
+         }
+
+         $data = array('total' => $maintenancesCount, 'rows' => $rows);
+
+         return $data;
+
+     }
 
         /**
          * getCreate
@@ -122,7 +130,6 @@
          */
         public function getCreate( $assetId = null )
         {
-
             // Prepare Asset Maintenance Type List
             $assetMaintenanceType = [
                                         '' => 'Select an asset maintenance type',
@@ -130,7 +137,7 @@
             // Mark the selected asset, if it came in
             $selectedAsset = $assetId;
             // Get the possible assets using a left join to get a list of assets and some other helpful info
-            $asset               = DB::table( 'assets' )
+            $asset               = Company::scopeCompanyables( DB::table( 'assets' ), 'assets.company_id' )
                                      ->leftJoin( 'users', 'users.id', '=', 'assets.assigned_to' )
                                      ->leftJoin( 'models', 'assets.model_id', '=', 'models.id' )
                                      ->select( 'assets.id', 'assets.name', 'first_name', 'last_name', 'asset_tag',
@@ -206,6 +213,12 @@
                     $assetMaintenance->notes = e( Input::get( 'notes' ) );
                 }
 
+                $asset = Asset::find( e( Input::get( 'asset_id' ) ) );
+
+                if (!Company::isCurrentUserHasAccess($asset)) {
+                    return static::getInsufficientPermissionsRedirect();
+                }
+
                 // Save the asset maintenance data
                 $assetMaintenance->asset_id               = e( Input::get( 'asset_id' ) );
                 $assetMaintenance->asset_maintenance_type = e( Input::get( 'asset_maintenance_type' ) );
@@ -253,13 +266,15 @@
          */
         public function getEdit( $assetMaintenanceId = null )
         {
-
             // Check if the asset maintenance exists
             if (is_null( $assetMaintenance = AssetMaintenance::find( $assetMaintenanceId ) )) {
                 // Redirect to the improvement management page
                 return Redirect::to( 'admin/asset_maintenances' )
                                ->with( 'error', Lang::get( 'admin/asset_maintenances/message.not_found' ) );
             }
+            else if (!Company::isCurrentUserHasAccess( $assetMaintenance->asset )) {
+                return static::getInsufficientPermissionsRedirect();
+            }
 
             if ($assetMaintenance->completion_date == '0000-00-00') {
                 $assetMaintenance->completion_date = null;
@@ -279,7 +294,7 @@
                                     ] + AssetMaintenance::getImprovementOptions();
 
             // Get the possible assets using a left join to get a list of assets and some other helpful info
-            $asset               = DB::table( 'assets' )
+            $asset               = Company::scopeCompanyables( DB::table( 'assets' ), 'assets.company_id' )
                                      ->leftJoin( 'users', 'users.id', '=', 'assets.assigned_to' )
                                      ->leftJoin( 'models', 'assets.model_id', '=', 'models.id' )
                                      ->select( 'assets.id', 'assets.name', 'first_name', 'last_name', 'asset_tag',
@@ -334,6 +349,9 @@
                 return Redirect::to( 'admin/asset_maintenances' )
                                ->with( 'error', Lang::get( 'admin/asset_maintenances/message.not_found' ) );
             }
+            else if (!Company::isCurrentUserHasAccess( $assetMaintenance->asset )) {
+                return static::getInsufficientPermissionsRedirect();
+            }
 
             // attempt validation
             if ($assetMaintenance->validate( $new )) {
@@ -362,6 +380,12 @@
                     $assetMaintenance->notes = e( Input::get( 'notes' ) );
                 }
 
+                $asset = Asset::find( e( Input::get( 'asset_id' ) ) );
+
+                if (!Company::isCurrentUserHasAccess($asset)) {
+                    return static::getInsufficientPermissionsRedirect();
+                }
+
                 // Save the asset maintenance data
                 $assetMaintenance->asset_id               = e( Input::get( 'asset_id' ) );
                 $assetMaintenance->asset_maintenance_type = e( Input::get( 'asset_maintenance_type' ) );
@@ -424,13 +448,16 @@
          */
         public function getDelete( $assetMaintenanceId )
         {
-
             // Check if the asset maintenance exists
             if (is_null( $assetMaintenance = AssetMaintenance::find( $assetMaintenanceId ) )) {
                 // Redirect to the asset maintenance management page
                 return Redirect::to( 'admin/asset_maintenances' )
                                ->with( 'error', Lang::get( 'admin/asset_maintenances/message.not_found' ) );
             }
+            else if (!Company::isCurrentUserHasAccess( $assetMaintenance->asset )) {
+                return static::getInsufficientPermissionsRedirect();
+            }
+
             // Delete the asset maintenance
             $assetMaintenance->delete();
 
@@ -450,15 +477,17 @@
          */
         public function getView( $assetMaintenanceId )
         {
-
             // Check if the asset maintenance exists
             if (is_null( $assetMaintenance = AssetMaintenance::find( $assetMaintenanceId ) )) {
                 // Redirect to the asset maintenance management page
                 return Redirect::to( 'admin/asset_maintenances' )
                                ->with( 'error', Lang::get( 'admin/asset_maintenances/message.not_found' ) );
             }
+            else if (!Company::isCurrentUserHasAccess( $assetMaintenance->asset )) {
+                return static::getInsufficientPermissionsRedirect();
+            }
 
             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;
@@ -12,6 +13,7 @@ use Setting;
 use Redirect;
 use DB;
 use Actionlog;
+use Company;
 use Model;
 use Depreciation;
 use Sentry;
@@ -23,12 +25,13 @@ 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
@@ -63,11 +66,13 @@ class AssetsController extends AdminController
         $manufacturer_list = manufacturerList();
         $category_list = categoryList();
         $supplier_list = suppliersList();
+        $company_list = Company::getSelectList();
         $assigned_to = usersList();
         $statuslabel_types = statusTypeList();
 
         $view = View::make('backend/hardware/edit');
         $view->with('supplier_list',$supplier_list);
+        $view->with('company_list',$company_list);
         $view->with('model_list',$model_list);
         $view->with('statuslabel_list',$statuslabel_list);
         $view->with('assigned_to',$assigned_to);
@@ -160,7 +165,8 @@ class AssetsController extends AdminController
             // Save the asset data
             $asset->name            		= e(Input::get('name'));
             $asset->serial            		= e(Input::get('serial'));
-            $asset->model_id           		= e(Input::get('model_id'));
+            $asset->company_id              = Company::getIdForCurrentUser(Input::get('company_id'));
+            $asset->model_id                = e(Input::get('model_id'));
             $asset->order_number            = e(Input::get('order_number'));
             $asset->notes            		= e(Input::get('notes'));
             $asset->asset_tag            	= e(Input::get('asset_tag'));
@@ -169,6 +175,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()) {
 
@@ -181,7 +200,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'));
             }
@@ -206,6 +224,9 @@ class AssetsController extends AdminController
             // Redirect to the asset management page
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($asset)) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         // Grab the dropdown lists
         $model_list = modelList();
@@ -214,12 +235,14 @@ class AssetsController extends AdminController
         $manufacturer_list = manufacturerList();
         $category_list = categoryList();
         $supplier_list = suppliersList();
+        $company_list = Company::getSelectList();
         $assigned_to = usersList();
         $statuslabel_types = statusTypeList();
 
         return View::make('backend/hardware/edit', compact('asset'))
         ->with('model_list',$model_list)
         ->with('supplier_list',$supplier_list)
+        ->with('company_list',$company_list)
         ->with('location_list',$location_list)
         ->with('statuslabel_list',$statuslabel_list)
         ->with('assigned_to',$assigned_to)
@@ -242,6 +265,9 @@ class AssetsController extends AdminController
             // Redirect to the asset management page with error
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($asset)) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         //attempt to validate
         $validator = Validator::make(Input::all(), $asset->validationRules($assetId));
@@ -301,13 +327,28 @@ class AssetsController extends AdminController
             $asset->mac_address = ($checkModel == true) ? e(Input::get('mac_address')) : NULL;
 
             // Update the asset data
-            $asset->name            		= e(Input::get('name'));
-            $asset->serial            		= e(Input::get('serial'));
-            $asset->model_id           		= e(Input::get('model_id'));
-            $asset->order_number            = e(Input::get('order_number'));
-            $asset->asset_tag           	= e(Input::get('asset_tag'));
-            $asset->notes            		= e(Input::get('notes'));
-            $asset->physical            	= '1';
+            $asset->name         = e(Input::get('name'));
+            $asset->serial       = e(Input::get('serial'));
+            $asset->company_id   = Company::getIdForCurrentUser(Input::get('company_id'));
+            $asset->model_id     = e(Input::get('model_id'));
+            $asset->order_number = e(Input::get('order_number'));
+            $asset->asset_tag    = e(Input::get('asset_tag'));
+            $asset->notes        = e(Input::get('notes'));
+            $asset->physical     = '1';
+
+	    // 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()) {
@@ -339,6 +380,9 @@ class AssetsController extends AdminController
             // Redirect to the asset management page with error
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($asset)) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         if (isset($asset->assigneduser->id) && ($asset->assigneduser->id!=0)) {
             // Redirect to the asset management page
@@ -371,6 +415,9 @@ class AssetsController extends AdminController
             // Redirect to the asset management page with error
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($asset)) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         // Get the dropdown of users and then pass it to the checkout view
         $users_list = usersList();
@@ -389,6 +436,9 @@ class AssetsController extends AdminController
         if (!$asset = Asset::find($assetId)) {
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($asset)) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         // Declare the rules for the form validation
         $rules = array(
@@ -416,13 +466,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;
         }
@@ -451,6 +501,9 @@ class AssetsController extends AdminController
             // Redirect to the asset management page with error
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($asset)) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         return View::make('backend/hardware/checkin', compact('asset'))->with('backto', $backto);
     }
@@ -469,6 +522,9 @@ class AssetsController extends AdminController
             // Redirect to the asset management page with error
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($asset)) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         // Check for a valid user to checkout fa-random
         // This will need to be tweaked for checkout to location
@@ -495,7 +551,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';
 				}
@@ -578,17 +634,36 @@ class AssetsController extends AdminController
     public function getView($assetId = null)
     {
         $asset = Asset::withTrashed()->find($assetId);
+        $settings = Setting::getSettings();
+
+        if (!Company::isCurrentUserHasAccess($asset)) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+        else 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'));
@@ -613,6 +688,10 @@ class AssetsController extends AdminController
             $asset = Asset::find($assetId);
             $size = barcodeDimensions($settings->barcode_type);
 
+            if (!Company::isCurrentUserHasAccess($asset)) {
+                return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+
             if (isset($asset->id,$asset->asset_tag)) {
                 $barcode = new \Com\Tecnick\Barcode\Barcode();
                 $barcode_obj =  $barcode->getBarcodeObj($settings->barcode_type, route('view/hardware', $asset->id), $size['height'], $size['width'], 'black', array(-2, -2, -2, -2));
@@ -628,6 +707,10 @@ class AssetsController extends AdminController
         $path = app_path().'/private_uploads/imports/assets';
         $files = array();
 
+        if (!Company::isCurrentUserAuthorized()) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+
         if ($handle = opendir($path)) {
 
             /* This is the correct way to loop over the directory. */
@@ -653,7 +736,10 @@ class AssetsController extends AdminController
 
     public function postAPIImportUpload() {
 
-        if (!Config::get('app.lock_passwords')) {
+        if (!Company::isCurrentUserAuthorized()) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+        elseif (!Config::get('app.lock_passwords')) {
 
             $rules = array(
                 'files' => 'required'
@@ -683,8 +769,9 @@ class AssetsController extends AdminController
                             return $results;
                         }
 
+                        $date = date('Y-m-d-his');
                         $fixed_filename = str_replace(' ','-',$file->getClientOriginalName());
-                        $file->move($path, date('Y-m-d-his').'-'.$file->getClientOriginalName());
+                        $file->move($path, $date.'-'.$fixed_filename);
                         $name = date('Y-m-d-his').'-'.$fixed_filename;
                         $filesize = Setting::fileSizeConvert(filesize($path.'/'.$name));
                         $results[] = compact('name', 'filesize');
@@ -707,6 +794,10 @@ class AssetsController extends AdminController
     public function getProcessImportFile($filename) {
         // php artisan asset-import:csv path/to/your/file.csv --domain=yourdomain.com --email_format=firstname.lastname
 
+        if (!Company::isCurrentUserAuthorized()) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+
         $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();
@@ -731,6 +822,9 @@ class AssetsController extends AdminController
             // Redirect to the asset management page
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($asset_to_clone)) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         // Grab the dropdown lists
         $model_list = modelList();
@@ -741,6 +835,7 @@ class AssetsController extends AdminController
         $supplier_list = suppliersList();
         $assigned_to = usersList();
         $statuslabel_types = statusTypeList();
+        $company_list = Company::getSelectList();
 
         $asset = clone $asset_to_clone;
         $asset->id = null;
@@ -757,7 +852,8 @@ class AssetsController extends AdminController
         ->with('asset',$asset)
         ->with('location_list',$location_list)
         ->with('manufacturer',$manufacturer_list)
-        ->with('category',$category_list);
+        ->with('category',$category_list)
+        ->with('company_list',$company_list);
 
     }
 
@@ -768,7 +864,10 @@ class AssetsController extends AdminController
 		// Get user information
 		$asset = Asset::withTrashed()->find($assetId);
 
-		 if (isset($asset->id)) {
+        if (!Company::isCurrentUserHasAccess($asset)) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+		else if (isset($asset->id)) {
 
 			// Restore the user
 			$asset->restore();
@@ -801,6 +900,10 @@ class AssetsController extends AdminController
 
         if (isset($asset->id)) {
 
+            if (!Company::isCurrentUserHasAccess($asset)) {
+                return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+
         	if (Input::hasFile('assetfile')) {
 
 				foreach(Input::file('assetfile') as $file) {
@@ -824,7 +927,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 {
@@ -872,6 +975,11 @@ class AssetsController extends AdminController
 		// the asset is valid
         if (isset($asset->id)) {
 
+
+            if (!Company::isCurrentUserHasAccess($asset)) {
+                return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+
 			$log = Actionlog::find($fileId);
 			$full_filename = $destinationPath.'/'.$log->filename;
 			if (file_exists($full_filename)) {
@@ -904,9 +1012,28 @@ class AssetsController extends AdminController
 
 		// the asset is valid
         if (isset($asset->id)) {
-				$log = Actionlog::find($fileId);
-				$file = $log->get_src();
-				return Response::download($file);
+
+
+            if (!Company::isCurrentUserHasAccess($asset)) {
+                return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+
+		$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'));
@@ -927,7 +1054,10 @@ class AssetsController extends AdminController
     public function postBulkEdit($assets = null)
     {
 
-	    if (!Input::has('edit_asset')) {
+        if (!Company::isCurrentUserAuthorized()) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+	    else if (!Input::has('edit_asset')) {
 			return Redirect::back()->with('error', 'No assets selected');
 		} else {
 			$asset_raw_array = Input::get('edit_asset');
@@ -983,7 +1113,10 @@ class AssetsController extends AdminController
     public function postBulkSave($assets = null)
     {
 
-		if (Input::has('bulk_edit')) {
+        if (!Company::isCurrentUserAuthorized()) {
+            return Redirect::to('hardware')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+		else if (Input::has('bulk_edit')) {
 
 			$assets = Input::get('bulk_edit');
 
@@ -1035,7 +1168,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'));
@@ -1066,8 +1199,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','warranty_months'));
 
+       $assets = Asset::select('assets.*')->with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category','assetstatus','assetloc', 'company')
+       ->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':
@@ -1094,127 +1248,95 @@ 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',
+      'companyName',
+      '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 'companyName':
+            $assets = $assets->OrderCompany($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 : '',
+            'companyName'   => is_null($asset->company) ? '' : e($asset->company->name)
+        );
       }
 
-      $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

@@ -4,6 +4,7 @@ use AdminController;
 use Input;
 use Lang;
 use Category;
+use Company;
 use Redirect;
 use Setting;
 use DB;
@@ -11,7 +12,6 @@ use Sentry;
 use Str;
 use Validator;
 use View;
-use Datatable;
 
 class CategoriesController extends AdminController
 {
@@ -218,61 +218,121 @@ 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::with('assets.company')->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,
+          'companyName' => Company::getName($asset),
+        );
+      }
+
+      $data = array('total' => $count, 'rows' => $rows);
+      return $data;
     }
 
 

app/controllers/admin/CompaniesController.php

@@ -0,0 +1,127 @@
+<?php namespace Controllers\Admin;
+
+use AdminController;
+use Company;
+
+use Input;
+use Lang;
+use Redirect;
+use Validator;
+use View;
+
+final class CompaniesController extends AdminController
+{
+    public function getIndex()
+    {
+        return View::make('backend/companies/index')->with('companies', Company::all());
+    }
+
+    public function getCreate()
+    {
+        return View::make('backend/companies/edit')->with('company', new Company);
+    }
+
+    public function postCreate()
+    {
+        $company = new Company;
+
+        if ($company->validate(Input::all()))
+        {
+            $company->name = e(Input::get('name'));
+
+            if($company->save())
+            {
+                return Redirect::to('admin/settings/companies')
+                    ->with('success', Lang::get('admin/companies/message.create.success'));
+            }
+            else
+            {
+                return Redirect::to('admin/settings/companies/create')
+                    ->with('error', Lang::get('admin/companies/message.create.error'));
+            }
+        }
+        else
+        {
+            return Redirect::back()->withInput()->withErrors($company->errors());
+        }
+    }
+
+    public function getEdit($companyId)
+    {
+        if (is_null($company = Company::find($companyId)))
+        {
+            return Redirect::to('admin/settings/companies')
+                ->with('error', Lang::get('admin/companies/message.does_not_exist'));
+        }
+        else
+        {
+            return View::make('backend/companies/edit')->with('company', $company);
+        }
+    }
+
+    public function postEdit($companyId)
+    {
+        if (is_null($company = Company::find($companyId)))
+        {
+            return Redirect::to('admin/settings/companies')->with('error', Lang::get('admin/companies/message.does_not_exist'));
+        }
+        else
+        {
+            $validator = Validator::make(Input::all(), $company->validationRules($companyId));
+
+            if ($validator->fails())
+            {
+                return Redirect::back()->withInput()->withErrors($validator->messages());
+            }
+            else
+            {
+                $company->name = e(Input::get('name'));
+
+                if($company->save())
+                {
+                    return Redirect::to('admin/settings/companies')
+                        ->with('success', Lang::get('admin/companies/message.update.success'));
+                }
+                else
+                {
+                    return Redirect::to("admin/settings/companies/$companyId/edit")
+                        ->with('error', Lang::get('admin/companies/message.update.error'));
+                }
+            }
+        }
+    }
+
+    public function postDelete($companyId)
+    {
+        if (is_null($company = Company::find($companyId)))
+        {
+            return Redirect::to('admin/settings/companies')
+                ->with('error', Lang::get('admin/companies/message.not_found'));
+        }
+        else
+        {
+            try
+            {
+                $company->delete();
+                return Redirect::to('admin/settings/companies')
+                    ->with('success', Lang::get('admin/companies/message.delete.success'));
+            }
+            catch (\Illuminate\Database\QueryException $exception)
+            {
+                /*
+                 * NOTE: This happens when there's a foreign key constraint violation
+                 * For example when rows in other tables are referencing this company
+                 */
+                if ($exception->getCode() == 23000)
+                {
+                    return Redirect::to('admin/settings/companies')
+                        ->with('error', Lang::get('admin/companies/message.assoc_users'));
+                }
+                else
+                {
+                    throw $exception;
+                }
+            }
+        }
+    }
+}

app/controllers/admin/ConsumablesController.php

@@ -8,6 +8,7 @@ use Setting;
 use DB;
 use Sentry;
 use Consumable;
+use Company;
 use Str;
 use Validator;
 use View;
@@ -41,7 +42,14 @@ class ConsumablesController extends AdminController
     {
         // Show the page
         $category_list = array('' => '') + DB::table('categories')->where('category_type','=','consumable')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
-        return View::make('backend/consumables/edit')->with('consumable',new Consumable)->with('category_list',$category_list);
+        $company_list = Company::getSelectList();
+        $location_list = locationsList();
+
+        return View::make('backend/consumables/edit')
+            ->with('consumable', new Consumable)
+            ->with('category_list', $category_list)
+            ->with('company_list', $company_list)
+            ->with('location_list', $location_list);
     }
 
 
@@ -66,10 +74,26 @@ 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->location_id            = e(Input::get('location_id'));
+            $consumable->company_id             = Company::getIdForCurrentUser(Input::get('company_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()) {
@@ -97,9 +121,18 @@ class ConsumablesController extends AdminController
             // Redirect to the blogs management page
             return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($consumable)) {
+            return Redirect::to('admin/consumables')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
 		$category_list = array('' => '') + DB::table('categories')->where('category_type','=','consumable')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
-        return View::make('backend/consumables/edit', compact('consumable'))->with('category_list',$category_list);
+        $company_list = Company::getSelectList();
+        $location_list = locationsList();
+
+        return View::make('backend/consumables/edit', compact('consumable'))
+            ->with('category_list', $category_list)
+            ->with('company_list', $company_list)
+            ->with('location_list', $location_list);
     }
 
 
@@ -116,6 +149,9 @@ class ConsumablesController extends AdminController
             // Redirect to the blogs management page
             return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($consumable)) {
+            return Redirect::to('admin/consumables')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
 
         // get the POST data
@@ -134,9 +170,25 @@ 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->location_id            = e(Input::get('location_id'));
+            $consumable->company_id             = Company::getIdForCurrentUser(Input::get('company_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()) {
@@ -163,6 +215,9 @@ class ConsumablesController extends AdminController
             // Redirect to the blogs management page
             return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
         }
+        else if (!Company::isCurrentUserHasAccess($consumable)) {
+            return Redirect::to('admin/consumables')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
 			$consumable->delete();
 
@@ -184,7 +239,14 @@ class ConsumablesController extends AdminController
         $consumable = Consumable::find($consumableID);
 
         if (isset($consumable->id)) {
+
+
+            if (!Company::isCurrentUserHasAccess($consumable)) {
+                return Redirect::to('admin/consumables')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+            else {
                 return View::make('backend/consumables/view', compact('consumable'));
+            }
         } else {
             // Prepare the error message
             $error = Lang::get('admin/consumables/message.does_not_exist', compact('id'));
@@ -206,6 +268,9 @@ class ConsumablesController extends AdminController
             // Redirect to the consumable management page with error
             return Redirect::to('consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
         }
+        else if (!Company::isCurrentUserHasAccess($consumable)) {
+            return Redirect::to('admin/consumables')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         // Get the dropdown of users and then pass it to the checkout view
         $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name," (",username,")") as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
@@ -219,57 +284,60 @@ class ConsumablesController extends AdminController
     **/
     public function postCheckout($consumableId)
     {
-        // Check if the consumable exists
-        if (is_null($consumable = Consumable::find($consumableId))) {
-            // Redirect to the consumable management page with error
-            return Redirect::to('consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
-        }
+      // Check if the consumable exists
+      if (is_null($consumable = Consumable::find($consumableId))) {
+          // Redirect to the consumable management page with error
+          return Redirect::to('consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
+      }
+      else if (!Company::isCurrentUserHasAccess($consumable)) {
+          return Redirect::to('admin/consumables')->with('error', Lang::get('general.insufficient_permissions'));
+      }
 
-		$admin_user = Sentry::getUser();
-        $assigned_to = e(Input::get('assigned_to'));
+	    $admin_user = Sentry::getUser();
+      $assigned_to = e(Input::get('assigned_to'));
 
 
-        // Declare the rules for the form validation
-        $rules = array(
-            'assigned_to'   => 'required|min:1'
-        );
+      // Declare the rules for the form validation
+      $rules = array(
+          'assigned_to'   => 'required|min:1'
+      );
 
-        // Create a new validator instance from our validation rules
-        $validator = Validator::make(Input::all(), $rules);
+      // Create a new validator instance from our validation rules
+      $validator = Validator::make(Input::all(), $rules);
 
-        // If validation fails, we'll exit the operation now.
-        if ($validator->fails()) {
-            // Ooops.. something went wrong
-            return Redirect::back()->withInput()->withErrors($validator);
-        }
+      // If validation fails, we'll exit the operation now.
+      if ($validator->fails()) {
+          // Ooops.. something went wrong
+          return Redirect::back()->withInput()->withErrors($validator);
+      }
 
 
-        // Check if the user exists
-        if (is_null($user = User::find($assigned_to))) {
-            // Redirect to the consumable management page with error
-            return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.user_does_not_exist'));
-        }
+      // Check if the user exists
+      if (is_null($user = User::find($assigned_to))) {
+          // Redirect to the consumable management page with error
+          return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.user_does_not_exist'));
+      }
 
-        // Update the consumable data
-        $consumable->assigned_to            		= e(Input::get('assigned_to'));
+      // Update the consumable data
+      $consumable->assigned_to = e(Input::get('assigned_to'));
 
-        $consumable->users()->attach($consumable->id, array(
-        'consumable_id' => $consumable->id,
-        'assigned_to' => e(Input::get('assigned_to'))));
+      $consumable->users()->attach($consumable->id, array(
+      'consumable_id' => $consumable->id,
+      'user_id' => $admin_user->id,
+      'assigned_to' => e(Input::get('assigned_to'))));
 
-            $logaction = new Actionlog();
-            $logaction->consumable_id = $consumable->id;
-            $logaction->checkedout_to = $consumable->assigned_to;
-            $logaction->asset_type = 'consumable';
-            $logaction->location_id = $user->location_id;
-            $logaction->user_id = Sentry::getUser()->id;
-            $logaction->note = e(Input::get('note'));
+      $logaction = new Actionlog();
+      $logaction->consumable_id = $consumable->id;
+      $logaction->checkedout_to = $consumable->assigned_to;
+      $logaction->asset_type = 'consumable';
+      $logaction->location_id = $user->location_id;
+      $logaction->user_id = Sentry::getUser()->id;
+      $logaction->note = e(Input::get('note'));
 
-            $settings = Setting::getSettings();
+      $settings = Setting::getSettings();
 
 			if ($settings->slack_endpoint) {
 
-
 				$slack_settings = [
 				    'username' => $settings->botname,
 				    'channel' => $settings->slack_channel,
@@ -290,45 +358,40 @@ class ConsumablesController extends AdminController
 						            'title' => 'Note:',
 						            'value' => e($logaction->note)
 						        ],
-
-
-
 						    ]
 						])->send('Consumable Checked Out');
 
 					} catch (Exception $e) {
 
 					}
-
 			}
 
 
+      $log = $logaction->logaction('checkout');
 
-            $log = $logaction->logaction('checkout');
+      $consumable_user = DB::table('consumables_users')->where('assigned_to','=',$consumable->assigned_to)->where('consumable_id','=',$consumable->id)->first();
 
-            $consumable_user = DB::table('consumables_users')->where('assigned_to','=',$consumable->assigned_to)->where('consumable_id','=',$consumable->id)->first();
-
-            $data['log_id'] = $logaction->id;
-            $data['eula'] = $consumable->getEula();
-            $data['first_name'] = $user->first_name;
-            $data['item_name'] = $consumable->name;
-            $data['checkout_date'] = $logaction->created_at;
-            $data['item_tag'] = '';
-            $data['expected_checkin'] = '';
-            $data['note'] = $logaction->note;
-            $data['require_acceptance'] = $consumable->requireAcceptance();
+      $data['log_id'] = $logaction->id;
+      $data['eula'] = $consumable->getEula();
+      $data['first_name'] = $user->first_name;
+      $data['item_name'] = $consumable->name;
+      $data['checkout_date'] = $logaction->created_at;
+      $data['item_tag'] = '';
+      $data['expected_checkin'] = '';
+      $data['note'] = $logaction->note;
+      $data['require_acceptance'] = $consumable->requireAcceptance();
 
 
-            if (($consumable->requireAcceptance()=='1')  || ($consumable->getEula())) {
+      if (($consumable->requireAcceptance()=='1')  || ($consumable->getEula())) {
 
-	            Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
-	                $m->to($user->email, $user->first_name . ' ' . $user->last_name);
-	                $m->subject('Confirm consumable delivery');
-	            });
-            }
+        Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
+            $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+            $m->subject('Confirm consumable delivery');
+        });
+      }
 
-            // Redirect to the new consumable page
-            return Redirect::to("admin/consumables")->with('success', Lang::get('admin/consumables/message.checkout.success'));
+      // Redirect to the new consumable page
+      return Redirect::to("admin/consumables")->with('success', Lang::get('admin/consumables/message.checkout.success'));
 
 
 
@@ -337,48 +400,105 @@ class ConsumablesController extends AdminController
 
     public function getDatatable()
     {
-        $consumables = Consumable::select(array('id','name','qty'))
-        ->whereNull('deleted_at')
-        ->orderBy('created_at', 'DESC');
+        $consumables = Consumable::select('consumables.*')->whereNull('consumables.deleted_at')
+            ->with('company','location','category','users');
 
-        $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_number','purchase_date','purchase_cost','companyName','category'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
+
+        switch ($sort)
+        {
+            case 'category':
+                $consumables = $consumables->OrderCategory($order);
+                break;
+            case 'location':
+                $consumables = $consumables->OrderLocation($order);
+                break;
+            case 'companyName':
+                $consumables = $consumables->OrderCompany($order);
+                break;
+            default:
+                $consumables = $consumables->orderBy($sort, $order);
+                break;
+        }
+
+        $consumCount = $consumables->count();
+        $consumables = $consumables->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach($consumables as $consumable) {
+            $actions = '<nobr><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></nobr>';
+            $company = $consumable->company;
+
+            $rows[] = array(
+                'id'            => $consumable->id,
+                'name'          => link_to('admin/consumables/'.$consumable->id.'/view', $consumable->name),
+                'location'   => ($consumable->location) ? e($consumable->location->name) : '',
+                'qty'           => $consumable->qty,
+                'category'           => ($consumable->category) ? $consumable->category->name : 'Missing category',
+                'order_number'  => $consumable->order_number,
+                'purchase_date'  => $consumable->purchase_date,
+                'purchase_cost'  => ($consumable->purchase_cost!='') ? number_format($consumable->purchase_cost,2): '' ,
+                'numRemaining'  => $consumable->numRemaining(),
+                'actions'       => $actions,
+                'companyName'   => is_null($company) ? '' : e($company->name),
+            );
+        }
+
+        $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;
+		//$consumable = Consumable::find($consumableID);
+    $consumable = Consumable::with(array('consumableAssigments'=>
+      function($query) {
+        $query->orderBy('created_at','DESC');
+      },
+      'consumableAssigments.admin'=> function($query) {},
+      'consumableAssigments.user'=> function($query) {},
+    ))->find($consumableID);
 
+  //  $consumable->load('consumableAssigments.admin','consumableAssigments.user');
 
-		return Datatable::collection($consumable_users)
-		->addColumn('name',function($consumable_users)
-			{
-				return link_to('/admin/users/'.$consumable_users->id.'/view', $consumable_users->fullName());
-			})
-		->make();
+    if (!Company::isCurrentUserHasAccess($consumable)) {
+      return ['total' => 0, 'rows' => []];
     }
 
+    $rows = array();
+
+    foreach ($consumable->consumableAssigments as $consumable_assignment) {
+      $rows[] = array(
+        'name' => link_to('/admin/users/'.$consumable_assignment->user->id.'/view', $consumable_assignment->user->fullName()),
+        'created_at' => ($consumable_assignment->created_at->format('Y-m-d H:i:s')=='-0001-11-30 00:00:00') ? '' : $consumable_assignment->created_at->format('Y-m-d H:i:s'),
+        'admin' => ($consumable_assignment->admin) ? $consumable_assignment->admin->fullName() : '',
+      );
+    }
+
+    $consumableCount = $consumable->users->count();
+    $data = array('total' => $consumableCount, 'rows' => $rows);
+    return $data;
+  }
+
 }

app/controllers/admin/DashboardController.php

@@ -4,6 +4,7 @@ use AdminController;
 use View;
 use Asset;
 use Actionlog;
+use Company;
 
 class DashboardController extends AdminController
 {
@@ -16,7 +17,10 @@ class DashboardController extends AdminController
     {
         // Show the page
 
-        $recent_activity = Actionlog::orderBy('created_at','DESC')->with('accessorylog','consumablelog','licenselog','assetlog','adminlog','userlog')->take(7)->get();
+        $recent_activity = Actionlog::orderBy('created_at','DESC')
+            ->with('accessorylog','consumablelog','licenselog','assetlog','adminlog','userlog')
+            ->take(7)
+            ->get();
 
 
         $asset_stats['total'] = Asset::Hardware()->count();

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

@@ -22,9 +22,6 @@ class GroupsController extends AdminController
      */
     public function getIndex()
     {
-        // Grab all the groups
-        $groups = Sentry::getGroupProvider()->createModel()->paginate();
-
         // Show the page
         return View::make('backend/groups/index', compact('groups'));
     }
@@ -215,4 +212,78 @@ class GroupsController extends AdminController
         }
     }
 
+
+
+    public function getDatatable($status = null)
+    {
+
+        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::get('sort')=='name') {
+            $sort = 'first_name';
+        } else {
+            $sort = e(Input::get('sort'));
+        }
+
+        // Grab all the groups
+        $groups = Sentry::getGroupProvider()->createModel();
+        //$users = Company::scopeCompanyables($users);
+
+         if (Input::has('search')) {
+             $groups = $users->TextSearch(Input::get('search'));
+         }
+
+         $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+
+        $allowed_columns =
+         [
+           'name','created_at'
+         ];
+
+        $sort = in_array($sort, $allowed_columns) ? $sort : 'name';
+        $groups = $groups->orderBy($sort, $order);
+
+        $groupsCount = $groups->count();
+        $groups = $groups->skip($offset)->take($limit)->get();
+        $rows = array();
+
+        foreach ($groups as $group)
+        {
+            $group_names = '';
+            $inout = '';
+            $actions = '<nobr>';
+
+            $actions .= '<a href="' . route('update/group', $group->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> ';
+
+            if (!Config::get('app.lock_passwords')) {
+                  $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/group', $group->id) . '" data-content="'.Lang::get('admin/groups/message.delete.confirm').'" data-title="Delete ' . htmlspecialchars($group->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a> ';
+              } else {
+                  $actions .= ' <span class="btn delete-asset btn-danger btn-sm disabled"><i class="fa fa-trash icon-white"></i></span>';
+              }
+
+            $actions .= '</nobr>';
+
+            $rows[] = array(
+                'id'         => $group->id,
+                'name'        => $group->name,
+                'users'         => $group->users->count(),
+                'created_at'        => $group->created_at->format('Y-m-d H:i:s'),
+                'actions'       => ($actions) ? $actions : '',
+            );
+        }
+
+        $data = array('total'=>$groupsCount, 'rows'=>$rows);
+        return $data;
+    }
+
 }

app/controllers/admin/LicensesController.php

@@ -12,6 +12,7 @@ use DB;
 use Redirect;
 use LicenseSeat;
 use Depreciation;
+use Company;
 use Setting;
 use Sentry;
 use Str;
@@ -55,11 +56,14 @@ class LicensesController extends AdminController
         $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
         $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
         $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
+        $company_list = Company::getSelectList();
+
         return View::make('backend/licenses/edit')
             ->with('license_options',$license_options)
             ->with('depreciation_list',$depreciation_list)
             ->with('supplier_list',$supplier_list)
             ->with('maintained_list',$maintained_list)
+            ->with('company_list', $company_list)
             ->with('license',new License);
     }
 
@@ -124,6 +128,7 @@ class LicensesController extends AdminController
             $license->purchase_date     = e(Input::get('purchase_date'));
             $license->purchase_order    = e(Input::get('purchase_order'));
             $license->depreciation_id   = e(Input::get('depreciation_id'));
+            $license->company_id        = Company::getIdForCurrentUser(Input::get('company_id'));
             $license->expiration_date   = e(Input::get('expiration_date'));
             $license->user_id           = Sentry::getId();
 
@@ -181,6 +186,9 @@ class LicensesController extends AdminController
             // Redirect to the blogs management page
             return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($license)) {
+            return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
             if ($license->purchase_date == "0000-00-00") {
                 $license->purchase_date = NULL;
@@ -195,10 +203,13 @@ class LicensesController extends AdminController
         $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
         $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
         $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
+        $company_list = Company::getSelectList();
+
         return View::make('backend/licenses/edit', compact('license'))
             ->with('license_options',$license_options)
             ->with('depreciation_list',$depreciation_list)
             ->with('supplier_list',$supplier_list)
+            ->with('company_list', $company_list)
             ->with('maintained_list',$maintained_list);
     }
 
@@ -216,6 +227,9 @@ class LicensesController extends AdminController
             // Redirect to the blogs management page
             return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($license)) {
+            return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
 
         // get the POST data
@@ -234,6 +248,7 @@ class LicensesController extends AdminController
             $license->notes             = e(Input::get('notes'));
             $license->order_number      = e(Input::get('order_number'));
             $license->depreciation_id   = e(Input::get('depreciation_id'));
+            $license->company_id        = Company::getIdForCurrentUser(Input::get('company_id'));
             $license->purchase_order    = e(Input::get('purchase_order'));
             $license->maintained        = e(Input::get('maintained'));
             $license->reassignable      = e(Input::get('reassignable'));
@@ -374,6 +389,9 @@ class LicensesController extends AdminController
             // Redirect to the license management page
             return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
         }
+        else if (!Company::isCurrentUserHasAccess($license)) {
+            return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         if (($license->assignedcount()) && ($license->assignedcount() > 0)) {
 
@@ -412,6 +430,9 @@ class LicensesController extends AdminController
             // Redirect to the asset management page with error
             return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
         }
+        else if (!Company::isCurrentUserHasAccess($licenseseat->license)) {
+            return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
         // Get the dropdown of users and then pass it to the checkout view
          $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name," (",username,")") as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
@@ -453,11 +474,15 @@ class LicensesController extends AdminController
     public function postCheckout($seatId)
     {
 
-
+        $licenseseat = LicenseSeat::find($seatId);
         $assigned_to = e(Input::get('assigned_to'));
         $asset_id = e(Input::get('asset_id'));
         $user = Sentry::getUser();
 
+        if (!Company::isCurrentUserHasAccess($licenseseat->license)) {
+            return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+
         // Declare the rules for the form validation
         $rules = array(
 
@@ -499,7 +524,7 @@ class LicensesController extends AdminController
 
 
 		// Check if the asset exists
-        if (is_null($licenseseat = LicenseSeat::find($seatId))) {
+        if (is_null($licenseseat)) {
             // Redirect to the asset management page with error
             return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
         }
@@ -602,6 +627,9 @@ class LicensesController extends AdminController
             // Redirect to the asset management page with error
             return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
         }
+        else if (!Company::isCurrentUserHasAccess($licenseseat->license)) {
+            return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+        }
         return View::make('backend/licenses/checkin', compact('licenseseat'))->with('backto',$backto);
 
     }
@@ -621,6 +649,10 @@ class LicensesController extends AdminController
 
         $license = License::find($licenseseat->license_id);
 
+        if (!Company::isCurrentUserHasAccess($license)) {
+            return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+        }
+
         if(!$license->reassignable) {
             // Not allowed to checkin
             Session::flash('error', 'License not reassignable.');
@@ -722,6 +754,10 @@ class LicensesController extends AdminController
         $license = License::find($licenseId);
 
         if (isset($license->id)) {
+
+                if (!Company::isCurrentUserHasAccess($license)) {
+                    return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+                }
                 return View::make('backend/licenses/view', compact('license'));
         } else {
             // Prepare the error message
@@ -739,10 +775,14 @@ class LicensesController extends AdminController
             // Redirect to the blogs management page
             return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.does_not_exist'));
         }
+        else if (!Company::isCurrentUserHasAccess($license_to_clone)) {
+            return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+        }
 
           // Show the page
         $license_options = array('0' => 'Top Level') + License::lists('name', 'id');
-		$maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
+		    $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
+        $company_list = Company::getSelectList();
         //clone the orig
         $license = clone $license_to_clone;
         $license->id = null;
@@ -751,7 +791,13 @@ class LicensesController extends AdminController
         // Show the page
         $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
         $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',$license)->with('maintained_list',$maintained_list);
+        return View::make('backend/licenses/edit')
+        ->with('license_options',$license_options)
+        ->with('depreciation_list',$depreciation_list)
+        ->with('supplier_list',$supplier_list)
+        ->with('license',$license)
+        ->with('maintained_list',$maintained_list)
+        ->with('company_list',$company_list);
 
     }
 
@@ -771,6 +817,11 @@ class LicensesController extends AdminController
 
         if (isset($license->id)) {
 
+
+            if (!Company::isCurrentUserHasAccess($license)) {
+                return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+
         	if (Input::hasFile('licensefile')) {
 
 				foreach(Input::file('licensefile') as $file) {
@@ -842,6 +893,11 @@ class LicensesController extends AdminController
 		// the license is valid
         if (isset($license->id)) {
 
+
+            if (!Company::isCurrentUserHasAccess($license)) {
+                return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+
 			$log = Actionlog::find($fileId);
 			$full_filename = $destinationPath.'/'.$log->filename;
 			if (file_exists($full_filename)) {
@@ -874,6 +930,11 @@ class LicensesController extends AdminController
 
 		// the license is valid
         if (isset($license->id)) {
+
+                if (!Company::isCurrentUserHasAccess($license)) {
+                    return Redirect::to('admin/licenses')->with('error', Lang::get('general.insufficient_permissions'));
+                }
+
 				$log = Actionlog::find($fileId);
 				$file = $log->get_src();
 				return Response::download($file);
@@ -887,41 +948,41 @@ class LicensesController extends AdminController
     }
 
     public function getDatatable() {
-        $licenses = License::orderBy('created_at', 'DESC')->get();
+        $licenses = License::select('id','name','serial','purchase_date','seats', 'company_id')->with('company');
 
-        $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('license_name', function($licenses) {
-            return $licenses->license_name;
-        })
-        ->addColumn('license_email', function($licenses) {
-            return $licenses->license_email;
-        })
-        ->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','license_name','license_email')
-        ->orderColumns('name','serial','totalSeats','remaining','purchase_date','actions','notes','license_name','license_email')
-        ->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,
+                'companyName'       => is_null($license->company) ? '' : e($license->company->name)
+            );
+        }
+
+        $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

@@ -1,6 +1,7 @@
 <?php namespace Controllers\Admin;
 
 use AdminController;
+use Company;
 use Input;
 use Lang;
 use Manufacturer;
@@ -20,9 +21,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 +190,124 @@ 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::with('assets.company')->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>';
+                }
+            }
+        }
+
+        $row = 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()): '',
+          'actions' => $actions,
+          'companyName' => Company::getName($asset),
+        );
+
+        if (isset($inout)) { $row['change'] = $inout; }
+
+        $rows[] = $row;
+      }
+
+      $data = array('total' => $count, 'rows' => $rows);
+      return $data;
+    }
 
 
 }

app/controllers/admin/ModelsController.php

@@ -15,6 +15,9 @@ use Str;
 use Validator;
 use View;
 use Datatable;
+use Asset;
+use Company;
+use Config;
 
 //use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -317,7 +320,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 +342,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 +374,139 @@ 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');
-        ($status != 'Deleted') ?: $models->withTrashed()->Deleted();;
-        $models = $models->get();
+        $models = Model::with('category','assets','depreciation');
+        ($status != 'Deleted') ?: $models->withTrashed()->Deleted();
 
-        $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),
+                'image' => ($model->image!='') ? '<img src="'.Config::get('app.url').'/uploads/models/'.$model->image.'" height=50 width=50>' : '',
+                '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()->with('company');
 
-        $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'));
+        }
+
+        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();
+        $actions = '';
+
+        foreach ($assets as $asset) {
+
+            if ($asset->assetstatus) {
+                if ($asset->assetstatus->deployable != 0) {
+                    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>';
+                    }
                 }
-            });
-
-        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());
             }
-        })
-        ->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,
+                'companyName'   => Company::getName($asset)
+            );
+        }
+
+        $data = array('total' => $assetsCount, 'rows' => $rows);
+
+        return $data;
     }
 
 }

app/controllers/admin/ReportsController.php

@@ -7,6 +7,7 @@ use Asset;
 use AssetMaintenance;
 use Carbon\Carbon;
 use Category;
+use Company;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Response;
@@ -30,7 +31,8 @@ class ReportsController extends AdminController
      */
     public function getAccessoryReport()
     {
-        $accessories = Accessory::orderBy('created_at', 'DESC')->get();
+        $accessories = Accessory::orderBy('created_at', 'DESC')->with('company')->get();
+
         return View::make('backend/reports/accessories', compact('accessories'));
     }
 
@@ -42,6 +44,7 @@ class ReportsController extends AdminController
     public function exportAccessoryReport()
     {
         $accessories = Accessory::orderBy('created_at', 'DESC')->get();
+
         $rows = array();
         $header = array(
             Lang::get('admin/accessories/table.title'),
@@ -78,10 +81,9 @@ class ReportsController extends AdminController
      */
     public function getAssetsReport()
     {
-
         // Grab all the assets
         $assets = Asset::with( 'model', 'assigneduser.userLoc', 'assetstatus', 'defaultLoc', 'assetlog', 'supplier',
-            'model.manufacturer' )
+            'model.manufacturer', 'company' )
                        ->orderBy( 'created_at', 'DESC' )
                        ->get();
 
@@ -95,10 +97,8 @@ class ReportsController extends AdminController
      */
     public function exportAssetReport()
     {
-
         // Grab all the assets
-        $assets = Asset::orderBy( 'created_at', 'DESC' )
-                       ->get();
+        $assets = Asset::orderBy( 'created_at', 'DESC' )->get();
 
         $rows = [ ];
 
@@ -205,9 +205,8 @@ class ReportsController extends AdminController
     {
 
         // Grab all the assets
-        $assets = Asset::with( 'model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog' )
-                       ->orderBy( 'created_at', 'DESC' )
-                       ->get();
+        $assets = Asset::with( 'model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog', 'company' )
+                       ->orderBy( 'created_at', 'DESC' )->get();
 
         return View::make( 'backend/reports/depreciation', compact( 'assets' ) );
     }
@@ -222,8 +221,7 @@ class ReportsController extends AdminController
 
         // Grab all the assets
         $assets = Asset::with( 'model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog' )
-                       ->orderBy( 'created_at', 'DESC' )
-                       ->get();
+                       ->orderBy( 'created_at', 'DESC' )->get();
 
         $csv = \League\Csv\Writer::createFromFileObject( new \SplTempFileObject() );
         $csv->setOutputBOM( Reader::BOM_UTF16_BE );
@@ -296,10 +294,8 @@ class ReportsController extends AdminController
      *
      * @return View
      */
-
     public function getActivityReport()
     {
-
         $log_actions = Actionlog::orderBy( 'created_at', 'DESC' )
                                 ->with( 'adminlog' )
                                 ->with( 'accessorylog' )
@@ -321,6 +317,7 @@ class ReportsController extends AdminController
     {
 
         $licenses = License::orderBy( 'created_at', 'DESC' )
+                           ->with( 'company' )
                            ->get();
 
         return View::make( 'backend/reports/licenses', compact( 'licenses' ) );
@@ -333,9 +330,8 @@ class ReportsController extends AdminController
      */
     public function exportLicenseReport()
     {
+        $licenses = License::orderBy( 'created_at', 'DESC' )->get();
 
-        $licenses = License::orderBy( 'created_at', 'DESC' )
-                           ->get();
         $rows     = [ ];
         $header   = [
             Lang::get( 'admin/licenses/table.title' ),
@@ -380,9 +376,8 @@ class ReportsController extends AdminController
 
     public function postCustom()
     {
+        $assets = Asset::orderBy( 'created_at', 'DESC' )->get();
 
-        $assets = Asset::orderBy( 'created_at', 'DESC' )
-                       ->get();
         $rows   = [ ];
         $header = [ ];
 
@@ -405,7 +400,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 +456,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') {
@@ -557,9 +552,8 @@ class ReportsController extends AdminController
      */
     public function getAssetMaintenancesReport()
     {
-
         // Grab all the improvements
-        $assetMaintenances = \AssetMaintenance::with( 'asset', 'supplier' )
+        $assetMaintenances = \AssetMaintenance::with( 'asset', 'supplier', 'asset.company' )
                                               ->orderBy( 'created_at', 'DESC' )
                                               ->get();
 
@@ -576,7 +570,6 @@ class ReportsController extends AdminController
      */
     public function exportAssetMaintenancesReport()
     {
-
         // Grab all the improvements
         $assetMaintenances = AssetMaintenance::with( 'asset', 'supplier' )
                                              ->orderBy( 'created_at', 'DESC' )
@@ -635,12 +628,9 @@ class ReportsController extends AdminController
      */
     public function getAssetAcceptanceReport()
     {
-
-        $assetsForReport = Asset::notYetAccepted()
-                                ->get();
+        $assetsForReport = Asset::notYetAccepted()->with( 'company' )->get();
 
         return View::make( 'backend/reports/unaccepted_assets', compact( 'assetsForReport' ) );
-
     }
 
     /**
@@ -701,12 +691,13 @@ class ReportsController extends AdminController
      */
     protected function getCheckedOutAssetsRequiringAcceptance( $modelsInCategoriesThatRequireAcceptance )
     {
+        $assets = Asset::deployed()
+                        ->inModelList( $modelsInCategoriesThatRequireAcceptance )
+                        ->select( 'id' )
+                        ->get()
+                        ->toArray();
 
-        return array_pluck( Asset::deployed()
-                                 ->inModelList( $modelsInCategoriesThatRequireAcceptance )
-                                 ->select( 'id' )
-                                 ->get()
-                                 ->toArray(), 'id' );
+        return array_pluck( $assets, 'id' );
     }
 
     /**
@@ -767,7 +758,6 @@ class ReportsController extends AdminController
      */
     protected function getAssetsNotAcceptedYet()
     {
-
         return Asset::unaccepted();
     }
 }

app/controllers/admin/SettingsController.php

@@ -14,6 +14,8 @@ use Image;
 use Config;
 use Response;
 use Artisan;
+use Crypt;
+
 
 class SettingsController extends AdminController
 {
@@ -41,9 +43,20 @@ class SettingsController extends AdminController
      */
     public function getEdit()
     {
-        $settings = Setting::orderBy('created_at', 'DESC')->paginate(10);
+        $setting = Setting::first();
         $is_gd_installed = extension_loaded('gd');
-        return View::make('backend/settings/edit', compact('settings', 'is_gd_installed'));
+
+        // echo '<pre>';
+        // print_r($settings);
+        // echo '</pre>';
+        // exit;
+
+        if ($setting->ldap_pword!='') {
+          $show_ldap_pword = Crypt::decrypt($setting->ldap_pword);
+        } else {
+          $show_ldap_pword = '';
+        }
+        return View::make('backend/settings/edit', compact('setting'))->with('is_gd_installed',$is_gd_installed)->with('show_ldap_pword',$show_ldap_pword);
     }
 
 
@@ -68,7 +81,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',
@@ -77,12 +91,20 @@ class SettingsController extends AdminController
             "default_currency"   => 'required',
 	        "slack_channel"   => 'regex:/(?<!\w)#\w+/',
 	        "slack_botname"   => 'alpha_dash',
+            "ldap_server"   => 'sometimes|required_if:ldap_enabled,1|url',
+            "ldap_uname"     => 'sometimes|required_if:ldap_enabled,1',
+            "ldap_pword"     => 'sometimes|required_if:ldap_enabled,1',
+            "ldap_basedn"     => 'sometimes|required_if:ldap_enabled,1',
+            "ldap_filter"     => 'sometimes|required_if:ldap_enabled,1',
+            "ldap_username_field"     => 'sometimes|required_if:ldap_enabled,1',
+            "ldap_lname_field"     => 'sometimes|required_if:ldap_enabled,1',
+            "ldap_auth_filter_query"     => 'sometimes|required_if:ldap_enabled,1',
+            "ldap_version"     => 'sometimes|required_if:ldap_enabled,1',
 	        );
 
         if (Config::get('app.lock_passwords')==false) {
 	        $rules['site_name'] = 'required|min:3';
-
-	    }
+	      }
 
         // Create a new validator instance from our validation rules
         $validator = Validator::make(Input::all(), $rules);
@@ -115,6 +137,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'));
              }
 
@@ -133,6 +156,24 @@ class SettingsController extends AdminController
             $setting->slack_endpoint = e(Input::get('slack_endpoint'));
             $setting->slack_channel = e(Input::get('slack_channel'));
             $setting->slack_botname = e(Input::get('slack_botname'));
+            $setting->ldap_enabled = Input::get('ldap_enabled', '0');
+            $setting->ldap_server = Input::get('ldap_server');
+            $setting->ldap_uname = Input::get('ldap_uname');
+            $setting->ldap_pword = Crypt::encrypt(Input::get('ldap_pword'));
+            $setting->ldap_basedn = Input::get('ldap_basedn');
+            $setting->ldap_filter = Input::get('ldap_filter');
+            $setting->ldap_username_field = Input::get('ldap_username_field');
+            $setting->ldap_lname_field = Input::get('ldap_lname_field');
+            $setting->ldap_fname_field = Input::get('ldap_fname_field');
+            $setting->ldap_auth_filter_query = Input::get('ldap_auth_filter_query');
+            $setting->ldap_version = Input::get('ldap_version');
+            $setting->ldap_active_flag = Input::get('ldap_active_flag');
+            $setting->ldap_emp_num = Input::get('ldap_emp_num');
+            $setting->ldap_email = Input::get('ldap_email');
+
+            if (Sentry::getUser()->isSuperUser()) {
+                $setting->full_multiple_companies_support = e(Input::get('full_multiple_companies_support', '0'));
+            }
 
 
             // Was the asset updated?

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

@@ -14,6 +14,7 @@ use DB;
 use Input;
 use User;
 use Asset;
+use Company;
 use Lang;
 use Actionlog;
 use Location;
@@ -31,6 +32,8 @@ use Mail;
 use Accessory;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Illuminate\Support\Facades\Log;
+use Crypt;
+
 
 class UsersController extends AdminController {
 
@@ -40,13 +43,14 @@ class UsersController extends AdminController {
      * @var array
      */
     protected $validationRules = array(
-        'first_name' => 'required|alpha_space|min:2',
-        'last_name' => 'required|alpha_space|min:2',
-        'location_id' => 'numeric',
-        'username' => 'required|min:2|unique:users,username',
-        'email' => 'email|unique:users,email',
-        'password' => 'required|min:6',
-        'password_confirm' => 'required|min:6|same:password',
+      'first_name' => 'required|alpha_space|min:2',
+      'last_name' => 'required|alpha_space|min:2',
+      'location_id' => 'numeric',
+      'username' => 'required|min:2|unique:users,deleted_at,NULL',
+      'email' => 'email|unique:users,email',
+      'password' => 'required|min:6',
+      'password_confirm' => 'required|min:6|same:password',
+      'company_id' => 'integer',
     );
 
     /**
@@ -82,6 +86,7 @@ class UsersController extends AdminController {
 
         $location_list = locationsList();
         $manager_list = managerList();
+        $company_list = Company::getSelectList();
 
         /* echo '<pre>';
           print_r($userPermissions);
@@ -93,6 +98,7 @@ class UsersController extends AdminController {
         return View::make('backend/users/edit', compact('groups', 'userGroups', 'permissions', 'userPermissions'))
                         ->with('location_list', $location_list)
                         ->with('manager_list', $manager_list)
+                        ->with('company_list', $company_list)
                         ->with('user', new User);
     }
 
@@ -102,6 +108,12 @@ class UsersController extends AdminController {
      * @return Redirect
      */
     public function postCreate() {
+
+        // echo '<pre>';
+        // print_r($this->validationRules);
+        // echo '</pre>';
+        // exit;
+
         // Create a new validator instance from our validation rules
         $validator = Validator::make(Input::all(), $this->validationRules);
         $permissions = Input::get('permissions', array());
@@ -120,6 +132,8 @@ class UsersController extends AdminController {
             // Get the inputs, with some exceptions
             $inputs = Input::except('csrf_token', 'password_confirm', 'groups', 'email_user');
 
+            $inputs['company_id'] = Company::getIdForUser(Input::get('company_id'));
+
             // @TODO: Figure out WTF I need to do this.
             if ($inputs['manager_id'] == '') {
                 unset($inputs['manager_id']);
@@ -252,6 +266,10 @@ class UsersController extends AdminController {
             // Get the user information
             $user = Sentry::getUserProvider()->findById($id);
 
+            if (!Company::isCurrentUserHasAccess($user)) {
+                return Redirect::route('users')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+
             // Get this user groups
             $userGroups = $user->groups()->lists('group_id', 'name');
 
@@ -267,6 +285,7 @@ class UsersController extends AdminController {
             $this->encodeAllPermissions($permissions);
 
             $location_list = array('' => '') + Location::lists('name', 'id');
+            $company_list = Company::getSelectList();
             $manager_list = array('' => 'Select a User') + DB::table('users')
                             ->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))
                             ->whereNull('deleted_at')
@@ -285,6 +304,7 @@ class UsersController extends AdminController {
         // Show the page
         return View::make('backend/users/edit', compact('user', 'groups', 'userGroups', 'permissions', 'userPermissions'))
                         ->with('location_list', $location_list)
+                        ->with('company_list', $company_list)
                         ->with('manager_list', $manager_list);
     }
 
@@ -309,6 +329,10 @@ class UsersController extends AdminController {
         try {
             // Get the user information
             $user = Sentry::getUserProvider()->findById($id);
+
+            if (!Company::isCurrentUserHasAccess($user)) {
+                return Redirect::route('users')->with('error', Lang::get('general.insufficient_permissions'));
+            }
         } catch (UserNotFoundException $e) {
             // Prepare the error message
             $error = Lang::get('admin/users/message.user_not_found', compact('id'));
@@ -357,6 +381,7 @@ class UsersController extends AdminController {
             $user->jobtitle = Input::get('jobtitle');
             $user->phone = Input::get('phone');
             $user->location_id = Input::get('location_id');
+            $user->company_id = Company::getIdForUser(Input::get('company_id'));
             $user->manager_id = Input::get('manager_id');
             $user->notes = Input::get('notes');
 
@@ -486,9 +511,12 @@ 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');
-            $users = User::whereIn('id', $user_raw_array)->with('groups')->get();
+            $statuslabel_list = statusLabelList();
+            $user_raw_array = array_keys(Input::get('edit_user'));
+
+            $users = User::whereIn('id', $user_raw_array)->with('groups');
+            $users = Company::scopeCompanyables($users)->get();
+
             return View::make('backend/users/confirm-bulk-delete', compact('users', 'statuslabel_list'));
         }
     }
@@ -512,7 +540,9 @@ class UsersController extends AdminController {
 
                 $assets = Asset::whereIn('assigned_to', $user_raw_array)->get();
                 $accessories = DB::table('accessories_users')->whereIn('assigned_to', $user_raw_array)->get();
-                $users = User::whereIn('id', $user_raw_array)->delete();
+
+                $users = User::whereIn('id', $user_raw_array);
+                $users = Company::scopeCompanyables($users)->delete();
 
                 foreach ($assets as $asset) {
 
@@ -572,14 +602,20 @@ class UsersController extends AdminController {
             // Get user information
             $user = Sentry::getUserProvider()->createModel()->withTrashed()->find($id);
 
-            // Restore the user
-            $user->restore();
+            if (!Company::isCurrentUserHasAccess($user)) {
+                return Redirect::route('users')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+            else
+            {
+                // Restore the user
+                $user->restore();
 
-            // Prepare the success message
-            $success = Lang::get('admin/users/message.success.restored');
+                // Prepare the success message
+                $success = Lang::get('admin/users/message.success.restored');
 
-            // Redirect to the user management page
-            return Redirect::route('users')->with('success', $success);
+                // Redirect to the user management page
+                return Redirect::route('users')->with('success', $success);
+            }
         } catch (UserNotFoundException $e) {
             // Prepare the error message
             $error = Lang::get('admin/users/message.user_not_found', compact('id'));
@@ -602,7 +638,12 @@ class UsersController extends AdminController {
         $userlog = $user->userlog->load('assetlog', 'consumablelog', 'assetlog.model', 'licenselog', 'accessorylog', 'userlog', 'adminlog');
 
         if (isset($user->id)) {
-            return View::make('backend/users/view', compact('user', 'userlog'));
+
+            if (!Company::isCurrentUserHasAccess($user)) {
+                return Redirect::route('users')->with('error', Lang::get('general.insufficient_permissions'));
+            } else {
+                return View::make('backend/users/view', compact('user', 'userlog'));
+            }
         } else {
             // Prepare the error message
             $error = Lang::get('admin/users/message.user_not_found', compact('id'));
@@ -689,6 +730,7 @@ class UsersController extends AdminController {
             $this->encodeAllPermissions($permissions);
 
             $location_list = array('' => '') + Location::lists('name', 'id');
+            $company_list = Company::getSelectList();
             $manager_list = array('' => 'Select a User') + DB::table('users')
                             ->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))
                             ->whereNull('deleted_at')
@@ -700,6 +742,7 @@ class UsersController extends AdminController {
             // Show the page
             return View::make('backend/users/edit', compact('groups', 'userGroups', 'permissions', 'userPermissions'))
                             ->with('location_list', $location_list)
+                            ->with('company_list', $company_list)
                             ->with('manager_list', $manager_list)
                             ->with('user', $user)
                             ->with('clone_user', $user_to_clone);
@@ -781,6 +824,7 @@ class UsersController extends AdminController {
                             'password' => $pass,
                             'activated' => $activated,
                             'location_id' => $row[4],
+                            'company_id' => Company::getIdForUser($row[5]),
                             'permissions' => '{"user":1}',
                             'notes' => 'Imported user'
                         );
@@ -824,94 +868,122 @@ 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','users.company_id'))
+            ->with('assets','accessories','consumables','licenses','manager','sentryThrottle','groups','userloc','company');
+        $users = Company::scopeCompanyables($users);
+
+        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;
+             case 'location':
+                $users = $users->OrderLocation($order);
+              break;
+             default:
+                $allowed_columns =
+                [
+                  'last_name','first_name','email','username',
+                  '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(
+                'id'         => $user->id,
+                '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 : '',
+                'companyName'   => is_null($user->company) ? '' : e($user->company->name)
+            );
+        }
 
-        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('username', function($users) {
-                            return $users->username;
-                        })
-                        ->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', 'username', 'manager', 'activated', 'groups', 'location')
-                        ->orderColumns('name', 'email', 'username', 'manager', 'activated', 'licenses', 'assets', 'accessories', 'consumables', 'groups', 'location')
-                        ->make();
+        $data = array('total'=>$userCount, 'rows'=>$rows);
+        return $data;
     }
 
     /**
@@ -928,7 +1000,10 @@ class UsersController extends AdminController {
 
         if (isset($user->id)) {
 
-            if (Input::hasFile('userfile')) {
+            if (!Company::isCurrentUserHasAccess($user)) {
+                return Redirect::route('users')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+            else if (Input::hasFile('userfile')) {
 
                 foreach (Input::file('userfile') as $file) {
 
@@ -989,13 +1064,19 @@ class UsersController extends AdminController {
         // the license is valid
         if (isset($user->id)) {
 
-            $log = Actionlog::find($fileId);
-            $full_filename = $destinationPath . '/' . $log->filename;
-            if (file_exists($full_filename)) {
-                unlink($destinationPath . '/' . $log->filename);
+            if (!Company::isCurrentUserHasAccess($user)) {
+                return Redirect::route('users')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+            else
+            {
+                $log = Actionlog::find($fileId);
+                $full_filename = $destinationPath . '/' . $log->filename;
+                if (file_exists($full_filename)) {
+                    unlink($destinationPath . '/' . $log->filename);
+                }
+                $log->delete();
+                return Redirect::back()->with('success', Lang::get('admin/users/message.deletefile.success'));
             }
-            $log->delete();
-            return Redirect::back()->with('success', Lang::get('admin/users/message.deletefile.success'));
         } else {
             // Prepare the error message
             $error = Lang::get('admin/users/message.does_not_exist', compact('id'));
@@ -1017,9 +1098,15 @@ class UsersController extends AdminController {
 
         // the license is valid
         if (isset($user->id)) {
-            $log = Actionlog::find($fileId);
-            $file = $log->get_src();
-            return Response::download($file);
+            if (!Company::isCurrentUserHasAccess($user)) {
+                return Redirect::route('users')->with('error', Lang::get('general.insufficient_permissions'));
+            }
+            else
+            {
+                $log = Actionlog::find($fileId);
+                $file = $log->get_src();
+                return Response::download($file);
+            }
         } else {
             // Prepare the error message
             $error = Lang::get('admin/users/message.does_not_exist', compact('id'));
@@ -1094,20 +1181,20 @@ class UsersController extends AdminController {
             return Redirect::back()->withInput()->withErrors($formValidator);
         }
 
-        $ldap_version = Config::get('ldap.version');
-        $url = Config::get('ldap.url');
-        $username = Config::get('ldap.username');
-        $password = Config::get('ldap.password');
-        $base_dn = Config::get('ldap.basedn');
-        $filter = Config::get('ldap.filter');
+        $ldap_version = Setting::getSettings()->ldap_version;
+        $url = Setting::getSettings()->ldap_server;
+        $username = Setting::getSettings()->ldap_uname;
+        $password = Crypt::decrypt(Setting::getSettings()->ldap_pword);
+        $base_dn = Setting::getSettings()->ldap_basedn;
+        $filter = Setting::getSettings()->ldap_filter;
 
-        $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');
-        $ldap_result_active_flag = Config::get('ldap.result.active.flag');
+        $ldap_result_username = Setting::getSettings()->ldap_username_field;
+        $ldap_result_last_name = Setting::getSettings()->ldap_lname_field;
+        $ldap_result_first_name = Setting::getSettings()->ldap_fname_field;
 
+        $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag_field;
+        $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num_field;
+        $ldap_result_email = Setting::getSettings()->ldap_email_field;
 
         // Connect to LDAP server
         $ldapconn = @ldap_connect($url);

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_061015_create_companies_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCompaniesTable extends Migration {
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('companies', function(Blueprint $table)
+        {
+            $table->increments('id');
+            $table->string('name')->unique();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('companies');
+    }
+}

app/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddCompanyIdToConsumablesTable extends Migration {
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('consumables', function(Blueprint $table)
+        {
+            $table->integer('company_id')->unsigned()->nullable();
+            $table->foreign('company_id')->references('id')->on('companies');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('consumables', function(Blueprint $table)
+        {
+            $table->dropForeign('consumables_company_id_foreign');
+            $table->dropColumn('company_id');
+        });
+    }
+}

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/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddCompanyIdToAccessoriesTable extends Migration {
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('accessories', function(Blueprint $table)
+        {
+            $table->integer('company_id')->unsigned()->nullable();
+            $table->foreign('company_id')->references('id')->on('companies');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('accessories', function(Blueprint $table)
+        {
+            $table->dropForeign('accessories_company_id_foreign');
+            $table->dropColumn('company_id');
+        });
+    }
+}

app/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddCompanyIdToUsersTable extends Migration {
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function(Blueprint $table)
+        {
+            $table->integer('company_id')->unsigned()->nullable();
+            $table->foreign('company_id')->references('id')->on('companies');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function(Blueprint $table)
+        {
+            $table->dropForeign('users_company_id_foreign');
+            $table->dropColumn('company_id');
+        });
+    }
+}

app/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddCompanyIdToLicensesTable extends Migration {
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('licenses', function(Blueprint $table)
+        {
+            $table->integer('company_id')->unsigned()->nullable();
+            $table->foreign('company_id')->references('id')->on('companies');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('licenses', function(Blueprint $table)
+        {
+            $table->dropForeign('licenses_company_id_foreign');
+            $table->dropColumn('company_id');
+        });
+    }
+}

app/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddCompanyIdToAssetsTable extends Migration {
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('assets', function(Blueprint $table)
+        {
+            $table->integer('company_id')->unsigned()->nullable();
+            $table->foreign('company_id')->references('id')->on('companies');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('assets', function(Blueprint $table)
+        {
+            $table->dropForeign('assets_company_id_foreign');
+            $table->dropColumn('company_id');
+        });
+    }
+}

app/database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php

@@ -0,0 +1,60 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddLdapFieldsToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('settings', function(Blueprint $table)
+		{
+			$table->string('ldap_enabled')->nullable()->default(NULL);
+			$table->string('ldap_server')->nullable()->default(NULL);
+			$table->string('ldap_uname')->nullable()->default(NULL);
+			$table->longText('ldap_pword')->nullable()->default(NULL);
+			$table->string('ldap_basedn')->nullable()->default(NULL);
+			$table->string('ldap_filter')->nullable()->default('cn=*');
+			$table->string('ldap_username_field')->nullable()->default('samaccountname');
+			$table->string('ldap_lname_field')->nullable()->default('sn');
+			$table->string('ldap_fname_field')->nullable()->default('givenname');
+			$table->string('ldap_auth_filter_query')->nullable()->default('uid=samaccountname');
+			$table->integer('ldap_version')->nullable()->default(3);
+			$table->string('ldap_active_flag')->nullable()->default(NULL);
+			$table->string('ldap_emp_num')->nullable()->default(NULL);
+			$table->string('ldap_email')->nullable()->default(NULL);
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('settings', function(Blueprint $table)
+		{
+			$table->dropColumn('ldap_enabled');
+			$table->dropColumn('ldap_server');
+			$table->dropColumn('ldap_uname');
+			$table->longText('ldap_pword');
+			$table->dropColumn('ldap_basedn');
+			$table->dropColumn('ldap_filter');
+			$table->dropColumn('ldap_username_field');
+			$table->dropColumn('ldap_lname_field');
+			$table->dropColumn('ldap_fname_field');
+			$table->dropColumn('ldap_auth_filter_query');
+			$table->dropColumn('ldap_version');
+			$table->dropColumn('ldap_active_flag');
+			$table->dropColumn('ldap_emp_num');
+			$table->dropColumn('ldap_email');
+		});
+	}
+
+}

app/database/migrations/2015_11_15_151803_add_full_multiple_companies_support_to_settings_table.php

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

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/filters.php

@@ -116,6 +116,13 @@ Route::filter('reporting-auth', function () {
     }
 });
 
+Route::filter('backup-auth', function () {
+
+    if (!Sentry::getUser()->isSuperUser()) {
+        return Redirect::route('home')->with('error', Lang::get('general.insufficient_permissions'));
+    }
+});
+
 
 
 /*

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/accessories/message.php

@@ -2,17 +2,17 @@
 
 return array(
 
-    'does_not_exist' => 'هذه الفئة غير موجودة.',
+    'does_not_exist' => 'Accessory does not exist.',
     'assoc_users'	 => 'تم إخراج :count عنصر من هذا الملحق للمستخدمين، الرجاء إيداع الملحقات ثم حاول مرة أخرى. ',
 
     'create' => array(
-        'error'   => 'فشل إنشاء التصنيف، الرجاء المحاولة مرة أخرى.',
-        'success' => 'تم إنشاء الفئة بنجاح.'
+        'error'   => 'Accessory was not created, please try again.',
+        'success' => 'Accessory created successfully.'
     ),
 
     'update' => array(
-        'error'   => 'فشل تحديث التصنيف، الرجاء المحاولة مرة أخرى',
-        'success' => 'Category updated successfully.'
+        'error'   => 'Accessory was not updated, please try again',
+        'success' => 'Accessory updated successfully.'
     ),
 
     'delete' => array(
@@ -20,7 +20,7 @@ return array(
         'error'   => 'There was an issue deleting the category. Please try again.',
         'success' => 'The category was deleted successfully.'
     ),
-    
+
      'checkout' => array(
         'error'   		=> 'لم يتم إخراج الملحق، الرجاء المحاولة مرة أخرى',
         'success' 		=> 'تم إخراج الملحق بنجاح.',

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/hardware/table.php

@@ -18,6 +18,7 @@ return array(
     'serial'   		=> 'Serial',
     'status'   		=> 'Status',
     'title'      	=> 'Asset ',
+    'image'		=> 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance'
 
 );

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

@@ -26,8 +26,27 @@ return array(
     '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.',
+    'ldap_enabled'              => 'LDAP enabled',
+    'ldap_integration'          => 'LDAP Integration',
+    'ldap_settings'             => 'LDAP Settings',
+    'ldap_server'               => 'LDAP Server',
+    'ldap_uname'                => 'LDAP Bind Username',
+    'ldap_pword'                => 'LDAP Bind Password',
+    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_filter'               => 'LDAP Filter',
+    'ldap_username_field'       => 'Username Field',
+    'ldap_lname_field'          => 'Last Name',
+    'ldap_fname_field'          => 'LDAP First Name',
+    'ldap_auth_filter_query'    => 'LDAP Authentication query',
+    'ldap_version'              => 'LDAP Version',
+    'ldap_active_flag'          => 'LDAP Active Flag',
+    'ldap_emp_num'              => 'LDAP Employee Number',
+    'ldap_email'                => 'LDAP Email',
+    'load_remote_text'          => 'Remote Scripts',
+    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
     'logo'                    	=> 'Logo',
+    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
+    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
@@ -47,4 +66,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/general.php

@@ -30,6 +30,8 @@
     'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'ترجيع',
     'city'  				=> 'المدينة',
+    'companies'			=> 'Companies',
+    'company'				=> 'Company',
     'consumable'			=> 'Consumable',
     'consumables'			=> 'Consumables',
     'country'  				=> 'الدولة',
@@ -43,6 +45,7 @@
     'date'					=> 'التاريخ',
     'delete'  				=> 'حذف',
     'deleted'  				=> 'تم حذفها',
+    'delete_seats'  		=> 'Deleted Seats',
     'deployed'				=> 'مُوزعة',
     'depreciation_report'	=> 'تقرير الإستهلاك',
     'download'				=> 'Download',
@@ -65,8 +68,9 @@
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'Item',
+    'insufficient_permissions' => 'Insufficient permissions!',
     'last'					=> 'Last',
-    'last_name'				=> 'الإسم الأخير',
+    'last_name'             => 'الإسم الأخير',
     'license'				=> 'الرخص',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'الرخص المتاحة',
@@ -139,4 +143,5 @@
     'years'					=> 'سنوات',
     'yes' 					=> 'نعم',
     'zip'  					=> 'الرمز البريدي',
+    'noimage'					=> 'No image uploaded or image not found.',
     ];

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

@@ -5,11 +5,14 @@ return array(
     'about_accessories_text'  			=> 'Аксесоарите са всички неща, които се изписват на потребителите, но нямат сериен номер (или няма нужда да бъдат конкретно проследявани). Например, това са мишки, клавиатури и др.',
     'accessory_category' 				=> 'Категория аксесоари',
     'accessory_name'  					=> 'Аксесоар',
+    'cost'					=> 'Стойност на закупуване',
     'create'  							=> 'Създаване на аксесоар',
+    'date'					=> 'Дата на закупуване',
     'eula_text'							=> 'EULA на категорията',
     'eula_text_help'					=> 'Това поле позволява да задавате различни EULA за всеки тип активи. Ако имате обща EULA за всички активи, можете да използвате кутийката по-долу за да използвате една обща по подразбиране.',
     'require_acceptance'				=> 'Задължаване на потребителите да потвърждават приемането на активи от тази категория.',
     'no_default_eula'					=> 'Няма EULA по подразбиране. Добавете я в Настройки.',
+    'order'					=> 'Номер на поръчка',
     'qty'  								=> 'Количество',
     'total'  							=> 'Oбщо',
     'remaining'  						=> 'Наличност',

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

@@ -2,17 +2,17 @@
 
 return array(
 
-    'does_not_exist' => 'Няма такава категория.',
+    'does_not_exist' => 'Accessory does not exist.',
     'assoc_users'	 => 'От този аксесоар са предадени :count броя на потребителите. Моля впишете обратно нови или върнати и опитайте отново.',
 
     'create' => array(
-        'error'   => 'Категорията не беше създадена. Моля опитайте отново.',
-        'success' => 'Категорията е създадена.'
+        'error'   => 'Accessory was not created, please try again.',
+        'success' => 'Accessory created successfully.'
     ),
 
     'update' => array(
-        'error'   => 'Категорията не беше обновена. Моля опитайте отново.',
-        'success' => 'Категорията е обновена.'
+        'error'   => 'Accessory was not updated, please try again',
+        'success' => 'Accessory updated successfully.'
     ),
 
     'delete' => array(
@@ -20,7 +20,7 @@ return array(
         'error'   => 'Проблем при изтриване на категорията. Моля опитайте отново.',
         'success' => 'Категорията бе изтрита успешно.'
     ),
-    
+
      'checkout' => array(
         'error'   		=> 'Аксесоарът не беше изписан. Моля опитайте отново.',
         'success' 		=> 'Аксесоарът изписан успешно.',

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

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

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

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

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

@@ -18,6 +18,7 @@ return array(
     'serial'   		=> 'Сериен номер',
     'status'   		=> 'Статус',
     'title'      	=> 'Актив ',
+    'image'		=> 'Device Image',
     'days_without_acceptance' => 'Дни без да е предаден'
 
 );

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'assets_rtd'		=> 'Бракувани активи',
+    'assets_checkedout'		=> 'Изписани активи',
     'id'      		=> 'ID',
     'city'   		=> 'Град',
     'state'   		=> 'Област',
@@ -13,5 +14,5 @@ return array(
     'zip'			=> 'Пощенски код',
     'locations'		=> 'Местоположения',
     'parent'		=> 'Присъединено към',
-    'currency'  	=> 'Валута на местоположението', // this is deprecated
+    'currency'  	=> 'Валута на местоположението',
 );

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

@@ -26,8 +26,27 @@ return array(
     'header_color'              => 'Цвят на хедъра',
     'info'                      => 'Тези настройки позволяват да конфигурирате различни аспекти на Вашата инсталация.',
     'laravel'                   => 'Версия на Laravel',
-    'load_remote'				=> 'Тази Snipe-IT инсталация може да зарежда и изпълнява външни скриптове.',
+    'ldap_enabled'              => 'LDAP enabled',
+    'ldap_integration'          => 'LDAP Integration',
+    'ldap_settings'             => 'LDAP Settings',
+    'ldap_server'               => 'LDAP Server',
+    'ldap_uname'                => 'LDAP Bind Username',
+    'ldap_pword'                => 'LDAP Bind Password',
+    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_filter'               => 'LDAP Filter',
+    'ldap_username_field'       => 'Username Field',
+    'ldap_lname_field'          => 'Last Name',
+    'ldap_fname_field'          => 'LDAP First Name',
+    'ldap_auth_filter_query'    => 'LDAP Authentication query',
+    'ldap_version'              => 'LDAP Version',
+    'ldap_active_flag'          => 'LDAP Active Flag',
+    'ldap_emp_num'              => 'LDAP Employee Number',
+    'ldap_email'                => 'LDAP Email',
+    'load_remote_text'          => 'Отдалечени скриптове',
+    'load_remote_help_text'		=> 'Тази Snipe-IT инсталация може да зарежда и изпълнява външни скриптове.',
     'logo'                    	=> 'Лого',
+    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
+    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
     'optional'					=> 'незадължително',
     'per_page'                  => 'Резултати на страница',
     'php'                       => 'PHP версия',
@@ -47,4 +66,7 @@ return array(
     'system'                    => 'Информация за системата',
     'update'                    => 'Обновяване на настройките',
     'value'                     => 'Стойност',
+    'brand'                     => 'Брандиране',
+    'about_settings_title'      => 'Относно настройките',
+    'about_settings_text'       => 'Тези настройки позволяват да конфигурирате различни аспекти на Вашата инсталация.',
 );

app/lang/bg/general.php

@@ -30,6 +30,8 @@
     'checkin_from'  		=> 'Форма за вписване',
     'checkout'  			=> 'Изписване',
     'city'  				=> 'Град',
+    'companies'			=> 'Companies',
+    'company'				=> 'Company',
     'consumable'			=> 'Консуматив',
     'consumables'			=> 'Консумативи',
     'country'  				=> 'Държава',
@@ -43,6 +45,7 @@
     'date'					=> 'Дата',
     'delete'  				=> 'Изтриване',
     'deleted'  				=> 'Изтрито',
+    'delete_seats'  		=> 'Изтрити работни места за лиценз',
     'deployed'				=> 'Изписани',
     'depreciation_report'	=> 'Справка за амортизации',
     'download'				=> 'Изтегляне',
@@ -65,8 +68,9 @@
     'asset_maintenance_report' => 'Справка за поддръжка на активи',
     'asset_maintenances'       => 'Поддръжки на активи',
     'item'  				=> 'Информация',
+    'insufficient_permissions' => 'Insufficient permissions!',
     'last'					=> 'Последна',
-    'last_name'				=> 'Фамилия',
+    'last_name'             => 'Фамилия',
     'license'				=> 'Лиценз',
     'license_report'        => 'Справка за лицензите',
     'licenses_available'	=> 'налични лицензи',
@@ -139,4 +143,5 @@
     'years'					=> 'години',
     'yes' 					=> 'Да',
     'zip'  					=> 'Пощенски код',
+    'noimage'					=> 'No image uploaded or image not found.',
     ];

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

@@ -5,11 +5,14 @@ return array(
     'about_accessories_text'  			=> 'Příslušenství je cokoliv, co předáte uživatelům, ale nemá to sérivoé číslo (nebo to neevidujete). Např. myš, klávesnice.',
     'accessory_category' 				=> 'Kategorie příslušenství',
     'accessory_name'  					=> 'Název příslušenství',
+    'cost'					=> 'Purchase Cost',
     'create'  							=> 'Vytvoř příslušenství',
+    'date'					=> 'Purchase Date',
     'eula_text'							=> 'Kategorie EULA',
     'eula_text_help'					=> 'Toto pole umožňuje upravit EULA pro různé druhy majetku. Pokud máte pouze jeden typ pro všechen majetek, můžete zaškrtnout položku níže pro použití jako výchozí.',
     'require_acceptance'				=> 'Požadovat potvrzení převzetí majetku v této kategorii.',
     'no_default_eula'					=> 'Žádná primární EULA. Přidat novou v Nastavení.',
+    'order'					=> 'Order Number',
     'qty'  								=> 'Množství',
     'total'  							=> 'CELKEM',
     'remaining'  						=> 'Dostupný',

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

@@ -2,17 +2,17 @@
 
 return array(
 
-    'does_not_exist' => 'Kategorie neexistuje.',
+    'does_not_exist' => 'Accessory does not exist.',
     'assoc_users'	 => 'Tato kategorie má nyní :count položek k předání uživatelům. Zkontrolujte převzetí příslušenství a zkuste to znovu. ',
 
     'create' => array(
-        'error'   => 'Kategorie nevytvořena, zkuste to znovu.',
-        'success' => 'Kategorie úspěšně vytvořena.'
+        'error'   => 'Accessory was not created, please try again.',
+        'success' => 'Accessory created successfully.'
     ),
 
     'update' => array(
-        'error'   => 'Kategorie neaktualizována, zkuste to znovu',
-        'success' => 'Kategorie úspěšně aktualizována.'
+        'error'   => 'Accessory was not updated, please try again',
+        'success' => 'Accessory updated successfully.'
     ),
 
     'delete' => array(
@@ -20,7 +20,7 @@ return array(
         'error'   => 'Vyskytl se problém při mazání kategorie. Zkuste to znovu.',
         'success' => 'Kategorie byla úspěšně smazána.'
     ),
-    
+
      'checkout' => array(
         'error'   		=> 'Příslušenství nebylo převzato, zkuste to znovu',
         'success' 		=> 'Příslušenství úspěšně předáno.',

app/lang/cs/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'             => 'Začátek',
-        'completion_date'        => 'Completion Date',
+        'completion_date'        => 'Completed',
         'cost'                   => 'Cena',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
+        'asset_maintenance_time' => 'Days',
         'notes'                  => 'Poznámky',
-        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Create Asset Maintenance'
+        'update'                 => 'Update',
+        'create'                 => 'Create'
     ];

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

@@ -6,4 +6,4 @@
         'supplier_name' => 'Dodavatel',
         'is_warranty'   => 'Záruka',
         'dl_csv'        => 'Stáhnout CSV'
-    ];
+    ];

app/lang/cs/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' 			             => 'Zbývá',
     'total' 			                 => 'Celkem',
     'update'                            => 'Update Consumable',

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

@@ -18,6 +18,7 @@ return array(
     'serial'   		=> 'Sériové číslo',
     'status'   		=> 'Stav',
     'title'      	=> 'Majetek ',
+    'image'		=> 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance'
 
 );

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'assets_rtd'		=> 'Assets RTD',
+    'assets_checkedout'		=> 'Assets Assigned',
     'id'      		=> 'ID',
     'city'   		=> 'Město',
     'state'   		=> 'Stát',
@@ -13,5 +14,5 @@ return array(
     'zip'			=> 'PSČ',
     'locations'		=> 'Umístění',
     'parent'		=> 'Parent',
-    'currency'  	=> 'Location Currency', // this is deprecated
+    'currency'  	=> 'Location Currency',
 );

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

@@ -26,8 +26,27 @@ return array(
     'header_color'              => 'Barva záhlaví',
     'info'                      => 'Tato nastavení umožňují zvolit určité prvky instalace.',
     'laravel'                   => 'Verze Laravel',
-    'load_remote'				=> 'Tato instalace Snipe-IT může nahrávat skripty z vnějšího světa.',
+    'ldap_enabled'              => 'LDAP enabled',
+    'ldap_integration'          => 'LDAP Integration',
+    'ldap_settings'             => 'LDAP Settings',
+    'ldap_server'               => 'LDAP Server',
+    'ldap_uname'                => 'LDAP Bind Username',
+    'ldap_pword'                => 'LDAP Bind Password',
+    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_filter'               => 'LDAP Filter',
+    'ldap_username_field'       => 'Username Field',
+    'ldap_lname_field'          => 'Last Name',
+    'ldap_fname_field'          => 'LDAP First Name',
+    'ldap_auth_filter_query'    => 'LDAP Authentication query',
+    'ldap_version'              => 'LDAP Version',
+    'ldap_active_flag'          => 'LDAP Active Flag',
+    'ldap_emp_num'              => 'LDAP Employee Number',
+    'ldap_email'                => 'LDAP Email',
+    'load_remote_text'          => 'Remote Scripts',
+    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
     'logo'                    	=> 'Logo',
+    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
+    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
     'optional'					=> 'volitelný',
     'per_page'                  => 'Výsledků na stránku',
     'php'                       => 'Verze PHP',
@@ -47,4 +66,7 @@ return array(
     'system'                    => 'Systémové informace',
     'update'                    => 'Upravit nastavení',
     'value'                     => 'Hodnota',
+    'brand'                     => 'Branding',
+    'about_settings_title'      => 'About Settings',
+    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
 );

app/lang/cs/general.php

@@ -30,6 +30,8 @@
     'checkin_from'  		=> 'Převzít od',
     'checkout'  			=> 'Výdej',
     'city'  				=> 'Město',
+    'companies'			=> 'Companies',
+    'company'				=> 'Company',
     'consumable'			=> 'Consumable',
     'consumables'			=> 'Consumables',
     'country'  				=> 'Země',
@@ -43,6 +45,7 @@
     'date'					=> 'Datum',
     'delete'  				=> 'Odstranit',
     'deleted'  				=> 'Odstraněno',
+    'delete_seats'  		=> 'Deleted Seats',
     'deployed'				=> 'Vydané',
     'depreciation_report'	=> 'Report zastarání',
     'download'				=> 'Stáhnout',
@@ -65,8 +68,9 @@
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'Položka',
+    'insufficient_permissions' => 'Insufficient permissions!',
     'last'					=> 'Poslední',
-    'last_name'				=> 'Příjmení',
+    'last_name'             => 'Příjmení',
     'license'				=> 'Licence',
     'license_report'        => 'Report licencí',
     'licenses_available'	=> 'dostupných licencí',
@@ -139,4 +143,5 @@
     'years'					=> 'roky',
     'yes' 					=> 'Ano',
     'zip'  					=> 'PSČ',
+    'noimage'					=> 'No image uploaded or image not found.',
     ];

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

@@ -5,15 +5,18 @@ return array(
     'about_accessories_text'  			=> 'Tilbehør er alt du udleverer til brugere men som ikke har et serienummer (eller som du er ligeglad med følge præcist). For eksempel, computermus eller tastaturer.',
     'accessory_category' 				=> 'Tilbehør Kategori',
     'accessory_name'  					=> 'Tilbehør Navn',
-    'create'  							=> 'Create Accessory',
+    'cost'					=> 'Indkøbspris',
+    'create'  							=> 'Opret tilbehør',
+    'date'					=> 'Købsdato',
     'eula_text'							=> 'Slutbrugerlicenskategori',
     'eula_text_help'					=> 'Dette felt tillader dig at tilpasse din slutbrugerlicens til specifikke typer af tilbehør. Hvis du kun har en slutbrugerlicens for alle dine tilbehør, kan du afkrydse boksen nedenfor for at bruge den primære standardlicens.',
     'require_acceptance'				=> 'Kræver brugere at bekræfte accept af tilbehør i denne kategori.',
     'no_default_eula'					=> 'Ingen primær standard slutbrugerlicens blev fundet. Tilføj en under Indstillinger.',
+    'order'					=> 'Ordrenummer',
     'qty'  								=> 'STK',
     'total'  							=> 'I alt',
     'remaining'  						=> 'Tilgængelig',
-    'update'  							=> 'Update Accessory',
+    'update'  							=> 'Opdater tilbehør',
     'use_default_eula'					=> 'Brug den <a href="#" data-toggle="modal" data-target="#eulaModal">primære standard slutbrugerlicens</a> i stedet for.',
     'use_default_eula_disabled'			=> '<del>Brug den primære standard slutbrugerlicens i stedet for.</del> Ingen primær standard slutbrugerlicens er defineret. Tilføj en under indstillinger.',
 

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

@@ -2,17 +2,17 @@
 
 return array(
 
-    'does_not_exist' => 'Kategorien eksisterer ikke.',
+    'does_not_exist' => 'Accessory does not exist.',
     'assoc_users'	 => 'Dette tilbehør har pt. :count emner tjekket ud til brugere. Tjek tilbehør ind og prøv igen.',
 
     'create' => array(
-        'error'   => 'Kategorien blev ikke oprettet, prøv igen.',
-        'success' => 'Kategorien blev oprettet.'
+        'error'   => 'Accessory was not created, please try again.',
+        'success' => 'Accessory created successfully.'
     ),
 
     'update' => array(
-        'error'   => 'Kategorien blev ikke opdateret, prøv igen',
-        'success' => 'Kategorien blev opdateret.'
+        'error'   => 'Accessory was not updated, please try again',
+        'success' => 'Accessory updated successfully.'
     ),
 
     'delete' => array(
@@ -20,7 +20,7 @@ return array(
         'error'   => 'Der opstod et problem under sletning af kategorien. Prøv igen.',
         'success' => 'Kategorien blev slettet.'
     ),
-    
+
      'checkout' => array(
         'error'   		=> 'Tilbehør blev ikke tjekket ud, prøv igen',
         'success' 		=> 'Tilbehør er tjekket ud.',

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

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-	'dl_csv'      				=> 'Download CSV',
+	'dl_csv'      				=> 'Hent CSV',
 	'eula_text'      			=> 'Slutbrugerlicens',
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Accept',

app/lang/da/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/da/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/da/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/da/admin/hardware/table.php

@@ -18,6 +18,7 @@ return array(
     'serial'   		=> 'Serial',
     'status'   		=> 'Status',
     'title'      	=> 'Asset ',
+    'image'		=> 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance'
 
 );

app/lang/da/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/da/admin/settings/general.php

@@ -26,8 +26,27 @@ return array(
     '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.',
+    'ldap_enabled'              => 'LDAP enabled',
+    'ldap_integration'          => 'LDAP Integration',
+    'ldap_settings'             => 'LDAP Settings',
+    'ldap_server'               => 'LDAP Server',
+    'ldap_uname'                => 'LDAP Bind Username',
+    'ldap_pword'                => 'LDAP Bind Password',
+    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_filter'               => 'LDAP Filter',
+    'ldap_username_field'       => 'Username Field',
+    'ldap_lname_field'          => 'Last Name',
+    'ldap_fname_field'          => 'LDAP First Name',
+    'ldap_auth_filter_query'    => 'LDAP Authentication query',
+    'ldap_version'              => 'LDAP Version',
+    'ldap_active_flag'          => 'LDAP Active Flag',
+    'ldap_emp_num'              => 'LDAP Employee Number',
+    'ldap_email'                => 'LDAP Email',
+    'load_remote_text'          => 'Remote Scripts',
+    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
     'logo'                    	=> 'Logo',
+    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
+    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
@@ -47,4 +66,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/da/auth/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'account_already_exists' => 'En konto med denne e-mail eksisterer allerede.',
-    'account_not_found'      => 'The username or password is incorrect.',
+    'account_not_found'      => 'Brugernavn eller kodeord er forkert.',
     'account_not_activated'  => 'Denne brugerkonto er ikke aktiveret.',
     'account_suspended'      => 'Denne brugerkonto er suspenderet.',
     'account_banned'         => 'Denne brugerkonto er blokeret.',

app/lang/da/button.php

@@ -8,7 +8,7 @@ return array(
     'delete'  	=> 'Slet',
     'edit'    	=> 'Rediger',
     'restore' 	=> 'Gendan',
-    'request'   => 'Request',
+    'request'   => 'Anmodning',
     'submit'  	=> 'Send',
     'upload'    => 'Upload',
 

app/lang/da/general.php

@@ -30,6 +30,8 @@
     'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Tjek Ud',
     'city'  				=> 'By',
+    'companies'			=> 'Companies',
+    'company'				=> 'Company',
     'consumable'			=> 'Consumable',
     'consumables'			=> 'Consumables',
     'country'  				=> 'Land',
@@ -43,6 +45,7 @@
     'date'					=> 'Dato',
     'delete'  				=> 'Slet',
     'deleted'  				=> 'Slettet',
+    'delete_seats'  		=> 'Deleted Seats',
     'deployed'				=> 'Implementeret',
     'depreciation_report'	=> 'Afskrivningsrapport',
     'download'				=> 'Hent',
@@ -65,8 +68,9 @@
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'Item',
+    'insufficient_permissions' => 'Insufficient permissions!',
     'last'					=> 'Last',
-    'last_name'				=> 'Efternavn',
+    'last_name'             => 'Efternavn',
     'license'				=> 'Licens',
     'license_report'        => 'Licensrapport',
     'licenses_available'	=> 'Tilgængelige licenser',
@@ -139,4 +143,5 @@
     'years'					=> 'år',
     'yes' 					=> 'Ja',
     'zip'  					=> 'Postnummer',
+    'noimage'					=> 'No image uploaded or image not found.',
     ];

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

@@ -5,11 +5,14 @@ return array(
     'about_accessories_text'  			=> 'Ein Zubehör ist alles was Sie an einem Benutzer ausgeben können, jedoch keine Seriennummer besitzt (oder wo es keinen Sinn macht eben diese zu verwalten). Zum Beispiel: Computer Mäuse und Tastaturen.',
     'accessory_category' 				=> 'Züberhor Kategorie',
     'accessory_name'  					=> 'Zubehör Name',
+    'cost'					=> 'Einkaufspreis',
     'create'  							=> 'Zubehör neu erstellen',
+    'date'					=> 'Kaufdatum',
     'eula_text'							=> 'Kategorie EULA',
     'eula_text_help'					=> 'Dieses Feld erlaubt Ihnen die EULA Ihren Bedürfnissen nach Asset Typ anzupassen.Wenn Sie nur eine EULA für alle Assets haben, aktivieren Sie die Checkbox unterhalb um die Standard EULA zu verwenden.',
     'require_acceptance'				=> 'Erfordert die Zustimmung der Assets in dieser Kategorie durch den Benutzer.',
     'no_default_eula'					=> 'Keine Standard EULA gefunden. Fügen Sie eine in den Einstellungen hinzu.',
+    'order'					=> 'Bestellnummer',
     'qty'  								=> 'Anzahl',
     'total'  							=> 'Gesamt',
     'remaining'  						=> 'Verfügbar',

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

@@ -2,17 +2,17 @@
 
 return array(
 
-    'does_not_exist' => 'Diese Kategorie existiert nicht.',
+    'does_not_exist' => 'Accessory does not exist.',
     'assoc_users'	 => 'Dieses Zubehör ist derzeit an :count  Benutzern zur Verwendung ausgegeben worden. Bitte buchen Sie das Zubehör wieder ein und versuchen es dann noch Einmal. ',
 
     'create' => array(
-        'error'   => 'Die Kategorie wurde nicht erstellt, bitte versuchen Sie es erneut.',
-        'success' => 'Die Kategorie wurde erfolgreich erstellt.'
+        'error'   => 'Accessory was not created, please try again.',
+        'success' => 'Accessory created successfully.'
     ),
 
     'update' => array(
-        'error'   => 'Die Kategorie konnte nicht aktualisiert werden, bitte versuchen Sie es erneut',
-        'success' => 'Die Kategorie wurde erfolgreich aktualisiert.'
+        'error'   => 'Accessory was not updated, please try again',
+        'success' => 'Accessory updated successfully.'
     ),
 
     'delete' => array(
@@ -20,7 +20,7 @@ return array(
         'error'   => 'Beim Löschen der Kategorie ist ein Problem aufgetreten. Bitte versuchen Sie es erneut.',
         'success' => 'Die Kategorie wurde erfolgreich gelöscht.'
     ),
-    
+
      'checkout' => array(
         'error'   		=> 'Zubehör konnte nicht ausgebucht werden, bitte versuchen Sie es erneut',
         'success' 		=> 'Zubehör erfolgreich ausgebucht.',

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

@@ -6,4 +6,4 @@
         'supplier_name' => 'Hersteller',
         'is_warranty'   => 'Garantie',
         'dl_csv'        => 'Als CSV herunterladen'
-    ];
+    ];

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

@@ -4,7 +4,10 @@ return array(
     'about_consumables_title' 			=> 'Details Verbrauchsmaterialien',
     'about_consumables_text'  			=> 'Verbrauchsmaterialien sind alle Dinge, die gekauft und mit der Zeit aufgebraucht werden, wie z.B. Druckerpatronen oder Kopierpapier.',
     'consumable_name'                  => 'Name des Verbrauchsmaterials',
+    'cost'				=> 'Einkaufspreis',
     'create'                             => 'Verbrauchsmaterial erstellen',
+    'date'					=> 'Kaufdatum',
+    'order'					=> 'Bestellnummer',
     'remaining' 			             => 'übrig',
     'total' 			                 => 'Gesamt',
     'update'                            => 'Verbrauchsmaterial überarbeiten',

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

@@ -18,6 +18,7 @@ return array(
     'serial'   		=> 'Seriennummer',
     'status'   		=> 'Status',
     'title'      	=> 'Asset ',
+    'image'		=> 'Device Image',
     'days_without_acceptance' => 'Tage ohne Akzeptierung'
 
 );

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-
+    'assets_rtd'		=> 'Asset bereit zum Herausgeben',
+    'assets_checkedout'		=> 'Zugewiesene Assets',
     'id'      		=> 'ID',
     'city'   		=> 'Stadt',
     'state'   		=> 'Bundesland',
@@ -13,5 +14,5 @@ return array(
     'zip'			=> 'Postleitzahl',
     'locations'		=> 'Standorte',
     'parent'		=> 'Hauptkategorie',
-    'currency'  	=> 'Landeswährung', // this is deprecated
+    'currency'  	=> 'Landeswährung',
 );

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

@@ -26,8 +26,27 @@ return array(
     'header_color'              => 'Farbe der Kopfzeile',
     'info'                      => 'Mit diesen Einstellungen können Sie verschieden Aspekte Ihrer Installation bearbeiten.',
     'laravel'                   => 'Laravel Version',
-    'load_remote'				=> 'Diese Installation von Snipe-IT kann Skripte aus der Aussenwelt laden.',
+    'ldap_enabled'              => 'LDAP enabled',
+    'ldap_integration'          => 'LDAP Integration',
+    'ldap_settings'             => 'LDAP Settings',
+    'ldap_server'               => 'LDAP Server',
+    'ldap_uname'                => 'LDAP Bind Username',
+    'ldap_pword'                => 'LDAP Bind Password',
+    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_filter'               => 'LDAP Filter',
+    'ldap_username_field'       => 'Username Field',
+    'ldap_lname_field'          => 'Last Name',
+    'ldap_fname_field'          => 'LDAP First Name',
+    'ldap_auth_filter_query'    => 'LDAP Authentication query',
+    'ldap_version'              => 'LDAP Version',
+    'ldap_active_flag'          => 'LDAP Active Flag',
+    'ldap_emp_num'              => 'LDAP Employee Number',
+    'ldap_email'                => 'LDAP Email',
+    'load_remote_text'          => 'Remote Skripte',
+    'load_remote_help_text'		=> 'Diese Installation von Snipe-IT kann Skripte von außerhalb laden.',
     'logo'                    	=> 'Logo',
+    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
+    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
     'optional'					=> 'optional',
     'per_page'                  => 'Ergebnisse pro Seite',
     'php'                       => 'PHP Version',
@@ -47,4 +66,7 @@ return array(
     'system'                    => 'Systeminformationen',
     'update'                    => 'Einstellungen übernehmen',
     'value'                     => 'Wert',
+    'brand'                     => 'Branding',
+    'about_settings_title'      => 'Über Einstellungen',
+    'about_settings_text'       => 'Mit diesen Einstellungen können Sie verschiedene Aspekte Ihrer Installation anpassen.',
 );

app/lang/de/general.php

@@ -30,6 +30,8 @@
     'checkin_from'  		=> 'Einchecken von',
     'checkout'  			=> 'Checkout Asset to User',
     'city'  				=> 'Stadt',
+    'companies'			=> 'Companies',
+    'company'				=> 'Company',
     'consumable'			=> 'Verbrauchsmaterial',
     'consumables'			=> 'Verbrauchsmaterialien',
     'country'  				=> 'Land',
@@ -43,6 +45,7 @@
     'date'					=> 'Purchase Date',
     'delete'  				=> 'Löschen',
     'deleted'  				=> 'Gelöscht',
+    'delete_seats'  		=> 'Gelöschte Lizenzen',
     'deployed'				=> 'Herausgegeben',
     'depreciation_report'	=> 'Abschreibunsgreport',
     'download'				=> 'Download',
@@ -65,8 +68,9 @@
     'asset_maintenance_report' => 'Asset Wartungsbericht',
     'asset_maintenances'       => 'Asset Wartungen',
     'item'  				=> 'Gegenstand',
+    'insufficient_permissions' => 'Insufficient permissions!',
     'last'					=> 'Letztes',
-    'last_name'				=> 'Familienname',
+    'last_name'             => 'Familienname',
     'license'				=> 'Lizenz',
     'license_report'        => 'Lizenz Report',
     'licenses_available'	=> 'Verfügbare Lizenzen',
@@ -139,4 +143,5 @@
     'years'					=> 'Jahre',
     'yes' 					=> 'Ja',
     'zip'  					=> 'Postal Code',
+    'noimage'					=> 'No image uploaded or image not found.',
     ];

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

@@ -5,11 +5,14 @@ return array(
     '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',
+    'cost'					=> 'Purchase Cost',
     'create'  							=> 'Create Accessory',
+    'date'					=> 'Purchase Date',
     '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.',
+    'order'					=> 'Order Number',
     'qty'  								=> 'QTY',
     'total'  							=> 'Total',
     'remaining'  						=> 'Avail',

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

@@ -2,17 +2,17 @@
 
 return array(
 
-    'does_not_exist' => 'Category does not exist.',
+    'does_not_exist' => 'Accessory does not exist.',
     'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
 
     'create' => array(
-        'error'   => 'Category was not created, please try again.',
-        'success' => 'Category created successfully.'
+        'error'   => 'Accessory was not created, please try again.',
+        'success' => 'Accessory created successfully.'
     ),
 
     'update' => array(
-        'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'error'   => 'Accessory was not updated, please try again',
+        'success' => 'Accessory updated successfully.'
     ),
 
     'delete' => array(
@@ -20,7 +20,7 @@ return array(
         'error'   => 'There was an issue deleting the category. Please try again.',
         'success' => 'The category was deleted successfully.'
     ),
-    
+
      'checkout' => array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',

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

@@ -6,4 +6,4 @@
         'supplier_name' => 'Supplier Name',
         'is_warranty'   => 'Warranty',
         'dl_csv'        => 'Download CSV'
-    ];
+    ];

app/lang/en-GB/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/en-GB/admin/hardware/table.php

@@ -18,6 +18,7 @@ return array(
     'serial'   		=> 'Serial',
     'status'   		=> 'Status',
     'title'      	=> 'Asset ',
+    'image'		=> 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance'
 
 );

app/lang/en-GB/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/en-GB/admin/settings/general.php

@@ -26,8 +26,27 @@ return array(
     '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.',
+    'ldap_enabled'              => 'LDAP enabled',
+    'ldap_integration'          => 'LDAP Integration',
+    'ldap_settings'             => 'LDAP Settings',
+    'ldap_server'               => 'LDAP Server',
+    'ldap_uname'                => 'LDAP Bind Username',
+    'ldap_pword'                => 'LDAP Bind Password',
+    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_filter'               => 'LDAP Filter',
+    'ldap_username_field'       => 'Username Field',
+    'ldap_lname_field'          => 'Last Name',
+    'ldap_fname_field'          => 'LDAP First Name',
+    'ldap_auth_filter_query'    => 'LDAP Authentication query',
+    'ldap_version'              => 'LDAP Version',
+    'ldap_active_flag'          => 'LDAP Active Flag',
+    'ldap_emp_num'              => 'LDAP Employee Number',
+    'ldap_email'                => 'LDAP Email',
+    'load_remote_text'          => 'Remote Scripts',
+    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
     'logo'                    	=> 'Logo',
+    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
+    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
@@ -47,4 +66,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/en-GB/general.php

@@ -30,6 +30,8 @@
     'checkin_from'  		=> 'Checkin from',
     'checkout'  			=> 'Checkout',
     'city'  				=> 'City',
+    'companies'			=> 'Companies',
+    'company'				=> 'Company',
     'consumable'			=> 'Consumable',
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
@@ -43,6 +45,7 @@
     'date'					=> 'Date',
     'delete'  				=> 'Delete',
     'deleted'  				=> 'Deleted',
+    'delete_seats'  		=> 'Deleted Seats',
     'deployed'				=> 'Deployed',
     'depreciation_report'	=> 'Depreciation Report',
     'download'				=> 'Download',
@@ -65,8 +68,9 @@
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'Item',
+    'insufficient_permissions' => 'Insufficient permissions!',
     'last'					=> 'Last',
-    'last_name'				=> 'Last Name',
+    'last_name'             => 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'licenses available',
@@ -139,4 +143,5 @@
     'years'					=> 'years',
     'yes' 					=> 'Yes',
     'zip'  					=> 'Zip',
+    'noimage'					=> 'No image uploaded or image not found.',
     ];

app/lang/en-ID/admin/accessories/general.php

@@ -5,11 +5,14 @@ return array(
     'about_accessories_text'  			=> 'Aksesoris adalah Aset yang tidak memiliki nomor seri (atau Anda tidak peduli tentang pelacakan mereka secara unik). Misalnya, mouse komputer atau keyboard.',
     'accessory_category' 				=> 'Kategori Aksesoris',
     'accessory_name'  					=> 'Nama Aksesoris',
+    'cost'					=> 'Purchase Cost',
     'create'  							=> 'Buat Aksesoris',
+    'date'					=> 'Purchase Date',
     'eula_text'							=> 'Kategori EULA',
     'eula_text_help'					=> 'Bidang ini memungkinkan Anda untuk menyesuaikan EULA Anda untuk jenis tertentu dari aset. Jika Anda hanya memiliki satu EULA untuk semua aset Anda, Anda dapat memeriksa kotak di bawah untuk menggunakan default primer.',
     'require_acceptance'				=> 'Mengharuskan pengguna untuk mengkonfirmasi penerimaan aset dalam kategori ini.',
     'no_default_eula'					=> 'Tidak ada EULA standar utama yang ditemukan. Tambahkan satu di Settings.',
+    'order'					=> 'Order Number',
     'qty'  								=> 'QTY',
     'total'  							=> 'Total',
     'remaining'  						=> 'Tersedia',

app/lang/en-ID/admin/accessories/message.php

@@ -2,17 +2,17 @@
 
 return array(
 
-    'does_not_exist' => 'Kategori tidak ada.',
+    'does_not_exist' => 'Accessory does not exist.',
     'assoc_users'	 => 'Aksesori saat ini memiliki :count item untuk pengguna. Silahkan cek di aksesoris dan dan coba lagi. ',
 
     'create' => array(
-        'error'   => 'Kategori gagal dibuat, silakan coba lagi.',
-        'success' => 'Kategori berhasil disimpan.'
+        'error'   => 'Accessory was not created, please try again.',
+        'success' => 'Accessory created successfully.'
     ),
 
     'update' => array(
-        'error'   => 'Kategori tidak terupdate, silakan coba lagi',
-        'success' => 'Kategori berhasil diupdate.'
+        'error'   => 'Accessory was not updated, please try again',
+        'success' => 'Accessory updated successfully.'
     ),
 
     'delete' => array(
@@ -20,7 +20,7 @@ return array(
         'error'   => 'Ada masalah menghapus kategori. Silakan coba lagi.',
         'success' => 'Kategori berhasil dihapus.'
     ),
-    
+
      'checkout' => array(
         'error'   		=> 'Aksesori belum diperiksa, silakan coba lagi',
         'success' 		=> 'Aksesori berhasil diperiksa.',

app/lang/en-ID/admin/asset_maintenances/table.php

@@ -6,4 +6,4 @@
         'supplier_name' => 'Nama Suplayer',
         'is_warranty'   => 'Jaminan',
         'dl_csv'        => 'Unduh CSV'
-    ];
+    ];