Merge remote-tracking branch 'origin/develop'

This reverts commit ca625418fe.

.gitignore

@@ -23,6 +23,12 @@ public/uploads/logo.gif
 public/uploads/logo.png
 .siteflow
 public/assets/.siteflow
-.settings/settings.json
-
-
+app/config/local/session.php
+.couscous
+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

.travis.yml

@@ -1,6 +1,7 @@
 addons:
-  hosts:
-    - AlisonMBP
+    hosts:
+        - localhost
+sudo: false
 
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php
@@ -13,28 +14,39 @@ php:
 
 # optionally specify a list of environments, for example to test different RDBMS
 env:
-  - DB=mysql
+  - DB=mysql APP_ENV=travis-ci
 
 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:
-  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;" -utravis; fi
+  - hostname
+  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_unit;" -utravis; fi
   - curl -s http://getcomposer.org/installer | php
-  - cp app/config/testing/app.example.php app/config/testing/app.php
-  - cp app/config/testing/database.example.php app/config/testing/database.php
-  - cp app/config/testing/mail.example.php app/config/testing/mail.php
+  - cp app/config/travis-ci/app.example.php app/config/travis-ci/app.php
+  - cp app/config/travis-ci/database.example.php app/config/travis-ci/database.php
+  - cp app/config/travis-ci/mail.example.php app/config/travis-ci/mail.php
   - composer self-update
   - composer install --prefer-source --no-interaction
-  - php artisan key:generate --env=testing
-  - php artisan migrate:install --env=testing --no-interaction -vvv
-  - php artisan migrate --package cartalyst/sentry --env=testing --no-interaction -vvv
-  - php artisan migrate --env=testing --no-interaction -vvv
-  - php artisan db:seed --env=testing --no-interaction -vvv
+  - php artisan key:generate
+  - php artisan migrate:install --no-interaction -vvv
+  - php artisan migrate --package cartalyst/sentry --no-interaction -vvv
+  - php artisan migrate --no-interaction -vvv
+  - php artisan db:seed --no-interaction -vvv
+  - ./vendor/bin/codecept build
+  - APP_ENV=travis-ci php artisan serve --port=8007 &
+  - sleep 5
 
 # omitting "script:" will default to phpunit
 # use the $DB env variable to determine the phpunit.xml to use
-script: phpunit
+script: ./vendor/bin/codecept run --env travis-ci -vvv
 
 # configure notifications (email, IRC, campfire etc)
 notifications:
+  email: false
   slack:
     secure: vv9we1RxB9RsrMbomSdq6D7vz/okobw87pEkgIZjB+hj1QpQ2by90gsPsOa+NgsJEFaEP7e4KlT6SH8kK+zhbmuKaUd3d1//XdcancE22LZXi6tkiB5yuR/Jhhb1LLDqyGJTB4D92hMnnCPiUjpxNA3r437ttNeYRdYIEEP3drA=
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/5e136eb0c1965f3918d0
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: change  # options: [always|never|change] default: always
+    on_start: false     # default: false

Dockerfile

@@ -4,6 +4,8 @@ MAINTAINER Brady Wetherington <uberbrady@gmail.com>
 RUN apt-get update && apt-get install -y \
 apache2-bin \
 libapache2-mod-php5 \
+php5-curl \
+php5-ldap \
 php5-mysql \
 php5-mcrypt \
 php5-gd \
@@ -31,36 +33,13 @@ RUN a2enmod rewrite
 
 ############ INITIAL APPLICATION SETUP #####################
 
-COPY docker/app_start.patch /tmp/app_start.patch
-
 WORKDIR /var/www/html
 
-#Patch bootstrap file
-RUN patch -p1 < /tmp/app_start.patch
+#Append to bootstrap file (less brittle than 'patch')
+RUN sed -i 's/return $app;/$env="production";\nreturn $app;/' bootstrap/start.php
 
-#DB create?
-# mysqladmin -u root  create snipeit_laravel
-
-#DB create user, grant access to new DB?
-# grant all privileges on snipeit_laravel.* TO snipeit;
-
-#DB config file init? (NEVER overwrite!)
-#RUN cp -n /var/www/html/app/config/production/database.example.php /var/www/html/app/config/production/database.php
-COPY docker/database.php /var/www/html/app/config/production/database.php
-
-COPY docker/mail.php /var/www/html/app/config/production/mail.php
-
-#change DB file user
-#RUN sed -i s/travis/snipe_it/ /var/www/html/app/config/production/database.php
-
-#init app config file (DO NOT overwrite!)
-RUN cp -n /var/www/html/app/config/production/app.example.php /var/www/html/app/config/production/app.php
-
-# Change default hostname to blank...I guess?
-RUN sed -i s%http://staging.yourserver.com%% /var/www/html/app/config/production/app.php
-
-# turn off the toolbar
-RUN sed -i 's%\x27debug\x27 => true%\x27debug\x27 => false%' /var/www/html/app/config/production/app.php
+#copy all configuration files
+COPY docker/*.php /var/www/html/app/config/production/
 
 RUN chown -R docker /var/www/html
 

README.md

@@ -9,18 +9,23 @@ This is a FOSS project for asset management in IT Operations. Knowing who has wh
 
 It is built on [Laravel 4.2](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
 
-This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](http://snipeitapp.com/demo/).)
+This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)
 
 __This is web-based software__. This means there there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows.
 
 -----
-### Documentation & Installation
 
-__Installation and configuration documentation for this project has been moved to http://snipeitapp.com/documentation/.__
+### Installation
 
-We'll be adding a long-overdue user's manual soon as well.
+__Installation and configuration documentation for this project has been moved to http://docs.snipeitapp.com.__
 
-__To deploy on Ubuntu using Ansible and Vagrant, be sure to check out the [Snipe-IT Installation scripts](https://github.com/GR360RY/snipeit-ansible) created by [@GR360RY](https://github.com/GR360RY/).__
+#### Server Requirements
+Please see the [requirements documentation](http://docs.snipeitapp.com/requirements.html) for full requirements.
+
+
+To deploy on Ubuntu using Ansible and Vagrant, check out the [Snipe-IT Installation scripts](https://github.com/GR360RY/snipeit-ansible) created by [@GR360RY](https://github.com/GR360RY/).
+
+To deploy on a fresh Ubuntu / CentOS install that will be dedicated to Snipe-It, run the "install.sh". Make sure to chmod +x install.sh and run as sudo on Ubuntu systems (or equivalent on CentOS.)
 
 -----
 ### Bug Reports & Feature Requests
@@ -29,44 +34,31 @@ Feel free to check out the [GitHub Issues for this project](https://github.com/s
 
 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)
+If you're having trouble with the installation, please check the [Common Issues](http://docs.snipeitapp.com/common-issues.html) and [Getting Help](http://docs.snipeitapp.com/getting-help.html) documentation.
 
 -----
+
+### Upgrading
+
+Please see the [upgrading documentation](http://docs.snipeitapp.com/upgrading.html) for instructions on upgrading Snipe-IT.
+
+------
 ### Announcement List
 
 To be notified of important news (such as new releases, security advisories, etc), [sign up for our list](http://eepurl.com/XyZKz). We'll never sell or give away your info, and we'll only email you when it's important.
 
+------
 
 ### Translations!
 
-If you're not a coder but want to give back to the project and you're fluent in other languages, consider helping out with the translations. We use [CrowdIn](https://crowdin.com) to manage translations, and it makes it super-simple for you to add translations to the project without messing with code. Check out [the Snipe-IT CrowdIn translation project here](https://crowdin.com/project/snipe-it/).
-
-We currently have English, Chinese, Finnish, Malay, Romanian and Spanish completed, and are looking for lots more!
-
------
-## Requirements
-
-- PHP 5.4 or later
-- MCrypt PHP Extension
-- Fileinfo Extension
-
-And _one_ of the following image libraries (for QR codes, asset model image and user avatar image uploads).
-
-- GD Library (>=2.0) … or …
-- Imagick PHP extension (>=6.3.8)
+Please see the [translations documentation](http://docs.snipeitapp.com/translations.html) for information about available languages and how to add translations to Snipe-IT.
 
 -----
 
-## Important Notes on Updating
+### Contributing
 
-Whenever you pull down a new version from master or develop, when you grab the [latest official release](https://github.com/snipe/snipe-it/releases), make sure to run the following commands via command line:
+Please see the documentation on [contributing and developing for Snipe-IT](http://docs.snipeitapp.com/contributing.html).
 
-	php composer.phar dump-autoload
-	php artisan migrate
-
-Forgetting to do this can mean your DB might end up out of sync with the new files you just pulled, or you may have some funky cached autoloader values. It's a good idea to get into the habit of running these every time you pull anything new down. If there are no database changes to migrate, it won't hurt anything to run migrations anyway.
-
-## Contributor Code of Conduct
+[![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready+for+dev&title=Ready+for+Development)](http://waffle.io/snipe/snipe-it)
 
 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.
-

app/commands/AppCommand.php

@@ -67,6 +67,7 @@ class AppCommand extends Command
         $this->askUserFirstName();
         $this->askUserLastName();
         $this->askUserUsername();
+        $this->askUserEmail();
         $this->askUserPassword();
 
 		$this->askUserDummyData();
@@ -89,10 +90,10 @@ class AppCommand extends Command
         $this->call('migrate:install');
 
         // Run the Sentry Migrations
-        $this->call('migrate', array('--package' => 'cartalyst/sentry'));
+        $this->call('migrate', array('--package' => 'cartalyst/sentry','--force'=>true));
 
         // Run the Migrations
-        $this->call('migrate');
+        $this->call('migrate', array('--force'=>true));
 
         // Create the default user and default groups.
         $this->sentryRunner();

app/commands/AssetImportCommand.php

@@ -0,0 +1,410 @@
+<?php
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+use League\Csv\Reader;
+
+class AssetImportCommand extends Command {
+
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'asset-import:csv';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Import Assets from CSV';
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function fire()
+	{
+		$filename = $this->argument('filename');
+
+
+		if (!$this->option('testrun')=='true') {
+			$this->comment('======= Importing Assets from '.$filename.' =========');
+		} else {
+			$this->comment('====== TEST ONLY Asset Import for '.$filename.' ====');
+			$this->comment('============== NO DATA WILL BE WRITTEN ==============');
+		}
+
+		if (! ini_get("auto_detect_line_endings")) {
+			ini_set("auto_detect_line_endings", '1');
+		}
+
+		$csv = Reader::createFromPath($this->argument('filename'));
+		$csv->setNewline("\r\n");
+		$csv->setOffset(1);
+		$duplicates = '';
+
+		// Loop through the records
+		$nbInsert = $csv->each(function ($row) use ($duplicates) {
+			$status_id = 1;
+
+			// Let's just map some of these entries to more user friendly words
+
+			// User's name
+			if (array_key_exists('0',$row)) {
+				$user_name = trim($row[0]);
+			} else {
+				$user_name = '';
+			}
+
+			// User's email
+			if (array_key_exists('1',$row)) {
+				$user_email = trim($row[1]);
+			} else {
+				$user_email = '';
+			}
+
+			// User's email
+			if (array_key_exists('2',$row)) {
+				$user_username = trim($row[2]);
+			} else {
+				$user_username = '';
+			}
+
+			// Asset Name
+			if (array_key_exists('3',$row)) {
+				$user_asset_asset_name = trim($row[3]);
+			} else {
+				$user_asset_asset_name = '';
+			}
+
+			// Asset Category
+			if (array_key_exists('4',$row)) {
+				$user_asset_category = trim($row[4]);
+			} else {
+				$user_asset_category = '';
+			}
+
+			// Asset Name
+			if (array_key_exists('5',$row)) {
+				$user_asset_name = trim($row[5]);
+			} else {
+				$user_asset_name = '';
+			}
+
+			// Asset Manufacturer
+			if (array_key_exists('6',$row)) {
+				$user_asset_mfgr = trim($row[6]);
+			} else {
+				$user_asset_mfgr = '';
+			}
+
+			// Asset model number
+			if (array_key_exists('7',$row)) {
+				$user_asset_modelno = trim($row[7]);
+			} else {
+				$user_asset_modelno = '';
+			}
+
+			// Asset serial number
+			if (array_key_exists('8',$row)) {
+				$user_asset_serial = trim($row[8]);
+			} else {
+				$user_asset_serial = '';
+			}
+
+			// Asset tag
+			if (array_key_exists('9',$row)) {
+				$user_asset_tag = trim($row[9]);
+			} else {
+				$user_asset_tag = '';
+			}
+
+			// Asset location
+			if (array_key_exists('10',$row)) {
+				$user_asset_location = trim($row[10]);
+			} else {
+				$user_asset_location = '';
+			}
+
+			// Asset notes
+			if (array_key_exists('11',$row)) {
+				$user_asset_notes = trim($row[11]);
+			} else {
+				$user_asset_notes = '';
+			}
+
+			// Asset purchase date
+			if (array_key_exists('12',$row)) {
+				if ($row[12]!='') {
+					$user_asset_purchase_date = date("Y-m-d 00:00:01", strtotime($row[12]));
+				} else {
+					$user_asset_purchase_date = '';
+				}
+			} else {
+				$user_asset_purchase_date = '';
+			}
+
+			// Asset purchase cost
+			if (array_key_exists('13',$row)) {
+				if ($row[13]!='') {
+					$user_asset_purchase_cost = trim($row[13]);
+				} else {
+					$user_asset_purchase_cost = '';
+				}
+			} else {
+				$user_asset_purchase_cost = '';
+			}
+
+			// A number was given instead of a name
+			if (is_numeric($user_name)) {
+				$this->comment('User '.$user_name.' is not a name - assume this user already exists');
+				$user_username = '';
+
+			// No name was given
+			} elseif ($user_name=='') {
+				$this->comment('No user data provided - skipping user creation, just adding asset');
+				$first_name = '';
+				$last_name = '';
+				$user_username = '';
+
+			} else {
+				$user_email_array = User::generateFormattedNameFromFullName($this->option('email_format'), $user_name);
+				$first_name = $user_email_array['first_name'];
+				$last_name = $user_email_array['last_name'];
+
+				if ($user_email=='') {
+					$user_email = $user_email_array['username'].'@'.Config::get('app.domain');
+				}
+
+				if ($user_username=='') {
+					if ($this->option('username_format')=='email') {
+						$user_username = $user_email;
+					} else {
+						$user_name_array = User::generateFormattedNameFromFullName($this->option('username_format'), $user_name);
+						$user_username = $user_name_array['username'];
+					}
+
+				}
+
+			}
+
+			$this->comment('Full Name: '.$user_name);
+			$this->comment('First Name: '.$first_name);
+			$this->comment('Last Name: '.$last_name);
+			$this->comment('Username: '.$user_username);
+			$this->comment('Email: '.$user_email);
+			$this->comment('Category Name: '.$user_asset_category);
+			$this->comment('Item: '.$user_asset_name);
+			$this->comment('Manufacturer ID: '.$user_asset_mfgr);
+			$this->comment('Model No: '.$user_asset_modelno);
+			$this->comment('Serial No: '.$user_asset_serial);
+			$this->comment('Asset Tag: '.$user_asset_tag);
+			$this->comment('Location: '.$user_asset_location);
+			$this->comment('Purchase Date: '.$user_asset_purchase_date);
+			$this->comment('Purchase Cost: '.$user_asset_purchase_cost);
+			$this->comment('Notes: '.$user_asset_notes);
+
+			$this->comment('------------- Action Summary ----------------');
+
+			if ($user_username!='') {
+				if ($user = User::MatchEmailOrUsername($user_username, $user_email)
+					->whereNotNull('username')->first()) {
+					$this->comment('User '.$user_username.' already exists');
+				} else {
+					// Create the user
+					$user = Sentry::createUser(array(
+						'first_name' => $first_name,
+						'last_name' => $last_name,
+						'email'     => $user_email,
+						'username'     => $user_username,
+						'password'  => substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 12),
+						'activated' => true,
+						'permissions' => array(
+							'admin' => 0,
+							'user'  => 1,
+						),
+						'notes'         => 'User imported through asset importer'
+					));
+
+					// Find the group using the group id
+					$userGroup = Sentry::findGroupById(3);
+
+					// Assign the group to the user
+					$user->addGroup($userGroup);
+					$this->comment('User '.$first_name.' created');
+				}
+			} else {
+				$user = new User;
+			}
+
+			// Check for the location match and create it if it doesn't exist
+			if ($location = Location::where('name', $user_asset_location)->first()) {
+				$this->comment('Location '.$user_asset_location.' already exists');
+			} else {
+
+				if ($user_asset_location!='') {
+
+					$location = new Location();
+					$location->name = e($user_asset_location);
+					$location->address = '';
+					$location->city = '';
+					$location->state = '';
+					$location->country = '';
+					$location->user_id = 1;
+
+					if (!$this->option('testrun')=='true') {
+
+						if ($location->save()) {
+							$this->comment('Location '.$user_asset_location.' was created');
+			            } else {
+							$this->comment('Something went wrong! Location '.$user_asset_location.' was NOT created');
+						}
+
+					} else {
+						$this->comment('Location '.$user_asset_location.' was (not) created - test run only');
+					}
+				} else {
+					$this->comment('No location given, so none created.');
+				}
+
+			}
+
+			// 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');
+			} else {
+				$category = new Category();
+				$category->name = e($user_asset_category);
+				$category->category_type = 'asset';
+				$category->user_id = 1;
+
+				if ($category->save()) {
+					$this->comment('Category '.$user_asset_category.' was created');
+	            } else {
+					$this->comment('Something went wrong! Category '.$user_asset_category.' was NOT created');
+				}
+
+			}
+
+			// Check for the manufacturer match and create it if it doesn't exist
+			if ($manufacturer = Manufacturer::where('name', $user_asset_mfgr)->first()) {
+				$this->comment('Manufacturer '.$user_asset_mfgr.' already exists');
+			} else {
+				$manufacturer = new Manufacturer();
+				$manufacturer->name = e($user_asset_mfgr);
+				$manufacturer->user_id = 1;
+
+				if ($manufacturer->save()) {
+					$this->comment('Manufacturer '.$user_asset_mfgr.' was created');
+	            } else {
+					$this->comment('Something went wrong! Manufacturer '.$user_asset_mfgr.' was NOT created');
+				}
+
+			}
+
+			// Check for the asset model match and create it if it doesn't exist
+			if ($asset_model = Model::where('name', $user_asset_name)->where('modelno', $user_asset_modelno)->where('category_id', $category->id)->where('manufacturer_id', $manufacturer->id)->first()) {
+				$this->comment('The Asset Model '.$user_asset_name.' with model number '.$user_asset_modelno.' already exists');
+			} else {
+				$asset_model = new Model();
+				$asset_model->name = e($user_asset_name);
+				$asset_model->manufacturer_id = $manufacturer->id;
+				$asset_model->modelno = e($user_asset_modelno);
+				$asset_model->category_id = $category->id;
+				$asset_model->user_id = 1;
+
+				if ($asset_model->save()) {
+					$this->comment('Asset Model '.$user_asset_name.' with model number '.$user_asset_modelno.' was created');
+	            } else {
+					$this->comment('Something went wrong! Asset Model '.$user_asset_name.' was NOT created');
+				}
+
+			}
+
+			// Check for the asset match and create it if it doesn't exist
+
+				$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');
+				}
+
+
+			$this->comment('=====================================');
+
+			return true;
+
+		});
+
+
+	}
+
+	/**
+	 * Get the console command arguments.
+	 *
+	 * @return array
+	 */
+	protected function getArguments()
+	{
+		return array(
+			array('filename', InputArgument::REQUIRED, 'File for the CSV import.'),
+		);
+	}
+
+
+	/**
+	 * Get the console command options.
+	 *
+	 * @return array
+	 */
+	protected function getOptions()
+	{
+	return array(
+		array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null),
+		array('username_format', null, InputOption::VALUE_REQUIRED, 'The format of the username that should be generated. Options are firstname.lastname, firstname, filastname, email', null),
+		array('testrun', null, InputOption::VALUE_REQUIRED, 'Test the output without writing to the database or not.', null),
+	);
+	}
+
+
+}

app/commands/ImportCommand.php

@@ -1,275 +0,0 @@
-<?php
-
-use Illuminate\Console\Command;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
-use League\Csv\Reader;
-
-class ImportCommand extends Command {
-
-	/**
-	 * The console command name.
-	 *
-	 * @var string
-	 */
-	protected $name = 'import:csv';
-
-	/**
-	 * The console command description.
-	 *
-	 * @var string
-	 */
-	protected $description = 'Import from CSV';
-
-	/**
-	 * Create a new command instance.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	/**
-	 * Execute the console command.
-	 *
-	 * @return mixed
-	 */
-	public function fire()
-	{
-		$filename = $this->argument('filename');
-
-
-		if (!$this->option('testrun')=='true') {
-			$this->comment('======= Importing '.$filename.' =========');
-		} else {
-			$this->comment('====== TEST ONLY Import for '.$filename.' ====');
-			$this->comment('============== NO DATA WILL BE WRITTEN ==============');
-		}
-
-		if (! ini_get("auto_detect_line_endings")) {
-			ini_set("auto_detect_line_endings", '1');
-		}
-
-		$csv = Reader::createFromPath($this->argument('filename'));
-		$csv->setNewline("\r\n");
-		$csv->setOffset(1);
-		$duplicates = '';
-
-		// Loop through the records
-		$nbInsert = $csv->each(function ($row) use ($duplicates) {
-			$status_id = 1;
-
-			if (is_numeric($row[0])) {
-				$this->comment('User '.$row[0].' is not a name - assume this user already exists');
-			} elseif ($row[0]=='') {
-				$this->comment('No user data provided - skipping user creation, just adding asset');
-			} else {
-
-				// Generate an email based on their name
-				$name = explode(" ", $row[0]);
-				$first_name = $name[0];
-				$last_name = '';
-				$email_last_name = '';
-
-				if ($first_name=='Unknown') {
-					$status_id = 7;
-				}
-
-				if (!array_key_exists(1, $name)) {
-					$last_name='';
-					$email_last_name = $last_name;
-					$email_prefix = $first_name;
-				} else {
-					// Loop through the rest of the explode so you don't truncate
-					for ($x=0; $x < count($name); $x++) {
-						if (($x > 0) && ($name[$x]!='')) {
-							$last_name.=' '.$name[$x];
-							$email_last_name.=$name[$x];
-						}
-					}
-					$email_prefix = $first_name[0].$email_last_name;
-				}
-
-				$email = strtolower(str_replace('.','',$email_prefix)).'@'.$this->option('domain');
-				$email = str_replace("'",'',$email);
-
-				$this->comment('Full Name: '.$row[0]);
-				$this->comment('First Name: '.$first_name);
-				$this->comment('Last Name: '.$last_name);
-				$this->comment('Email: '.$email);
-				$this->comment('Category Name: '.$row[1]);
-				$this->comment('Item: '.$row[2]);
-				$this->comment('Manufacturer ID: '.$row[3]);
-				$this->comment('Model No: '.$row[4]);
-				$this->comment('Serial No: '.$row[5]);
-				$this->comment('Asset Tag: '.$row[6]);
-				$this->comment('Location: '.$row[7]);
-			}
-
-			$this->comment('------------- Action Summary ----------------');
-
-			if (isset($email)) {
-				if ($user = User::where('email', $email)->first()) {
-					$this->comment('User '.$email.' already exists');
-				} else {
-					// Create the user
-					$user = Sentry::createUser(array(
-						'first_name' => $first_name,
-						'last_name' => $last_name,
-						'email'     => $email,
-						'password'  => substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10),
-						'activated' => true,
-						'permissions' => array(
-							'admin' => 0,
-							'user'  => 1,
-						),
-						'notes'         => 'Imported user'
-					));
-
-					// Find the group using the group id
-					$userGroup = Sentry::findGroupById(3);
-
-					// Assign the group to the user
-					$user->addGroup($userGroup);
-					$this->comment('User '.$first_name.' created');
-				}
-			} else {
-				$user = new User;
-			}
-
-			// Check for the location match and create it if it doesn't exist
-			if ($location = Location::where('name', $row[7])->first()) {
-				$this->comment('Location '.$row[7].' already exists');
-			} else {
-				$location = new Location();
-				$location->name = e($row[7]);
-				$location->address = '';
-				$location->city = '';
-				$location->state = '';
-				$location->country = '';
-				$location->user_id = 1;
-
-				if (!$this->option('testrun')=='true') {
-
-					if ($location->save()) {
-						$this->comment('Location '.$row[7].' was created');
-		            } else {
-						$this->comment('Something went wrong! Location '.$row[1].' was NOT created');
-					}
-
-				} else {
-					$this->comment('Location '.$row[7].' was (not) created - test run only');
-				}
-
-			}
-
-			// Check for the category match and create it if it doesn't exist
-			if ($category = Category::where('name', $row[1])->where('category_type', 'asset')->first()) {
-				$this->comment('Category '.$row[1].' already exists');
-			} else {
-				$category = new Category();
-				$category->name = e($row[1]);
-				$category->category_type = 'asset';
-				$category->user_id = 1;
-
-				if ($category->save()) {
-					$this->comment('Category '.$row[1].' was created');
-	            } else {
-					$this->comment('Something went wrong! Category '.$row[1].' was NOT created');
-				}
-
-			}
-
-			// Check for the manufacturer match and create it if it doesn't exist
-			if ($manufacturer = Manufacturer::where('name', $row[3])->first()) {
-				$this->comment('Manufacturer '.$row[3].' already exists');
-			} else {
-				$manufacturer = new Manufacturer();
-				$manufacturer->name = e($row[3]);
-				$manufacturer->user_id = 1;
-
-				if ($manufacturer->save()) {
-					$this->comment('Manufacturer '.$row[3].' was created');
-	            } else {
-					$this->comment('Something went wrong! Manufacturer '.$row[3].' was NOT created');
-				}
-
-			}
-
-			// Check for the asset model match and create it if it doesn't exist
-			if ($asset_model = Model::where('name', $row[2])->where('modelno', $row[4])->where('category_id', $category->id)->where('manufacturer_id', $manufacturer->id)->first()) {
-				$this->comment('The Asset Model '.$row[2].' with model number '.$row[4].' already exists');
-			} else {
-				$asset_model = new Model();
-				$asset_model->name = e($row[2]);
-				$asset_model->manufacturer_id = $manufacturer->id;
-				$asset_model->modelno = e($row[4]);
-				$asset_model->category_id = $category->id;
-				$asset_model->user_id = 1;
-
-				if ($asset_model->save()) {
-					$this->comment('Asset Model '.$row[2].' with model number '.$row[4].' was created');
-	            } else {
-					$this->comment('Something went wrong! Asset Model '.$row[2].' was NOT created');
-				}
-
-			}
-
-			// Check for the asset match and create it if it doesn't exist
-
-				$asset = new Asset();
-				$asset->name = e($row[2]);
-				$asset->serial = e($row[5]);
-				$asset->asset_tag = e($row[6]);
-				$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 ($asset->save()) {
-					$this->comment('Asset '.$row[2].' with serial number '.$row[5].' was created');
-	            } else {
-					$this->comment('Something went wrong! Asset '.$row[5].' was NOT created');
-				}
-
-
-			$this->comment('=====================================');
-
-			return true;
-
-		});
-
-
-	}
-
-	/**
-	 * Get the console command arguments.
-	 *
-	 * @return array
-	 */
-	protected function getArguments()
-	{
-		return array(
-			array('filename', InputArgument::REQUIRED, 'File for the CSV import.'),
-		);
-	}
-
-
-	/**
-	 * Get the console command options.
-	 *
-	 * @return array
-	 */
-	protected function getOptions()
-	{
-		return array(
-			array('domain', null, InputOption::VALUE_REQUIRED, 'Email domain for generated email addresses.', null),
-			array('testrun', null, InputOption::VALUE_REQUIRED, 'Test the output without writing to the database or not.', null),
-		);
-	}
-
-
-}

app/commands/LicenseImportCommand.php

@@ -0,0 +1,381 @@
+<?php
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+use League\Csv\Reader;
+
+class LicenseImportCommand extends Command {
+
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'license-import:csv';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Import Licenses from CSV';
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function fire()
+	{
+		$filename = $this->argument('filename');
+
+
+		if (!$this->option('testrun')=='true') {
+			$this->comment('======= Importing Licenses from '.$filename.' =========');
+		} else {
+			$this->comment('====== TEST ONLY License Import for '.$filename.' ====');
+			$this->comment('============== NO DATA WILL BE WRITTEN ==============');
+		}
+
+		if (! ini_get("auto_detect_line_endings")) {
+			ini_set("auto_detect_line_endings", '1');
+		}
+
+		$csv = Reader::createFromPath($this->argument('filename'));
+		$csv->setNewline("\r\n");
+		$csv->setOffset(1);
+		$duplicates = '';
+
+		// Loop through the records
+		$nbInsert = $csv->each(function ($row) use ($duplicates) {
+			$status_id = 1;
+
+			// Let's just map some of these entries to more user friendly words
+
+			if (array_key_exists('0',$row)) {
+				$user_name = trim($row[0]);
+			} else {
+				$user_name = '';
+			}
+
+			if (array_key_exists('1',$row)) {
+				$user_email = trim($row[1]);
+			} else {
+				$user_email = '';
+			}
+
+			if (array_key_exists('2',$row)) {
+				$user_username = trim($row[2]);
+			} else {
+				$user_username = '';
+			}
+
+			if (array_key_exists('3',$row)) {
+				$user_license_name = trim($row[3]);
+			} else {
+				$user_license_name = '';
+			}
+
+			if (array_key_exists('4',$row)) {
+				$user_license_serial = trim($row[4]);
+			} else {
+				$user_license_serial = '';
+			}
+
+			if (array_key_exists('5',$row)) {
+				$user_licensed_to_name = trim($row[5]);
+			} else {
+				$user_licensed_to_name = '';
+			}
+
+			if (array_key_exists('6',$row)) {
+				$user_licensed_to_email = trim($row[6]);
+			} else {
+				$user_licensed_to_email = '';
+			}
+
+			if (array_key_exists('7',$row)) {
+				$user_license_seats = trim($row[7]);
+			} else {
+				$user_license_seats = '';
+			}
+
+			if (array_key_exists('8',$row)) {
+				$user_license_reassignable = trim($row[8]);
+				if ($user_license_reassignable!='') {
+					if ((strtolower($user_license_reassignable)=='yes') || (strtolower($user_license_reassignable)=='true') || ($user_license_reassignable=='1')) {
+						$user_license_reassignable = 1;
+					}
+				} else {
+					$user_license_reassignable = 0;
+				}
+			} else {
+				$user_license_reassignable = 0;
+			}
+
+			if (array_key_exists('9',$row)) {
+				$user_license_supplier = trim($row[9]);
+			} else {
+				$user_license_supplier = '';
+			}
+
+			if (array_key_exists('10',$row)) {
+				$user_license_maintained = trim($row[10]);
+
+				if ($user_license_maintained!='') {
+					if ((strtolower($user_license_maintained)=='yes') || (strtolower($user_license_maintained)=='true') || ($user_license_maintained=='1')) {
+						$user_license_maintained = 1;
+					}
+				} else {
+					$user_license_maintained = 0;
+				}
+
+
+			} else {
+				$user_license_maintained = '';
+			}
+
+			if (array_key_exists('11',$row)) {
+				$user_license_notes = trim($row[11]);
+			} else {
+				$user_license_notes = '';
+			}
+
+			if (array_key_exists('12',$row)) {
+				if ($row[12]!='') {
+					$user_license_purchase_date = date("Y-m-d 00:00:01", strtotime($row[12]));
+				} else {
+					$user_license_purchase_date = '';
+				}
+			} else {
+				$user_license_purchase_date = 0;
+			}
+
+			// A number was given instead of a name
+			if (is_numeric($user_name)) {
+				$this->comment('User '.$user_name.' is not a name - assume this user already exists');
+				$user_username = '';
+			// No name was given
+
+			} elseif ($user_name=='') {
+				$this->comment('No user data provided - skipping user creation, just adding license');
+				$first_name = '';
+				$last_name = '';
+				$user_username = '';
+
+			} else {
+
+					$name = explode(" ", $user_name);
+					$first_name = $name[0];
+					$email_last_name = '';
+					$email_prefix = $first_name;
+
+					if (!array_key_exists(1, $name)) {
+						$last_name='';
+						$email_last_name = $last_name;
+						$email_prefix = $first_name;
+					} else {
+						$last_name = str_replace($first_name,'',$user_name);
+
+						if ($this->option('email_format')=='filastname') {
+							$email_last_name.=str_replace(' ','',$last_name);
+							$email_prefix = $first_name[0].$email_last_name;
+
+						} elseif ($this->option('email_format')=='firstname.lastname') {
+							$email_last_name.=str_replace(' ','',$last_name);
+							$email_prefix = $first_name.'.'.$email_last_name;
+
+						} elseif ($this->option('email_format')=='firstname') {
+							$email_last_name.=str_replace(' ','',$last_name);
+							$email_prefix = $first_name;
+						}
+
+
+					}
+
+
+					$user_username = $email_prefix;
+
+					// Generate an email based on their name if no email address is given
+					if ($user_email=='') {
+						if ($first_name=='Unknown') {
+							$status_id = 7;
+						}
+						$email = strtolower($email_prefix).'@'.$this->option('domain');
+						$user_email = str_replace("'",'',$email);
+					}
+			}
+
+			$this->comment('Full Name: '.$user_name);
+			$this->comment('First Name: '.$first_name);
+			$this->comment('Last Name: '.$last_name);
+			$this->comment('Username: '.$user_username);
+			$this->comment('Email: '.$user_email);
+			$this->comment('License Name: '.$user_license_name);
+			$this->comment('Serial No: '.$user_license_serial);
+			$this->comment('Licensed To Name: '.$user_licensed_to_name);
+			$this->comment('Licensed To Email: '.$user_licensed_to_email);
+			$this->comment('Seats: '.$user_license_seats);
+			$this->comment('Reassignable: '.$user_license_reassignable);
+			$this->comment('Supplier: '.$user_license_supplier);
+			$this->comment('Maintained: '.$user_license_maintained);
+			$this->comment('Notes: '.$user_license_notes);
+			$this->comment('Purchase Date: '.$user_license_purchase_date);
+
+			$this->comment('------------- Action Summary ----------------');
+
+			if ($user_username!='') {
+				if ($user = User::where('username', $user_username)->whereNotNull('username')->first()) {
+					$this->comment('User '.$user_username.' already exists');
+				} else {
+					// Create the user
+					$user = Sentry::createUser(array(
+						'first_name' => $first_name,
+						'last_name' => $last_name,
+						'email'     => $user_email,
+						'username'     => $user_username,
+						'password'  => substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10),
+						'activated' => true,
+						'permissions' => array(
+							'admin' => 0,
+							'user'  => 1,
+						),
+						'notes'         => 'User importerd through license importer'
+					));
+
+					// Find the group using the group id
+					$userGroup = Sentry::findGroupById(3);
+
+					// Assign the group to the user
+					$user->addGroup($userGroup);
+					$this->comment('User '.$first_name.' created');
+				}
+			} else {
+				$user = new User;
+				$user->user_id = NULL;
+			}
+
+
+			// Check for the supplier match and create it if it doesn't exist
+			if ($supplier = Supplier::where('name', $user_license_supplier)->first()) {
+				$this->comment('Supplier '.$user_license_supplier.' already exists');
+			} else {
+				$supplier = new Supplier();
+				$supplier->name = e($user_license_supplier);
+				$supplier->user_id = 1;
+
+				if ($supplier->save()) {
+					$this->comment('Supplier '.$user_license_supplier.' was created');
+	            } else {
+					$this->comment('Something went wrong! Supplier '.$user_license_supplier.' was NOT created');
+				}
+
+			}
+
+
+			// Add the license
+			$license = new License();
+			$license->name = e($user_license_name);
+			if ($user_license_purchase_date!='') {
+				$license->purchase_date = $user_license_purchase_date;
+			} else {
+				$license->purchase_date = NULL;
+			}
+			$license->serial = e($user_license_serial);
+			$license->seats = e($user_license_seats);
+			$license->supplier_id = $supplier->id;
+			$license->user_id = 1;
+			if ($user_license_purchase_date!='') {
+				$license->purchase_date = $user_license_purchase_date;
+			} else {
+				$license->purchase_date = NULL;
+			}
+			$license->license_name = $user_licensed_to_name;
+			$license->license_email = $user_licensed_to_email;
+			$license->notes = e($user_license_notes);
+
+			if ($license->save()) {
+				$this->comment('License '.$user_license_name.' with serial number '.$user_license_serial.' was created');
+
+
+				$license_seat_created = 0;
+
+				for ($x = 0; $x < $user_license_seats; $x++) {
+					// Create the license seat entries
+					$license_seat = new LicenseSeat();
+					$license_seat->license_id = $license->id;
+
+					// Only assign the first seat to the user
+					if ($x==0) {
+						$license_seat->assigned_to = $user->id;
+					} else {
+						$license_seat->assigned_to = NULL;
+					}
+
+					if ($license_seat->save()) {
+						$license_seat_created++;
+					}
+				}
+
+				if ($license_seat_created > 0) {
+					$this->comment($license_seat_created.' seats were created');
+				} else {
+					$this->comment('Something went wrong! NO seats for '.$user_license_name.' were created');
+				}
+
+
+
+            } else {
+				$this->comment('Something went wrong! License '.$user_license_name.' was NOT created');
+			}
+
+
+			$this->comment('=====================================');
+
+			return true;
+
+		});
+
+
+	}
+
+	/**
+	 * Get the console command arguments.
+	 *
+	 * @return array
+	 */
+	protected function getArguments()
+	{
+		return array(
+			array('filename', InputArgument::REQUIRED, 'File for the CSV import.'),
+		);
+	}
+
+
+	/**
+	 * Get the console command options.
+	 *
+	 * @return array
+	 */
+	protected function getOptions()
+	{
+		return array(
+			array('domain', null, InputOption::VALUE_REQUIRED, 'Email domain for generated email addresses.', null),
+			array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null),
+			array('testrun', null, InputOption::VALUE_REQUIRED, 'Test the output without writing to the database or not.', null),
+		);
+	}
+
+
+}

app/commands/SystemBackup.php

@@ -18,7 +18,7 @@ class SystemBackup extends Command {
 	 *
 	 * @var string
 	 */
-	protected $description = 'This commandcreates a database dump and zips up all of the uploaded files in the upload directories.';
+	protected $description = 'This command creates a database dump and zips up all of the uploaded files in the upload directories.';
 
 	/**
 	 * Create a new command instance.

app/config/app.php

@@ -101,10 +101,10 @@ return array(
         'Barryvdh\Debugbar\ServiceProvider',
         'Cartalyst\Sentry\SentryServiceProvider',
         'Chumper\Datatable\DatatableServiceProvider',
-        'Dinesh\Barcode\BarcodeServiceProvider',
         'Maknz\Slack\SlackServiceProvider',
         'Schickling\Backup\BackupServiceProvider',
         'Chumper\Zipper\ZipperServiceProvider',
+        'Fideloper\Proxy\ProxyServiceProvider',
 
     ),
 
@@ -176,8 +176,6 @@ return array(
             'Validator'       		=> 'Illuminate\Support\Facades\Validator',
             'View'            		=> 'Illuminate\Support\Facades\View',
             'Reader'				=> 'League\Csv\Reader',
-            'DNS1D'                 => 'Dinesh\Barcode\Facades\DNS1DFacade',
-            'DNS2D'                 => 'Dinesh\Barcode\Facades\DNS2DFacade',
             'Slack' 				=> 'Maknz\Slack\Facades\Slack',
             'Zipper'                => 'Chumper\Zipper\Zipper',
 

app/config/local/app.example.php

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

app/config/local/ldap.example.php

@@ -0,0 +1,112 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | URL
+    |--------------------------------------------------------------------------
+    |
+    | URL for the LDAP server. This should start with ldap://, for example:
+    | ldap://ldap.yourserver.com
+    |
+    */
+    'url' => "",
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Username
+    |--------------------------------------------------------------------------
+    |
+    | Username to use to connect authenticate to LDAP, for example:
+    | cn=read-only-admin,dc=example,dc=com
+    |
+    */
+	'username' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Password
+    |--------------------------------------------------------------------------
+    |
+    | Password to use when authenticating to LDAP.
+    |
+    */
+	'password' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Basedn
+    |--------------------------------------------------------------------------
+    |
+    | The base where the search for users will be executed, for example:
+    | dc=example,dc=com
+    |
+    */
+	'basedn'   => "",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | Filter
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query. This probably does not have to be
+    | changed.
+    |
+    */
+	'filter' => "&(cn=*)",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | LDAP field names that will be retrieved to create a user.
+    |
+    | Using the username as an example:
+    | If I set 'result.username' => 'my-org-username', the code will connect to
+    | LDAP as follows (where $results[$i] represents a row in the LDAP query:
+    | $username-to-insert-in-snipe-it = $results[$i]["my-org-username"][0]
+    |
+    | Note: all these fields are required.
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query.
+    |
+    */
+    'result.username' => "",
+    'result.last.name'  => "",
+    'result.first.name' => "",
+
+    /*
+    | These fields are optional as not all LDAP directories will have it.  If yours
+    | does not have them, just leave these blank and the extra check will
+    | be omitted.
+    */
+    'result.active.flag' => "",
+    'result.emp.num'  => "",
+    'result.email' => "",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP filter query for authentication
+    |--------------------------------------------------------------------------
+    |
+    | The LDAP query that we want to execute when authenticating a user. This
+    | should not have to be changed.
+    |
+    */
+    'authentication.filter.query' => "uid=",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP Version
+    |--------------------------------------------------------------------------
+    |
+    | Version of LDAP you are using.
+    |
+    */
+    'version' => 3,
+
+
+);

app/config/packages/cartalyst/sentry/config.php

@@ -46,7 +46,7 @@ return array(
 	|
 	*/
 
-	'hasher' => 'native',
+	'hasher' => 'bcrypt',
 
 	/*
 	|--------------------------------------------------------------------------

app/config/packages/schickling/backup/config.example.php

@@ -1,6 +1,6 @@
 <?php
 return array(
-	'path' => storage_path() . '/dumps/',
+	'path' => 'app/storage/dumps/',
 
 	'mysql' => array(
 		'dump_command_path' => '',

app/config/production/.gitignore

@@ -1,3 +1,4 @@
 app.php
 mail.php
 database.php
+ldap.php

app/config/production/app.example.php

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

app/config/production/ldap.example.php

@@ -0,0 +1,112 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | URL
+    |--------------------------------------------------------------------------
+    |
+    | URL for the LDAP server. This should start with ldap://, for example:
+    | ldap://ldap.yourserver.com
+    |
+    */
+    'url' => "",
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Username
+    |--------------------------------------------------------------------------
+    |
+    | Username to use to connect authenticate to LDAP, for example:
+    | cn=read-only-admin,dc=example,dc=com
+    |
+    */
+	'username' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Password
+    |--------------------------------------------------------------------------
+    |
+    | Password to use when authenticating to LDAP.
+    |
+    */
+	'password' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Basedn
+    |--------------------------------------------------------------------------
+    |
+    | The base where the search for users will be executed, for example:
+    | dc=example,dc=com
+    |
+    */
+	'basedn'   => "",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | Filter
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query. This probably does not have to be
+    | changed.
+    |
+    */
+	'filter' => "&(cn=*)",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | LDAP field names that will be retrieved to create a user.
+    |
+    | Using the username as an example:
+    | If I set 'result.username' => 'my-org-username', the code will connect to
+    | LDAP as follows (where $results[$i] represents a row in the LDAP query:
+    | $username-to-insert-in-snipe-it = $results[$i]["my-org-username"][0]
+    |
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query.
+    | Note: all these fields are required, and they should all be lowercase.
+    |
+    */
+    'result.username' => "",
+    'result.last.name'  => "",
+    'result.first.name' => "",
+
+    /*
+    | These fields are optional as not all LDAP directories will have it.  If yours
+    | does not have them, just leave these blank and the extra check will
+    | be omitted.
+    */
+    'result.active.flag' => "",
+    'result.emp.num'  => "",
+    'result.email' => "",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP filter query for authentication
+    |--------------------------------------------------------------------------
+    |
+    | The LDAP query that we want to execute when authenticating a user. This
+    | should not have to be changed.
+    |
+    */
+    'authentication.filter.query' => "uid=",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP Version
+    |--------------------------------------------------------------------------
+    |
+    | Version of LDAP you are using.
+    |
+    */
+    'version' => 3,
+
+
+);

app/config/staging/app.example.php

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

app/config/staging/ldap.example.php

@@ -0,0 +1,112 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | URL
+    |--------------------------------------------------------------------------
+    |
+    | URL for the LDAP server. This should start with ldap://, for example:
+    | ldap://ldap.yourserver.com
+    |
+    */
+    'url' => "",
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Username
+    |--------------------------------------------------------------------------
+    |
+    | Username to use to connect authenticate to LDAP, for example:
+    | cn=read-only-admin,dc=example,dc=com
+    |
+    */
+	'username' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Password
+    |--------------------------------------------------------------------------
+    |
+    | Password to use when authenticating to LDAP.
+    |
+    */
+	'password' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Basedn
+    |--------------------------------------------------------------------------
+    |
+    | The base where the search for users will be executed, for example:
+    | dc=example,dc=com
+    |
+    */
+	'basedn'   => "",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | Filter
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query. This probably does not have to be
+    | changed.
+    |
+    */
+	'filter' => "&(cn=*)",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | LDAP field names that will be retrieved to create a user.
+    |
+    | Using the username as an example:
+    | If I set 'result.username' => 'my-org-username', the code will connect to
+    | LDAP as follows (where $results[$i] represents a row in the LDAP query:
+    | $username-to-insert-in-snipe-it = $results[$i]["my-org-username"][0]
+    |
+    | Note: all these fields are required.
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query.
+    |
+    */
+    'result.username' => "",
+    'result.last.name'  => "",
+    'result.first.name' => "",
+
+    /*
+    | These fields are optional as not all LDAP directories will have it.  If yours
+    | does not have them, just leave these blank and the extra check will
+    | be omitted.
+    */
+    'result.active.flag' => "",
+    'result.emp.num'  => "",
+    'result.email' => "",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP filter query for authentication
+    |--------------------------------------------------------------------------
+    |
+    | The LDAP query that we want to execute when authenticating a user. This
+    | should not have to be changed.
+    |
+    */
+    'authentication.filter.query' => "uid=",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP Version
+    |--------------------------------------------------------------------------
+    |
+    | Version of LDAP you are using.
+    |
+    */
+    'version' => 3,
+
+
+);

app/config/testing/app.example.php

@@ -26,7 +26,7 @@ return array(
     |
     */
 
-    'url' => 'http://staging.yourserver.com',
+    'url' => 'http://snipe-it.dev',
 
     /*
     |--------------------------------------------------------------------------
@@ -40,6 +40,6 @@ return array(
     | Run a php artisan key:generate --env=staging to create a random one
     */
 
-    'key' => 'Change_this_key_or_snipe_will_get_ya',
+    'key' => '8YHfiO4EyWBewqrpGHDA4Iuom2ZIahXQ',
 
 );

app/config/testing/database.example.php

@@ -54,7 +54,7 @@ return array(
         'mysql' => array(
             'driver'    => 'mysql',
             'host'      => 'localhost',
-            'database'  => 'snipeit_laravel',
+            'database'  => 'snipeit_unit',
             'username'  => 'travis',
             'password'  => '',
             'charset'   => 'utf8',

app/config/testing/ldap.example.php

@@ -0,0 +1,112 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | URL
+    |--------------------------------------------------------------------------
+    |
+    | URL for the LDAP server. This should start with ldap://, for example:
+    | ldap://ldap.yourserver.com
+    |
+    */
+    'url' => "",
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Username
+    |--------------------------------------------------------------------------
+    |
+    | Username to use to connect authenticate to LDAP, for example:
+    | cn=read-only-admin,dc=example,dc=com
+    |
+    */
+	'username' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Password
+    |--------------------------------------------------------------------------
+    |
+    | Password to use when authenticating to LDAP.
+    |
+    */
+	'password' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Basedn
+    |--------------------------------------------------------------------------
+    |
+    | The base where the search for users will be executed, for example:
+    | dc=example,dc=com
+    |
+    */
+	'basedn'   => "",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | Filter
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query. This probably does not have to be
+    | changed.
+    |
+    */
+	'filter' => "&(cn=*)",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | LDAP field names that will be retrieved to create a user.
+    |
+    | Using the username as an example:
+    | If I set 'result.username' => 'my-org-username', the code will connect to
+    | LDAP as follows (where $results[$i] represents a row in the LDAP query:
+    | $username-to-insert-in-snipe-it = $results[$i]["my-org-username"][0]
+    |
+    | Note: all these fields are required.
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query.
+    |
+    */
+    'result.username' => "",
+    'result.last.name'  => "",
+    'result.first.name' => "",
+
+    /*
+    | These fields are optional as not all LDAP directories will have it.  If yours
+    | does not have them, just leave these blank and the extra check will
+    | be omitted.
+    */
+    'result.active.flag' => "",
+    'result.emp.num'  => "",
+    'result.email' => "",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP filter query for authentication
+    |--------------------------------------------------------------------------
+    |
+    | The LDAP query that we want to execute when authenticating a user. This
+    | should not have to be changed.
+    |
+    */
+    'authentication.filter.query' => "uid=",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP Version
+    |--------------------------------------------------------------------------
+    |
+    | Version of LDAP you are using.
+    |
+    */
+    'version' => 3,
+
+
+);

app/config/travis-ci/app.example.php

@@ -0,0 +1,45 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Debug Mode
+    |--------------------------------------------------------------------------
+    |
+    | When your application is in debug mode, detailed error messages with
+    | stack traces will be shown on every error that occurs within your
+    | application. If disabled, a simple generic error page is shown.
+    |
+    */
+
+    'debug' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application URL
+    |--------------------------------------------------------------------------
+    |
+    | This URL is used by the console to properly generate URLs when using
+    | the Artisan command line tool. You should set this to the root of
+    | your application so that it is used when running Artisan tasks.
+    |
+    */
+
+    'url' => 'http://localhost:8007',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Encryption Key
+    |--------------------------------------------------------------------------
+    |
+    | This key is used by the Illuminate encrypter service and should be set
+    | to a random, 32 character string, otherwise these encrypted strings
+    | will not be safe. Please do this before deploying an application!
+    |
+    | Run a php artisan key:generate --env=staging to create a random one
+    */
+
+    'key' => '8YHfiO4EyWBewqrpGHDA4Iuom2ZIahXQ',
+
+);

app/config/travis-ci/cache.php

@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Cache Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default cache "driver" that will be used when
+    | using the Caching library. Of course, you may use other drivers any
+    | time you wish. This is the default when another is not specified.
+    |
+    | Supported: "file", "database", "apc", "memcached", "redis", "array"
+    |
+    */
+
+    'driver' => 'array',
+
+);

app/config/travis-ci/database.example.php

@@ -0,0 +1,103 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | PDO Fetch Style
+    |--------------------------------------------------------------------------
+    |
+    | By default, database results will be returned as instances of the PHP
+    | stdClass object; however, you may desire to retrieve records in an
+    | array format for simplicity. Here you can tweak the fetch style.
+    |
+    */
+
+    'fetch' => PDO::FETCH_CLASS,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Database Connection Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which of the database connections below you wish
+    | to use as your default connection for all database work. Of course
+    | you may use many connections at once using the Database library.
+    |
+    */
+
+    'default' => 'mysql',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Database Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here are each of the database connections setup for your application.
+    | Of course, examples of configuring each database platform that is
+    | supported by Laravel is shown below to make development simple.
+    |
+    |
+    | All database work in Laravel is done through the PHP PDO facilities
+    | so make sure you have the driver for your particular database of
+    | choice installed on your machine before you begin development.
+    |
+    */
+
+    'connections' => array(
+        'sqlite' => array(
+            'driver'   => 'sqlite',
+            'database' => ':memory:',
+            'prefix'   => ''
+        ),
+
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_unit',
+            'username'  => 'travis',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),
+
+    ),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Migration Repository Table
+    |--------------------------------------------------------------------------
+    |
+    | This table keeps track of all the migrations that have already run for
+    | your application. Using this information, we can determine which of
+    | the migrations on disk have not actually be run in the databases.
+    |
+    */
+
+    'migrations' => 'migrations',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Redis Databases
+    |--------------------------------------------------------------------------
+    |
+    | Redis is an open source, fast, and advanced key-value store that also
+    | provides a richer set of commands than a typical key-value systems
+    | such as APC or Memcached. Laravel makes it easy to dig right in.
+    |
+    */
+
+    'redis' => array(
+
+        'cluster' => true,
+
+        'default' => array(
+            'host'     => '127.0.0.1',
+            'port'     => 6379,
+            'database' => 0,
+        ),
+
+    ),
+
+);

app/config/travis-ci/ldap.example.php

@@ -0,0 +1,112 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | URL
+    |--------------------------------------------------------------------------
+    |
+    | URL for the LDAP server. This should start with ldap://, for example:
+    | ldap://ldap.yourserver.com
+    |
+    */
+    'url' => "",
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Username
+    |--------------------------------------------------------------------------
+    |
+    | Username to use to connect authenticate to LDAP, for example:
+    | cn=read-only-admin,dc=example,dc=com
+    |
+    */
+	'username' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Password
+    |--------------------------------------------------------------------------
+    |
+    | Password to use when authenticating to LDAP.
+    |
+    */
+	'password' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Basedn
+    |--------------------------------------------------------------------------
+    |
+    | The base where the search for users will be executed, for example:
+    | dc=example,dc=com
+    |
+    */
+	'basedn'   => "",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | Filter
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query. This probably does not have to be
+    | changed.
+    |
+    */
+	'filter' => "&(cn=*)",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | LDAP field names that will be retrieved to create a user.
+    |
+    | Using the username as an example:
+    | If I set 'result.username' => 'my-org-username', the code will connect to
+    | LDAP as follows (where $results[$i] represents a row in the LDAP query:
+    | $username-to-insert-in-snipe-it = $results[$i]["my-org-username"][0]
+    |
+    | Note: all these fields are required.
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query.
+    |
+    */
+    'result.username' => "",
+    'result.last.name'  => "",
+    'result.first.name' => "",
+
+    /*
+    | These fields are optional as not all LDAP directories will have it.  If yours
+    | does not have them, just leave these blank and the extra check will
+    | be omitted.
+    */
+    'result.active.flag' => "",
+    'result.emp.num'  => "",
+    'result.email' => "",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP filter query for authentication
+    |--------------------------------------------------------------------------
+    |
+    | The LDAP query that we want to execute when authenticating a user. This
+    | should not have to be changed.
+    |
+    */
+    'authentication.filter.query' => "uid=",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP Version
+    |--------------------------------------------------------------------------
+    |
+    | Version of LDAP you are using.
+    |
+    */
+    'version' => 3,
+
+
+);

app/config/travis-ci/mail.example.php

@@ -0,0 +1,124 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Mail Driver
+    |--------------------------------------------------------------------------
+    |
+    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
+    | sending of e-mail. You may specify which one you're using throughout
+    | your application here. By default, Laravel is setup for SMTP mail.
+    |
+    | Supported: "smtp", "mail", "sendmail"
+    |
+    */
+
+    'driver' => 'smtp',
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Address
+    |--------------------------------------------------------------------------
+    |
+    | Here you may provide the host address of the SMTP server used by your
+    | applications. A default option is provided that is compatible with
+    | the Postmark mail service, which will provide reliable delivery.
+    |
+    */
+
+    'host' => 'smtp.mandrillapp.com',
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Port
+    |--------------------------------------------------------------------------
+    |
+    | This is the SMTP port used by your application to delivery e-mails to
+    | users of your application. Like the host we have set this value to
+    | stay compatible with the Postmark e-mail application by default.
+    |
+    */
+
+    'port' => 587,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Global "From" Address
+    |--------------------------------------------------------------------------
+    |
+    | You may wish for all e-mails sent by your application to be sent from
+    | the same address. Here, you may specify a name and address that is
+    | used globally for all e-mails that are sent by your application.
+    |
+    */
+
+    'from' => array('address' => null, 'name' => null),
+
+    /*
+    |--------------------------------------------------------------------------
+    | E-Mail Encryption Protocol
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the encryption protocol that should be used when
+    | the application send e-mail messages. A sensible default using the
+    | transport layer security protocol should provide great security.
+    |
+    */
+
+    'encryption' => 'tls',
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Username
+    |--------------------------------------------------------------------------
+    |
+    | If your SMTP server requires a username for authentication, you should
+    | set it here. This will get used to authenticate with your server on
+    | connection. You may also set the "password" value below this one.
+    |
+    */
+
+    'username' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Password
+    |--------------------------------------------------------------------------
+    |
+    | Here you may set the password required by your SMTP server to send out
+    | messages from your application. This will be given to the server on
+    | connection so that the application will be able to send messages.
+    |
+    */
+
+    'password' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Sendmail System Path
+    |--------------------------------------------------------------------------
+    |
+    | When using the "sendmail" driver to send e-mails, we will need to know
+    | the path to where Sendmail lives on this server. A default path has
+    | been provided here, which will work well on most of your systems.
+    |
+    */
+
+    'sendmail' => '/usr/sbin/sendmail -bs',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Mail "Pretend"
+    |--------------------------------------------------------------------------
+    |
+    | When this option is enabled, e-mail will not actually be sent over the
+    | web and will instead be written to your application's logs files so
+    | you may inspect the message. This is great for local development.
+    |
+    */
+
+    'pretend' => true,
+
+);

app/config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.8-150',
-  'hash_version' => 'v1.2.8-150-g84ffc1a',
+  'app_version' => 'v2.0-175',
+  'hash_version' => 'v2.0-175-gd0aab3e',
 );

app/controllers/AuthController.php

@@ -18,6 +18,50 @@ class AuthController extends BaseController
         return View::make('frontend.auth.signin');
     }
 
+
+    /**
+     * 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
+     *
+     */
+    function ldap($username, $password) {
+
+        $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');
+
+	// 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 ) {
+                    $entry = ldap_first_entry($connection, $results);
+                    if ( ($userDn = @ldap_get_dn($connection, $entry)) !== false ) {
+                        if( ($isBound = ldap_bind($connection, $userDn, $password)) == "true") {
+                            return true;
+                        }
+                    }
+                }
+            }
+        } catch (Exception $e) {
+            LOG::error($e->getMessage());
+        }
+	ldap_close($connection);
+	return false;
+    }
+
+
     /**
      * Account sign in form processing.
      *
@@ -41,8 +85,39 @@ class AuthController extends BaseController
         }
 
         try {
-            // Try to log the user in
-            Sentry::authenticate(Input::only('username', 'password'), Input::get('remember-me', 0));
+
+            /**
+             * =================================================================
+             * Hack in LDAP authentication
+             */
+
+            // Try to get the user from the database.
+            $user = (array) DB::table('users')->where('username', Input::get('username'))->first();
+
+            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");
+                    $pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10);
+                    $user = Sentry::findUserByLogin( Input::get('username') );
+                    $user->password = $pass;
+                    $user->save();
+                    $credentials = array(
+                        'username' => Input::get('username'),
+                        'password' => $pass,
+                    );
+                    Sentry::authenticate($credentials, Input::get('remember-me', 0));
+                }
+                else {
+                    throw new Cartalyst\Sentry\Users\UserNotFoundException();
+                }
+            }
+            /* ============================================================== */
+            else {
+                LOG::debug("Authenticating user against database.");
+                // Try to log the user in
+                Sentry::authenticate(Input::only('username', 'password'), Input::get('remember-me', 0));
+            }
 
             // Get the page we were before
             $redirect = Session::get('loginRedirect', 'account');
@@ -134,19 +209,30 @@ class AuthController extends BaseController
 
         try {
             // Get the user password recovery code
-            $user = Sentry::getUserProvider()->findByLogin(Input::get('username'));
+            if (!$user = Sentry::getUserProvider()->findByLogin(Input::get('username'))) {
+                $user = User::where('email','=',Input::get('username'));
+            }
+
+            $reset = $user->getResetPasswordCode();
 
             // Data to be used on the username view
             $data = array(
                 'user'              => $user,
-                'forgotPasswordUrl' => URL::route('forgot-password-confirm', $user->getResetPasswordCode()),
+                'forgotPasswordUrl' => URL::route('forgot-password-confirm', $reset),
             );
 
-            // Send the activation code through username
-            Mail::send('usernames.forgot-password', $data, function ($m) use ($user) {
-                $m->to($user->username, $user->first_name . ' ' . $user->last_name);
-                $m->subject('Account Password Recovery');
-            });
+            $user->reset_password_code = $reset;
+            $user->save();
+
+
+            if ($user->email) {
+                // Send the activation code through username
+                Mail::send('emails.forgot-password', $data, function ($m) use ($user) {
+                    $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+                    $m->subject('Account Password Recovery');
+                });
+            }
+
         } catch (Cartalyst\Sentry\Users\UserNotFoundException $e) {
             // Even though the username was not found, we will pretend
             // we have sent the password reset code through username,
@@ -165,12 +251,13 @@ class AuthController extends BaseController
      */
     public function getForgotPasswordConfirm($passwordResetCode = null)
     {
+
         try {
             // Find the user using the password reset code
             $user = Sentry::getUserProvider()->findByResetPasswordCode($passwordResetCode);
         } catch(Cartalyst\Sentry\Users\UserNotFoundException $e) {
             // Redirect to the forgot password page
-            return Redirect::route('forgot-password')->with('error', Lang::get('auth/message.account_not_found'));
+            //return Redirect::route('forgot-password')->with('error', Lang::get('auth/message.account_not_found'));
         }
 
         // Show the page

app/controllers/account/ViewAssetsController.php

@@ -12,6 +12,9 @@ use Actionlog;
 use Lang;
 use Accessory;
 use DB;
+use Slack;
+use Setting;
+use Config;
 
 class ViewAssetsController extends AuthorizedController
 {
@@ -47,117 +50,183 @@ class ViewAssetsController extends AuthorizedController
 
     public function getRequestAsset($assetId = null) {
 
-    	// Check if the asset exists
-        if (is_null($asset = Asset::find($assetId))) {
+        $user = Sentry::getUser();
+
+    	// Check if the asset exists and is requestable
+        if (is_null($asset = Asset::RequestableAssets()->find($assetId))) {
             // Redirect to the asset management page
-            return Redirect::to('frontend/account/view-assets')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
+            return Redirect::route('requestable-assets')->with('error', Lang::get('admin/hardware/message.does_not_exist_or_not_requestable'));
         } else {
 
+            $logaction = new Actionlog();
+            $logaction->asset_id = $asset->id;
+            $logaction->asset_type = 'hardware';
+            $logaction->created_at =  date("Y-m-d h:i:s");
 
-			 return View::make('frontend/account/view-assets', compact('asset'));
+            if ($user->location_id) {
+                $logaction->location_id = $user->location_id;
+            }
+            $logaction->user_id = Sentry::getUser()->id;
+            $log = $logaction->logaction('requested');
+
+            $settings = Setting::getSettings();
+
+			if ($settings->slack_endpoint) {
+
+
+				$slack_settings = [
+				    'username' => $settings->botname,
+				    'channel' => $settings->slack_channel,
+				    'link_names' => true
+				];
+
+				$client = new \Maknz\Slack\Client($settings->slack_endpoint,$slack_settings);
+
+				try {
+						$client->attach([
+						    'color' => 'good',
+						    'fields' => [
+						        [
+						            'title' => 'REQUESTED:',
+						            'value' => strtoupper($logaction->asset_type).' asset <'.Config::get('app.url').'/hardware/'.$asset->id.'/view'.'|'.$asset->showAssetName().'> requested by <'.Config::get('app.url').'/hardware/'.$asset->id.'/view'.'|'.Sentry::getUser()->fullName().'>.'
+						        ]
+
+						    ]
+						])->send('Asset Requested');
+
+					} catch (Exception $e) {
+
+					}
+
+			}
+
+            return Redirect::route('requestable-assets')->with('success')->with('success', Lang::get('admin/hardware/message.requests.success'));
         }
 
 
     }
-    
-    
-    
+
+
+
     // Get the acceptance screen
     public function getAcceptAsset($logID = null) {
-	    
+
 	    if (is_null($findlog = Actionlog::find($logID))) {
             // Redirect to the asset management page
             return Redirect::to('account')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
-        
+
         // Asset
         if (($findlog->asset_id!='') && ($findlog->asset_type=='hardware')) {
         	$item = Asset::find($findlog->asset_id);
-        
-        // software	
-        } elseif (($findlog->asset_id!='') && ($findlog->asset_type=='software')) {     
+
+        // software
+        } elseif (($findlog->asset_id!='') && ($findlog->asset_type=='software')) {
 	        $item = License::find($findlog->asset_id);
-	    // accessories    
+	    // accessories
 	    } elseif ($findlog->accessory_id!='') {
-		   $item = Accessory::find($findlog->accessory_id);         
+		   $item = Accessory::find($findlog->accessory_id);
         }
-        
+
 	    // Check if the asset exists
         if (is_null($item)) {
             // 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);
-        
-        
 
-	    
+        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'));
         }
-                
-        
+
+
         if ($findlog->accepted_id!='') {
             // Redirect to the asset management page
             return Redirect::to('account/view-assets')->with('error', Lang::get('admin/users/message.error.asset_already_accepted'));
         }
-        
+
+        if (!Input::has('asset_acceptance')) {
+            return Redirect::to('account/view-assets')->with('error', Lang::get('admin/users/message.error.accept_or_decline'));
+        }
+
     	$user = Sentry::getUser();
 		$logaction = new Actionlog();
-			
+
+        if (Input::get('asset_acceptance')=='accepted') {
+            $logaction_msg  = 'accepted';
+            $accepted="accepted";
+            $return_msg = Lang::get('admin/users/message.accepted');
+        } else {
+            $logaction_msg = 'declined';
+            $accepted="rejected";
+            $return_msg = Lang::get('admin/users/message.declined');
+        }
+
 		// Asset
         if (($findlog->asset_id!='') && ($findlog->asset_type=='hardware')) {
         	$logaction->asset_id = $findlog->asset_id;
         	$logaction->accessory_id = NULL;
         	$logaction->asset_type = 'hardware';
-        
-        // software	
-        } elseif (($findlog->asset_id!='') && ($findlog->asset_type=='software')) {     
+
+            if (Input::get('asset_acceptance')!='accepted') {
+                DB::table('assets')
+                ->where('id', $findlog->asset_id)
+                ->update(array('assigned_to' => null));
+            }
+
+
+        // software
+        } elseif (($findlog->asset_id!='') && ($findlog->asset_type=='software')) {
 	        $logaction->asset_id = $findlog->asset_id;
         	$logaction->accessory_id = NULL;
         	$logaction->asset_type = 'software';
-        	
-		// accessories    
+
+		// accessories
 	    } elseif ($findlog->accessory_id!='') {
 		    $logaction->asset_id = NULL;
         	$logaction->accessory_id = $findlog->accessory_id;
-        	$logaction->asset_type = 'accessory';         
+        	$logaction->asset_type = 'accessory';
         }
-			
+
 		$logaction->checkedout_to = $findlog->checkedout_to;
-		
+
 		$logaction->note = e(Input::get('note'));
 		$logaction->user_id = $user->id;
 		$logaction->accepted_at = date("Y-m-d h:i:s");
-		$log = $logaction->logaction('accepted');
-		
-      
+		$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();
+
 		if ($update_checkout ) {
-			return Redirect::to('account/view-assets')->with('success', 'You have successfully accept this asset.');
-			
+			return Redirect::to('account/view-assets')->with('success', $return_msg);
+
 		} else {
 			return Redirect::to('account/view-assets')->with('error', 'Something went wrong ');
 		}
-		
-		
 
-  
-	    
+
+
+
+
     }
-    
+
 
 
 

app/controllers/admin/AccessoriesController.php

@@ -218,7 +218,7 @@ class AccessoriesController extends AdminController
         }
 
         // Get the dropdown of users and then pass it to the checkout view
-        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+        $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');
 
         return View::make('backend/accessories/checkout', compact('accessory'))->with('users_list',$users_list);
 
@@ -322,6 +322,10 @@ class AccessoriesController extends AdminController
             $data['eula'] = $accessory->getEula();
             $data['first_name'] = $user->first_name;
             $data['item_name'] = $accessory->name;
+            $data['checkout_date'] = $logaction->created_at;
+            $data['item_tag'] = '';
+            $data['expected_checkin'] = '';
+            $data['note'] = $logaction->note;
             $data['require_acceptance'] = $accessory->requireAcceptance();
 
 
@@ -429,6 +433,25 @@ class AccessoriesController extends AdminController
 
             $log = $logaction->logaction('checkin from');
 
+            if(!is_null($accessory_user->assigned_to)) {
+                $user = User::find($accessory_user->assigned_to);
+            }
+
+            $data['log_id'] = $logaction->id;
+            $data['first_name'] = $user->first_name;
+            $data['item_name'] = $accessory->name;
+            $data['checkin_date'] = $logaction->created_at;
+            $data['item_tag'] = '';
+            $data['note'] = $logaction->note;
+
+            if (($accessory->checkin_email()=='1')) {
+
+                Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {
+                    $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+                    $m->subject('Confirm Accessory Checkin');
+                });
+            }
+
             if ($backto=='user') {
 				return Redirect::to("admin/users/".$return_to.'/view')->with('success', Lang::get('admin/accessories/message.checkin.success'));
 			} else {
@@ -442,7 +465,7 @@ class AccessoriesController extends AdminController
 
     public function getDatatable()
     {
-        $accessories = Accessory::select(array('id','name','qty'))
+        $accessories = Accessory::with('category')
         ->whereNull('deleted_at')
         ->orderBy('created_at', 'DESC');
 
@@ -454,6 +477,10 @@ class AccessoriesController extends AdminController
             });
 
         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);
@@ -467,8 +494,8 @@ class AccessoriesController extends AdminController
                 return $accessories->numRemaining();
             })
         ->addColumn($actions)
-        ->searchColumns('name','qty','numRemaining','actions')
-        ->orderColumns('name','qty','numRemaining','actions')
+        ->searchColumns('category','name','qty','numRemaining','actions')
+        ->orderColumns('category','name','qty','numRemaining','actions')
         ->make();
     }
 

app/controllers/admin/AssetMaintenancesController.php

@@ -0,0 +1,464 @@
+<?php
+
+    namespace Controllers\Admin;
+
+    use AdminController;
+    use AssetMaintenance;
+    use Carbon\Carbon;
+    use Datatable;
+    use DB;
+    use Input;
+    use Lang;
+    use Log;
+    use Mail;
+    use Redirect;
+    use Response;
+    use Sentry;
+    use Slack;
+    use Str;
+    use Supplier;
+    use TCPDF;
+    use Validator;
+    use View;
+
+    class AssetMaintenancesController extends AdminController
+    {
+
+        /**
+         * getIndex
+         *
+         * @return mixed
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        public function getIndex()
+        {
+
+            return View::make( 'backend/asset_maintenances/index' );
+        }
+
+        /**
+         * getDatatable
+         * Gets the datatable for the index page
+         *
+         * @return mixed
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        public function getDatatable()
+        {
+
+            $assetMaintenances = AssetMaintenance::orderBy( 'created_at', 'DESC' )
+                                            ->get();
+
+            $actions = new \Chumper\Datatable\Columns\FunctionColumn( 'actions', function ( $assetMaintenances ) {
+
+                return '<a href="' . route( 'update/asset_maintenance', $assetMaintenances->id )
+                       . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'
+                       . route( 'delete/asset_maintenance', $assetMaintenances->id ) . '" data-content="'
+                       . Lang::get( 'admin/asset_maintenances/message.delete.confirm' ) . '" data-title="'
+                       . Lang::get( 'general.delete' ) . ' ' . htmlspecialchars( $assetMaintenances->title )
+                       . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            } );
+
+            return Datatable::collection( $assetMaintenances )
+                            ->addColumn( 'asset', function ( $assetMaintenances ) {
+
+                                return link_to( '/hardware/' . $assetMaintenances->asset_id . '/view',
+                                    mb_strimwidth( $assetMaintenances->asset->name, 0, 50, "..." ) );
+                            } )
+                            ->addColumn( 'supplier', function ( $assetMaintenances ) {
+
+                                return link_to( '/admin/settings/suppliers/' . $assetMaintenances->supplier_id
+                                                . '/view',
+                                    mb_strimwidth( $assetMaintenances->supplier->name, 0, 50, "..." ) );
+                            } )
+                            ->addColumn( 'asset_maintenance_type', function ( $assetMaintenances ) {
+
+                                return $assetMaintenances->asset_maintenance_type;
+                            } )
+                            ->addColumn( 'title', function ( $assetMaintenances ) {
+
+                                return link_to( '/admin/asset_maintenances/' . $assetMaintenances->id . '/view',
+                                    mb_strimwidth( $assetMaintenances->title, 0, 50, "..." ) );
+                            } )
+                            ->addColumn( 'start_date', function ( $assetMaintenances ) {
+
+                                return $assetMaintenances->start_date;
+                            } )
+                            ->addColumn( 'completion_date', function ( $assetMaintenances ) {
+
+                                return $assetMaintenances->completion_date;
+                            } )
+                            ->addColumn( 'asset_maintenance_time', function ( $assetMaintenances ) {
+
+                                if (is_null( $assetMaintenances->asset_maintenance_time )) {
+                                    $assetMaintenances->asset_maintenance_time = Carbon::now()
+                                                                                       ->diffInDays( Carbon::parse( $assetMaintenances->start_date ) );
+                                }
+
+                                return intval( $assetMaintenances->asset_maintenance_time );
+                            } )
+                            ->addColumn( 'cost', function ( $assetMaintenances ) {
+
+                                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();
+        }
+
+        /**
+         * getCreate
+         *
+         * @param null $assetId
+         *
+         * @return mixed
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        public function getCreate( $assetId = null )
+        {
+
+            // Prepare Asset Maintenance Type List
+            $assetMaintenanceType = [
+                                        '' => 'Select an asset maintenance type',
+                                    ] + AssetMaintenance::getImprovementOptions();
+            // 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' )
+                                     ->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',
+                                         DB::raw( 'concat(first_name," ",last_name) as full_name, assets.id as id, models.name as modelname' ) )
+                                     ->whereNull( 'assets.deleted_at' )
+                                     ->get();
+            $asset_array         = json_decode( json_encode( $asset ), true );
+            $asset_element[ '' ] = 'Please select an asset';
+            // Build a list out of the data results
+            for ($x = 0; $x < count( $asset_array ); $x++) {
+
+                if ($asset_array[ $x ][ 'full_name' ] != '') {
+                    $full_name = ' (' . $asset_array[ $x ][ 'full_name' ] . ') ' . $asset_array[ $x ][ 'modelname' ];
+                } else {
+                    $full_name = ' (Unassigned) ' . $asset_array[ $x ][ 'modelname' ];
+                }
+                $asset_element[ $asset_array[ $x ][ 'id' ] ] =
+                    $asset_array[ $x ][ 'asset_tag' ] . ' - ' . $asset_array[ $x ][ 'name' ] . $full_name;
+            }
+            // Get Supplier List
+            $supplier_list = [ '' => 'Select Supplier' ] + Supplier::orderBy( 'name', 'asc' )
+                                                                   ->lists( 'name', 'id' );
+
+            // Render the view
+            return View::make( 'backend/asset_maintenances/edit' )
+                       ->with( 'asset_list', $asset_element )
+                       ->with( 'selectedAsset', $selectedAsset )
+                       ->with( 'supplier_list', $supplier_list )
+                       ->with( 'assetMaintenanceType', $assetMaintenanceType )
+                       ->with( 'assetMaintenance', new AssetMaintenance );
+        }
+
+        /**
+         * postCreate
+         *
+         * @return mixed
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        public function postCreate()
+        {
+
+            // get the POST data
+            $new = Input::all();
+
+            // create a new model instance
+            $assetMaintenance = new AssetMaintenance();
+
+            // attempt validation
+            if ($assetMaintenance->validate( $new )) {
+
+                if (e( Input::get( 'supplier_id' ) ) == '') {
+                    $assetMaintenance->supplier_id = null;
+                } else {
+                    $assetMaintenance->supplier_id = e( Input::get( 'supplier_id' ) );
+                }
+
+                if (e( Input::get( 'is_warranty' ) ) == '') {
+                    $assetMaintenance->is_warranty = 0;
+                } else {
+                    $assetMaintenance->is_warranty = e( Input::get( 'is_warranty' ) );
+                }
+
+                if (e( Input::get( 'cost' ) ) == '') {
+                    $assetMaintenance->cost = '';
+                } else {
+                    $assetMaintenance->cost = ParseFloat( e( Input::get( 'cost' ) ) );
+                }
+
+                if (e( Input::get( 'notes' ) ) == '') {
+                    $assetMaintenance->notes = null;
+                } else {
+                    $assetMaintenance->notes = e( Input::get( 'notes' ) );
+                }
+
+                // Save the asset maintenance data
+                $assetMaintenance->asset_id               = e( Input::get( 'asset_id' ) );
+                $assetMaintenance->asset_maintenance_type = e( Input::get( 'asset_maintenance_type' ) );
+                $assetMaintenance->title                  = e( Input::get( 'title' ) );
+                $assetMaintenance->start_date             = e( Input::get( 'start_date' ) );
+                $assetMaintenance->completion_date        = e( Input::get( 'completion_date' ) );
+
+                if (( $assetMaintenance->completion_date == "" )
+                    || ( $assetMaintenance->completion_date == "0000-00-00" )
+                ) {
+                    $assetMaintenance->completion_date = null;
+                }
+
+                // Was the asset maintenance created?
+                if ($assetMaintenance->save()) {
+
+                    // Redirect to the new asset maintenance page
+                    return Redirect::to( "admin/asset_maintenances" )
+                                   ->with( 'success', Lang::get( 'admin/asset_maintenances/message.create.success' ) );
+                }
+            } else {
+                // failure
+                $errors = $assetMaintenance->errors();
+
+                return Redirect::back()
+                               ->withInput()
+                               ->withErrors( $errors );
+            }
+
+            // Redirect to the asset maintenance create page
+            return Redirect::to( 'admin/asset_maintenances/edit' )
+                           ->with( 'error', Lang::get( 'admin/asset_maintenances/message.create.error' ) )
+                           ->with( 'assetMaintenance', new AssetMaintenance );
+
+        }
+
+        /**
+         * getEdit
+         *
+         * @param null $assetMaintenanceId
+         *
+         * @return mixed
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        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' ) );
+            }
+
+            if ($assetMaintenance->completion_date == '0000-00-00') {
+                $assetMaintenance->completion_date = null;
+            }
+
+            if ($assetMaintenance->start_date == '0000-00-00') {
+                $assetMaintenance->start_date = null;
+            }
+
+            if ($assetMaintenance->cost == '0.00') {
+                $assetMaintenance->cost = null;
+            }
+
+            // Prepare Improvement Type List
+            $assetMaintenanceType = [
+                                        '' => 'Select an improvement type',
+                                    ] + 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' )
+                                     ->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',
+                                         DB::raw( 'concat(first_name," ",last_name) as full_name, assets.id as id, models.name as modelname' ) )
+                                     ->whereNull( 'assets.deleted_at' )
+                                     ->get();
+            $asset_array         = json_decode( json_encode( $asset ), true );
+            $asset_element[ '' ] = 'Please select an asset';
+            // Build a list out of the data results
+            for ($x = 0; $x < count( $asset_array ); $x++) {
+
+                if ($asset_array[ $x ][ 'full_name' ] != '') {
+                    $full_name = ' (' . $asset_array[ $x ][ 'full_name' ] . ') ' . $asset_array[ $x ][ 'modelname' ];
+                } else {
+                    $full_name = ' (Unassigned) ' . $asset_array[ $x ][ 'modelname' ];
+                }
+                $asset_element[ $asset_array[ $x ][ 'id' ] ] =
+                    $asset_array[ $x ][ 'asset_tag' ] . ' - ' . $asset_array[ $x ][ 'name' ] . $full_name;
+            }
+            // Get Supplier List
+            $supplier_list = [ '' => 'Select Supplier' ] + Supplier::orderBy( 'name', 'asc' )
+                                                                   ->lists( 'name', 'id' );
+
+            // Render the view
+            return View::make( 'backend/asset_maintenances/edit' )
+                       ->with( 'asset_list', $asset_element )
+                       ->with( 'selectedAsset', null )
+                       ->with( 'supplier_list', $supplier_list )
+                       ->with( 'assetMaintenanceType', $assetMaintenanceType )
+                       ->with( 'assetMaintenance', $assetMaintenance );
+
+        }
+
+        /**
+         * postEdit
+         *
+         * @param null $assetMaintenanceId
+         *
+         * @return mixed
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        public function postEdit( $assetMaintenanceId = null )
+        {
+
+            // get the POST data
+            $new = Input::all();
+
+            // 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' ) );
+            }
+
+            // attempt validation
+            if ($assetMaintenance->validate( $new )) {
+
+                if (e( Input::get( 'supplier_id' ) ) == '') {
+                    $assetMaintenance->supplier_id = null;
+                } else {
+                    $assetMaintenance->supplier_id = e( Input::get( 'supplier_id' ) );
+                }
+
+                if (e( Input::get( 'is_warranty' ) ) == '') {
+                    $assetMaintenance->is_warranty = 0;
+                } else {
+                    $assetMaintenance->is_warranty = e( Input::get( 'is_warranty' ) );
+                }
+
+                if (e( Input::get( 'cost' ) ) == '') {
+                    $assetMaintenance->cost = '';
+                } else {
+                    $assetMaintenance->cost = ParseFloat( e( Input::get( 'cost' ) ) );
+                }
+
+                if (e( Input::get( 'notes' ) ) == '') {
+                    $assetMaintenance->notes = null;
+                } else {
+                    $assetMaintenance->notes = e( Input::get( 'notes' ) );
+                }
+
+                // Save the asset maintenance data
+                $assetMaintenance->asset_id               = e( Input::get( 'asset_id' ) );
+                $assetMaintenance->asset_maintenance_type = e( Input::get( 'asset_maintenance_type' ) );
+                $assetMaintenance->title                  = e( Input::get( 'title' ) );
+                $assetMaintenance->start_date             = e( Input::get( 'start_date' ) );
+                $assetMaintenance->completion_date        = e( Input::get( 'completion_date' ) );
+
+                if (( $assetMaintenance->completion_date == "" )
+                    || ( $assetMaintenance->completion_date == "0000-00-00" )
+                ) {
+                    $assetMaintenance->completion_date = null;
+                    if (( $assetMaintenance->asset_maintenance_time !== 0 )
+                        || ( !is_null( $assetMaintenance->asset_maintenance_time ) )
+                    ) {
+                        $assetMaintenance->asset_maintenance_time = null;
+                    }
+                }
+
+                if (( $assetMaintenance->completion_date !== "" )
+                    && ( $assetMaintenance->completion_date !== "0000-00-00" )
+                    && ( $assetMaintenance->start_date !== "" )
+                    && ( $assetMaintenance->start_date !== "0000-00-00" )
+                ) {
+                    $startDate                                = Carbon::parse( $assetMaintenance->start_date );
+                    $completionDate                           = Carbon::parse( $assetMaintenance->completion_date );
+                    $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays( $startDate );
+                }
+
+                // Was the asset maintenance created?
+                if ($assetMaintenance->save()) {
+
+                    // Redirect to the new asset maintenance page
+                    return Redirect::to( "admin/asset_maintenances" )
+                                   ->with( 'success', Lang::get( 'admin/asset_maintenances/message.create.success' ) );
+                }
+            } else {
+                // failure
+                $errors = $assetMaintenance->errors();
+
+                return Redirect::back()
+                               ->withInput()
+                               ->withErrors( $errors );
+            }
+
+            // Redirect to the improvement create page
+            return Redirect::to( 'admin/asset_maintenances/edit' )
+                           ->with( 'error', Lang::get( 'admin/asset_maintenances/message.create.error' ) )
+                           ->with( 'assetMaintenance', $assetMaintenance );
+
+        }
+
+        /**
+         * getDelete
+         *
+         * @param $assetMaintenanceId
+         *
+         * @return mixed
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        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' ) );
+            }
+            // Delete the asset maintenance
+            $assetMaintenance->delete();
+
+            // Redirect to the asset_maintenance management page
+            return Redirect::to( 'admin/asset_maintenances' )
+                           ->with( 'success', Lang::get( 'admin/asset_maintenances/message.delete.success' ) );
+        }
+
+        /**
+         * getView
+         *
+         * @param $assetMaintenanceId
+         *
+         * @return mixed
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        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' ) );
+            }
+
+            return View::make( 'backend/asset_maintenances/view')->with('assetMaintenance', $assetMaintenance);
+        }
+
+    }

app/controllers/admin/AssetsController.php

@@ -5,6 +5,7 @@ use Input;
 use Lang;
 use Asset;
 use Supplier;
+use AssetMaintenance;
 use Statuslabel;
 use User;
 use Setting;
@@ -21,15 +22,19 @@ use Response;
 use Config;
 use Location;
 use Log;
-use DNS2D;
 use Mail;
 use Datatable;
 use TCPDF;
 use Slack;
+use Manufacturer; //for embedded-create
+use Artisan;
+use Symfony\Component\Console\Output\BufferedOutput;
+
 
 class AssetsController extends AdminController
 {
     protected $qrCodeDimensions = array( 'height' => 3.5, 'width' => 3.5);
+    protected $barCodeDimensions = array( 'height' => 2, 'width' => 22);
 
     /**
      * Show a list of all the assets.
@@ -42,8 +47,6 @@ class AssetsController extends AdminController
         return View::make('backend/hardware/index');
     }
 
-
-
     /**
      * Asset create.
      *
@@ -53,29 +56,15 @@ class AssetsController extends AdminController
      */
     public function getCreate($model_id = null)
     {
-
-        /*
-        // Grab the dropdown list of models
-        //$model_list = array('' => 'Select a Model') + Model::orderBy('name', 'asc')->lists('name'.' '. 'modelno', 'id');
-
-        $model_list = Model::select(DB::raw('concat(manufacturers.name," ",name) as name, id'))->orderBy('name', 'asc')->with('manufacturer')->lists('name', 'id');
-        //$model_list = array('' => Lang::get('general.select_model'));
-        */
-
-        $model_list = array('' => Lang::get('general.select_model')) + DB::table('models')
-        ->select(DB::raw('concat(name," / ",modelno) as name, id'))->orderBy('name', 'asc')
-        ->orderBy('modelno', 'asc')
-        ->whereNull('deleted_at')
-        ->lists('name', 'id');
-
-
-        $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
-        $location_list = array('' => Lang::get('general.select_location')) + Location::orderBy('name', 'asc')->lists('name', 'id');
-
-
-        // Grab the dropdown list of status
-        $statuslabel_list = array('' => Lang::get('general.select_statuslabel')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
+        // Grab the dropdown lists
+        $model_list = modelList();
+        $statuslabel_list = statusLabelList();
+        $location_list = locationsList();
+        $manufacturer_list = manufacturerList();
+        $category_list = categoryList();
+        $supplier_list = suppliersList();
+        $assigned_to = usersList();
+        $statuslabel_types = statusTypeList();
 
         $view = View::make('backend/hardware/edit');
         $view->with('supplier_list',$supplier_list);
@@ -84,6 +73,9 @@ class AssetsController extends AdminController
         $view->with('assigned_to',$assigned_to);
         $view->with('location_list',$location_list);
         $view->with('asset',new Asset);
+        $view->with('manufacturer',$manufacturer_list);
+        $view->with('category',$category_list);
+        $view->with('statuslabel_types',$statuslabel_types);
 
         if (!is_null($model_id)) {
             $selected_model = Model::find($model_id);
@@ -215,19 +207,25 @@ class AssetsController extends AdminController
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
+        // Grab the dropdown lists
+        $model_list = modelList();
+        $statuslabel_list = statusLabelList();
+        $location_list = locationsList();
+        $manufacturer_list = manufacturerList();
+        $category_list = categoryList();
+        $supplier_list = suppliersList();
+        $assigned_to = usersList();
+        $statuslabel_types = statusTypeList();
 
-        // Grab the dropdown list of models
-		$model_list = array('' => Lang::get('general.select_model')) + DB::table('models')
-		->select(DB::raw('concat(name," / ",modelno) as name, id'))->orderBy('name', 'asc')
-		->orderBy('modelno', 'asc')
-		->lists('name', 'id');
-        $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        $location_list = array('' => Lang::get('general.select_location')) + Location::orderBy('name', 'asc')->lists('name', 'id');
-
-        // Grab the dropdown list of status
-        $statuslabel_list = Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
-
-        return View::make('backend/hardware/edit', compact('asset'))->with('model_list',$model_list)->with('supplier_list',$supplier_list)->with('location_list',$location_list)->with('statuslabel_list',$statuslabel_list);
+        return View::make('backend/hardware/edit', compact('asset'))
+        ->with('model_list',$model_list)
+        ->with('supplier_list',$supplier_list)
+        ->with('location_list',$location_list)
+        ->with('statuslabel_list',$statuslabel_list)
+        ->with('assigned_to',$assigned_to)
+        ->with('manufacturer',$manufacturer_list)
+        ->with('statuslabel_types',$statuslabel_types)
+        ->with('category',$category_list);
     }
 
 
@@ -339,7 +337,7 @@ class AssetsController extends AdminController
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
             // Redirect to the asset management page with error
-            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
         if (isset($asset->assigneduser->id) && ($asset->assigneduser->id!=0)) {
@@ -371,11 +369,11 @@ class AssetsController extends AdminController
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
             // Redirect to the asset management page with error
-            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
         // Get the dropdown of users and then pass it to the checkout view
-        $users_list = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+        $users_list = usersList();
 
         return View::make('backend/hardware/checkout', compact('asset'))->with('users_list',$users_list);
 
@@ -386,113 +384,51 @@ class AssetsController extends AdminController
     **/
     public function postCheckout($assetId)
     {
+
         // Check if the asset exists
-        if (is_null($asset = Asset::find($assetId))) {
-            // Redirect to the asset management page with error
-            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+        if (!$asset = Asset::find($assetId)) {
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
-        $assigned_to = e(Input::get('assigned_to'));
-
-
-
         // Declare the rules for the form validation
         $rules = array(
             'assigned_to'   => 'required|min:1',
+            'checkout_at'   => 'required|date',
             'note'   => 'alpha_space',
         );
 
         // 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);
         }
 
-
-        // Check if the user exists
-        if (is_null($user = User::find($assigned_to))) {
-            // Redirect to the asset management page with error
+        if (!$user = User::find(e(Input::get('assigned_to')))) {
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.user_does_not_exist'));
         }
 
-        // Update the asset data
-        $asset->assigned_to            		= e(Input::get('assigned_to'));
-
-        // Was the asset updated?
-        if($asset->save()) {
-            $logaction = new Actionlog();
-
-            if (Input::has('checkout_at')) {
-            	if (Input::get('checkout_at')!= date("Y-m-d")){
-					$logaction->created_at = e(Input::get('checkout_at')).' 00:00:00';
-				}
-        	}
+        if (!$admin = Sentry::getUser()) {
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.admin_user_does_not_exist'));
+        }
 
 
+    	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");
+        }
 
-            $logaction->asset_id = $asset->id;
-            $logaction->checkedout_to = $asset->assigned_to;
-            $logaction->asset_type = 'hardware';
-            $logaction->location_id = $user->location_id;
-            $logaction->user_id = Sentry::getUser()->id;
-            $logaction->note = e(Input::get('note'));
-            $log = $logaction->logaction('checkout');
-
-            $data['log_id'] = $logaction->id;
-            $data['eula'] = $asset->getEula();
-            $data['first_name'] = $user->first_name;
-            $data['item_name'] = $asset->showAssetName();
-            $data['require_acceptance'] = $asset->requireAcceptance();
-
-            $settings = Setting::getSettings();
-
-			if ($settings->slack_endpoint) {
-
-
-				$slack_settings = [
-				    'username' => $settings->botname,
-				    'channel' => $settings->slack_channel,
-				    'link_names' => true
-				];
-
-				$client = new \Maknz\Slack\Client($settings->slack_endpoint,$slack_settings);
-
-				try {
-						$client->attach([
-						    'color' => 'good',
-						    'fields' => [
-						        [
-						            'title' => 'Checked Out:',
-						            'value' => strtoupper($logaction->asset_type).' asset <'.Config::get('app.url').'/hardware/'.$asset->id.'/view'.'|'.$asset->showAssetName().'> checked out to <'.Config::get('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.Config::get('app.url').'/hardware/'.$asset->id.'/view'.'|'.Sentry::getUser()->fullName().'>.'
-						        ],
-						        [
-						            'title' => 'Note:',
-						            'value' => e($logaction->note)
-						        ],
-
-
-
-						    ]
-						])->send('Asset Checked Out');
-
-					} catch (Exception $e) {
-
-					}
-
+        if (Input::has('expected_checkin')) {
+        	if (Input::get('expected_checkin')!= date("Y-m-d")){
+				$expected_checkin = e(Input::get('expected_checkin')).' 00:00:00';
 			}
+    	} else {
+            $expected_checkin = null;
+        }
 
 
-            if (($asset->requireAcceptance()=='1')  || ($asset->getEula())) {
-
-	            Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
-	                $m->to($user->email, $user->first_name . ' ' . $user->last_name);
-	                $m->subject('Confirm asset delivery');
-	            });
-            }
-
+        if ($asset->checkOutToUser($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')), e(Input::get('name')))) {
             // Redirect to the new asset page
             return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.checkout.success'));
         }
@@ -513,7 +449,7 @@ class AssetsController extends AdminController
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
             // Redirect to the asset management page with error
-            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
         return View::make('backend/hardware/checkin', compact('asset'))->with('backto', $backto);
@@ -531,11 +467,15 @@ class AssetsController extends AdminController
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
             // Redirect to the asset management page with error
-            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
+        // Check for a valid user to checkout fa-random
+        // This will need to be tweaked for checkout to location
         if (!is_null($asset->assigned_to)) {
             $user = User::find($asset->assigned_to);
+        } else {
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.already_checked_in'));
         }
 
         // This is just used for the redirect
@@ -546,6 +486,7 @@ class AssetsController extends AdminController
 
         // Update the asset data to null, since it's being checked in
         $asset->assigned_to            		= NULL;
+        $asset->accepted                  = NULL;
 
 
         // Was the asset updated?
@@ -571,7 +512,6 @@ class AssetsController extends AdminController
 
 			if ($settings->slack_endpoint) {
 
-
 				$slack_settings = [
 				    'username' => $settings->botname,
 				    'channel' => $settings->slack_channel,
@@ -602,6 +542,20 @@ class AssetsController extends AdminController
 
 			}
 
+            $data['log_id'] = $logaction->id;
+            $data['first_name'] = $user->first_name;
+            $data['item_name'] = $asset->showAssetName();
+            $data['checkin_date'] = $logaction->created_at;
+            $data['item_tag'] = $asset->asset_tag;
+            $data['note'] = $logaction->note;
+
+            if ((($asset->checkin_email()=='1')) && ($user) && (!Config::get('app.lock_passwords'))) {
+                Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {
+                	$m->to($user->email, $user->first_name . ' ' . $user->last_name);
+                	$m->subject('Confirm Asset Checkin');
+                });
+            }
+
 			if ($backto=='user') {
 				return Redirect::to("admin/users/".$return_to.'/view')->with('success', Lang::get('admin/hardware/message.checkin.success'));
 			} else {
@@ -657,26 +611,111 @@ class AssetsController extends AdminController
 
         if ($settings->qr_code == '1') {
             $asset = Asset::find($assetId);
+            $size = barcodeDimensions($settings->barcode_type);
 
             if (isset($asset->id,$asset->asset_tag)) {
-
-                $content = DNS2D::getBarcodePNG(route('view/hardware', $asset->id), $settings->barcode_type,
-                    $this->qrCodeDimensions['height'],$this->qrCodeDimensions['width']);
-
-                $img = imagecreatefromstring(base64_decode($content));
-                imagepng($img);
-                imagedestroy($img);
-
-                $content_disposition = sprintf('attachment;filename=qr_code_%s.png', preg_replace('/\W/', '', $asset->asset_tag));
-                $response = Response::make($content, 200);
-                $response->header('Content-Type', 'image/png');
-                $response->header('Content-Disposition', $content_disposition);
-                return $response;
+                $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));
+                return $barcode_obj->getPngData();
             }
         }
 
-        $response = Response::make('', 404);
-        return $response;
+    }
+
+
+    public function getImportUpload() {
+
+        $path = app_path().'/private_uploads/imports/assets';
+        $files = array();
+
+        if ($handle = opendir($path)) {
+
+            /* This is the correct way to loop over the directory. */
+            while (false !== ($entry = readdir($handle))) {
+                clearstatcache();
+                if (substr(strrchr($entry,'.'),1)=='csv') {
+                    $files[] = array(
+                            'filename' => $entry,
+                            'filesize' => Setting::fileSizeConvert(filesize($path.'/'.$entry)),
+                            'modified' => filemtime($path.'/'.$entry)
+                        );
+                }
+
+            }
+            closedir($handle);
+            $files = array_reverse($files);
+        }
+
+        return View::make('backend/hardware/import')->with('files',$files);
+    }
+
+
+
+    public function postAPIImportUpload() {
+
+        if (!Config::get('app.lock_passwords')) {
+
+            $rules = array(
+                'files' => 'required'
+            );
+
+            $validator = Validator::make(Input::all(), $rules);
+
+            if ($validator->fails()) {
+                $messages = $validator->messages();
+                $results['error']=$messages->first('files');
+                return $results;
+
+            } else {
+                    $files = Input::file('files');
+                    $path = app_path().'/private_uploads/imports/assets';
+                    $results = array();
+
+                    foreach ($files as $file) {
+
+                        if (!in_array($file->getMimeType(), array(
+                            'application/vnd.ms-excel',
+                            'text/csv',
+                            'text/plain',
+                            'text/comma-separated-values',
+                            'text/tsv'))) {
+                            $results['error']='File type must be CSV';
+                            return $results;
+                        }
+
+                        $fixed_filename = str_replace(' ','-',$file->getClientOriginalName());
+                        $file->move($path, date('Y-m-d-his').'-'.$file->getClientOriginalName());
+                        $name = date('Y-m-d-his').'-'.$fixed_filename;
+                        $filesize = Setting::fileSizeConvert(filesize($path.'/'.$name));
+                        $results[] = compact('name', 'filesize');
+                    }
+            }
+
+        } else {
+
+            $results['error']=Lang::get('general.feature_disabled');
+            return $results;
+        }
+
+        return array(
+            'files' => $results
+        );
+
+
+    }
+
+    public function getProcessImportFile($filename) {
+        // php artisan asset-import:csv path/to/your/file.csv --domain=yourdomain.com --email_format=firstname.lastname
+
+        $output = new BufferedOutput;
+        Artisan::call('asset-import:csv', ['filename'=> app_path().'/private_uploads/imports/assets/'.$filename, '--email_format'=>'firstname.lastname', '--username_format'=>'firstname.lastname'], $output);
+        $display_output =  $output->fetch();
+        $file = app_path().'/private_uploads/imports/assets/'.str_replace('.csv','',$filename).'-output-'.date("Y-m-d-his").'.txt';
+        file_put_contents($file, $display_output);
+
+
+        return View::make('backend/hardware/import-status');
+
     }
 
     /**
@@ -693,17 +732,15 @@ class AssetsController extends AdminController
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
-        // Grab the dropdown list of models
-        $model_list = array('' => Lang::get('general.select_model')) + Model::lists('name', 'id');
-
-        // Grab the dropdown list of status
-        $statuslabel_list = Statuslabel::lists('name', 'id');
-
-        $location_list = array('' => Lang::get('general.select_location')) + Location::lists('name', 'id');
-
-        // get depreciation list
-        $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
+        // Grab the dropdown lists
+        $model_list = modelList();
+        $statuslabel_list = statusLabelList();
+        $location_list = locationsList();
+        $manufacturer_list = manufacturerList();
+        $category_list = categoryList();
+        $supplier_list = suppliersList();
+        $assigned_to = usersList();
+        $statuslabel_types = statusTypeList();
 
         $asset = clone $asset_to_clone;
         $asset->id = null;
@@ -711,7 +748,16 @@ class AssetsController extends AdminController
         $asset->serial = '';
         $asset->assigned_to = '';
         $asset->mac_address = '';
-        return View::make('backend/hardware/edit')->with('supplier_list',$supplier_list)->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list)->with('assigned_to',$assigned_to)->with('asset',$asset)->with('location_list',$location_list);
+        return View::make('backend/hardware/edit')
+        ->with('supplier_list',$supplier_list)
+        ->with('model_list',$model_list)
+        ->with('statuslabel_list',$statuslabel_list)
+        ->with('statuslabel_types',$statuslabel_types)
+        ->with('assigned_to',$assigned_to)
+        ->with('asset',$asset)
+        ->with('location_list',$location_list)
+        ->with('manufacturer',$manufacturer_list)
+        ->with('category',$category_list);
 
     }
 
@@ -734,7 +780,7 @@ class AssetsController extends AdminController
 			return Redirect::route('hardware')->with('success', $success);
 
 		 } else {
-			 return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
+			 return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
 		 }
 
     }
@@ -795,7 +841,7 @@ class AssetsController extends AdminController
 				}
 
 			} else {
-				 return Redirect::back()->with('success', Lang::get('admin/hardware/message.upload.nofiles'));
+				 return Redirect::back()->with('error', Lang::get('admin/hardware/message.upload.nofiles'));
 			}
 
 
@@ -911,10 +957,10 @@ class AssetsController extends AdminController
 				$assets = Input::get('edit_asset');
 
 				$supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        $statuslabel_list = array('' => '') + Statuslabel::lists('name', 'id');
-        $location_list = array('' => '') + Location::lists('name', 'id');
+                $statuslabel_list = array('' => '') + Statuslabel::lists('name', 'id');
+                $location_list = array('' => '') + Location::lists('name', 'id');
 
-        return View::make('backend/hardware/bulk')->with('assets',$assets)->with('supplier_list',$supplier_list)->with('statuslabel_list',$statuslabel_list)->with('location_list',$location_list);
+                return View::make('backend/hardware/bulk')->with('assets',$assets)->with('supplier_list',$supplier_list)->with('statuslabel_list',$statuslabel_list)->with('location_list',$location_list);
 
 
 			}
@@ -941,7 +987,7 @@ class AssetsController extends AdminController
 
 			$assets = Input::get('bulk_edit');
 
-			if ( (Input::has('purchase_date')) ||  (Input::has('purchase_cost'))  ||  (Input::has('supplier_id')) ||  (Input::has('order_number')) || (Input::has('warranty_months')) || (Input::has('rtd_location_id')) ||  (Input::has('status_id')) )  {
+			if ( (Input::has('purchase_date')) ||  (Input::has('purchase_cost'))  ||  (Input::has('supplier_id')) ||  (Input::has('order_number')) || (Input::has('warranty_months')) || (Input::has('rtd_location_id'))  || (Input::has('requestable')) ||  (Input::has('status_id')) )  {
 
 				foreach ($assets as $key => $value) {
 
@@ -975,6 +1021,12 @@ class AssetsController extends AdminController
 						$update_array['status_id'] = e(Input::get('status_id'));
 					}
 
+                    if (Input::get('requestable')=='1') {
+						$update_array['requestable'] =  1;
+					} else {
+                        $update_array['requestable'] =  0;
+                    }
+
 
 					if (DB::table('assets')
 		            ->where('id', $key)
@@ -1014,7 +1066,7 @@ 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'));
+       $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'));
 
 
       switch ($status) {
@@ -1042,6 +1094,9 @@ class AssetsController extends AdminController
 
       }
 
+      if (Input::has('order_number')) {
+          $assets->where('order_number','=',e(Input::get('order_number')));
+      }
 
       $assets = $assets->orderBy('asset_tag', 'ASC')->get();
 
@@ -1049,37 +1104,43 @@ class AssetsController extends AdminController
       $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($assets)
       	{
         	if ($assets->deleted_at=='') {
-        		return '<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>';
-        	} elseif ($assets->model->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)
+	   $inout = new \Chumper\Datatable\Columns\FunctionColumn('inout', function ($assets)
       	{
-       	 	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>';
-      }
+
+            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 '<input type="checkbox" name="edit_asset['.$assets->id.']" class="one_required">';
-          })
-      ->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>';
-        })
+        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')
 
@@ -1095,7 +1156,7 @@ class AssetsController extends AdminController
       ->addColumn('status',function($assets)
         {
           	if ($assets->assigned_to!='') {
-            	return link_to('../admin/users/'.$assets->assigned_to.'/view', $assets->assigneduser->fullName());
+            	return link_to(Config::get('app.url').'/admin/users/'.$assets->assigned_to.'/view', $assets->assigneduser->fullName());
             } else {
                 if ($assets->assetstatus) {
                     return $assets->assetstatus->name;
@@ -1127,6 +1188,20 @@ class AssetsController extends AdminController
         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)
         {
@@ -1137,8 +1212,8 @@ class AssetsController extends AdminController
         })
       ->addColumn($inout)
       ->addColumn($actions)
-      ->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','category')
-      ->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout')
+      ->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();
 
 		}

app/controllers/admin/CategoriesController.php

@@ -36,7 +36,7 @@ class CategoriesController extends AdminController
     public function getCreate()
     {
         // Show the page
-         $category_types= array('' => '', 'asset' => 'Asset', 'accessory' => 'Accessory', 'consumable' => 'Consumable');
+         $category_types= categoryTypeList();
         return View::make('backend/categories/edit')->with('category',new Category)
         ->with('category_types',$category_types);
     }
@@ -68,6 +68,7 @@ class CategoriesController extends AdminController
             $category->eula_text            = e(Input::get('eula_text'));
             $category->use_default_eula     = e(Input::get('use_default_eula', '0'));
             $category->require_acceptance   = e(Input::get('require_acceptance', '0'));
+            $category->checkin_email        = e(Input::get('checkin_email', '0'));
             $category->user_id          	= Sentry::getId();
 
             // Was the asset created?
@@ -145,6 +146,7 @@ class CategoriesController extends AdminController
             $category->eula_text            = e(Input::get('eula_text'));
             $category->use_default_eula     = e(Input::get('use_default_eula', '0'));
             $category->require_acceptance   = e(Input::get('require_acceptance', '0'));
+            $category->checkin_email        = e(Input::get('checkin_email', '0'));
 
             // Was the asset created?
             if($category->save()) {

app/controllers/admin/ConsumablesController.php

@@ -164,21 +164,11 @@ class ConsumablesController extends AdminController
             return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
         }
 
-
-		if ($consumable->hasUsers() > 0) {
-			 return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.assoc_users', array('count'=> $consumable->hasUsers())));
-		} else {
 			$consumable->delete();
 
             // Redirect to the locations management page
             return Redirect::to('admin/consumables')->with('success', Lang::get('admin/consumables/message.delete.success'));
 
-		}
-
-
-
-
-
     }
 
 
@@ -218,7 +208,7 @@ class ConsumablesController extends AdminController
         }
 
         // Get the dropdown of users and then pass it to the checkout view
-        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+        $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');
 
         return View::make('backend/consumables/checkout', compact('consumable'))->with('users_list',$users_list);
 
@@ -322,6 +312,10 @@ class ConsumablesController extends AdminController
             $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();
 
 

app/controllers/admin/GroupsController.php

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

app/controllers/admin/LicensesController.php

@@ -101,6 +101,12 @@ class LicensesController extends AdminController
                 $license->maintained = e(Input::get('maintained'));
             }
 
+            if ( e(Input::get('reassignable')) == '') {
+                $license->reassignable = 0;
+            } else {
+                $license->reassignable = e(Input::get('reassignable'));
+            }
+
             if ( e(Input::get('purchase_order')) == '') {
                 $license->purchase_order = '';
             } else {
@@ -135,7 +141,7 @@ class LicensesController extends AdminController
 
             // Was the license created?
             if($license->save()) {
-	            
+
                 $insertedId = $license->id;
                 // Save the license seat data
                 for ($x=0; $x<$license->seats; $x++) {
@@ -408,7 +414,7 @@ class LicensesController extends AdminController
         }
 
         // Get the dropdown of users and then pass it to the checkout view
-         $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+         $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');
 
 
         // Left join to get a list of assets and some other helpful info
@@ -524,7 +530,7 @@ class LicensesController extends AdminController
             $logaction->asset_id = $licenseseat->license_id;
 
 
-			$license = License::find($licenseseat->license_id);          
+			$license = License::find($licenseseat->license_id);
             $settings = Setting::getSettings();
 
 
@@ -533,23 +539,23 @@ class LicensesController extends AdminController
                 $logaction->checkedout_to = NULL;
                 $slack_msg = strtoupper($logaction->asset_type).' license <'.Config::get('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked out to <'.Config::get('app.url').'/hardware/'.$is_asset_id->id.'/view|'.$is_asset_id->showAssetName().'> by <'.Config::get('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.';
             } else {
-                $logaction->checkedout_to = e(Input::get('assigned_to'));             
+                $logaction->checkedout_to = e(Input::get('assigned_to'));
                 $slack_msg = strtoupper($logaction->asset_type).' license <'.Config::get('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked out to <'.Config::get('app.url').'/admin/users/'.$is_assigned_to->id.'/view|'.$is_assigned_to->fullName().'> by <'.Config::get('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.';
             }
-            
-        
-            
+
+
+
             if ($settings->slack_endpoint) {
-				
+
 
 				$slack_settings = [
 				    'username' => $settings->botname,
 				    'channel' => $settings->slack_channel,
 				    'link_names' => true
 				];
-				
+
 				$client = new \Maknz\Slack\Client($settings->slack_endpoint,$slack_settings);
-				
+
 				try {
 						$client->attach([
 						    'color' => 'good',
@@ -563,13 +569,13 @@ class LicensesController extends AdminController
 						            'value' => e($logaction->note)
 						        ],
 
-						        
-						        				   
+
+
 						    ]
 						])->send('License Checked Out');
-					
+
 					} catch (Exception $e) {
-						
+
 					}
 
 			}
@@ -612,7 +618,7 @@ 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'));
         }
-        
+
         $license = License::find($licenseseat->license_id);
 
         if(!$license->reassignable) {
@@ -620,7 +626,7 @@ class LicensesController extends AdminController
             Session::flash('error', 'License not reassignable.');
             return Redirect::back()->withInput();
         }
-        
+
         // Declare the rules for the form validation
         $rules = array(
             'note'   => 'alpha_space',
@@ -642,7 +648,7 @@ class LicensesController extends AdminController
         // Update the asset data
         $licenseseat->assigned_to                   = NULL;
         $licenseseat->asset_id                      = NULL;
-        
+
         $user = Sentry::getUser();
 
         // Was the asset updated?
@@ -652,20 +658,20 @@ class LicensesController extends AdminController
             $logaction->asset_type = 'software';
             $logaction->note = e(Input::get('note'));
             $logaction->user_id = $user->id;
-            
+
             $settings = Setting::getSettings();
-			
+
 			if ($settings->slack_endpoint) {
-				
+
 
 				$slack_settings = [
 				    'username' => $settings->botname,
 				    'channel' => $settings->slack_channel,
 				    'link_names' => true
 				];
-				
+
 				$client = new \Maknz\Slack\Client($settings->slack_endpoint,$slack_settings);
-				
+
 				try {
 						$client->attach([
 						    'color' => 'good',
@@ -678,20 +684,20 @@ class LicensesController extends AdminController
 						            'title' => 'Note:',
 						            'value' => e($logaction->note)
 						        ],
-						        				   
+
 						    ]
 						])->send('License Checked In');
-					
+
 					} catch (Exception $e) {
-						
+
 					}
 
 			}
-			
-			
+
+
             $log = $logaction->logaction('checkin from');
-            
-            
+
+
 
 			if ($backto=='user') {
 				return Redirect::to("admin/users/".$return_to.'/view')->with('success', Lang::get('admin/licenses/message.checkin.success'));
@@ -805,7 +811,7 @@ class LicensesController extends AdminController
 				}
 
 			} else {
-				 return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.nofiles'));
+				 return Redirect::back()->with('error', Lang::get('admin/licenses/message.upload.nofiles'));
 			}
 
 
@@ -884,7 +890,7 @@ class LicensesController extends AdminController
         $licenses = License::orderBy('created_at', 'DESC')->get();
 
         $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function($licenses) {
-            return '<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>';
+            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>';
         });
 
         return Datatable::collection($licenses)
@@ -894,6 +900,12 @@ class LicensesController extends AdminController
         ->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();
         })
@@ -903,9 +915,22 @@ class LicensesController extends AdminController
         ->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')
-        ->orderColumns('name','serial','totalSeats','remaining','purchase_date','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();
     }
+
+    public function getFreeLicense($licenseId) {
+        // Check if the asset exists
+        if (is_null($license = License::find($licenseId))) {
+            // Redirect to the asset management page with error
+            return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
+        }
+        $seatId = $license->freeSeat($licenseId);
+        return Redirect::to('admin/licenses/'.$seatId.'/checkout');
+    }
 }

app/controllers/admin/LocationsController.php

@@ -12,6 +12,8 @@ use Str;
 use Validator;
 use View;
 
+use Symfony\Component\HttpFoundation\JsonResponse;
+
 class LocationsController extends AdminController
 {
     /**
@@ -73,7 +75,7 @@ class LocationsController extends AdminController
             } else {
                 $location->parent_id		= e(Input::get('parent_id'));
             }
-            $location->currency			= e(Input::get('currency'));
+            $location->currency			= Input::get('currency','$');
             $location->address			= e(Input::get('address'));
             $location->address2			= e(Input::get('address2'));
             $location->city    			= e(Input::get('city'));
@@ -98,6 +100,52 @@ class LocationsController extends AdminController
 
     }
 
+    public function store()
+    {
+      $new = Input::all();
+
+      $new['currency']=Setting::first()->default_currency;
+
+      // create a new location instance
+      $location = new Location();
+
+      // attempt validation
+      if ($location->validate($new)) {
+
+          // Save the location data
+          $location->name            	= e(Input::get('name'));
+          // if (Input::get('parent_id')=='') {
+          //     $location->parent_id		= null;
+          // } else {
+          //     $location->parent_id		= e(Input::get('parent_id'));
+          // }
+          $location->currency			=  Setting::first()->default_currency; //e(Input::get('currency'));
+          $location->address			= ''; //e(Input::get('address'));
+          // $location->address2			= e(Input::get('address2'));
+          $location->city    			= e(Input::get('city'));
+          $location->state    		= '';//e(Input::get('state'));
+          $location->country    		= e(Input::get('country'));
+          // $location->zip    			= e(Input::get('zip'));
+          $location->user_id          = Sentry::getId();
+
+          // Was the asset created?
+          if($location->save()) {
+              // Redirect to the new location  page
+              return JsonResponse::create($location);
+              //return Redirect::to("admin/settings/locations")->with('success', Lang::get('admin/locations/message.create.success'));
+          } else {
+            return JsonResponse::create(["error" => "Couldn't save Location"],500);
+          }
+      } else {
+          // failure
+          $errors = $location->errors();
+          return JsonResponse::create(["error" => "Failed validation: ".print_r($errors->all('<li>:message</li>'),true)],500);
+      }
+
+      // Redirect to the location create page
+      return Redirect::to('admin/settings/locations/create')->with('error', Lang::get('admin/locations/message.create.error'));
+    }
+
 
     /**
      * Location update.
@@ -154,7 +202,7 @@ class LocationsController extends AdminController
             } else {
                 $location->parent_id		= e(Input::get('parent_id',''));
             }
-            $location->currency			= e(Input::get('currency'));
+            $location->currency			= Input::get('currency','$');
             $location->address			= e(Input::get('address'));
             $location->address2			= e(Input::get('address2'));
             $location->city    			= e(Input::get('city'));
@@ -189,10 +237,14 @@ class LocationsController extends AdminController
         }
 
 
-        if ($location->has_users->count() > 0) {
+        if ($location->users->count() > 0) {
             return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users'));
         } elseif ($location->childLocations->count() > 0) {
-            return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users'));
+            return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_child_loc'));
+        } elseif ($location->assets->count() > 0) {
+            return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_assets'));
+        } elseif ($location->assignedassets->count() > 0) {
+            return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_assets'));
         } else {
             $location->delete();
             return Redirect::to('admin/settings/locations')->with('success', Lang::get('admin/locations/message.delete.success'));

app/controllers/admin/ModelsController.php

@@ -16,6 +16,9 @@ use Validator;
 use View;
 use Datatable;
 
+//use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
 class ModelsController extends AdminController
 {
     /**
@@ -37,9 +40,9 @@ class ModelsController extends AdminController
     public function getCreate()
     {
         // Show the page
-        $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
-        $manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
-        $category_list = array('' => '') + DB::table('categories')->whereNull('deleted_at')->lists('name', 'id');
+        $depreciation_list = depreciationList();
+        $manufacturer_list = manufacturerList();
+        $category_list = categoryList();
         $view = View::make('backend/models/edit');
         $view->with('category_list',$category_list);
         $view->with('depreciation_list',$depreciation_list);
@@ -60,6 +63,27 @@ class ModelsController extends AdminController
         // Create a new manufacturer
         $model = new Model;
 
+
+        $validator = Validator::make(
+            // Validator data goes here
+            array(
+                'unique_fields' => array(Input::get('name'), Input::get('modelno'), Input::get('manufacturer_id'))
+            ),
+            // Validator rules go here
+            array(
+                'unique_fields' => 'unique_multiple:models,name,modelno,manufacturer_id'
+            )
+        );
+
+        // attempt validation
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->with('error', Lang::get('admin/models/message.create.duplicate_set'));;
+        }
+
+
+
         $validator = Validator::make(Input::all(), $model->validationRules());
 
         // attempt validation
@@ -77,7 +101,7 @@ class ModelsController extends AdminController
                 $model->depreciation_id = e(Input::get('depreciation_id'));
             }
 
-             if ( e(Input::get('eol')) == '') {
+            if ( e(Input::get('eol')) == '') {
                 $model->eol =  0;
             } else {
                 $model->eol = e(Input::get('eol'));
@@ -115,6 +139,36 @@ class ModelsController extends AdminController
 
     }
 
+    public function store()
+    {
+      //COPYPASTA!!!! FIXME
+      $model = new Model;
+
+      $settings=Input::all();
+      $settings['eol']=0;
+      //
+
+      $validator = Validator::make($settings, $model->validationRules());
+      if ($validator->fails())
+      {
+          // The given data did not pass validation
+          return JsonResponse::create(["error" => "Failed validation: ".print_r($validator->messages()->all('<li>:message</li>'),true)],500);
+      } else {
+        $model->name=e(Input::get('name'));
+        $model->manufacturer_id = e(Input::get('manufacturer_id'));
+        $model->category_id = e(Input::get('category_id'));
+        $model->modelno = e(Input::get('modelno'));
+        $model->user_id = Sentry::getUser()->id;
+        $model->eol=0;
+
+        if($model->save()) {
+          return JsonResponse::create($model);
+        } else {
+          return JsonResponse::create(["error" => "Couldn't save Model"],500);
+        }
+      }
+    }
+
     /**
      * Model update.
      *
@@ -131,7 +185,7 @@ class ModelsController extends AdminController
 
         $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
         $manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
-        $category_list = array('' => '') + DB::table('categories')->lists('name', 'id');
+        $category_list = array('' => '') + DB::table('categories')->whereNull('deleted_at')->lists('name', 'id');
         $view = View::make('backend/models/edit', compact('model'));
         $view->with('category_list',$category_list);
         $view->with('depreciation_list',$depreciation_list);

app/controllers/admin/ReportsController.php

@@ -1,22 +1,76 @@
 <?php namespace Controllers\Admin;
 
-use AdminController;
-use Input;
-use Lang;
-use License;
-use Asset;
-use User;
-use View;
-use Location;
-use Redirect;
-use Response;
+use Accessory;
 use Actionlog;
-use Setting;
-use League\Csv\Writer;
+use AdminController;
+use Asset;
+use AssetMaintenance;
+use Carbon\Carbon;
+use Category;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
+use Input;
 use League\Csv\Reader;
+use License;
+use Location;
+use Model;
+use Redirect;
+use Setting;
+use User;
 
 class ReportsController extends AdminController
 {
+
+    /**
+     * Show Report for Accessories
+     *
+     * @return View
+     */
+    public function getAccessoryReport()
+    {
+        $accessories = Accessory::orderBy('created_at', 'DESC')->get();
+        return View::make('backend/reports/accessories', compact('accessories'));
+    }
+
+    /**
+     * Export Accessories Report as CSV
+     *
+     * @return file download
+     */
+    public function exportAccessoryReport()
+    {
+        $accessories = Accessory::orderBy('created_at', 'DESC')->get();
+        $rows = array();
+        $header = array(
+            Lang::get('admin/accessories/table.title'),
+			Lang::get('admin/accessories/general.accessory_category'),
+            Lang::get('admin/accessories/general.total'),
+            Lang::get('admin/accessories/general.remaining')
+        );
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ', ');
+
+        // Row per accessory
+        foreach ($accessories as $accessory) {
+            $row = array();
+            $row[] = $accessory->accessory_name;
+			$row[] = $accessory->accessory_category;
+            $row[] = $accessory->total;
+            $row[] = $accessory->remaining;
+
+            $rows[] = implode($row, ',');
+        }
+
+        $csv = implode($rows, "\n");
+        $response = Response::make($csv, 200);
+        $response->header('Content-Type', 'text/csv');
+        $response->header('Content-disposition', 'attachment;filename=report.csv');
+
+        return $response;
+    }
+
     /**
      * Show Asset Report
      *
@@ -24,9 +78,14 @@ class ReportsController extends AdminController
      */
     public function getAssetsReport()
     {
+
         // Grab all the assets
-        $assets = Asset::with('model','assigneduser.userLoc','assetstatus','defaultLoc','assetlog','supplier','model.manufacturer')->orderBy('created_at', 'DESC')->get();
-        return View::make('backend/reports/asset', compact('assets'));
+        $assets = Asset::with( 'model', 'assigneduser.userLoc', 'assetstatus', 'defaultLoc', 'assetlog', 'supplier',
+            'model.manufacturer' )
+                       ->orderBy( 'created_at', 'DESC' )
+                       ->get();
+
+        return View::make( 'backend/reports/asset', compact( 'assets' ) );
     }
 
     /**
@@ -36,41 +95,44 @@ class ReportsController extends AdminController
      */
     public function exportAssetReport()
     {
-        // Grab all the assets
-        $assets = Asset::orderBy('created_at', 'DESC')->get();
 
-        $rows = array();
+        // Grab all the assets
+        $assets = Asset::orderBy( 'created_at', 'DESC' )
+                       ->get();
+
+        $rows = [ ];
 
         // Create the header row
-        $header = array(
-            Lang::get('admin/hardware/table.asset_tag'),
-            Lang::get('admin/hardware/form.manufacturer'),
-            Lang::get('admin/hardware/form.model'),
-            Lang::get('general.model_no'),
-            Lang::get('general.name'),
-            Lang::get('admin/hardware/table.serial'),
-            Lang::get('general.status'),
-            Lang::get('admin/hardware/table.purchase_date'),
-            Lang::get('admin/hardware/table.purchase_cost'),
-            Lang::get('admin/hardware/form.order'),
-            Lang::get('admin/hardware/form.supplier'),
-            Lang::get('admin/hardware/table.checkoutto'),
-            Lang::get('admin/hardware/table.location')
-        );
-        $header = array_map('trim', $header);
-        $rows[] = implode($header, ',');
+        $header = [
+            Lang::get( 'admin/hardware/table.asset_tag' ),
+            Lang::get( 'admin/hardware/form.manufacturer' ),
+            Lang::get( 'admin/hardware/form.model' ),
+            Lang::get( 'general.model_no' ),
+            Lang::get( 'general.name' ),
+            Lang::get( 'admin/hardware/table.serial' ),
+            Lang::get( 'general.status' ),
+            Lang::get( 'admin/hardware/table.purchase_date' ),
+            Lang::get( 'admin/hardware/table.purchase_cost' ),
+            Lang::get( 'admin/hardware/form.order' ),
+            Lang::get( 'admin/hardware/form.supplier' ),
+            Lang::get( 'admin/hardware/table.checkoutto' ),
+            Lang::get( 'admin/hardware/table.location' ),
+            Lang::get( 'general.notes' ),
+        ];
+        $header = array_map( 'trim', $header );
+        $rows[] = implode( $header, ',' );
 
         // Create a row per asset
         foreach ($assets as $asset) {
-            $row = array();
+            $row   = [ ];
             $row[] = $asset->asset_tag;
             if ($asset->model->manufacturer) {
                 $row[] = $asset->model->manufacturer->name;
             } else {
                 $row[] = '';
             }
-            $row[] = '"'.$asset->model->name.'"';
-            $row[] = '"'.$asset->model->modelno.'"';
+            $row[] = '"' . $asset->model->name . '"';
+            $row[] = '"' . $asset->model->modelno . '"';
             $row[] = $asset->name;
             $row[] = $asset->serial;
             if ($asset->assetstatus) {
@@ -79,7 +141,7 @@ class ReportsController extends AdminController
                 $row[] = '';
             }
             $row[] = $asset->purchase_date;
-            $row[] = '"'.number_format($asset->purchase_cost).'"';
+            $row[] = '"' . number_format( $asset->purchase_cost ) . '"';
             if ($asset->order_number) {
                 $row[] = $asset->order_number;
             } else {
@@ -92,21 +154,21 @@ class ReportsController extends AdminController
             }
 
             if ($asset->assigned_to > 0) {
-                $user = User::find($asset->assigned_to);
+                $user  = User::find( $asset->assigned_to );
                 $row[] = $user->fullName();
             } else {
                 $row[] = ''; // Empty string if unassigned
             }
 
-            if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {
-                $location = Location::find($asset->assigneduser->location_id);
+            if (( $asset->assigned_to > 0 ) && ( $asset->assigneduser->location_id > 0 )) {
+                $location = Location::find( $asset->assigneduser->location_id );
                 if ($location->name) {
                     $row[] = $location->name;
                 } else {
                     $row[] = '';
                 }
             } elseif ($asset->rtd_location_id) {
-                $location = Location::find($asset->rtd_location_id);
+                $location = Location::find( $asset->rtd_location_id );
                 if ($location->name) {
                     $row[] = $location->name;
                 } else {
@@ -116,14 +178,20 @@ class ReportsController extends AdminController
                 $row[] = '';  // Empty string if location is not set
             }
 
-            $rows[] = implode($row, ',');
+            if ($asset->notes) {
+                $row[] = '"' . $asset->notes . '"';
+            } else {
+                $row[] = '';
+            }
+
+            $rows[] = implode( $row, ',' );
         }
 
         // spit out a csv
-        $csv = implode($rows, "\n");
-        $response = Response::make($csv, 200);
-        $response->header('Content-Type', 'text/csv');
-        $response->header('Content-disposition', 'attachment;filename=report.csv');
+        $csv      = implode( $rows, "\n" );
+        $response = Response::make( $csv, 200 );
+        $response->header( 'Content-Type', 'text/csv' );
+        $response->header( 'Content-disposition', 'attachment;filename=report.csv' );
 
         return $response;
     }
@@ -135,9 +203,13 @@ class ReportsController extends AdminController
      */
     public function getDeprecationReport()
     {
+
         // Grab all the assets
-        $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')->orderBy('created_at', 'DESC')->get();
-        return View::make('backend/reports/depreciation', compact('assets'));
+        $assets = Asset::with( 'model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog' )
+                       ->orderBy( 'created_at', 'DESC' )
+                       ->get();
+
+        return View::make( 'backend/reports/depreciation', compact( 'assets' ) );
     }
 
     /**
@@ -147,47 +219,49 @@ class ReportsController extends AdminController
      */
     public function exportDeprecationReport()
     {
+
         // 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' )
+                       ->orderBy( 'created_at', 'DESC' )
+                       ->get();
 
-        $csv = \League\Csv\Writer::createFromFileObject(new \SplTempFileObject());
-        $csv->setOutputBOM(Reader::BOM_UTF16_BE);
+        $csv = \League\Csv\Writer::createFromFileObject( new \SplTempFileObject() );
+        $csv->setOutputBOM( Reader::BOM_UTF16_BE );
 
-        $rows = array();
+        $rows = [ ];
 
         // Create the header row
-        $header = array(
-            Lang::get('admin/hardware/table.asset_tag'),
-            Lang::get('admin/hardware/table.title'),
-            Lang::get('admin/hardware/table.serial'),
-            Lang::get('admin/hardware/table.checkoutto'),
-            Lang::get('admin/hardware/table.location'),
-            Lang::get('admin/hardware/table.purchase_date'),
-            Lang::get('admin/hardware/table.purchase_cost'),
-            Lang::get('admin/hardware/table.book_value'),
-            Lang::get('admin/hardware/table.diff')
-        );
+        $header = [
+            Lang::get( 'admin/hardware/table.asset_tag' ),
+            Lang::get( 'admin/hardware/table.title' ),
+            Lang::get( 'admin/hardware/table.serial' ),
+            Lang::get( 'admin/hardware/table.checkoutto' ),
+            Lang::get( 'admin/hardware/table.location' ),
+            Lang::get( 'admin/hardware/table.purchase_date' ),
+            Lang::get( 'admin/hardware/table.purchase_cost' ),
+            Lang::get( 'admin/hardware/table.book_value' ),
+            Lang::get( 'admin/hardware/table.diff' )
+        ];
 
         //we insert the CSV header
-        $csv->insertOne($header);
+        $csv->insertOne( $header );
 
         // Create a row per asset
         foreach ($assets as $asset) {
-            $row = array();
+            $row   = [ ];
             $row[] = $asset->asset_tag;
             $row[] = $asset->name;
             $row[] = $asset->serial;
 
-
             if ($asset->assigned_to > 0) {
-              $user = User::find($asset->assigned_to);
-              $row[] = $user->fullName();
-              } else {
+                $user  = User::find( $asset->assigned_to );
+                $row[] = $user->fullName();
+            } else {
                 $row[] = ''; // Empty string if unassigned
             }
 
-            if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {
-                $location = Location::find($asset->assigneduser->location_id);
+            if (( $asset->assigned_to > 0 ) && ( $asset->assigneduser->location_id > 0 )) {
+                $location = Location::find( $asset->assigneduser->location_id );
                 if ($location->city) {
                     $row[] = $location->city . ', ' . $location->state;
                 } elseif ($location->name) {
@@ -199,45 +273,44 @@ class ReportsController extends AdminController
                 $row[] = '';  // Empty string if location is not set
             }
 
-
-
             if ($asset->assetloc) {
-                $currency =  $asset->assetloc->currency;
+                $currency = $asset->assetloc->currency;
             } else {
-                $currency =   Setting::first()->default_currency;
+                $currency = Setting::first()->default_currency;
             }
 
             $row[] = $asset->purchase_date;
-            $row[] = $currency.number_format($asset->purchase_cost);
-            $row[] = $currency.number_format($asset->getDepreciatedValue());
-            $row[] = $currency.number_format(($asset->purchase_cost - $asset->getDepreciatedValue()));
-            $csv->insertOne($row);
+            $row[] = $currency . number_format( $asset->purchase_cost );
+            $row[] = $currency . number_format( $asset->getDepreciatedValue() );
+            $row[] = $currency . number_format( ( $asset->purchase_cost - $asset->getDepreciatedValue() ) );
+            $csv->insertOne( $row );
         }
 
-        $csv->output('depreciation-report-'.date('Y-m-d').'.csv');
+        $csv->output( 'depreciation-report-' . date( 'Y-m-d' ) . '.csv' );
         die;
 
     }
 
-	/**
+    /**
      * Show Report for Activity
      *
      * @return View
      */
 
-	public function getActivityReport()
+    public function getActivityReport()
     {
-        $log_actions = Actionlog::orderBy('created_at', 'DESC')
-        ->with('adminlog')
-        ->with('accessorylog')
-        ->with('assetlog')
-        ->with('licenselog')
-        ->with('userlog')
-        ->orderBy('created_at','DESC')
-        ->get();
-        return View::make('backend/reports/activity', compact('log_actions'));
-    }
 
+        $log_actions = Actionlog::orderBy( 'created_at', 'DESC' )
+                                ->with( 'adminlog' )
+                                ->with( 'accessorylog' )
+                                ->with( 'assetlog' )
+                                ->with( 'licenselog' )
+                                ->with( 'userlog' )
+                                ->orderBy( 'created_at', 'DESC' )
+                                ->get();
+
+        return View::make( 'backend/reports/activity', compact( 'log_actions' ) );
+    }
 
     /**
      * Show Report for Licenses
@@ -246,8 +319,11 @@ class ReportsController extends AdminController
      */
     public function getLicenseReport()
     {
-        $licenses = License::orderBy('created_at', 'DESC')->get();
-        return View::make('backend/reports/licenses', compact('licenses'));
+
+        $licenses = License::orderBy( 'created_at', 'DESC' )
+                           ->get();
+
+        return View::make( 'backend/reports/licenses', compact( 'licenses' ) );
     }
 
     /**
@@ -257,170 +333,161 @@ class ReportsController extends AdminController
      */
     public function exportLicenseReport()
     {
-        $licenses = License::orderBy('created_at', 'DESC')->get();
-        $rows = array();
-        $header = array(
-            Lang::get('admin/licenses/table.title'),
-            Lang::get('admin/licenses/table.serial'),
-            Lang::get('admin/licenses/form.seats'),
-            Lang::get('admin/licenses/form.remaining_seats'),
-            Lang::get('admin/licenses/form.expiration'),
-            Lang::get('admin/licenses/form.date'),
-            Lang::get('admin/licenses/form.cost')
-        );
 
-        $header = array_map('trim', $header);
-        $rows[] = implode($header, ', ');
+        $licenses = License::orderBy( 'created_at', 'DESC' )
+                           ->get();
+        $rows     = [ ];
+        $header   = [
+            Lang::get( 'admin/licenses/table.title' ),
+            Lang::get( 'admin/licenses/table.serial' ),
+            Lang::get( 'admin/licenses/form.seats' ),
+            Lang::get( 'admin/licenses/form.remaining_seats' ),
+            Lang::get( 'admin/licenses/form.expiration' ),
+            Lang::get( 'admin/licenses/form.date' ),
+            Lang::get( 'admin/licenses/form.cost' )
+        ];
+
+        $header = array_map( 'trim', $header );
+        $rows[] = implode( $header, ', ' );
 
         // Row per license
         foreach ($licenses as $license) {
-            $row = array();
+            $row   = [ ];
             $row[] = $license->name;
             $row[] = $license->serial;
             $row[] = $license->seats;
             $row[] = $license->remaincount();
             $row[] = $license->expiration_date;
             $row[] = $license->purchase_date;
-            $row[] = '"'.number_format($license->purchase_cost).'"';
+            $row[] = '"' . number_format( $license->purchase_cost ) . '"';
 
-            $rows[] = implode($row, ',');
+            $rows[] = implode( $row, ',' );
         }
 
-        $csv = implode($rows, "\n");
-        $response = Response::make($csv, 200);
-        $response->header('Content-Type', 'text/csv');
-        $response->header('Content-disposition', 'attachment;filename=report.csv');
+        $csv      = implode( $rows, "\n" );
+        $response = Response::make( $csv, 200 );
+        $response->header( 'Content-Type', 'text/csv' );
+        $response->header( 'Content-disposition', 'attachment;filename=report.csv' );
 
         return $response;
     }
 
     public function getCustomReport()
     {
-        return View::make('backend/reports/custom');
+
+        return View::make( 'backend/reports/custom' );
     }
 
     public function postCustom()
     {
-        $assets = Asset::orderBy('created_at', 'DESC')->get();
-        $rows = array();
-        $header = array();
 
-        if (e(Input::get('asset_name')) == '1')
-        {
+        $assets = Asset::orderBy( 'created_at', 'DESC' )
+                       ->get();
+        $rows   = [ ];
+        $header = [ ];
+
+        if (e( Input::get( 'asset_name' ) ) == '1') {
             $header[] = 'Asset Name';
         }
-        if (e(Input::get('asset_tag')) == '1')
-        {
+        if (e( Input::get( 'asset_tag' ) ) == '1') {
             $header[] = 'Asset Tag';
         }
-        if (e(Input::get('manufacturer')) == '1')
-        {
+        if (e( Input::get( 'manufacturer' ) ) == '1') {
             $header[] = 'Manufacturer';
         }
-        if (e(Input::get('model')) == '1')
-        {
+        if (e( Input::get( 'model' ) ) == '1') {
             $header[] = 'Model';
             $header[] = 'Model Number';
         }
-        if (e(Input::get('serial')) == '1')
-        {
+        if (e( Input::get( 'serial' ) ) == '1') {
             $header[] = 'Serial';
         }
-        if (e(Input::get('purchase_date')) == '1')
-        {
+        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' ) ) == '0' )) {
             $header[] = 'Purchase Cost';
         }
-        if (e(Input::get('order')) == '1')
-        {
+        if (e( Input::get( 'order' ) ) == '1') {
             $header[] = 'Order Number';
         }
-        if (e(Input::get('supplier')) == '1')
-        {
+        if (e( Input::get( 'supplier' ) ) == '1') {
             $header[] = 'Supplier';
         }
-        if (e(Input::get('location')) == '1')
-        {
+        if (e( Input::get( 'location' ) ) == '1') {
             $header[] = 'Location';
         }
-        if (e(Input::get('assigned_to')) == '1')
-        {
+        if (e( Input::get( 'assigned_to' ) ) == '1') {
             $header[] = 'Assigned To';
         }
-        if (e(Input::get('status')) == '1')
-        {
+        if (e( Input::get( 'status' ) ) == '1') {
             $header[] = 'Status';
         }
-        if (e(Input::get('warranty')) == '1')
-        {
+        if (e( Input::get( 'warranty' ) ) == '1') {
             $header[] = 'Warranty';
             $header[] = 'Warranty Expires';
         }
-        if (e(Input::get('depreciation')) == '1')
-        {
+        if (e( Input::get( 'depreciation' ) ) == '1') {
             $header[] = 'Purchase Cost';
             $header[] = 'Value';
             $header[] = 'Diff';
         }
 
-        $header = array_map('trim', $header);
-        $rows[] = implode($header, ',');
+        $header = array_map( 'trim', $header );
+        $rows[] = implode( $header, ',' );
 
-        foreach($assets as $asset) {
-            $row = array();
-            if (e(Input::get('asset_name')) == '1') {
+        foreach ($assets as $asset) {
+            $row = [ ];
+            if (e( Input::get( 'asset_name' ) ) == '1') {
                 $row[] = $asset->name;
             }
-            if (e(Input::get('asset_tag')) == '1') {
+            if (e( Input::get( 'asset_tag' ) ) == '1') {
                 $row[] = $asset->asset_tag;
             }
-            if (e(Input::get('manufacturer')) == '1') {
+            if (e( Input::get( 'manufacturer' ) ) == '1') {
                 if ($asset->model->manufacturer) {
                     $row[] = $asset->model->manufacturer->name;
                 } else {
                     $row[] = '';
                 }
             }
-            if (e(Input::get('model')) == '1') {
-                $row[] = '"'.$asset->model->name.'"';
-                $row[] = '"'.$asset->model->modelno.'"';
+            if (e( Input::get( 'model' ) ) == '1') {
+                $row[] = '"' . $asset->model->name . '"';
+                $row[] = '"' . $asset->model->modelno . '"';
             }
-            if (e(Input::get('serial')) == '1') {
+            if (e( Input::get( 'serial' ) ) == '1') {
                 $row[] = $asset->serial;
             }
-            if (e(Input::get('purchase_date')) == '1') {
+            if (e( Input::get( 'purchase_date' ) ) == '1') {
                 $row[] = $asset->purchase_date;
             }
-            if (e(Input::get('purchase_cost')) == '1') {
-                $row[] = '"'.number_format($asset->purchase_cost).'"';
+            if (e( Input::get( 'purchase_cost' ) ) == '1') {
+                $row[] = '"' . number_format( $asset->purchase_cost ) . '"';
             }
-            if (e(Input::get('order')) == '1') {
+            if (e( Input::get( 'order' ) ) == '1') {
                 if ($asset->order_number) {
                     $row[] = $asset->order_number;
                 } else {
                     $row[] = '';
                 }
             }
-            if (e(Input::get('supplier')) == '1') {
+            if (e( Input::get( 'supplier' ) ) == '1') {
                 if ($asset->supplier_id) {
                     $row[] = $asset->supplier->name;
                 } else {
                     $row[] = '';
                 }
             }
-            if (e(Input::get('location')) == '1') {
-                if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {
-                    $location = Location::find($asset->assigneduser->location_id);
+            if (e( Input::get( 'location' ) ) == '1') {
+                if (( $asset->assigned_to > 0 ) && ( $asset->assigneduser->location_id > 0 )) {
+                    $location = Location::find( $asset->assigneduser->location_id );
                     if ($location->name) {
                         $row[] = $location->name;
                     } else {
                         $row[] = '';
                     }
                 } elseif ($asset->rtd_location_id) {
-                    $location = Location::find($asset->rtd_location_id);
+                    $location = Location::find( $asset->rtd_location_id );
                     if ($location->name) {
                         $row[] = $location->name;
                     } else {
@@ -430,26 +497,26 @@ class ReportsController extends AdminController
                     $row[] = '';  // Empty string if location is not set
                 }
             }
-            if (e(Input::get('assigned_to')) == '1') {
+            if (e( Input::get( 'assigned_to' ) ) == '1') {
                 if ($asset->assigned_to > 0) {
-                    $user = User::find($asset->assigned_to);
+                    $user  = User::find( $asset->assigned_to );
                     $row[] = $user->fullName();
                 } else {
                     $row[] = ''; // Empty string if unassigned
                 }
             }
-            if (e(Input::get('status')) == '1') {
-                if (($asset->status_id == '0') && ($asset->assigned_to == '0')) {
-                    $row[] = Lang::get('general.ready_to_deploy');
-                } elseif (($asset->status_id == '') && ($asset->assigned_to == '0')) {
-                    $row[] = Lang::get('general.pending');
+            if (e( Input::get( 'status' ) ) == '1') {
+                if (( $asset->status_id == '0' ) && ( $asset->assigned_to == '0' )) {
+                    $row[] = Lang::get( 'general.ready_to_deploy' );
+                } elseif (( $asset->status_id == '' ) && ( $asset->assigned_to == '0' )) {
+                    $row[] = Lang::get( 'general.pending' );
                 } elseif ($asset->assetstatus) {
                     $row[] = $asset->assetstatus->name;
                 } else {
                     $row[] = '';
                 }
             }
-            if (e(Input::get('warranty')) == '1') {
+            if (e( Input::get( 'warranty' ) ) == '1') {
                 if ($asset->warranty_months) {
                     $row[] = $asset->warranty_months;
                     $row[] = $asset->warrantee_expires();
@@ -458,24 +525,249 @@ class ReportsController extends AdminController
                     $row[] = '';
                 }
             }
-            if (e(Input::get('depreciation')) == '1') {
+            if (e( Input::get( 'depreciation' ) ) == '1') {
                 $depreciation = $asset->getDepreciatedValue();
-                $row[] = '"'.number_format($asset->purchase_cost).'"';
-                $row[] = '"'.number_format($depreciation).'"';
-                $row[] = '"'.number_format($asset->purchase_cost - $depreciation).'"';
+                $row[]        = '"' . number_format( $asset->purchase_cost ) . '"';
+                $row[]        = '"' . number_format( $depreciation ) . '"';
+                $row[]        = '"' . number_format( $asset->purchase_cost - $depreciation ) . '"';
             }
-            $rows[] = implode($row, ',');
+            $rows[] = implode( $row, ',' );
         }
 
         // spit out a csv
-        if (array_filter($rows)) {
-            $csv = implode($rows, "\n");
-            $response = Response::make($csv, 200);
-            $response->header('Content-Type', 'text/csv');
-            $response->header('Content-disposition', 'attachment;filename=report.csv');
+        if (array_filter( $rows )) {
+            $csv      = implode( $rows, "\n" );
+            $response = Response::make( $csv, 200 );
+            $response->header( 'Content-Type', 'text/csv' );
+            $response->header( 'Content-disposition', 'attachment;filename=report.csv' );
+
             return $response;
         } else {
-            return Redirect::to("reports/custom")->with('error', Lang::get('admin/reports/message.error'));
+            return Redirect::to( "reports/custom" )
+                           ->with( 'error', Lang::get( 'admin/reports/message.error' ) );
         }
     }
+
+    /**
+     * getImprovementsReport
+     *
+     * @return mixed
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    public function getAssetMaintenancesReport()
+    {
+
+        // Grab all the improvements
+        $assetMaintenances = \AssetMaintenance::with( 'asset', 'supplier' )
+                                              ->orderBy( 'created_at', 'DESC' )
+                                              ->get();
+
+        return View::make( 'backend/reports/asset_maintenances', compact( 'assetMaintenances' ) );
+
+    }
+
+    /**
+     * exportImprovementsReport
+     *
+     * @return \Illuminate\Http\Response
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    public function exportAssetMaintenancesReport()
+    {
+
+        // Grab all the improvements
+        $assetMaintenances = AssetMaintenance::with( 'asset', 'supplier' )
+                                             ->orderBy( 'created_at', 'DESC' )
+                                             ->get();
+
+        $rows = [ ];
+
+        $header = [
+            Lang::get( 'admin/asset_maintenances/table.asset_name' ),
+            Lang::get( 'admin/asset_maintenances/table.supplier_name' ),
+            Lang::get( 'admin/asset_maintenances/form.asset_maintenance_type' ),
+            Lang::get( 'admin/asset_maintenances/form.title' ),
+            Lang::get( 'admin/asset_maintenances/form.start_date' ),
+            Lang::get( 'admin/asset_maintenances/form.completion_date' ),
+            Lang::get( 'admin/asset_maintenances/form.asset_maintenance_time' ),
+            Lang::get( 'admin/asset_maintenances/form.cost' )
+        ];
+
+        $header = array_map( 'trim', $header );
+        $rows[] = implode( $header, ',' );
+
+        foreach ($assetMaintenances as $assetMaintenance) {
+            $row   = [ ];
+            $row[] = str_replace( ',', '', $assetMaintenance->asset->name );
+            $row[] = str_replace( ',', '', $assetMaintenance->supplier->name );
+            $row[] = $assetMaintenance->improvement_type;
+            $row[] = $assetMaintenance->title;
+            $row[] = $assetMaintenance->start_date;
+            $row[] = $assetMaintenance->completion_date;
+            if (is_null( $assetMaintenance->asset_maintenance_time )) {
+                $improvementTime = intval( Carbon::now()
+                                                 ->diffInDays( Carbon::parse( $assetMaintenance->start_date ) ) );
+            } else {
+                $improvementTime = intval( $assetMaintenance->asset_maintenance_time );
+            }
+            $row[]  = $improvementTime;
+            $row[]  = Lang::get( 'general.currency' ) . number_format( $assetMaintenance->cost, 2 );
+            $rows[] = implode( $row, ',' );
+        }
+
+        // spit out a csv
+        $csv      = implode( $rows, "\n" );
+        $response = Response::make( $csv, 200 );
+        $response->header( 'Content-Type', 'text/csv' );
+        $response->header( 'Content-disposition', 'attachment;filename=report.csv' );
+
+        return $response;
+    }
+
+    /**
+     * getAssetAcceptanceReport
+     *
+     * @return mixed
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    public function getAssetAcceptanceReport()
+    {
+
+        $assetsForReport = Asset::notYetAccepted()
+                                ->get();
+
+        return View::make( 'backend/reports/unaccepted_assets', compact( 'assetsForReport' ) );
+
+    }
+
+    /**
+     * exportAssetAcceptanceReport
+     *
+     * @return \Illuminate\Http\Response
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    public function exportAssetAcceptanceReport()
+    {
+
+        // Grab all the improvements
+        $assetsForReport = Actionlog::whereIn( 'id', $this->getAssetsNotAcceptedYet() )
+                                    ->get();
+
+        $rows = [ ];
+
+        $header = [
+            Lang::get( 'general.category' ),
+            Lang::get( 'admin/hardware/form.model' ),
+            Lang::get( 'admin/hardware/form.name' ),
+            Lang::get( 'admin/hardware/table.asset_tag' ),
+            Lang::get( 'admin/hardware/table.checkoutto' ),
+        ];
+
+        $header = array_map( 'trim', $header );
+        $rows[] = implode( $header, ',' );
+
+        foreach ($assetsForReport as $assetItem) {
+            $row    = [ ];
+            $row[]  = str_replace( ',', '', $assetItem->assetlog->model->category->name );
+            $row[]  = str_replace( ',', '', $assetItem->assetlog->model->name );
+            $row[]  = str_replace( ',', '', $assetItem->assetlog->showAssetName() );
+            $row[]  = str_replace( ',', '', $assetItem->assetlog->asset_tag );
+            $row[]  = str_replace( ',', '', $assetItem->assetlog->assigneduser->fullName() );
+            $rows[] = implode( $row, ',' );
+        }
+
+        // spit out a csv
+        $csv      = implode( $rows, "\n" );
+        $response = Response::make( $csv, 200 );
+        $response->header( 'Content-Type', 'text/csv' );
+        $response->header( 'Content-disposition', 'attachment;filename=report.csv' );
+
+        return $response;
+
+    }
+
+    /**
+     * getCheckedOutAssetsRequiringAcceptance
+     *
+     * @param $modelsInCategoriesThatRequireAcceptance
+     *
+     * @return array
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    protected function getCheckedOutAssetsRequiringAcceptance( $modelsInCategoriesThatRequireAcceptance )
+    {
+
+        return array_pluck( Asset::deployed()
+                                 ->inModelList( $modelsInCategoriesThatRequireAcceptance )
+                                 ->select( 'id' )
+                                 ->get()
+                                 ->toArray(), 'id' );
+    }
+
+    /**
+     * getModelsInCategoriesThatRequireAcceptance
+     *
+     * @param $assetCategoriesRequiringAcceptance
+     *
+     * @return array
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    protected function getModelsInCategoriesThatRequireAcceptance( $assetCategoriesRequiringAcceptance )
+    {
+
+        return array_pluck( Model::inCategory( $assetCategoriesRequiringAcceptance )
+                                 ->select( 'id' )
+                                 ->get()
+                                 ->toArray(), 'id' );
+    }
+
+    /**
+     * getCategoriesThatRequireAcceptance
+     *
+     * @return array
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    protected function getCategoriesThatRequireAcceptance()
+    {
+
+        return array_pluck( Category::requiresAcceptance()
+                                    ->select( 'id' )
+                                    ->get()
+                                    ->toArray(), 'id' );
+    }
+
+    /**
+     * getAssetsCheckedOutRequiringAcceptance
+     *
+     * @return array
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    protected function getAssetsCheckedOutRequiringAcceptance()
+    {
+
+        return $this->getCheckedOutAssetsRequiringAcceptance(
+            $this->getModelsInCategoriesThatRequireAcceptance( $this->getCategoriesThatRequireAcceptance() )
+        );
+    }
+
+    /**
+     * getAssetsNotAcceptedYet
+     *
+     * @return array
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    protected function getAssetsNotAcceptedYet()
+    {
+
+        return Asset::unaccepted();
+    }
 }

app/controllers/admin/SettingsController.php

@@ -13,6 +13,7 @@ use View;
 use Image;
 use Config;
 use Response;
+use Artisan;
 
 class SettingsController extends AdminController
 {
@@ -70,6 +71,7 @@ class SettingsController extends AdminController
 	        "per_page"   	=> 'required|min:1|numeric',
 	        "qr_text"		=> 'min:1|max:31',
 	        "logo"   		=> 'mimes:jpeg,bmp,png,gif',
+            "custom_css"   => 'alpha_space',
 	        "alert_email"   => 'email',
 	        "slack_endpoint"   => 'url',
             "default_currency"   => 'required',
@@ -113,13 +115,14 @@ class SettingsController extends AdminController
 
              if (Config::get('app.lock_passwords')==false) {
 	             $setting->site_name = e(Input::get('site_name'));
+                 $setting->custom_css = e(Input::get('custom_css'));
              }
 
             $setting->per_page = e(Input::get('per_page'));
             $setting->qr_code = e(Input::get('qr_code', '0'));
             $setting->barcode_type = e(Input::get('barcode_type'));
             $setting->load_remote = e(Input::get('load_remote', '0'));
-            $setting->default_currency = e(Input::get('default_currency', '$'));
+            $setting->default_currency = Input::get('default_currency', '$');
             $setting->qr_text = e(Input::get('qr_text'));
             $setting->auto_increment_prefix = e(Input::get('auto_increment_prefix'));
             $setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0'));
@@ -170,12 +173,34 @@ class SettingsController extends AdminController
 
             }
             closedir($handle);
+            $files = array_reverse($files);
         }
 
 
         return View::make('backend/settings/backups', compact('path','files'));
     }
 
+
+    /**
+    * Generate the backup page
+    *
+    * @return View
+    **/
+
+    public function postBackups()
+    {
+        if (!Config::get('app.lock_passwords')) {
+            Artisan::call('snipe:backup');
+            return Redirect::to("admin/settings/backups")->with('success', Lang::get('admin/settings/message.backup.generated'));
+        } else {
+            Artisan::call('snipe:backup');
+            return Redirect::to("admin/settings/backups")->with('error', Lang::get('general.feature_disabled'));
+        }
+
+
+    }
+
+
     /**
     * Download the dump file
     *
@@ -184,20 +209,45 @@ class SettingsController extends AdminController
     **/
     public function downloadFile($filename = null)
     {
+        if (!Config::get('app.lock_passwords')) {
+            $file = Config::get('backup::path').'/'.$filename;
+            if (file_exists($file)) {
+    				return Response::download($file);
+            } else {
 
-        $file = Config::get('backup::path').'/'.$filename;
-
-
-		// the license is valid
-        if (file_exists($file)) {
-				return Response::download($file);
+                // Redirect to the backup page
+                return Redirect::route('settings/backups')->with('error',  Lang::get('admin/settings/message.backup.file_not_found'));
+            }
         } else {
-            // Prepare the error message
-            $error = Lang::get('admin/settings/message.does_not_exist');
-
-            // Redirect to the licence management page
-            return Redirect::route('settings/backups')->with('error', $error);
+            // Redirect to the backup page
+            return Redirect::route('settings/backups')->with('error',  Lang::get('general.feature_disabled'));
         }
+
+
+    }
+
+    /**
+    * Download the dump file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function deleteFile($filename = null)
+    {
+
+        if (!Config::get('app.lock_passwords')) {
+
+            $file = Config::get('backup::path').'/'.$filename;
+            if (file_exists($file)) {
+    			unlink($file);
+                return Redirect::route('settings/backups')->with('success', Lang::get('admin/settings/message.backup.file_deleted'));
+            } else {
+                return Redirect::route('settings/backups')->with('error', Lang::get('admin/settings/message.backup.file_not_found'));
+            }
+        } else {
+            return Redirect::route('settings/backups')->with('error',  Lang::get('general.feature_disabled'));
+        }
+
     }
 
 

app/controllers/admin/StatuslabelsController.php

@@ -12,6 +12,8 @@ use Str;
 use Validator;
 use View;
 
+use Symfony\Component\HttpFoundation\JsonResponse;
+
 class StatuslabelsController extends AdminController
 {
     /**
@@ -40,8 +42,7 @@ class StatuslabelsController extends AdminController
         // Show the page
 		$statuslabel = new Statuslabel;
 		$use_statuslabel_type = $statuslabel->getStatuslabelType();
-
-    	$statuslabel_types = array('' => Lang::get('admin/hardware/form.select_statustype')) + array('undeployable' => Lang::get('admin/hardware/general.undeployable')) + array('pending' => Lang::get('admin/hardware/general.pending')) + array('archived' => Lang::get('admin/hardware/general.archived')) + array('deployable' => Lang::get('admin/hardware/general.deployable'));
+    	$statuslabel_types = statusTypeList();
 
         return View::make('backend/statuslabels/edit', compact('statuslabel_types','statuslabel'))->with('use_statuslabel_type',$use_statuslabel_type);
     }
@@ -90,6 +91,44 @@ class StatuslabelsController extends AdminController
 
     }
 
+    public function store()
+    {
+      // get the POST data
+      $new = Input::all();
+
+      $new['statuslabel_types']="deployable";
+
+      // create a new model instance
+      $statuslabel = new Statuslabel();
+      $statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
+
+      // attempt validation
+      if ($statuslabel->validate($new)) {
+
+        //$statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
+
+          // Save the Statuslabel data
+          $statuslabel->name            = e(Input::get('name'));
+          $statuslabel->user_id         = Sentry::getId();
+          $statuslabel->notes           =  '';
+          $statuslabel->deployable      =  $statustype['deployable'];
+          $statuslabel->pending         =  $statustype['pending'];
+          $statuslabel->archived        =  $statustype['archived'];
+
+          // Was the asset created?
+          if($statuslabel->save()) {
+              // Redirect to the new Statuslabel  page
+              return JsonResponse::create($statuslabel);
+          } else {
+            return JsonResponse::create(["error" => "Couldn't save Statuslabel"],500);
+          }
+      } else {
+          // failure
+          $errors = $statuslabel->errors();
+          return  JsonResponse::create(["error" => "Failed validation: ".print_r($errors->all('<li>:message</li>'),true)],500);
+      }
+    }
+
 
     /**
      * Statuslabel update.

app/controllers/admin/SuppliersController.php

@@ -2,6 +2,7 @@
 
 use AdminController;
 use Image;
+use AssetMaintenance;
 use Input;
 use Lang;
 use Supplier;
@@ -12,6 +13,9 @@ use Str;
 use Validator;
 use View;
 
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+
 class SuppliersController extends AdminController
 {
     /**
@@ -99,6 +103,26 @@ 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;
+      $new=Input::all();
+      $validator = Validator::make($new, $supplier->validationRules());
+      if($validator->fails()) {
+        return JsonResponse::create(["error" => "Failed validation: ".print_r($validator->messages()->all('<li>:message</li>'),true)],500);
+      } else {
+        //$supplier->fill($new);
+        $supplier->name=$new['name'];
+        $supplier->user_id              = Sentry::getId();
+      
+        if($supplier->save()) {
+          return JsonResponse::create($supplier);
+        } else {
+          return JsonResponse::create(["error" => "Couldn't save Supplier"]);
+        }
+      }
+    }
 
     /**
      * Supplier update.

app/database/migrations/2015_06_26_213716_create_asset_maintenances_table.php

@@ -0,0 +1,65 @@
+<?php
+
+    use Illuminate\Database\Migrations\Migration;
+    use Illuminate\Database\Schema\Blueprint;
+    use Illuminate\Support\Facades\Lang;
+
+    class CreateAssetMaintenancesTable extends Migration
+    {
+
+        /**
+         * Run the migrations.
+         *
+         * @return void
+         */
+        public function up()
+        {
+
+            Schema::create( 'asset_maintenances', function ( Blueprint $table ) {
+
+                $table->increments( 'id' );
+                $table->integer( 'asset_id' )
+                      ->unsigned();
+                $table->integer( 'supplier_id' )
+                      ->unsigned();
+                $table->enum( 'asset_maintenance_type', $this->getEnumFields() );
+                $table->string( 'title', 100 );
+                $table->boolean( 'is_warranty' );
+                $table->date( 'start_date' );
+                $table->date( 'completion_date' )
+                      ->nullable();
+                $table->integer( 'asset_maintenance_time' )
+                      ->nullable();
+                $table->longText( 'notes' )
+                      ->nullable();
+                $table->decimal( 'cost', 10, 2 )
+                      ->nullable();
+                $table->dateTime( 'deleted_at' )
+                      ->nullable();
+                $table->timestamps();
+            } );
+        }
+
+        protected function getEnumFields()
+        {
+
+            return [
+                Lang::get( 'admin/asset_maintenances/general.maintenance' ),
+                Lang::get( 'admin/asset_maintenances/general.repair' ),
+                Lang::get( 'admin/asset_maintenances/general.upgrade' )
+            ];
+        }
+
+        /**
+         * Reverse the migrations.
+         *
+         * @return void
+         */
+        public function down()
+        {
+
+            Schema::dropIfExists( 'asset_maintenances' );
+
+        }
+
+}

app/database/migrations/2015_07_21_122022_add_expected_checkin_date_to_asset_logs.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddExpectedCheckinDateToAssetLogs extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+
+		Schema::table('asset_logs', function ($table) {
+            $table->date('expected_checkin')->nullable()->default(NULL);
+        });
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+
+		Schema::table('asset_logs', function(Blueprint $table)
+		{
+			$table->dropColumn('expected_checkin');
+		});
+
+	}
+
+}

app/database/migrations/2015_07_24_093845_add_checkin_email_to_category_table.php

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

app/database/migrations/2015_07_25_055415_remove_email_unique_constraint.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RemoveEmailUniqueConstraint extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('users', function(Blueprint $table)
+	    {
+	        $table->dropUnique('users_email_unique');
+	    });
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}

app/database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php

@@ -0,0 +1,214 @@
+<?php
+
+    use Illuminate\Database\Schema\Blueprint;
+    use Illuminate\Database\Migrations\Migration;
+
+    class AddThreadIdToAssetLogsTable extends Migration
+    {
+
+        /**
+         * currentAssetId
+         *
+         * @var int
+         */
+        protected $currentAssetId = null;
+
+        /**
+         * currentAssetLogId
+         *
+         * @var int
+         */
+        protected $currentAssetLogId = null;
+
+        /**
+         * assetLogs
+         *
+         * @var array
+         */
+        protected $assetLogs = null;
+
+        /**
+         * startOfCurrentThread
+         *
+         * @var bool
+         */
+        protected $startOfCurrentThread = true;
+
+        /**
+         * threadStartingActionTypes
+         *
+         * @var array
+         */
+        protected $threadStartingActionTypes = [ 'checkout', 'requested' ];
+
+        /**
+         * threadFinalActionTypes
+         *
+         * @var array
+         */
+        protected $threadFinalActionTypes = [ 'checkin from' ];
+
+        /**
+         * actionlog
+         *
+         * @var \Actionlog
+         */
+        private $actionlog;
+
+        /**
+         * Run the migrations.
+         *
+         * @return void
+         */
+        public function up()
+        {
+
+            if (!Schema::hasColumn('asset_logs', 'thread_id')) {
+
+                Schema::table( 'asset_logs', function ( Blueprint $table ) {
+
+                    $table->integer( 'thread_id' )
+                          ->nullable()
+                          ->default( null );
+                    $table->index( 'thread_id' );
+                } );
+            }
+
+            $this->actionlog = new Actionlog();
+            $this->assetLogs = $this->actionlog->getListingOfActionLogsChronologicalOrder();
+
+            foreach ($this->assetLogs as $assetLog) {
+
+                if ($this->hasAssetChanged( $assetLog )) {
+                    $this->resetCurrentAssetInformation( $assetLog );
+                }
+
+                if ($this->hasBegunNewChain( $assetLog )) {
+                    $this->startOfCurrentThread = false;
+                    continue;
+                }
+
+                $this->updateAssetLogWithThreadInformation( $assetLog );
+
+                if ($this->hasReachedEndOfChain( $assetLog )
+                ) {
+                    $this->clearCurrentAssetInformation();
+                }
+
+            }
+        }
+
+
+
+        /**
+         * Reverse the migrations.
+         *
+         * @return void
+         */
+        public function down()
+        {
+
+            Schema::table( 'asset_logs', function ( Blueprint $table ) {
+
+                $table->dropIndex( 'thread_id' );
+                $table->dropColumn( 'thread_id' );
+            } );
+        }
+
+        /**
+         * hasAssetChanged
+         *
+         * @param $assetLog
+         *
+         * @return bool
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        protected function hasAssetChanged( $assetLog )
+        {
+
+            return $assetLog->asset_id !== $this->currentAssetId;
+        }
+
+        /**
+         * resetCurrentAssetInformation
+         *
+         * @param $assetLog
+         *
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        protected function resetCurrentAssetInformation( $assetLog )
+        {
+
+            $this->currentAssetId       = $assetLog->asset_id;
+            $this->currentAssetLogId    = $assetLog->id;
+            $this->startOfCurrentThread = true;
+        }
+
+        /**
+         * hasReachedEndOfChain
+         *
+         * @param $assetLog
+         *
+         * @return bool
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        protected function hasReachedEndOfChain( $assetLog )
+        {
+
+            return in_array( $assetLog->action_type, $this->threadFinalActionTypes )
+                   && $this->startOfCurrentThread == false;
+        }
+
+        /**
+         * clearCurrentAssetInformation
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        protected function clearCurrentAssetInformation()
+        {
+
+            $this->startOfCurrentThread = true;
+            $this->currentAssetLogId    = null;
+            $this->currentAssetId       = null;
+        }
+
+        /**
+         * updateAssetLogWithThreadInformation
+         *
+         * @param $assetLog
+         *
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        protected function updateAssetLogWithThreadInformation( $assetLog )
+        {
+
+            $loadedAssetLog = Actionlog::find( $assetLog->id );
+
+            $loadedAssetLog->thread_id = $this->currentAssetLogId;
+
+            $loadedAssetLog->update();
+
+            unset( $loadedAssetLog );
+        }
+
+        /**
+         * hasBegunNewChain
+         *
+         * @param $assetLog
+         *
+         * @return bool
+         * @author  Vincent Sposato <vincent.sposato@gmail.com>
+         * @version v1.0
+         */
+        protected function hasBegunNewChain( $assetLog )
+        {
+
+            return in_array( $assetLog->action_type, $this->threadStartingActionTypes )
+                   && $this->startOfCurrentThread == true;
+        }
+
+    }

app/database/migrations/2015_07_31_015430_add_accepted_to_assets.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAcceptedToAssets extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('assets', function(Blueprint $table)
+		{
+			$table->enum('accepted',["pending","accepted","rejected"])->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('assets', function(Blueprint $table)
+		{
+			$table->dropColumn('accepted');
+		});
+	}
+
+}

app/database/migrations/2015_09_09_195301_add_custom_css_to_settings.php

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

app/database/migrations/2015_09_28_003314_fix_default_purchase_order.php

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

app/database/seeds/AccessoriesSeeder.php

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

app/database/seeds/ActionlogSeeder.php

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

app/database/seeds/AssetMaintenancesSeeder.php

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

app/database/seeds/AssetsSeeder.php

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

app/database/seeds/CategoriesSeeder.php

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

app/database/seeds/DatabaseSeeder.php

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

app/database/seeds/SuppliersSeeder.php

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

app/helpers.php

@@ -1,18 +1,101 @@
 <?php
 
-/* 
+/*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-function ParseFloat($floatString){ 
-    
+function ParseFloat($floatString){
+
     // use comma for thousands until local info is property used
     $LocaleInfo = localeconv();
-    //$thousands = isset($LocaleInfo["mon_thousands_sep"]) ? $LocaleInfo["mon_thousands_sep"] : ","; 
-    //$floatString = str_replace($LocaleInfo["mon_thousands_sep"] , "", $floatString); 
-    //$floatString = str_replace($LocaleInfo["decimal_point"] , ".", $floatString); 
-    $floatString = str_replace("," , "", $floatString); 
-    $floatString = str_replace($LocaleInfo["decimal_point"] , ".", $floatString); 
-    return floatval($floatString); 
-} 
+    $floatString = str_replace("," , "", $floatString);
+    $floatString = str_replace($LocaleInfo["decimal_point"] , ".", $floatString);
+    return floatval($floatString);
+}
+
+function modelList() {
+    $model_list = array('' => Lang::get('general.select_model')) + DB::table('models')
+    ->select(DB::raw('IF (modelno="" OR modelno IS NULL,name,concat(name, " / ",modelno)) as name, id'))
+    ->orderBy('name', 'asc')
+    ->whereNull('deleted_at')
+    ->lists('name', 'id');
+    return $model_list;
+}
+
+function categoryList() {
+    $category_list = array('' => '') + DB::table('categories')
+    ->whereNull('deleted_at')
+    ->orderBy('name', 'asc')
+    ->lists('name', 'id');
+    return $category_list;
+}
+
+function suppliersList() {
+    $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')
+    ->orderBy('name', 'asc')
+    ->lists('name', 'id');
+    return $supplier_list;
+}
+
+function statusLabelList() {
+    $statuslabel_list = Statuslabel::orderBy('name', 'asc')
+    ->lists('name', 'id');
+    return $statuslabel_list;
+}
+
+function locationsList() {
+    $location_list = array('' => Lang::get('general.select_location')) + Location::orderBy('name', 'asc')
+    ->lists('name', 'id');
+    return $location_list;
+}
+
+function manufacturerList() {
+    $manufacturer_list = array('' => 'Select One') + Manufacturer::orderBy('name', 'asc')
+    ->lists('name', 'id');
+    return $manufacturer_list;
+}
+
+function statusTypeList() {
+    $statuslabel_types = array('' => Lang::get('admin/hardware/form.select_statustype')) + array('undeployable' => Lang::get('admin/hardware/general.undeployable')) + array('pending' => Lang::get('admin/hardware/general.pending')) + array('archived' => Lang::get('admin/hardware/general.archived')) + array('deployable' => Lang::get('admin/hardware/general.deployable'));
+    return $statuslabel_types;
+}
+
+function managerList() {
+    $manager_list = array('' => '') + DB::table('users')
+    ->select(DB::raw('concat(last_name,", ",first_name," (",username,")") as full_name, id'))
+    ->whereNull('deleted_at', 'and')
+    ->orderBy('last_name', 'asc')
+    ->orderBy('first_name', 'asc')
+    ->lists('full_name', 'id');
+    return $manager_list;
+}
+
+function depreciationList() {
+    $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::orderBy('name', 'asc')->lists('name', 'id');
+    return $depreciation_list;
+}
+
+function categoryTypeList() {
+     $category_types= array('' => '','accessory' => 'Accessory', 'asset' => 'Asset', 'consumable' => 'Consumable');
+     return $category_types;
+}
+
+function usersList() {
+    $users_list = array('' => Lang::get('general.select_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');
+    return $users_list;
+}
+
+function barcodeDimensions ($barcode_type = 'QRCODE') {
+    if ($barcode_type == 'C128') {
+        $size['height'] = '-1';
+        $size['width'] = '-10';
+    } elseif  ($barcode_type == 'PDF417') {
+        $size['height'] = '-3';
+        $size['width'] = '-10';
+    } else {
+        $size['height'] = '-3';
+        $size['width'] = '-3';
+    }
+    return $size;
+}

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

@@ -5,7 +5,7 @@ return array(
     'about_accessories_text'  			=> 'الملحقات هي أي شيء تقوم بتسليمه للمستخدمين لكنه لا يحتوي على رقم تسلسلي (أو أنك لست بحاجة إلى تتبعه بشكل خاص). مثال: فأرة الحاسوب أو لوحة المفاتيح.',
     'accessory_category' 				=> 'فئة الملحق',
     'accessory_name'  					=> 'اسم الملحق',
-    'create'  							=> 'إنشاء فئة جديدة',
+    'create'  							=> 'Create Accessory',
     'eula_text'							=> 'إنشاء اتفاقية جديدة',
     'eula_text_help'					=> 'يسمح لك هذا الحقل بتخصيص الاتفاقيات لأنواع معينة من الأصول. اذا كنت تمتلك اتفاقية واحدة لجميع أصولك يمكنك أن تقوم بتأشير المربع في الأسفل لاستخدام الاتفاقية الافتراضية.',
     'require_acceptance'				=> 'مطالبة المستخدمين بتأكيد قبولهم الأصول في هذه الفئة.',
@@ -13,7 +13,7 @@ return array(
     'qty'  								=> 'الكمية',
     'total'  							=> 'المجموع',
     'remaining'  						=> 'المتاح',
-    'update'  							=> 'تحديث الفئة',
+    'update'  							=> 'Update Accessory',
     'use_default_eula'					=> 'قم باستعمال <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
 

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

@@ -1,9 +1,11 @@
 <?php
 
 return array(
+	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'اتفاقية ترخيص المستخدم',
     'id'      					=> 'رقم المعرف',
     'require_acceptance'      	=> 'القبول',
     'title'      				=> 'اسم الملحق',
 
+
 );

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

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

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

@@ -0,0 +1,11 @@
+<?php
+
+    return [
+        'asset_maintenances' => 'Asset Maintenances',
+        'edit'               => 'Edit Asset Maintenance',
+        'delete'             => 'Delete Asset Maintenance',
+        'view'               => 'View Asset Maintenance Details',
+        'repair'             => 'Repair',
+        'maintenance'        => 'Maintenance',
+        'upgrade'            => 'Upgrade'
+    ];

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

@@ -0,0 +1,17 @@
+<?php
+
+    return [
+        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'delete'                       => [
+            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
+            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
+            'success' => 'The asset maintenance was deleted successfully.'
+        ],
+        'create'                       => [
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
+        ],
+        'asset_maintenance_incomplete' => 'Not Completed Yet',
+        'warranty'                     => 'Warranty',
+        'not_warranty'                 => 'Not Warranty',
+    ];

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

@@ -0,0 +1,9 @@
+<?php
+
+    return [
+        'title'         => 'Asset Maintenance',
+        'asset_name'    => 'Asset Name',
+        'supplier_name' => 'Supplier Name',
+        'is_warranty'   => 'Warranty',
+        'dl_csv'        => 'Download CSV'
+    ];

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

@@ -5,6 +5,7 @@ return array(
     'about_categories'  				=> 'تصنيفات الأصول تساعدك على ترتيب الأصول. من الأمثلة على التصنيفات " مكاتب "،  "أجهزة الكمبيوتر المحمولة "،  "الهواتف النقالة "،  "أجهزة لوحية " وهكذا، كما يمكنك استخدام التصنيفات بأي طريقة تناسبك. ',
     'asset_categories' 					=> 'التصنيفات',
     'category_name'  					=> 'اسم التصنيف',
+    'checkin_email'                     => 'Send email to user on checkin.',
     'clone'                             => 'Clone Category',
     'create'  							=> 'إنشاء تصنيف',
     'edit'                              => 'Edit Category',

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

@@ -3,6 +3,9 @@
 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',
+    'create'                             => 'Create Consumable',
     'remaining' 			             => 'Remaining',
     'total' 			                 => 'Total',
+    'update'                            => 'Update Consumable',
 );

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

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

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

@@ -17,9 +17,10 @@ return array(
     'default_location'	=> 'Default Location',
     'eol_date'			=> 'EOL Date',
     'eol_rate'			=> 'EOL Rate',
+    'expected_checkin'  => 'Expected Checkin Date',
     'expires'			=> 'Expires',
     'fully_depreciated'	=> 'Fully Depreciated',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
     'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Manufacturer',
     'model'				=> 'Model',

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

@@ -5,6 +5,7 @@ return array(
     'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
                         If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Asset does not exist.',
+    'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.',
     'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
 
     'create' => array(
@@ -22,7 +23,7 @@ return array(
         'error'   		=> 'Asset was not restored, please try again',
         'success' 		=> 'Asset restored successfully.'
     ),
-    
+
     'deletefile' => array(
         'error'   => 'File not deleted. Please try again.',
         'success' => 'File successfully deleted.',
@@ -31,7 +32,7 @@ return array(
     'upload' => array(
         'error'   => 'File(s) not uploaded. Please try again.',
         'success' => 'File(s) successfully uploaded.',
-        'nofiles' => 'You did not select any files for upload',
+        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
         'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
     ),
 

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

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

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

@@ -22,7 +22,7 @@ return array(
     'upload' => array(
         'error'   => 'File(s) not uploaded. Please try again.',
         'success' => 'File(s) successfully uploaded.',
-        'nofiles' => 'You did not select any files for upload',
+        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
         'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
     ),
 

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

@@ -4,6 +4,8 @@ return array(
 
     'does_not_exist' => 'Location does not exist.',
     'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
+    'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
 
 
     'create' => array(

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

@@ -12,4 +12,6 @@ return array(
     'address'		=> 'Address',
     'zip'			=> 'Postal Code',
     'locations'		=> 'Locations',
+    'parent'		=> 'Parent',
+    'currency'  	=> 'Location Currency', // this is deprecated
 );

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

@@ -8,7 +8,8 @@ return array(
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
-        'success' => 'Model created successfully.'
+        'success' => 'Model created successfully.',
+        'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.',
     ),
 
     'update' => array(
@@ -21,7 +22,7 @@ return array(
         'error'   => 'There was an issue deleting the model. Please try again.',
         'success' => 'The model was deleted successfully.'
     ),
-    
+
     'restore' => array(
         'error'   		=> 'Model was not restored, please try again',
         'success' 		=> 'Model restored successfully.'

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

@@ -10,6 +10,9 @@ return array(
 	'backups'					=> 'Backups',
 	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.',
+	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
 	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'display_asset_name'        => 'Display Asset Name',
@@ -19,6 +22,7 @@ return array(
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'general_settings'			=> 'General Settings',
+	'generate_backup'			=> 'Generate Backup',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
     'laravel'                   => 'Laravel Version',

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

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

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

@@ -3,13 +3,16 @@
 
 return array(
 
-    'assets_user'  		=> 'الجهاز مسجل بعهدة :name',
-    'clone'  			=> 'نسخ المستخدم',
-    'contact_user'  	=> 'اتصل بـ :name',
-    'edit'  			=> 'تعديل المستخدم',
-    'history_user'  	=> 'الأرشيف الخاص بـ :name',
-    'last_login'  		=> 'آخر دخول للمستخدم',
-    'software_user'  	=> 'البرامج المسجلة لـ :name',
-    'view_user'  		=> 'عرض المستخدم :name',
-    'usercsv'			=> 'ملف CSV',
+    'assets_user'       => 'الجهاز مسجل بعهدة :name',
+    'clone'             => 'نسخ المستخدم',
+    'contact_user'      => 'اتصل بـ :name',
+    'edit'              => 'تعديل المستخدم',
+    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'history_user'      => 'الأرشيف الخاص بـ :name',
+    'last_login'        => 'آخر دخول للمستخدم',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
+    'software_user'     => 'البرامج المسجلة لـ :name',
+    'view_user'         => 'عرض المستخدم :name',
+    'usercsv'           => 'ملف CSV',
     );

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

@@ -2,12 +2,15 @@
 
 return array(
 
-    'user_exists'              	=> 'المستخدم موجود مسبقاً!',
-    'user_not_found'           	=> 'المستخدم [id:] غير موجود.',
-    'user_login_required'      	=> 'حقل "الدخول" مطلوب',
-    'user_password_required'   	=> 'كلمة السر مطلوبة.',
-    'insufficient_permissions' 	=> 'صلاحيات غير كافية.',
-    'user_deleted_warning' 		=> 'تم حذف المستخدم. سيكون عليك استعادة هذا المستخدم للتعديل عليه او تسليمه اجهزة جديدة.',
+    'accepted'                  => 'You have successfully accepted this asset.',
+    'declined'                  => 'You have successfully declined this asset.',
+    'user_exists'               => 'المستخدم موجود مسبقاً!',
+    'user_not_found'            => 'المستخدم [id:] غير موجود.',
+    'user_login_required'       => 'حقل "الدخول" مطلوب',
+    'user_password_required'    => 'كلمة السر مطلوبة.',
+    'insufficient_permissions'  => 'صلاحيات غير كافية.',
+    'user_deleted_warning'      => 'تم حذف المستخدم. سيكون عليك استعادة هذا المستخدم للتعديل عليه او تسليمه اجهزة جديدة.',
+    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
 
 
     'success' => array(
@@ -29,6 +32,23 @@ return array(
         'unsuspend' => 'حدث خطأ ما أثناء إلغاء التعليق عن المستخدم. حاول مرة أخرى.',
         'import'    => 'حدث خطأ أثناء استيراد المستخدمين. حاول مرة أخرى.',
         'asset_already_accepted' => 'هذا الجهاز تم قبوله مسبقاً.',
+        'accept_or_decline' => 'You must either accept or decline this asset.',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+    ),
+
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
     ),
 
 );

app/lang/ar/auth/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'account_already_exists' => 'An account with the this email already exists.',
-    'account_not_found'      => 'The email account or password is incorrect.',
+    'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
     'account_banned'         => 'This user account is banned.',

app/lang/ar/button.php

@@ -8,6 +8,7 @@ return array(
     'delete'  	=> 'حذف',
     'edit'    	=> 'تعديل',
     'restore' 	=> 'إستعادة',
+    'request'   => 'Request',
     'submit'  	=> 'إرسال',
     'upload'    => 'Upload',
 

app/lang/ar/general.php

@@ -1,10 +1,9 @@
 <?php
 
-return array(
-
-
+    return [
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'accessory_report'			=> 'Accessory Report',
     'action'                => 'Action',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'العنوان',
@@ -21,6 +20,7 @@ return array(
     'avatar_delete'         => 'حذف الصورة الرمزية',
     'avatar_upload'         => 'رفع صورة رمزية',
     'back'      			=> 'الرجوع للخلف',
+    'bad_data'      		=> 'Nothing found. Maybe bad data?',
     'cancel'  				=> 'إلغاء',
     'categories'			=> 'Categories',
     'category'				=> 'Category',
@@ -36,7 +36,7 @@ return array(
     'create'				=> 'إضافة',
     'created_asset'			=> 'الأصول المضافة',
     'created_at' 			=> 'أنشئت في',
-    'currency'  			=> '$',
+    'currency'  			=> '$', // this is deprecated
     'current'  				=> 'الحالي',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
@@ -60,6 +60,10 @@ return array(
     'id'  					=> 'الرقم',
     'image_delete'         	=> 'حذف الصورة',
     'image_upload'         	=> 'رفع صورة',
+    'import'         	    => 'Import',
+    'asset_maintenance'        => 'Asset Maintenance',
+    'asset_maintenance_report' => 'Asset Maintenance Report',
+    'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'الإسم الأخير',
@@ -69,6 +73,8 @@ return array(
     'licenses'				=> 'الرخص',
     'list_all'				=> 'عرض الكل',
     'loading'				=> 'Loading',
+    'lock_passwords'        => 'This field cannot be edited in this installation.',
+    'feature_disabled'      => 'This feature has been disabled for this installation.',
     'location'              => 'الموقع',
     'locations'				=> 'المواقع',
     'logout'				=> 'تسجيل خروج',
@@ -96,6 +102,7 @@ return array(
     'ready_to_deploy'		=> 'جاهزة للتوزيع',
     'recent_activity'		=> 'Recent Activity',
     'reports'				=> 'التقارير',
+    'requested'				=> 'Requested',
     'save'  				=> 'حفظ',
     'select'				=> 'Select',
     'search'				=> 'Search',
@@ -106,6 +113,7 @@ return array(
     'select_supplier'		=> 'Select a Supplier',
     'select_user'			=> 'Select a User',
     'select_date'			=> 'Select Date',
+    'select_statuslabel'	=> 'Select Status',
     'settings'				=> 'الإعدادات',
     'sign_in'				=> 'تسجيل الدخول',
     'site_name'				=> 'إسم الموقع',
@@ -118,8 +126,12 @@ return array(
     'type'  				=> 'Type',
     'undeployable'			=> 'غير قابلة للتوزيع',
     'unknown_admin'			=> 'إداري غير معروف',
+    'update'                => 'Update',
     'uploaded'              => 'Uploaded',
     'user'					=> 'المستخدم',
+    'accepted'			    => 'accepted',
+    'declined'			    => 'declined',
+    'unaccepted_asset_report' => 'Unaccepted Assets',
     'users'                 => 'Users',
     'viewassets'  			=> 'عرض الأصول المسجلة',
     'website'               => 'الموقع',
@@ -127,5 +139,4 @@ return array(
     'years'					=> 'سنوات',
     'yes' 					=> 'نعم',
     'zip'  					=> 'الرمز البريدي',
-
-);
+    ];

app/lang/ar/validation.php

@@ -77,7 +77,7 @@ return array(
     */
 
     'custom' => array(),
-    'alpha_space' => "The :attribute field may only contain letters, commas, spaces and dashes.",
+    'alpha_space' => "The :attribute field contains a character that is not allowed.",
 
     /*
     |--------------------------------------------------------------------------

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

@@ -0,0 +1,20 @@
+<?php
+
+return array(
+    'about_accessories_title' 			=> 'Относно аксесоарите',
+    'about_accessories_text'  			=> 'Аксесоарите са всички неща, които се изписват на потребителите, но нямат сериен номер (или няма нужда да бъдат конкретно проследявани). Например, това са мишки, клавиатури и др.',
+    'accessory_category' 				=> 'Категория аксесоари',
+    'accessory_name'  					=> 'Аксесоар',
+    'create'  							=> 'Създаване на аксесоар',
+    'eula_text'							=> 'EULA на категорията',
+    'eula_text_help'					=> 'Това поле позволява да задавате различни EULA за всеки тип активи. Ако имате обща EULA за всички активи, можете да използвате кутийката по-долу за да използвате една обща по подразбиране.',
+    'require_acceptance'				=> 'Задължаване на потребителите да потвърждават приемането на активи от тази категория.',
+    'no_default_eula'					=> 'Няма EULA по подразбиране. Добавете я в Настройки.',
+    'qty'  								=> 'Количество',
+    'total'  							=> 'Oбщо',
+    'remaining'  						=> 'Наличност',
+    'update'  							=> 'Обновяване на аксесоар',
+    'use_default_eula'					=> 'Използване на <a href="#" data-toggle="modal" data-target="#eulaModal">EULA по подразбиране</a>.',
+    'use_default_eula_disabled'			=> '<del>Използване на EULA по подразбиране</del> Няма EULA по подразбиране. Добавете я в Настройки.',
+
+);

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

@@ -0,0 +1,37 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Няма такава категория.',
+    'assoc_users'	 => 'От този аксесоар са предадени :count броя на потребителите. Моля впишете обратно нови или върнати и опитайте отново.',
+
+    'create' => array(
+        'error'   => 'Категорията не беше създадена. Моля опитайте отново.',
+        'success' => 'Категорията е създадена.'
+    ),
+
+    'update' => array(
+        'error'   => 'Категорията не беше обновена. Моля опитайте отново.',
+        'success' => 'Категорията е обновена.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Сигурни ли сте, че желаете изтриване на категорията?',
+        'error'   => 'Проблем при изтриване на категорията. Моля опитайте отново.',
+        'success' => 'Категорията бе изтрита успешно.'
+    ),
+    
+     'checkout' => array(
+        'error'   		=> 'Аксесоарът не беше изписан. Моля опитайте отново.',
+        'success' 		=> 'Аксесоарът изписан успешно.',
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Аксесоарът не беше вписан. Моля опитайте отново.',
+        'success' 		=> 'Аксесоарът вписан успешно.',
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
+    )
+
+
+);

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

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

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

@@ -0,0 +1,14 @@
+<?php
+
+    return [
+        'asset_maintenance_type' => 'Тип на поддръжка на актив',
+        'title'                  => 'Заглавие',
+        'start_date'             => 'Начална дата',
+        'completion_date'        => 'Крайна дата',
+        'cost'                   => 'Стойност',
+        'is_warranty'            => 'Подобрение на гаранцията',
+        'asset_maintenance_time' => 'Време за поддръжка на актив (в дни)',
+        'notes'                  => 'Бележки',
+        'update'                 => 'Редакция на поддръжка на актив',
+        'create'                 => 'Създаване на поддръжка на актив'
+    ];

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

@@ -0,0 +1,11 @@
+<?php
+
+    return [
+        'asset_maintenances' => 'Поддръжка на активи',
+        'edit'               => 'Редакция на поддръжка на актив',
+        'delete'             => 'Изтриване на поддръжка на актив',
+        'view'               => 'Преглед на поддръжка на актив',
+        'repair'             => 'Ремонт',
+        'maintenance'        => 'Поддръжка',
+        'upgrade'            => 'Upgrade'
+    ];

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

@@ -0,0 +1,17 @@
+<?php
+
+    return [
+        'not_found'                    => 'Поддръжката на актив, която търсите не бе открита!',
+        'delete'                       => [
+            'confirm' => 'Потвърдете изтриването на поддръжката на актив.',
+            'error'   => 'Проблем при изтриването на поддръжка на актив. Моля опитайте отново.',
+            'success' => 'Поддръжката на актив изтрита успешно.'
+        ],
+        'create'                       => [
+            'error'   => 'Поддръжката на актив не бе създадена. Моля опитайте отново.',
+            'success' => 'Поддръжката на актив създадена успешно.'
+        ],
+        'asset_maintenance_incomplete' => 'Все още неприключила',
+        'warranty'                     => 'Гаранция',
+        'not_warranty'                 => 'Без гаранция',
+    ];

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

@@ -0,0 +1,9 @@
+<?php
+
+    return [
+        'title'         => 'Поддръжка на активи',
+        'asset_name'    => 'Актив',
+        'supplier_name' => 'Доставчик',
+        'is_warranty'   => 'Гаранция',
+        'dl_csv'        => 'Сваляне на CSV'
+    ];

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

@@ -0,0 +1,22 @@
+<?php
+
+return array(
+    'about_asset_categories' 			=> 'Относно категориите на активи',
+    'about_categories'  				=> 'Категориите помагат организирането на активите. Примерни категории могат да бъдат &quot;Стационарни PC&quot;, &quot;Лаптопи&quot;, &quot;Мобилни телефони&quot;, &quot;Таблети&quot; и т.н., но можете да използвате всяка категория, имаща смисъл за организацията Ви.',
+    'asset_categories' 					=> 'Категории на активи',
+    'category_name'  					=> 'Име на категория',
+    'checkin_email'                     => 'Изпращане на email до потребителя при вписване на активи.',
+    'clone'                             => 'Копиране на категория',
+    'create'  							=> 'Създаване на категория',
+    'edit'                              => 'Редакция на категория',
+    'eula_text'							=> 'Категория EULA',
+    'eula_text_help'					=> 'Това поле позволява да задавате различни EULA за всеки тип активи. Ако имате обща EULA за всички активи, можете да използвате кутийката по-долу за да използвате една обща по подразбиране.',
+    'require_acceptance'				=> 'Задължаване на потребителите да потвърждават приемането на активи от тази категория.',
+    'required_acceptance'				=> 'Потребителят ще получи email с връзка за потвърждаване получаването на актива.',
+    'required_eula'						=> 'Потребителят ще получи копие на EULA.',
+    'no_default_eula'					=> 'Няма EULA по подразбиране. Добавете я в Настройки.',
+    'update'  							=> 'Обновяване на категория',
+    'use_default_eula'					=> 'Използване на <a href="#" data-toggle="modal" data-target="#eulaModal">EULA по подразбиране</a>.',
+    'use_default_eula_disabled'			=> '<del>Използване на EULA по подразбиране</del> Няма EULA по подразбиране. Добавете я в Настройки.',
+
+);

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

@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Категорията не съществува.',
+    'assoc_users'	 => 'Тази категория е асоциирана с поне един модел и не може да бъде изтрита. Моля обновете връзките с моделите и опитайте отново.',
+
+    'create' => array(
+        'error'   => 'Категорията не беше създадена. Моля опитайте отново.',
+        'success' => 'Категорията е създадена.'
+    ),
+
+    'update' => array(
+        'error'   => 'Категорията не беше обновена. Моля опитайте отново',
+        'success' => 'Категорията е обновена успешно.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Желаете ли да изтриете тази категория?',
+        'error'   => 'Проблем при изтриване на категорията. Моля опитайте отново.',
+        'success' => 'Категорията бе изтрита успешно.'
+    )
+
+);

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

@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'ID',
+    'parent'   					=> 'Горна категория',
+    'require_acceptance'      	=> 'Утвърждаване',
+    'title'      				=> 'Категория на актива',
+
+);

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

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+    'about_consumables_title' 			=> 'Относно консумативите',
+    'about_consumables_text'  			=> 'Консумативите са всички неща, купувани във времето. Например тонер за принтер или хартия.',
+    'consumable_name'                  => 'Консуматив',
+    'create'                             => 'Създаване на консуматив',
+    'remaining' 			             => 'Остава',
+    'total' 			                 => 'Oбщо',
+    'update'                            => 'Обновяване на консуматив',
+);

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

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Консуматива не съществува.',
+
+    'create' => array(
+        'error'   => 'Консумативът не беше създаден. Моля опитайте отново.',
+        'success' => 'Консумативът създаден успешно.'
+    ),
+
+    'update' => array(
+        'error'   => 'Консумативът не беше обновен. Моля опитайте отново.',
+        'success' => 'Консумативът обновен успешно.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Желаете ли изтриване на консуматива?',
+        'error'   => 'Проблем при изтриването на консуматива. Моля опитайте отново.',
+        'success' => 'Консумативът изтрит успешно.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Консумативът не беше изписан. Моля опитайте отново.',
+        'success' 		=> 'Консумативът изписан успешно.',
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Консумативът не беше вписан. Моля опитайте отново.',
+        'success' 		=> 'Консумативът вписан успешно.',
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
+    )
+
+
+);

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

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

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

@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'about_asset_depreciations'  			=> 'Относно амортизацията на активи',
+    'about_depreciations'  					=> 'Тук можете да конфигурирате линейна амортизация на активи във времето.',
+    'asset_depreciations'  					=> 'Амортизация на активи',
+    'create_depreciation'  					=> 'Създаване на амортизация',
+    'depreciation_name'  					=> 'Амортизация',
+    'number_of_months'  					=> 'Брой месеци',
+    'update_depreciation'  					=> 'Обновяване на амортизация',
+
+);

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

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Амортизацията не съществува.',
+    'assoc_users'	 => 'Тази амортизация е асоциирана с един или повече модели и не може да бъде изтрита. Моля изтрийте моделите и опитайте отново.',
+
+
+    'create' => array(
+        'error'   => 'Класът на амортизация не беше създаден. Моля опитайте отново.',
+        'success' => 'Класът на амортизация създаден успешно.'
+    ),
+
+    'update' => array(
+        'error'   => 'Класът на амортизация не беше обновен. Моля опитайте отново.',
+        'success' => 'Класът на амортизация обновен успешно.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Сигурни ли сте, че желаете изтриване на класът на амортизация?',
+        'error'   => 'Проблем при изтриването на класа на амортизация. Моля опитайте отново.',
+        'success' => 'Класът на амортизация изтрит успешно.'
+    )
+
+);