Bumped version

Merge remote-tracking branch 'origin/develop' into 2.0
# Conflicts: # app/controllers/admin/AssetsController.php
2015-07-09 01:24:43 -07:00 · 2015-07-09 01:24:34 -07:00 · 2015-07-09 01:19:57 -07:00 · 2015-07-09 01:17:02 -07:00 · 2015-07-09 01:02:49 -07:00 · 2015-07-09 00:53:58 -07:00
1576 changed files with 81673 additions and 5582 deletions
--- a/.bash_history
+++ b/.bash_history
@@ -1,37 +0,0 @@
-ls
-pwd
-cd app
-ls
-cd views/
-cd backend/
-ls
-cd users/
-ls
-vi view.blade.php 
-ls -alF
-cd
-pwd
-ls -alF
-pwd
-cd app
-ls
-cd views/
-cd backend/
-cd users/
-ls
-ls -alF
-chown snipeitftp view.blade.php
-sudo chown snipeitftp view.blade.php
-pwd
-ls
-vi view.blade.php
-set noswapfile
-set nobackup
-vi view.blade.php
-touch delete.me
-vi delete.me
-ls
-ls -alF
-touch view.blade.php
-touch index.blade.php
-vi view.blade.php
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+.git
+.dockerignore
+app/storage/logs/*
+app/storage/views/*
+vendor/*
--- a/.gitignore
+++ b/.gitignore
@@ -7,10 +7,22 @@ composer.phar
 /app/database/*.sqlite
 /app/storage/meta/services.json
 /app/config/*/mail.php
+/app/config/*/session.php
 /app/config/*/database.php
 /app/config/*/app.php
 public/packages/*
+public/uploads/models/*
+public/uploads/avatars/*
 /app/storage/views/*
 /app/storage/logs/*
 /app/storage/debugbar/
-/bin/
+/bin/
+.idea
+crowdin.yaml
+public/uploads/logo.gif
+public/uploads/logo.png
+.siteflow
+public/assets/.siteflow
+.settings/settings.json
+
+
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,7 @@
+addons:
+  hosts:
+    - AlisonMBP
+
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php

@@ -15,14 +19,16 @@ env:
 before_script:
  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;" -utravis; fi
  - curl -s http://getcomposer.org/installer | php
-  - cp app/config/production/database.example.php app/config/database.php
-  - cp app/config/production/mail.example.php app/config/mail.php
-  - composer install --prefer-source --no-interaction --dev
-  - php artisan key:generate
-  - php artisan migrate:install
-  - php artisan migrate --package cartalyst/sentry
-  - php artisan migrate
-  - php artisan db:seed
+  - 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
+  - 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

 # omitting "script:" will default to phpunit
 # use the $DB env variable to determine the phpunit.xml to use
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,216 @@


-###  v0.3.11-alpha - Released Jul 19, 2014 07:16:53
+###  v1.2.6.1 - Released Mar 12, 2015 08:25:28
+* <a href="http://github.com/snipe/snipe-it/commit/7047af44f6544d2eeed0f0fcefdbdd44489f189a">view</a> &bull; Fixed layout for remember me button 
+* <a href="http://github.com/snipe/snipe-it/commit/4502582beb064ffeee4a1cdf892f513e58534014">view</a> &bull; Trying to fix pre-commit hook :( 
+* <a href="http://github.com/snipe/snipe-it/commit/61b04d6e40baa9054e1701455259d8d62fa868ff">view</a> &bull; Fixes #579 - user cannot accept more than once 
+* <a href="http://github.com/snipe/snipe-it/commit/2d196b1595ec87f119ad5a82f8f676918c52c896">view</a> &bull; Fixes #602 for strict_mode 
+* <a href="http://github.com/snipe/snipe-it/commit/2540e90c37f37515d8d0277a4152c4b8198a4222">view</a> &bull; Fixes #605 - hides user requestable view from admins 
+* <a href="http://github.com/snipe/snipe-it/commit/1c333e4a24a4950418175a8c354d7541637b7658">view</a> &bull; Fixes #596 - better routes for checking in multiple items from user 
+* <a href="http://github.com/snipe/snipe-it/commit/7d5ee9750f912d85ac0c7f42e2beaba7e026989c">view</a> &bull; Added #596 fix for accessories 
+* <a href="http://github.com/snipe/snipe-it/commit/3f9d9f23d5190052deb1f36be919c650e8f773b8">view</a> &bull; Fixes #280 - updated link to use config url 
+* <a href="http://github.com/snipe/snipe-it/commit/817384b7615a301d6d692aefe6e41cd92ecfd6e1">view</a> &bull; Fixes #597 - print-friendly view on users 
+* <a href="http://github.com/snipe/snipe-it/commit/2115c82587e06049245f17f9d710fbc7a61e57b9">view</a> &bull; Fixed DB format for nullable EULA 
+* <a href="http://github.com/snipe/snipe-it/commit/f62f22b4bf1399c3b98041dfe17f4cc8450847b2">view</a> &bull; ref #599. showing groups in user detail view. fixes a small design bug with group edit view 
+* <a href="http://github.com/snipe/snipe-it/commit/ad25c048c4a52a7f80a479a3b7d621aaad18b1d7">view</a> &bull; Updated Sentry version to fix #625 
+* <a href="http://github.com/snipe/snipe-it/commit/d31c12cfafb2ba323973964215f033bd9aeb1f9b">view</a> &bull; Merge pull request #629 from uberbrady/unicode_fix 
+* <a href="http://github.com/snipe/snipe-it/commit/33dd59fb814089c81886c0264b2356df2b212864">view</a> &bull; Fix #637 - Remove Deleted Models from drop down 
+* <a href="http://github.com/snipe/snipe-it/commit/cb171bcac5c4ccbb347f370e3d2b28783378c0b2">view</a> &bull; Fixes #645 - adds zip and rar to filetype 
+
+
+###  v1.2.6 - Released Feb 28, 2015 08:27:45
+
+
+###  v1.2.6-beta - Released Feb 27, 2015 03:17:06
 #### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/30df21c7aa2582bc3b1efbfd788c1aea2733aa7d">view</a> &bull; Fixed missing checkedout-to info on asset view 
+* <a href="http://github.com/snipe/snipe-it/commit/70ae59ed6260101bcfb6e3cbd6309ecb9c1c935a">view</a> &bull; Fixed a bug when no assets are in table that the autoincrement method blows up. Also optimzed the logic to get max id instead of popping top off creation date. 
+* <a href="http://github.com/snipe/snipe-it/commit/f8e12cabd4af8875abd759a3c9d6c2216cb88601">view</a> &bull; Fixes #476 - added logo upload and header color 
+* <a href="http://github.com/snipe/snipe-it/commit/f85061f988a946f1d4a284fbfc8c442636c1364c">view</a> &bull; Fix #541 - Headers not being skipped if checked 
+* <a href="http://github.com/snipe/snipe-it/commit/8b3e22b58e080b44e4de809b8598283fa6ba5bb0">view</a> &bull; Fixes #546 - only insert data if values exist 
+* <a href="http://github.com/snipe/snipe-it/commit/083cb1b5ec51aa2b6932a59b9436a1a45fad5460">view</a> &bull; Fix activate for strict db 
+* <a href="http://github.com/snipe/snipe-it/commit/35cf5b3d609fec2bc3613bdae42d338448413520">view</a> &bull; Fixes #423 
+* <a href="http://github.com/snipe/snipe-it/commit/097bb38a231795aa52ff772a38887700e828256d">view</a> &bull; Fixes #163 - accept acceptance + eula 
+* <a href="http://github.com/snipe/snipe-it/commit/b2af455523fcca1bb02018b38fdb6dc4861819d8">view</a> &bull; Merge conflict resolution. Added a use at the same line as remote. Fixed 
+* <a href="http://github.com/snipe/snipe-it/commit/8879bff16084b2cfa0280fcb1f83d3f90368797f">view</a> &bull; Fixed bug for reporting on upload in dashboard 
+* <a href="http://github.com/snipe/snipe-it/commit/3135869d5a3fafcf70e49dcbb99e36c2ec04ddd0">view</a> &bull; Fixed font path 
+* <a href="http://github.com/snipe/snipe-it/commit/a5a1c4223b357b9cc2751a28e0c4e3085e476733">view</a> &bull; Fixed chevrons 
+* <a href="http://github.com/snipe/snipe-it/commit/734dc49564e4f970846f786177c9d2928284fb5f">view</a> &bull; Fixed icon 
+* <a href="http://github.com/snipe/snipe-it/commit/a6232cbfd8050ace613259df56afae243954c625">view</a> &bull; Fix language string for create accessory 
+* <a href="http://github.com/snipe/snipe-it/commit/c2bbc1281ccdda65caa55665c66c78613142099f">view</a> &bull; Mobile fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/29863004e2e622a9b3b4616abdcd92f2b950bebe">view</a> &bull; more small mobile fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/8eaa70c39b3ace90a517387dc91f452aede18958">view</a> &bull; Fixes #567 - bug in depreciation report csv export 
+* <a href="http://github.com/snipe/snipe-it/commit/e41621def05994302627cd4a6a81abd8e43c86be">view</a> &bull; Fixed relation between accessory and category 
+* <a href="http://github.com/snipe/snipe-it/commit/9f3edd701b51a7aecf792e5736534c1bb15aca9a">view</a> &bull; Fixes #565 - Soft Delete Models and Allow Restore 
+* <a href="http://github.com/snipe/snipe-it/commit/528c06cf7fb4f5c35d4b90eb256c0d195b8366b7">view</a> &bull; Reverting icon fix 
+* <a href="http://github.com/snipe/snipe-it/commit/1ac401f0c036eca0cec1df0986d4c7e1903556fa">view</a> &bull; Fixed EULA mail 
+* <a href="http://github.com/snipe/snipe-it/commit/6d16c97902dadad2351b627f3157257774a075f3">view</a> &bull; Fixed back arrow 
+* <a href="http://github.com/snipe/snipe-it/commit/3e189d3502f8147c012b641cc366394875e9005c">view</a> &bull; Fixes #538 - sortable tables 
+* <a href="http://github.com/snipe/snipe-it/commit/31df29cac878deeb75d8b9b5a2efc7c84ef4b592">view</a> &bull; Fixed funky layout from datatables 
+* <a href="http://github.com/snipe/snipe-it/commit/efaf067b948899d0b784f47092dc3bc22fe504ca">view</a> &bull; Fixed user relationship 
+* <a href="http://github.com/snipe/snipe-it/commit/5010720a976019306e37b89f5aa0e917c0ffdea3">view</a> &bull; Fixed accessory relationship 
+* <a href="http://github.com/snipe/snipe-it/commit/a20e1f6943eab11fc937fcfeb3fe99dc0d520734">view</a> &bull; Fixed attach to relation 
+* <a href="http://github.com/snipe/snipe-it/commit/19ad8970d76a1676de3494b758efa65c0ed6a5c1">view</a> &bull; Fixed arrow icon 
+* <a href="http://github.com/snipe/snipe-it/commit/430b8233ed6f23402597fe54215b9988a3405dd7">view</a> &bull; Fixed user relationship 
+* <a href="http://github.com/snipe/snipe-it/commit/c0c563b1c77ff9942212af89384c8ded40b83b29">view</a> &bull; Fixes accessory relationshop for pivot 
+* <a href="http://github.com/snipe/snipe-it/commit/ef6eae63d86f159a170c3a322a44e08bab827080">view</a> &bull; Fixed error icon 
+* <a href="http://github.com/snipe/snipe-it/commit/d33dcbbcb12172527cec977f679198f594ac975b">view</a> &bull; Fixed bad method call in accessories on delete 
+* <a href="http://github.com/snipe/snipe-it/commit/04735f1affd2fdff9d6cf96ed583ece895cfb341">view</a> &bull; Fixed assetlog display 
+* <a href="http://github.com/snipe/snipe-it/commit/c484afb12b0720eaba2d28f501bf547e2ad9caa9">view</a> &bull; Fixed typo for accessories accept 


-###  v0.3.10-alpha - Released Jul 17, 2014 07:54:10
+###  v1.2.5 - Released Feb 18, 2015 03:18:10
+* <a href="http://github.com/snipe/snipe-it/commit/00f7717142e11b90764ffce2d554c566f8ad219f">view</a> &bull; Fix #475 and styling 
+* <a href="http://github.com/snipe/snipe-it/commit/49f25a23a99c08606d58101e039a885b89503fa7">view</a> &bull; Merge pull request #516 from splaer/fix-475 
+* <a href="http://github.com/snipe/snipe-it/commit/58ff929d7193b054073ef46ae2fafdef51d51919">view</a> &bull; Fixes error when no model present because new asset 
+* <a href="http://github.com/snipe/snipe-it/commit/f57c61dd4d789635cee6f62899807b1a7928800e">view</a> &bull; Possible fix for #518 - license count issue 
+* <a href="http://github.com/snipe/snipe-it/commit/064c0211dbb310d1dfdb126e3ce2cee72a80f628">view</a> &bull; Fix #517 - User Requestable Assets 
+* <a href="http://github.com/snipe/snipe-it/commit/4a5007264e1712250726047162df91041d12d28c">view</a> &bull; Fixed mac address not showing 
+* <a href="http://github.com/snipe/snipe-it/commit/17258b73a1c09918960d894702a0ae341a18f0b8">view</a> &bull; Fixes #520 - state no longer required 
+* <a href="http://github.com/snipe/snipe-it/commit/f40bb7b8b3a17ff772c797a3f91a845b068be3d2">view</a> &bull; Fixes #520 postal code requirement 
+* <a href="http://github.com/snipe/snipe-it/commit/08ee02d0cd4d1ff9ed2b0600b75390c1e34c1f53">view</a> &bull; Fixes #525 - added serial to asset model UI 
+* <a href="http://github.com/snipe/snipe-it/commit/24f5cdc743acd55ead02282e13e07f3cbd3551b0">view</a> &bull; Fixes #523 - added file uploads to assets 
+* <a href="http://github.com/snipe/snipe-it/commit/e02bea4275306fb3d2696e3018066b4b1486fa8d">view</a> &bull; Fixes #457 - added bulk options to hardware 
+* <a href="http://github.com/snipe/snipe-it/commit/4e4144ea749974332f645fa77eb74fbbfef51b90">view</a> &bull; Fixed blade reference 
+* <a href="http://github.com/snipe/snipe-it/commit/b32d74de57a3a26326a220236838f57550549ca5">view</a> &bull; Fixed seeder with duplicate ID 
+* <a href="http://github.com/snipe/snipe-it/commit/ea6a6d098ad1795fc5463c61b72240cdcd8a43e7">view</a> &bull; Fixes #440 - removed unique constraint on serial 
+* <a href="http://github.com/snipe/snipe-it/commit/38961298ed6efe3649fdbf4b1e9b3278ab85567a">view</a> &bull; Fixes #439 - loads javascript and CSS locally 
+* <a href="http://github.com/snipe/snipe-it/commit/063e5c407c8f817c16026887be16eeb42598417f">view</a> &bull; Fixed the depreciation report, fixes to calculate current depreciated value (which were only used there). Additional fixes and refactoring around Depreciable, in terms of how assets get depreciation via models, and licenses get depreciation directly. 
+
+
+###  v1.2.4 - Released Feb 12, 2015 06:57:47
+* <a href="http://github.com/snipe/snipe-it/commit/2277b6ee699a78108523eee11695a280e76b1bb4">view</a> &bull; Fixed checkout logic for new assigned_to 
+* <a href="http://github.com/snipe/snipe-it/commit/dbc93de6b3966470f83254547f8029c60f489490">view</a> &bull; Fixes checkin button on view 
+* <a href="http://github.com/snipe/snipe-it/commit/c06a4d4118039d112b69e48f9d4efc2be796f2e0">view</a> &bull; Fixed wonky checkin/checkout buttons 
+* <a href="http://github.com/snipe/snipe-it/commit/31f4ba88f655e1386f2f4f0efae84399f7aa6d52">view</a> &bull; Fix RTD query to not display checked out asset 
+* <a href="http://github.com/snipe/snipe-it/commit/5867c604104781c351f870ff3e0fd4b4d6eeb35a">view</a> &bull; Fixed scope chaining on assigned_to 
+* <a href="http://github.com/snipe/snipe-it/commit/a2178392e65bcc35594d516a20f67eea8466e5c1">view</a> &bull; Fixed seeder 
+* <a href="http://github.com/snipe/snipe-it/commit/7715731c4a2e423afb94873227eb728ad4877221">view</a> &bull; Fix count in header 
+* <a href="http://github.com/snipe/snipe-it/commit/c2e532e32e4943e251dcb5fdd005e9b65d9798a5">view</a> &bull; Fixed language file for status label messages 
+* <a href="http://github.com/snipe/snipe-it/commit/f36029a34a696d89b1058c9abdca7953d51e2bc4">view</a> &bull; Fixed migration for to set assigned_to to null per #506 
+* <a href="http://github.com/snipe/snipe-it/commit/f72b38579037d76b5b188c5d85e24ca567e2480b">view</a> &bull; Fix licenses so null instead of 0 
+* <a href="http://github.com/snipe/snipe-it/commit/34032c73ceee7a9666680f21bf7490fdc32dbdb6">view</a> &bull; Fixed licenses so null instead of 0 
+* <a href="http://github.com/snipe/snipe-it/commit/7b165a12e05396b72381fc2789124acd2b98a2b8">view</a> &bull; Fixes #508 - compacted UI for licenses overview 
+* <a href="http://github.com/snipe/snipe-it/commit/c89be345033bfbed326ffd4207a63438ea09378f">view</a> &bull; Fixes #329 and #454 - added category asset view 
+* <a href="http://github.com/snipe/snipe-it/commit/35a133bbf9f7330a038dda2e79995b9825ca7633">view</a> &bull; Fixes #382 - allow admins to restore deleted assets 
+* <a href="http://github.com/snipe/snipe-it/commit/80e10c4c9838ae4acea8847ed907c6ad05bfac1a">view</a> &bull; Fixes #387 - sortable asset view by manufacturer 
+* <a href="http://github.com/snipe/snipe-it/commit/e343c157c5998d6f30a4e25da23ad1092d50c103">view</a> &bull; Fixed naming conflict for requestable 
+* <a href="http://github.com/snipe/snipe-it/commit/cd5a352961a1e1e8d90368abf81fedee5ce94bef">view</a> &bull; Fix for wrong math on remaining licenses when assigned to an asset 
+* <a href="http://github.com/snipe/snipe-it/commit/342a8b81afb2060a128d0667acc15fa5caafc2ea">view</a> &bull; Fix for error when asset has null status 
+* <a href="http://github.com/snipe/snipe-it/commit/8cdd2156143864974423bea70521d45db6d0cb9c">view</a> &bull; Fixed intenting 
+* <a href="http://github.com/snipe/snipe-it/commit/fbf03b225d732e12821bfc83b9bae7fb7b4b8be8">view</a> &bull; Fixes #509 - added MAC address as model option 
+
+
+###  v1.2.4-beta - Released Feb 11, 2015 01:11:40
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/389c27b2e691743eb361cc1fbe4ece4259ae6046">view</a> &bull; Fixes #477 - wrong sidebar on asset view 
+* <a href="http://github.com/snipe/snipe-it/commit/7009b24748edab02921c609c26bc549fa96dcd2f">view</a> &bull; Merge pull request #498 from snipe/fixes/477 
+* <a href="http://github.com/snipe/snipe-it/commit/c1600a33db6d4463d27f74f87389489210de700e">view</a> &bull; Fixes #499 - timestamps in asset logs 
+* <a href="http://github.com/snipe/snipe-it/commit/b360736b7728d2ac872193bbe8888037c9794494">view</a> &bull; Fixes #484 
+* <a href="http://github.com/snipe/snipe-it/commit/addfcd4bc5417784f95145394940f90f1302376f">view</a> &bull; Fix RTD bug 
+* <a href="http://github.com/snipe/snipe-it/commit/d2438f9fdb9b281025c17e22ac2bfaa07ce04a2d">view</a> &bull; Fixes #502 - normalized statuses 
+* <a href="http://github.com/snipe/snipe-it/commit/aef3a734a3530f109b82fc0897e25727293f9862">view</a> &bull; Small fix for pending status 
+* <a href="http://github.com/snipe/snipe-it/commit/f175f52530e58bd5ab80139c526fc7838750cb11">view</a> &bull; Fixed spacer in sidenav for list all 
+
+
+###  v1.2.3 - Released Feb 09, 2015 12:22:12
+
+
+###  v1.2.3-beta - Released Feb 07, 2015 06:02:52
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/950567e9d66a6836cbca1383d24fc8548d3cbadf">view</a> &bull; Fixes issue related to #471 - assigning to user ID 0 causes erro 
+* <a href="http://github.com/snipe/snipe-it/commit/2b86f14e30c155f72b903428fd05a896ee9adfcc">view</a> &bull; Possible fix for #484 - fullname issue 
+* <a href="http://github.com/snipe/snipe-it/commit/b3af102d22a2f4f147b863e0ba8c2e4064aad01a">view</a> &bull; Fixed safe mode issue with license seeder 
+* <a href="http://github.com/snipe/snipe-it/commit/1db806f8b283e13dd04f20335d7087d12a04fa23">view</a> &bull; Fixes #488 - longer user jobtitle 
+* <a href="http://github.com/snipe/snipe-it/commit/f5efc368a58e1b26689dadb285918b090b66eb59">view</a> &bull; Fixes #487 - maintained and purchase order in strict mode 
+* <a href="http://github.com/snipe/snipe-it/commit/4dc81ce65fddced3282a9255a5a31ba8aa6a1458">view</a> &bull; Resolves #478 - redirects non-reporting users to view assets page 
+* <a href="http://github.com/snipe/snipe-it/commit/cd338d2a70e1bd4dca3bc651813e51095d7155f0">view</a> &bull; Fixes #483 - line breaks in notes on view 
+* <a href="http://github.com/snipe/snipe-it/commit/e67ba8a7437d4f27ae869072898e65749602f2dd">view</a> &bull; Fix reporting error on depreciation 
+* <a href="http://github.com/snipe/snipe-it/commit/1aeb4de0fae723801f0cdb555c77b5ee17ae1919">view</a> &bull; Possible fix for #491 - solving for giticide on package dep 
+* <a href="http://github.com/snipe/snipe-it/commit/c255edaf617872ac4a896106e56cc816209c2d5b">view</a> &bull; More travis fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/feeef4b66c1b6049a1f18c67e034907ea26c7da9">view</a> &bull; Fix for asset log incorrectly using soft deletes 
+* <a href="http://github.com/snipe/snipe-it/commit/140bd137a48c199269d635aef57d14b1f0a4330a">view</a> &bull; Minor display fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/29f5b7c5e3adc994b727842730c0157429520197">view</a> &bull; Fixed datetime 
+
+
+###  v1.2.2 - Released Jan 22, 2015 11:41:36
+* <a href="http://github.com/snipe/snipe-it/commit/4a77dee79c18f0e2ab155c7024234150ce98b808">view</a> &bull; Fixes #447 - added asset log entry on save 
+* <a href="http://github.com/snipe/snipe-it/commit/d85e5246807e597c1efac85c368a642a6fdcf944">view</a> &bull; Fixes #451 - allows spaces in state name 
+* <a href="http://github.com/snipe/snipe-it/commit/95141d49ba3c4f2b17ed6a26c20e7ad2a8aac9cb">view</a> &bull; Fixes #432 - add model name to checkout 
+* <a href="http://github.com/snipe/snipe-it/commit/3787a3f4bab9908f4903abdc2951cc254c8dc911">view</a> &bull; Fixed language strings for incrementing IDs 
+
+
+###  v1.2.1 - Released Jan 22, 2015 09:24:01
+
+
+###  v1.2.0 - Released Jan 22, 2015 09:24:01
+* <a href="http://github.com/snipe/snipe-it/commit/8699a90093bd27c0502dcc25f6e7d55344d54a3b">view</a> &bull; Fixed changelog 
+* <a href="http://github.com/snipe/snipe-it/commit/cff24309a1514f9ea991881ca72898c7a6358562">view</a> &bull; Possibly fixes #343 
+* <a href="http://github.com/snipe/snipe-it/commit/b2d5dc9ec5460ff1f02db6c1a31ea87d224de4c9">view</a> &bull; Fix #342 
+* <a href="http://github.com/snipe/snipe-it/commit/74ae2fceea68d18514e87edc008cb3016361beee">view</a> &bull; Fix class on th 
+* <a href="http://github.com/snipe/snipe-it/commit/fc2d472ed350d7d63fb97942d00a97b62d4bed55">view</a> &bull; Fixed english language string 
+* <a href="http://github.com/snipe/snipe-it/commit/89c7159c56f88bcf8459a5eb02d79d636335cb28">view</a> &bull; Fix array check for empty rows 
+* <a href="http://github.com/snipe/snipe-it/commit/7ddc6d497af13e7894031ac763939be9863889a4">view</a> &bull; Fix Report Langs 
+* <a href="http://github.com/snipe/snipe-it/commit/13b173409fcd5b5ce8e79566b5110eadcf51c233">view</a> &bull; Fix License form langs 
+* <a href="http://github.com/snipe/snipe-it/commit/b73ae3147a60b29ac455063ecf419a609cce2cac">view</a> &bull; Fixes #362, reduced asset name to 2 char min 
+* <a href="http://github.com/snipe/snipe-it/commit/637009054cc74b17e2dd226c6f8c467eed5b0962">view</a> &bull; Fixed typo in english 
+* <a href="http://github.com/snipe/snipe-it/commit/6905d82fc48998f9c95c454c8bf37a34e30c002e">view</a> &bull; Fixes #374 to keep the requirement to PHP 5.4 
+* <a href="http://github.com/snipe/snipe-it/commit/102481631330fbed894bf72510845bff6c88e59e">view</a> &bull; Fix #377 - Checkout users last_name, first_name 
+* <a href="http://github.com/snipe/snipe-it/commit/d6a0249c60cbb026b2e3190285d50723a76f22ee">view</a> &bull; Fixed #373 - added ability to auto-increment asset tags 
+* <a href="http://github.com/snipe/snipe-it/commit/1b41c974cf67c550b2cae39eeec8f90cb2da79e0">view</a> &bull; Fixes #348 - remove constraints on license keys 
+* <a href="http://github.com/snipe/snipe-it/commit/89a2b87e42c18b308835ef71d196b91002b451ef">view</a> &bull; Fixes #367 - added model number to dropdown 
+* <a href="http://github.com/snipe/snipe-it/commit/64c16a0bacfcde7c4d92971f2129f1b1aeac2c0e">view</a> &bull; Fixes #386 and #273 - altered column type to text 
+* <a href="http://github.com/snipe/snipe-it/commit/daefc86e5878a21f9909806599f22198360c1f9b">view</a> &bull; Formattig fixes for #386 
+* <a href="http://github.com/snipe/snipe-it/commit/73dd339772fcc35e50603ded115f67714620da69">view</a> &bull; Fix #388 - License not showing checked out in view 
+* <a href="http://github.com/snipe/snipe-it/commit/0663ccb99fa926ff944dded330ba1f0cd95abbb3">view</a> &bull; Check if ->adminuser->id isset before trying to print the fullName so we can catch when a user that created an asset has been deleted. Fixes #349 
+* <a href="http://github.com/snipe/snipe-it/commit/533be7f942cb6dfccd1e8a79c043d61791e4c54b">view</a> &bull; fixed #435. using namespace with route groups to increase the readability 
+* <a href="http://github.com/snipe/snipe-it/commit/e434616db83a8d693af63b4705e1b24476fc3c17">view</a> &bull; Merge pull request #436 from rashivkp/fix-435 
+* <a href="http://github.com/snipe/snipe-it/commit/5e496672c66428a1bbd37772aabd44f8bb1cb0fa">view</a> &bull; Fixes #469 
+* <a href="http://github.com/snipe/snipe-it/commit/3c141e8f5017e8f161b6fd1fb82b288283b8450c">view</a> &bull; Fixes #467 
+* <a href="http://github.com/snipe/snipe-it/commit/548de1a1a217e6b5c6fcbbf6cd4918f078e64542">view</a> &bull; Fixes #468 - updated ordering on license checkout 
+
+
+###  v1.1 - Released Nov 06, 2014 02:16:26
+* <a href="http://github.com/snipe/snipe-it/commit/fafd03f00f49cb9ffe81d50aa9ca3d1f1fa1d043">view</a> &bull; Added DB Prefix to Migrations 
+* <a href="http://github.com/snipe/snipe-it/commit/309772e67d62989f1f60141a4a10d724a44c6baa">view</a> &bull; Fixed operator for setting bool display 
+* <a href="http://github.com/snipe/snipe-it/commit/22f81912e416cfe1227a08b5d8b6323e32e1ef36">view</a> &bull; Fixes #299 
+* <a href="http://github.com/snipe/snipe-it/commit/86b7b6946f1e1bd404127e228c615e4abe0b20fb">view</a> &bull; Fixes #316 - added model name back to view 
+* <a href="http://github.com/snipe/snipe-it/commit/9e85dcb9fcb4cc932ecddd23caa6b51e83110543">view</a> &bull; Fixes #315 - add EOL as display option in settings (run migrations) 
+* <a href="http://github.com/snipe/snipe-it/commit/ee35948980c22f9256241c02d7febd90275f6229">view</a> &bull; fix div issues 
+* <a href="http://github.com/snipe/snipe-it/commit/0022389463e251e73402450cfbc280cb05633bd1">view</a> &bull; Fix dropdown menu position 
+* <a href="http://github.com/snipe/snipe-it/commit/343798d241172707145ef365445062db9bb6b99a">view</a> &bull; Merge pull request #322 from madd15/fix-js-delete-asset 
+* <a href="http://github.com/snipe/snipe-it/commit/1078dbf5c5f6a5bec1a2ef864cebfcc7883d31e6">view</a> &bull; Fixes #324 
+* <a href="http://github.com/snipe/snipe-it/commit/6b2d3efe3e76429c9c2f5de78f04c4f7e2748a3d">view</a> &bull; Fixes #237 - reporting-only group 
+* <a href="http://github.com/snipe/snipe-it/commit/e04cc806d9209b54a1833172ebb66ab55b5f0c06">view</a> &bull; Fixes #327 
+
+
+###  v1.0 - Released Oct 16, 2014 09:46:47
+* <a href="http://github.com/snipe/snipe-it/commit/a4b220d6c31c97f6504023f0b52527825a4cd897">view</a> &bull; Fixed #191 - allow admins to assign a user during asset creation 
+* <a href="http://github.com/snipe/snipe-it/commit/dc1033025a0bc1b2d657e06c89058c3ab95f2c59">view</a> &bull; Fixed #151 - more complete translations 
+* <a href="http://github.com/snipe/snipe-it/commit/56d619b218794b43d8c6b182c89c75f83af9dcd9">view</a> &bull; Fixed missing language string 
+* <a href="http://github.com/snipe/snipe-it/commit/69fca5d1eda0e5f26d2085f7eebc08fafd84a3ae">view</a> &bull; Fixed #58 
+* <a href="http://github.com/snipe/snipe-it/commit/8197e6174e9f12bcfddd94c6bf606ee36e6801bf">view</a> &bull; Fixes #200 
+* <a href="http://github.com/snipe/snipe-it/commit/cb8369e9de96aaf1cf9108e22f4038fa6486b881">view</a> &bull; Initial QA Patch to fix errors Add License Add Asset Show Deleted Users License Assign 
+* <a href="http://github.com/snipe/snipe-it/commit/62a3ed671bbd957075563933f49e8a5445042737">view</a> &bull; DB migration, layout and clone fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/9ccc7d756f9361757eafc1dce9684ee9f5ecc1c3">view</a> &bull; A0.4.2: Added asset, license, user, model cloning and fixed some bugs. 
+* <a href="http://github.com/snipe/snipe-it/commit/652f1c746c4757dce9d33d7bd90a9357822c4656">view</a> &bull; Fixes Travis CI build 
+* <a href="http://github.com/snipe/snipe-it/commit/363d084bd623f778cd72ca7d385a4fb2f67ef474">view</a> &bull; Fixed DB name in travis CI 
+* <a href="http://github.com/snipe/snipe-it/commit/49c5607e1c8a82a3111123ad84b537644546ebb3">view</a> &bull; Fixes #222 
+* <a href="http://github.com/snipe/snipe-it/commit/96e40d72b9ac3f74b94b0e39b6f296f0f0b2a1f4">view</a> &bull; fix typo: artisand -> artisan 
+* <a href="http://github.com/snipe/snipe-it/commit/e978038cc044f60c2eca71b6319063009a57886f">view</a> &bull; Merge pull request #234 from burlito/typo-fix 
+* <a href="http://github.com/snipe/snipe-it/commit/a829fcf52f933d087c3776993b42311ec9a8988e">view</a> &bull; fix: Use the old asset tag when cloning 
+* <a href="http://github.com/snipe/snipe-it/commit/ee7d9bec7082dc2e60a4797dea84a0b7443c8090">view</a> &bull; Fixes #279 - QR checkbox not staying checked 
+* <a href="http://github.com/snipe/snipe-it/commit/bf1e07555160ede517d41f649d6b1d0911f89dd2">view</a> &bull; Fixes #87 - made datatables responsive 
+
+
+###  v0.3.11-alpha - Released Jul 19, 2014 05:16:53
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/ac4c905c42d920d2cf8455d644f4c65332a81d0d">view</a> &bull; Fixed #140 
+* <a href="http://github.com/snipe/snipe-it/commit/4a13cded607415d749151cef495332c48c58cf86">view</a> &bull; Fixed path for Travis composer 
+* <a href="http://github.com/snipe/snipe-it/commit/ddf946ad5eb6dd8480eeaa709f82af75e0c61444">view</a> &bull; Tried to fix failing build caused by travis composer 
+
+
+###  v0.3.10-alpha - Released Jul 17, 2014 05:54:10
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/89a8f3c277d2482b2cd04c4c5c582c9e507770f8">view</a> &bull; Fixes #183 - added employee number to users 
 * <a href="http://github.com/snipe/snipe-it/commit/a7b809cb91f49fb2c8eaecc67822fa155a0f20ce">view</a> &bull; Updated title/header for users, additional fixes for #151 
@@ -21,14 +227,14 @@
 * <a href="http://github.com/snipe/snipe-it/commit/e203fc516fadf6218f5ce87c070d0cdba9fca188">view</a> &bull; Fixes #194 


-###  v0.3.9-alpha - Released Jul 03, 2014 04:08:38
+###  v0.3.9-alpha - Released Jul 03, 2014 02:08:38
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/2825bcb4310899e89ccbc73dfa8b59ade28018da">view</a> &bull; Fixed #179 - account page to show assets checked out to the logged in user 
 * <a href="http://github.com/snipe/snipe-it/commit/c782f29f5aae752a6246be9778d418df172dd4f6">view</a> &bull; Pulled account sub-nav into top menu to free up UI space. #changelog 
 * <a href="http://github.com/snipe/snipe-it/commit/fad2ec66fa9abe0b34baf16cce453a7e9fc9e4d4">view</a> &bull; More README fixes and refinement 


-###  v0.3.8-alpha - Released Jun 27, 2014 11:28:22
+###  v0.3.8-alpha - Released Jun 27, 2014 09:28:22
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/3e7a9e45d1954531bbc3b73f2ed59dd16d59c657">view</a> &bull; Fixes PR #168 and #167 
 * <a href="http://github.com/snipe/snipe-it/commit/945cb3253f1349e30aafa4e7cb57bb507a2ea0cc">view</a> &bull; Fix #117 
@@ -41,17 +247,17 @@
 * <a href="http://github.com/snipe/snipe-it/commit/ec9eab81bfb3b35bfe7ad06008b26f19009e6638">view</a> &bull; Closes #177 - change log file added, needs refining 


-###  v.0.3.5-alpha - Released Jun 20, 2014 04:23:09
+###  v.0.3.5-alpha - Released Jun 20, 2014 02:23:09
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/d1499deecdff3c7a4235ffdfad5adbddc1a5098f">view</a> &bull; Provisions for strict mode, fixed license deletion bug 


-###  v.0.3.4-alpha - Released Jun 20, 2014 12:27:59
+###  v.0.3.4-alpha - Released Jun 19, 2014 10:27:59
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/08d05b481f6366ad48fcdce72a8df53755f5dee8">view</a> &bull; Fixes #158 


-###  v.0.3.3-alpha - Released Jun 18, 2014 10:04:46
+###  v.0.3.3-alpha - Released Jun 18, 2014 08:04:46
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/3518ab9f55f7992d6d4f886389d67b062a02f2d8">view</a> &bull; Fixes #139 
 * <a href="http://github.com/snipe/snipe-it/commit/ad9b1fc446ab15157502fe7c52ddbda455e3ea8f">view</a> &bull; Fixes #139 
@@ -63,12 +269,12 @@
 * <a href="http://github.com/snipe/snipe-it/commit/610c405aa50118163ad5d26d43e4bf6c2456f624">view</a> &bull; More fixes for #151 


-###  v.0.3.2-alpha - Released May 06, 2014 10:26:21
+###  v.0.3.2-alpha - Released May 06, 2014 08:26:21
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/f4c5da57d0397877d90aa398267e59fcffee7b47">view</a> &bull; Fixed auth error when user isn't logged in 


-###  v.0.3.1-alpha - Released May 06, 2014 06:48:09
+###  v.0.3.1-alpha - Released May 06, 2014 04:48:09
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/efad5db082d1461ea26556fad2f1671a49dc1480">view</a> &bull; Fix for broken datatables in upgrading to v2.2 
 * <a href="http://github.com/snipe/snipe-it/commit/5690e9ce1f178486179ce6cdfb00ca417acd87dd">view</a> &bull; Fixed code indentation for Apache virtualhost example 
@@ -76,7 +282,7 @@
 * <a href="http://github.com/snipe/snipe-it/commit/06067fc19c0127fdcbb78541e7cdc8e77f5444ac">view</a> &bull; Fixed CSV rexport 


-###  v0.3.0-alpha - Released Jan 29, 2014 02:28:31
+###  v0.3.0-alpha - Released Jan 29, 2014 01:28:31
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/d91d75abe4df19dd6cd54705ba9967295973ced0">view</a> &bull; Fixing JSON parse errors from #97 
 * <a href="http://github.com/snipe/snipe-it/commit/baab758377e117a86c3273dd1d6e03e66b02dc8b">view</a> &bull; Fixed language support 
@@ -103,7 +309,7 @@
 * <a href="http://github.com/snipe/snipe-it/commit/580590b4c0b4a2f76ef8edfe02de986267fc7395">view</a> &bull; Fixed  === to  == (PHP is loosely typed) 


-###  v0.2.0-alpha - Released Nov 29, 2013 11:09:07
+###  v0.2.0-alpha - Released Nov 29, 2013 10:09:07
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/06cbd0723e415d81ea12aa48f2c37188741b2dbc">view</a> &bull; Fixes #93 
 * <a href="http://github.com/snipe/snipe-it/commit/e305099b45401c871f16fec23c200080830fcd5d">view</a> &bull; Fixed model view 
@@ -113,7 +319,7 @@
 * <a href="http://github.com/snipe/snipe-it/commit/11c657ffa4c3bdd01cd04b81d01980b2d795107c">view</a> &bull; Fixes #36 


-###  v0.1.2-alpha - Released Nov 29, 2013 02:59:05
+###  v0.1.2-alpha - Released Nov 29, 2013 01:59:05
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/b1aa67ddb72158513f0a706996c8c1f5b3609aa5">view</a> &bull; Fixes #69 
 * <a href="http://github.com/snipe/snipe-it/commit/aa38d83ba6369215451d905e599492214e9f4b8b">view</a> &bull; Fixes #63 and #70 
@@ -126,12 +332,75 @@
 * <a href="http://github.com/snipe/snipe-it/commit/d9a37f38228d55bb6265efc626e3ab7919013362">view</a> &bull; Fixes #88 
 * <a href="http://github.com/snipe/snipe-it/commit/5858bfb99b2144fbc805ec62cc90e6aaaf019f77">view</a> &bull; Fixed language file paths caused by #88 
 * <a href="http://github.com/snipe/snipe-it/commit/9f7cbc8a4f01ddf2596e831f658c9a8c321b2f46">view</a> &bull; Another fix related to #88, also accounts for users with invalid location_ids 
+* <a href="http://github.com/snipe/snipe-it/commit/1b56c31a22afd39a875677714b9c07e96876b8df">view</a> &bull; Fixed relationship between users/locations because fuck you ORM 
 * <a href="http://github.com/snipe/snipe-it/commit/f0f07b578b2439a627e5e946df0849d88d8526cf">view</a> &bull; Fixing pivot for users 
 * <a href="http://github.com/snipe/snipe-it/commit/9fa826b2e77ce22d25a8b3094bc825802d25be85">view</a> &bull; Fixed assigned to id 
+* <a href="http://github.com/snipe/snipe-it/commit/839d01a3af08d780be4152bc02b33bff1a7d7f20">view</a> &bull; Fixed relationship method because fuck you ORM 


-###  v0.1.1-alpha - Released Nov 27, 2013 12:11:00
+###  v0.1.1-alpha - Released Nov 26, 2013 11:11:00
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/1527b88fd671a20c879c9b2061ae95f3b386ba27">view</a> &bull; Fixes #61 
 * <a href="http://github.com/snipe/snipe-it/commit/4c0af1eae1031c2630f6e29cc73f8a9dfac1081c">view</a> &bull; Fixed typo causing failure with mysql strict 
 * <a href="http://github.com/snipe/snipe-it/commit/0e3bcfecd05a39bfea6fc7ba11cb24d9d49e6d86">view</a> &bull; Should be final fixes for mysql strict mode 
+
+
+###  Initial alpha - Released Nov 26, 2013 09:01:13
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/14972f894bb0e761e2d0170a2c93c9aac4edfca6">view</a> &bull; fixed typo 
+* <a href="http://github.com/snipe/snipe-it/commit/79da13dff767d57f6f4fbb12f195e25f409ee5ec">view</a> &bull; Fixed layout for category view 
+* <a href="http://github.com/snipe/snipe-it/commit/0e4e26206bdcc164e5df586368ed45edd45b9a74">view</a> &bull; fixed broken redirect route 
+* <a href="http://github.com/snipe/snipe-it/commit/9364c46c2df79c0de07dc5dbb724a3c44485b739">view</a> &bull; Fixed licensed link 
+* <a href="http://github.com/snipe/snipe-it/commit/4f0a1789db01f12ebc4bd47e7e0594bf67b64daf">view</a> &bull; Fixed license blades 
+* <a href="http://github.com/snipe/snipe-it/commit/27514f85c3ba9056c4609774a482a58605f4d8cf">view</a> &bull; Fixed typo in variable name 
+* <a href="http://github.com/snipe/snipe-it/commit/ffe786f659e3e8c5b91c27cd33cb77b6d24d3545">view</a> &bull; Fixed routes. 
+* <a href="http://github.com/snipe/snipe-it/commit/cf59ec8c67e142c0612fb7797448057b19af5cfa">view</a> &bull; Fixed pagination bug 
+* <a href="http://github.com/snipe/snipe-it/commit/76ac39115347dabac8ada21d981494a3edf7a29c">view</a> &bull; Fixed edit bug where new Category was invoked twice 
+* <a href="http://github.com/snipe/snipe-it/commit/940281dd4dd0a69b900a052c0bb84e24dde89666">view</a> &bull; Fixed bug on validation display 
+* <a href="http://github.com/snipe/snipe-it/commit/31d323fb71fcbe94f17f0a2b38183709e8c77151">view</a> &bull; Cosmetic fix on form 
+* <a href="http://github.com/snipe/snipe-it/commit/8f86ec9dae58cef27387b028f70c8116d649b425">view</a> &bull; Change depreciation to be by month; formatting fixes. 
+* <a href="http://github.com/snipe/snipe-it/commit/4da2bccbf78a0b630267c6ed75f3a1bd8100e20d">view</a> &bull; Merge pull request #27 from snipe/depreciation_fix 
+* <a href="http://github.com/snipe/snipe-it/commit/7bc7ffb72813cd176658d536bbdd6be0faa9a45c">view</a> &bull; Fixed some error reporting/required fields around checkout/checkin 
+* <a href="http://github.com/snipe/snipe-it/commit/48e180c6910d30732559b0cc077fce679344f56e">view</a> &bull; Fixed asset bug caused by unique validation in assets model 
+* <a href="http://github.com/snipe/snipe-it/commit/57107dceeee81e8618198da33af79fe66bde0d9e">view</a> &bull; Fixed checkin text 
+* <a href="http://github.com/snipe/snipe-it/commit/7b59f42fb03ee5017c11cf32abc8a23c3f5d2141">view</a> &bull; Fixed pagination bug, styled buttons 
+* <a href="http://github.com/snipe/snipe-it/commit/ffdb4b1aa8dde9942f7c3b110e9a68006779998b">view</a> &bull; Fixed wonky layout issue 
+* <a href="http://github.com/snipe/snipe-it/commit/3401fee672d796f4aca8dafced6917c7caf87866">view</a> &bull; Another table fix 
+* <a href="http://github.com/snipe/snipe-it/commit/ddfd69e5100b19bb05d6b76cb9fad3dbadad1921">view</a> &bull; More table fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/5c43caf0579a26c1604fc81f5cbdf8f0d43c157d">view</a> &bull; More table fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/44ba90f9f0a968999a743c35dd2bf153c2edbf1d">view</a> &bull; Fixed icon set to white in main nav 
+* <a href="http://github.com/snipe/snipe-it/commit/719c36d482cc67f1513351672eda057519f7f735">view</a> &bull; migration to fix a few fields in the log table 
+* <a href="http://github.com/snipe/snipe-it/commit/5b27a34f050646467a178ff780efc80036aadf1b">view</a> &bull; Fixed fieldname in userlog 
+* <a href="http://github.com/snipe/snipe-it/commit/76da83cbe1c4334380bb996a40cc374ab4ec12e9">view</a> &bull; Fixed links to edit/checkout 
+* <a href="http://github.com/snipe/snipe-it/commit/d6a718e99766829e700760c2266b62ad37cdb66b">view</a> &bull; Fixed bug in views for created_at date 
+* <a href="http://github.com/snipe/snipe-it/commit/0ee08e47e9f2b144084703142ae5eb099090476d">view</a> &bull; Fixed fatal error if admin who created the asset was deleted. (This should never happen, but...) 
+* <a href="http://github.com/snipe/snipe-it/commit/61cceb5f0b44e7f2a82ccca44be2bc42e8825156">view</a> &bull; Fixed open tag in CSS 
+* <a href="http://github.com/snipe/snipe-it/commit/c93469c465c0ce8a291d595ac8ccbafbfc68c71a">view</a> &bull; Fixed query for asset/license header boxes 
+* <a href="http://github.com/snipe/snipe-it/commit/d46556a83d5335913b8b7fe8558f416540290343">view</a> &bull; Fixed phone display if no value set 
+* <a href="http://github.com/snipe/snipe-it/commit/fc8c3c086ca70a513cd3fff39275fcf035cead5a">view</a> &bull; fixed #37 
+* <a href="http://github.com/snipe/snipe-it/commit/52020d09f034c9de78b798725c0f3700d0253beb">view</a> &bull; Fixed bomb when asset is unassigned 
+* <a href="http://github.com/snipe/snipe-it/commit/1b1efec858e8e0cfc5cfafc63bfb537e45191cd1">view</a> &bull; Fixed foreign key in assets 
+* <a href="http://github.com/snipe/snipe-it/commit/b7251d9992401c04a5da1771af0fcddad2754362">view</a> &bull; Fixed potential bug in blade 
+* <a href="http://github.com/snipe/snipe-it/commit/9249786a25bc166bf5341f59a11d644cf4f6425c">view</a> &bull; Fixed status display 
+* <a href="http://github.com/snipe/snipe-it/commit/c32d45e90142b41b567a350af6d399af67994a02">view</a> &bull; Fixed ID 
+* <a href="http://github.com/snipe/snipe-it/commit/2203789f4c5310599a94799bb3ead9ff9c1ce802">view</a> &bull; Fixes #41 
+* <a href="http://github.com/snipe/snipe-it/commit/03edbc008c671c868fced94a7761683309d9ab8b">view</a> &bull; Fixes #43 
+* <a href="http://github.com/snipe/snipe-it/commit/2b088a3fb2ea7711f66e4a887882b17f401ba4bc">view</a> &bull; Fixes #17 
+* <a href="http://github.com/snipe/snipe-it/commit/ad680a337e50638b4b9865e42e4ea7e453c4151b">view</a> &bull; Fixed column name spelling in DB 
+* <a href="http://github.com/snipe/snipe-it/commit/718236b2d4bedeaaad80cc601e3e91a3229e81fa">view</a> &bull; Fixed #9 
+* <a href="http://github.com/snipe/snipe-it/commit/3cc0ed87438b632679ce8b61a7ea0fae48999438">view</a> &bull; Fixed sorting weirdness 
+* <a href="http://github.com/snipe/snipe-it/commit/57d0f3643518190f0b4a6fe33ac6d83eda647119">view</a> &bull; Fixes #4 
+* <a href="http://github.com/snipe/snipe-it/commit/3ea0ad87c8733ce1bac0e9c10c2cdaf3254743d5">view</a> &bull; Fixes #22 
+* <a href="http://github.com/snipe/snipe-it/commit/e87e5b9cae19bfd06b815cf01be309d665409828">view</a> &bull; Fixes #46 
+* <a href="http://github.com/snipe/snipe-it/commit/7a5b133c5875959c5d7bebf16ea82bac7ceb3989">view</a> &bull; Fixed bug linking to assets when they should be pointing to licenses 
+* <a href="http://github.com/snipe/snipe-it/commit/e13578d97d6b1ef1990f171beda9b35868fda47c">view</a> &bull; Fixed error when no category is given 
+* <a href="http://github.com/snipe/snipe-it/commit/45c04b1cdebc0b19243a519d2580af921c82b47b">view</a> &bull; Fixed display bug 
+* <a href="http://github.com/snipe/snipe-it/commit/4d1dd1c446f76e5530d6fb7f932a77a8da2d0b73">view</a> &bull; Fixed #50 - MOAR VALIDATION! 
+* <a href="http://github.com/snipe/snipe-it/commit/12958553022d4b7b2184ebf837d4113b23f5cf27">view</a> &bull; Fixes #51 
+* <a href="http://github.com/snipe/snipe-it/commit/d0cbb9f3a7e4a1fc05ddcabd19e201434c14370b">view</a> &bull; Fixes #52 
+* <a href="http://github.com/snipe/snipe-it/commit/5bf38b1d02e743af22a51393f1e477100b1f76b7">view</a> &bull; Fixes #50 
+* <a href="http://github.com/snipe/snipe-it/commit/e6fc1956fc93132d04bf5ac4c0d108c1ae9eee0b">view</a> &bull; Fixes #55 
+* <a href="http://github.com/snipe/snipe-it/commit/ee3fb2785e719c938b6036f6ea74527c1217aba8">view</a> &bull; Fixed XSS on modal 
+* <a href="http://github.com/snipe/snipe-it/commit/dc5ad876863a1e17babce06adfb365f38c30ca59">view</a> &bull; Fixes #59 
+* <a href="http://github.com/snipe/snipe-it/commit/d7a8cac1dc6158983673688c2e48e9a48217b6f2">view</a> &bull; Fixed validation 
+* <a href="http://github.com/snipe/snipe-it/commit/196710dac807d48f6c73b02c2444a5b8d301b8a6">view</a> &bull; Fixed bug in error validation display 
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,15 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.1.0, available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,25 +1,31 @@
 # Contribution Guidelines

-Please submit all issues and pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository in the `develop` branch!
+**Before opening an issue to report a bug or request help, make sure you've checked the [Common Issues](http://snipeitapp.com/documentation/common-issues/) and [Getting Help](http://snipeitapp.com/documentation/getting-help/) pages.**
+
+## Developing on Snipe-IT
+
+Please submit all pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository in the `develop` branch!

 **As you're working on bug-fixes or features, please break them out into their own feature branches and open the pull request against your feature branch**. It makes it _much_ easier to decipher down the road, as you open multiple pull requests over time, and makes it much easier for me to approve pull requests quickly.

 If you don't have a feature in mind, but would like to contribute back to the project, check out the [open issues](https://github.com/snipe/snipe-it/issues?state=open) and see if there are any you can tackle.

+We use Waffle.io to help better communicate our roadmap with users. Our [project page there](http://waffle.io/snipe/snipe-it) will show you the backlog, what's ready to be worked on, what's in progress, and what's completed.
+
+[![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)
+
+The labels we use in GitHub Issues and Waffle.io indicate whether we've confirmed an issue as a bug, whether we're considering the issue as a potential feature, and whether it's ready for someone to work on it. We also provide labels such as "n00b", "intermediate" and "advanced" for the experience level we think it requires for contributors who want to help.
+
 -----

 ## Translations!

-If you're not great at PHP and you still want to help, consider contributing some translation files (assuming, of course, that you are fluent in another language.)
-
-To do so:
-
-* fork the develop branch
-* create a new branch on your new fork (something like `translations/french`)
-* copy the `en` directory and name it according to the [two-letter ISO 639-1 code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
-* translate the strings
-* submit a pull request!
-
-**If you've translated Snipe IT into another language already for your own usage, please consider contributing those translation files back to the project so that everyone can benefit.**
+If you're not a coder but want to give back to the project and you're fluent in other languages, that's okay too. We use [CrowdIn](https://crowdin.com) to manage translations, and it makes it super-simple for you to add translations (or validate proposed translations) to the project without messing with code. __Check out [the Snipe-IT CrowdIn translation project here](https://crowdin.com/project/snipe-it/)__.

 Thanks!
+
+-----
+
+## Contributor Code of Conduct
+
+Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
--- a/88
+++ b/88
@@ -0,0 +1,88 @@
+FROM ubuntu
+MAINTAINER Brady Wetherington <uberbrady@gmail.com>
+
+RUN apt-get update && apt-get install -y \
+apache2-bin \
+libapache2-mod-php5 \
+php5-mysql \
+php5-mcrypt \
+php5-gd \
+patch \
+curl \
+vim \
+git 
+
+RUN php5enmod mcrypt
+RUN php5enmod gd
+
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php5/apache2/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php5/cli/php.ini
+
+RUN useradd --uid 1000 --gid 50 docker
+
+RUN echo export APACHE_RUN_USER=docker >> /etc/apache2/envvars
+RUN echo export APACHE_RUN_GROUP=staff >> /etc/apache2/envvars
+
+COPY docker/000-default.conf /etc/apache2/sites-enabled/000-default.conf
+
+COPY . /var/www/html
+
+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
+
+#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
+
+RUN chown -R docker /var/www/html
+
+############## DEPENDENCIES via COMPOSER ###################
+
+#global install of composer
+RUN cd /tmp;curl -sS https://getcomposer.org/installer | php;mv /tmp/composer.phar /usr/local/bin/composer
+
+# Get dependencies
+RUN cd /var/www/html;composer install
+
+############### APPLICATION INSTALL/INIT #################
+
+#RUN php artisan app:install
+# too interactive! Try something else
+
+#COPY docker/app_install.exp /tmp/app_install.exp
+#RUN chmod +x /tmp/app_install.exp
+#RUN /tmp/app_install.exp
+
+##### START SERVER
+
+CMD . /etc/apache2/envvars ;apache2 -DFOREGROUND
+
+EXPOSE 80
--- a/README.md
+++ b/README.md
@@ -1,20 +1,22 @@
-[![Click here to lend your support to: Snipe IT - Free Open Source Asset Management System and make a donation at pledgie.com](https://pledgie.com/campaigns/22899.png?skin_name=chrome)](https://pledgie.com/campaigns/22899) [![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=develop)](https://travis-ci.org/snipe/snipe-it) [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it) [![ProjectStatus](http://stillmaintained.com/snipe/snipe-it.png)](http://stillmaintained.com/snipe/snipe-it)
+[![Click here to lend your support to: Snipe IT - Free Open Source Asset Management System and make a donation at pledgie.com](https://pledgie.com/campaigns/22899.png?skin_name=chrome)](https://pledgie.com/campaigns/22899) [![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=develop)](https://travis-ci.org/snipe/snipe-it) [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it) [![ProjectStatus](http://stillmaintained.com/snipe/snipe-it.png)](http://stillmaintained.com/snipe/snipe-it) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.png)](https://crowdin.com/project/snipe-it)


 ## Snipe-IT - Asset Management For the Rest of Us

+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.

-It is built on [Laravel 4.1](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
+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 (at what seems like breakneck speed sometimes!) We're still in alpha release, so this is NOT recommended for production use yet, as many more things will likely change before v1.0-stable is ready - but we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](http://snipeitapp.com/demo.php).)
+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 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://docs.snipeitapp.com.__ This provides a more easily navigated, organized view of the documentation, and is based off of the [documentation branch](https://github.com/snipe/snipe-it/tree/documentation) in this repo. Contributions and bugfixes to the documentation are always welcome!
+__Installation and configuration documentation for this project has been moved to http://snipeitapp.com/documentation/.__

 We'll be adding a long-overdue user's manual soon as well.

@@ -34,11 +36,24 @@ We use Waffle.io to help better communicate our roadmap with users. Our [project

 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)

 -----

@@ -50,3 +65,8 @@ Whenever you pull down a new version from master or develop, when you grab the [
 	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
+
+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.
+
--- a/app/commands/AppCommand.php
+++ b/app/commands/AppCommand.php
@@ -18,7 +18,7 @@ class AppCommand extends Command
     *
     * @var	string
     */
-    protected $description = '';
+    protected $description = 'This command kicks off your database table creation and migration, and creates your first admin user.';

    /**
     * Holds the user information.
@@ -28,10 +28,12 @@ class AppCommand extends Command
    protected $userData = array(
        'first_name' => null,
        'last_name'  => null,
-        'email'      => null,
+        'username'      => null,
        'password'   => null
    );

+	protected $dummyData = true;
+
    /**
     * Create a new command instance.
     *
@@ -64,9 +66,10 @@ class AppCommand extends Command
        // Let's ask the user some questions, shall we?
        $this->askUserFirstName();
        $this->askUserLastName();
-        $this->askUserEmail();
+        $this->askUserUsername();
        $this->askUserPassword();

+		$this->askUserDummyData();

        $this->comment('');
        $this->comment('');
@@ -95,7 +98,19 @@ class AppCommand extends Command
        $this->sentryRunner();

        // Seed the tables with dummy data
-        $this->call('db:seed');
+		if( $this->dummyData === true )
+		{
+			$this->call('db:seed', array('--force'=>true));
+		}
+		else
+		{
+			// Seeding Settings table is mandatory
+			$this->call('db:seed', array('--class' => 'SettingsSeeder', '--force'=>true));
+			// Seeding Statuslabels is strongly recommended
+			$this->call('db:seed', array('--class' => 'StatuslabelsSeeder', '--force'=>true));
+			// Seeding Categories is good to have
+			$this->call('db:seed', array('--class' => 'CategoriesSeeder', '--force'=>true));
+		}
    }

    /**
@@ -147,7 +162,7 @@ class AppCommand extends Command
    }

    /**
-     * Asks the user for the user email address.
+     * Asks the user for the username address.
     *
     * @return void
     * @todo   Use the Laravel Validator
@@ -156,7 +171,7 @@ class AppCommand extends Command
    {
        do {
            // Ask the user to input the email address
-            $email = $this->ask('Please enter your user email: ');
+            $email = $this->ask('Please enter your email: ');

            // Check if email is valid
            if ($email == '') {
@@ -170,6 +185,32 @@ class AppCommand extends Command
        while ( ! $email);
    }

+
+    /**
+     * Asks the user for the username address.
+     *
+     * @return void
+     * @todo   Use the Laravel Validator
+     */
+    protected function askUserUsername()
+    {
+        do {
+            // Ask the user to input the username
+            $username = $this->ask('Please enter your username: ');
+
+            // Check if username is valid
+            if ($username == '') {
+                // Return an error message
+                $this->error('Username is invalid. Please try again.');
+            }
+
+            // Store the username address
+            $this->userData['username'] = $username;
+        }
+        while ( ! $username);
+    }
+
+
    /**
     * Asks the user for the user password.
     *
@@ -182,7 +223,7 @@ class AppCommand extends Command
            // Ask the user to input the user password
            $password = $this->ask('Please enter your user password (at least 8 characters): ');

-            // Check if email is valid
+            // Check if password is valid
            if ($password == '') {
                // Return an error message
                $this->error('Password is invalid. Please try again.');
@@ -193,6 +234,20 @@ class AppCommand extends Command
        } while( ! $password);
    }

+	/**
+	 * Asks the user to create dummy data
+	 *
+	 * @return void
+	 * @todo   Use the Laravel Validator
+	 */
+	protected function askUserDummyData()
+	{
+		// Ask the user to input the user password
+		$dummydata = $this->ask('Do you want to seed your database with dummy data? Y/n (default is yes): ');
+
+		$this->dummyData = ( strstr($dummydata, 'Y' ) || empty($dummydata) ) ? true : false;
+	}
+
    /**
     * Runs all the necessary Sentry commands.
     *
@@ -207,7 +262,10 @@ class AppCommand extends Command
        $this->sentryCreateUser();

        // Create dummy user
-        $this->sentryCreateDummyUser();
+		if( $this->dummyData === true )
+		{
+			$this->sentryCreateDummyUser();
+		}
    }

    /**
@@ -223,7 +281,8 @@ class AppCommand extends Command
                'name'        => 'Admin',
                'permissions' => array(
                    'admin' => 1,
-                    'users' => 1
+                    'users' => 1,
+                    'reports' => 1
                )
            ));

@@ -242,7 +301,8 @@ class AppCommand extends Command
                'name'        => 'Reporting',
                'permissions' => array(
                    'admin' => 0,
-                    'users' => 1
+                    'users' => 1,
+                    'reports' => 1,
                )
            ));

@@ -260,7 +320,8 @@ class AppCommand extends Command
                'name'        => 'Users',
                'permissions' => array(
                    'admin' => 0,
-                    'users' => 1
+                    'users' => 1,
+                    'reports' => 0,
                )
            ));

@@ -283,6 +344,7 @@ class AppCommand extends Command
        $data = array_merge($this->userData, array(
            'activated'   => 1,
            'manager_id'  => NULL,
+            'notes'  => 'Generated on install',
            'permissions' => array(
                'admin' => 1,
                'user'  => 1,
@@ -293,7 +355,7 @@ class AppCommand extends Command
        $user = Sentry::getUserProvider()->create($data);

        // Associate the Admin group to this user
-        $group = Sentry::getGroupProvider()->findById(1);
+        $group = Sentry::findGroupByName('Admin');
        $user->addGroup($group);

        // Show the success message
@@ -314,7 +376,9 @@ class AppCommand extends Command
            'first_name' => 'John',
            'last_name'  => 'Doe',
            'email'      => 'john.doe@example.com',
-            'password'   => 'johndoe',
+            'username'      => 'john.doe@example.com',
+            'password'   => substr(str_shuffle(str_repeat('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', mt_rand(1,10))),1,10),
+            'notes'      => 'Generated on install',
            'activated'  => 1,
            'manager_id'  => 1,
        );
--- a/app/commands/ImportCommand.php
+++ b/app/commands/ImportCommand.php
@@ -0,0 +1,275 @@
+<?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),
+		);
+	}
+
+
+}
--- a/app/commands/SendExpirationAlerts.php
+++ b/app/commands/SendExpirationAlerts.php
@@ -0,0 +1,130 @@
+<?php
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+
+class SendExpirationAlerts extends Command {
+
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'alerts:expiring';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'This command checks for expiring warrantees and service agreements, and sends out an alert email.';
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function fire()
+	{
+
+		// Expiring Assets
+		$expiring_assets = Asset::getExpiringWarrantee(60);
+		$this->info(count($expiring_assets).' expiring assets');
+
+		$asset_data['count'] =  count($expiring_assets);
+		$asset_data['email_content'] ='';
+		$now = date("Y-m-d");
+
+
+		foreach ($expiring_assets as $asset) {
+
+			$expires = $asset->warrantee_expires();
+			$difference =  round(abs(strtotime($expires) - strtotime($now))/86400);
+
+			if ($difference > 30) {
+				$asset_data['email_content'] .= '<tr style="background-color: #fcffa3;">';
+			} else {
+				$asset_data['email_content'] .= '<tr style="background-color:#d9534f;">';
+			}
+				$asset_data['email_content'] .= '<td><a href="'.Config::get('app.url').'/hardware/'.$asset->id.'/view">';
+				$asset_data['email_content'] .= $asset->showAssetName().'</a></td><td>'.$asset->asset_tag.'</td>';
+				$asset_data['email_content'] .= '<td>'.$asset->warrantee_expires().'</td>';
+				$asset_data['email_content'] .= '<td>'.$difference.' days</td>';
+				$asset_data['email_content'] .= '</tr>';
+		}
+
+		// Expiring licenses
+		$expiring_licenses = License::getExpiringLicenses(60);
+		$this->info(count($expiring_licenses).' expiring licenses');
+
+
+		$license_data['count'] =  count($expiring_licenses);
+		$license_data['email_content'] = '';
+
+		foreach ($expiring_licenses as $license) {
+			$expires = $license->expiration_date;
+			$difference =  round(abs(strtotime($expires) - strtotime($now))/86400);
+
+			if ($difference > 30) {
+				$license_data['email_content'] .= '<tr style="background-color: #fcffa3;">';
+			} else {
+				$license_data['email_content'] .= '<tr style="background-color:#d9534f;">';
+			}
+				$license_data['email_content'] .= '<td><a href="'.Config::get('app.url').'/admin/licenses/'.$license->id.'/view">';
+				$license_data['email_content'] .= $license->name.'</a></td>';
+				$license_data['email_content'] .= '<td>'.$license->expiration_date.'</td>';
+				$license_data['email_content'] .= '<td>'.$difference.' days</td>';
+				$license_data['email_content'] .= '</tr>';
+		}
+
+		if ((Setting::getSettings()->alert_email!='')  && (Setting::getSettings()->alerts_enabled==1)) {
+
+
+			if (count($expiring_assets) > 0) {
+				Mail::send('emails.expiring-assets-report', $asset_data, function ($m)  {
+	                $m->to(Setting::getSettings()->alert_email, Setting::getSettings()->site_name);
+	                $m->subject('Expiring Assets Report');
+	        	});
+
+			}
+
+			if (count($expiring_licenses) > 0) {
+				Mail::send('emails.expiring-licenses-report', $license_data, function ($m)  {
+	                $m->to(Setting::getSettings()->alert_email, Setting::getSettings()->site_name);
+	                $m->subject('Expiring Licenses Report');
+	        	});
+
+			}
+
+
+		} else {
+
+			if (Setting::getSettings()->alert_email=='') {
+				echo "Could not send email. No alert email configured in settings. \n";
+			} elseif (Setting::getSettings()->alerts_enabled!=1) {
+				echo "Alerts are disabled in the settings. No mail will be sent. \n";
+			}
+
+		}
+
+
+
+
+	}
+
+
+
+
+
+}
--- a/app/commands/SystemBackup.php
+++ b/app/commands/SystemBackup.php
@@ -0,0 +1,65 @@
+<?php
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+
+class SystemBackup extends Command {
+
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'snipeit:backup';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'This commandcreates a database dump and zips up all of the uploaded files in the upload directories.';
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function fire()
+	{
+		//
+		$files['avatars'] = glob(public_path().'/uploads/avatars/*');
+		$files['models'] = glob(public_path().'/uploads/models/*');
+		$files['suppliers'] = glob(public_path().'/uploads/suppliers/*');
+		$files['private_uploads'] = glob(app_path().'/private_uploads/*');
+		$base_filename = date('Ymdgis');
+		$zip_file = app_path().'/storage/dumps/'.$base_filename.'-backup.zip';
+		$db_dump = Config::get('backup::path').$base_filename.'-db.sql';
+		$this->call('db:backup', array('filename' => $db_dump));
+
+		Zipper::make($zip_file)
+			->folder('avatars')->add($files['avatars'])
+			->folder('models')->add($files['models'])
+			->folder('suppliers')->add($files['suppliers'])
+			->folder('private_uploads')->add($files['private_uploads'])
+			->folder('database')->add($db_dump)->close();
+
+		$this->info('Backup file created at '.$zip_file);
+		$this->info('Removing SQL dump at '.$db_dump);
+		unlink($db_dump);
+
+	}
+
+
+
+}
--- a/app/commands/Versioning.php
+++ b/app/commands/Versioning.php
@@ -0,0 +1,89 @@
+<?php
+	
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+ 
+class Versioning extends Command {
+ 
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'versioning:update';
+ 
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Generate and update app\'s version via git.';
+ 
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+ 
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+        // Path to the file containing your version
+        // This will be overwritten everything you commit a message
+        $versionFile = app_path().'/config/version.php';
+ 
+        // The git's output
+        // get the argument passed in the git command
+		 $hash_version = $this->argument('app_version');
+		 
+		 // discard the commit hash
+		 $version = explode('-', $hash_version);
+		 $realVersion = $version[0] . '-' . $version[1];
+		 
+		 // save the version array to a variable
+		 $array = var_export(array('app_version' => $realVersion,'hash_version' => $hash_version), true);
+ 
+ 
+        // Construct our file content
+        $content = <<<CON
+<?php
+return $array;
+CON;
+
+        // And finally write the file and output the current version
+        \File::put($versionFile, $content);
+        $this->line('Setting version: '. \Config::get('version.latest'));
+    }
+ 
+    /**
+     * Get the console command arguments.
+     *
+     * @return array
+     */
+    protected function getArguments()
+    {
+        return array(
+            array('app_version', InputArgument::REQUIRED, 'version number is required.'),
+        );
+    }
+ 
+    /**
+     * Get the console command options.
+     *
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return array(
+        );
+    }
+}
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -27,6 +27,37 @@ return array(

    'locale' => 'en',

+    /*
+    |--------------------------------------------------------------------------
+    | Autoloaded Service Providers
+    |--------------------------------------------------------------------------
+    |
+    | This setting may be used to control the default cipher used by the Laravel
+    | encryption facilities.
+    |
+    | Note: In Laravel 4.2, the default cipher is MCRYPT_RIJNDAEL_128 (AES),
+    | which is considered to be the most secure cipher. Changing the cipher
+    | back to MCRYPT_RIJNDAEL_256 is required to decrypt cookies/values that
+    | were encrypted in Laravel <= 4.1
+    |
+    */
+
+    'cipher' => MCRYPT_RIJNDAEL_256,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Prevent Password changes
+    |--------------------------------------------------------------------------
+    |
+    | If for some reason you do not wish for admins to be able to edit the password
+    | for any user (including themselves), set this to true.
+    |
+    */
+
+    'lock_passwords' => false,
+
+
+
    /*
    |--------------------------------------------------------------------------
    | Autoloaded Service Providers
@@ -70,6 +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',

    ),

@@ -99,45 +134,52 @@ return array(

    'aliases' => array(

-            'App'             => 'Illuminate\Support\Facades\App',
-            'Artisan'         => 'Illuminate\Support\Facades\Artisan',
-            'Auth'            => 'Illuminate\Support\Facades\Auth',
-            'Blade'           => 'Illuminate\Support\Facades\Blade',
-            'Cache'           => 'Illuminate\Support\Facades\Cache',
-            'ClassLoader'     => 'Illuminate\Support\ClassLoader',
-            'Config'          => 'Illuminate\Support\Facades\Config',
-            'Controller'      => 'Illuminate\Routing\Controller',
-            'Cookie'          => 'Illuminate\Support\Facades\Cookie',
-            'Crypt'           => 'Illuminate\Support\Facades\Crypt',
-            'DB'              => 'Illuminate\Support\Facades\DB',
-            'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade',
-            'Eloquent'        => 'Illuminate\Database\Eloquent\Model',
-            'Event'           => 'Illuminate\Support\Facades\Event',
-            'File'            => 'Illuminate\Support\Facades\File',
-            'Form'            => 'Illuminate\Support\Facades\Form',
-            'Hash'            => 'Illuminate\Support\Facades\Hash',
-            'HTML'            => 'Illuminate\Support\Facades\HTML',
-            'Input'           => 'Illuminate\Support\Facades\Input',
-            'Lang'            => 'Illuminate\Support\Facades\Lang',
-            'Log'             => 'Illuminate\Support\Facades\Log',
-            'Mail'            => 'Illuminate\Support\Facades\Mail',
-            'Paginator'       => 'Illuminate\Support\Facades\Paginator',
-            'Password'        => 'Illuminate\Support\Facades\Password',
-            'Queue'           => 'Illuminate\Support\Facades\Queue',
-            'Redirect'        => 'Illuminate\Support\Facades\Redirect',
-            'Redis'           => 'Illuminate\Support\Facades\Redis',
-            'Request'         => 'Illuminate\Support\Facades\Request',
-            'Response'        => 'Illuminate\Support\Facades\Response',
-            'Route'           => 'Illuminate\Support\Facades\Route',
-            'Schema'          => 'Illuminate\Support\Facades\Schema',
-            'Seeder'          => 'Illuminate\Database\Seeder',
-            'Sentry'          => 'Cartalyst\Sentry\Facades\Laravel\Sentry',
-            'Session'         => 'Illuminate\Support\Facades\Session',
-            'SSH'             => 'Illuminate\Support\Facades\SSH',
-            'Str'             => 'Illuminate\Support\Str',
-            'URL'             => 'Illuminate\Support\Facades\URL',
-            'Validator'       => 'Illuminate\Support\Facades\Validator',
-            'View'            => 'Illuminate\Support\Facades\View'
+            'App'             		=> 'Illuminate\Support\Facades\App',
+            'Artisan'         		=> 'Illuminate\Support\Facades\Artisan',
+            'Auth'            		=> 'Illuminate\Support\Facades\Auth',
+            'Blade'           		=> 'Illuminate\Support\Facades\Blade',
+            'Cache'           		=> 'Illuminate\Support\Facades\Cache',
+            'ClassLoader'     		=> 'Illuminate\Support\ClassLoader',
+            'Config'          		=> 'Illuminate\Support\Facades\Config',
+            'Controller'      		=> 'Illuminate\Routing\Controller',
+            'Cookie'          		=> 'Illuminate\Support\Facades\Cookie',
+            'Crypt'           		=> 'Illuminate\Support\Facades\Crypt',
+            'DB'              		=> 'Illuminate\Support\Facades\DB',
+            'Datatable' 			=> 'Chumper\Datatable\Facades\DatatableFacade',
+            'Eloquent'        		=> 'Illuminate\Database\Eloquent\Model',
+            'Event'           		=> 'Illuminate\Support\Facades\Event',
+            'File'            		=> 'Illuminate\Support\Facades\File',
+            'Form'            		=> 'Illuminate\Support\Facades\Form',
+            'Hash'            		=> 'Illuminate\Support\Facades\Hash',
+            'HTML'            		=> 'Illuminate\Support\Facades\HTML',
+			'Image'           		=> 'Intervention\Image\ImageManagerStatic',
+            'Input'           		=> 'Illuminate\Support\Facades\Input',
+            'Lang'            		=> 'Illuminate\Support\Facades\Lang',
+            'Log'             		=> 'Illuminate\Support\Facades\Log',
+            'Mail'            		=> 'Illuminate\Support\Facades\Mail',
+            'Paginator'       		=> 'Illuminate\Support\Facades\Paginator',
+            'Password'        		=> 'Illuminate\Support\Facades\Password',
+            'Queue'           		=> 'Illuminate\Support\Facades\Queue',
+            'Redirect'        		=> 'Illuminate\Support\Facades\Redirect',
+            'Redis'           		=> 'Illuminate\Support\Facades\Redis',
+            'Request'         		=> 'Illuminate\Support\Facades\Request',
+            'Response'        		=> 'Illuminate\Support\Facades\Response',
+            'Route'           		=> 'Illuminate\Support\Facades\Route',
+            'Schema'          		=> 'Illuminate\Support\Facades\Schema',
+            'Seeder'          		=> 'Illuminate\Database\Seeder',
+            'Sentry'          		=> 'Cartalyst\Sentry\Facades\Laravel\Sentry',
+            'Session'         		=> 'Illuminate\Support\Facades\Session',
+            'SoftDeletingTrait'     => 'Illuminate\Database\Eloquent\SoftDeletingTrait',
+            'SSH'             		=> 'Illuminate\Support\Facades\SSH',
+            'Str'             		=> 'Illuminate\Support\Str',
+            'URL'             		=> 'Illuminate\Support\Facades\URL',
+            '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',

    ),

--- a/app/config/local/app.example.php
+++ b/app/config/local/app.example.php
@@ -37,7 +37,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 --env=staging to create a random one
+    | Run a php artisan key:generate to create a random one
    */

    'key' => 'Change_this_key_or_snipe_will_get_ya',
--- a/app/config/local/database.example.php
+++ b/app/config/local/database.example.php
@@ -61,6 +61,7 @@ return array(
            'charset'   => 'utf8',
            'collation' => 'utf8_unicode_ci',
            'prefix'    => '',
+            'strict'    => false,
        ),

        'pgsql' => array(
--- a/app/config/local/mail.example.php
+++ b/app/config/local/mail.example.php
@@ -28,7 +28,7 @@ return array(
    |
    */

-    'host' => 'smtp.mailgun.org',
+    'host' => 'smtp.mandrillapp.com',

    /*
    |--------------------------------------------------------------------------
--- a/app/config/local/session.example.php
+++ b/app/config/local/session.example.php
@@ -0,0 +1,140 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Session Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default session "driver" that will be used on
+    | requests. By default, we will use the lightweight native driver but
+    | you may specify any of the other wonderful drivers provided here.
+    |
+    | Supported: "file", "cookie", "database", "apc",
+    |            "memcached", "redis", "array"
+    |
+    */
+
+    'driver' => 'file',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Lifetime
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the number of minutes that you wish the session
+    | to be allowed to remain idle before it expires. If you want them
+    | to immediately expire on the browser closing, set that option.
+    |
+    */
+
+    'lifetime' => 12000,
+
+    'expire_on_close' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session File Location
+    |--------------------------------------------------------------------------
+    |
+    | When using the native session driver, we need a location where session
+    | files may be stored. A default has been set for you but a different
+    | location may be specified. This is only needed for file sessions.
+    |
+    */
+
+    'files' => storage_path().'/sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Connection
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" or "redis" session drivers, you may specify a
+    | connection that should be used to manage these sessions. This should
+    | correspond to a connection in your database configuration options.
+    |
+    */
+
+    'connection' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Table
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" session driver, you may specify the table we
+    | should use to manage the sessions. Of course, a sensible default is
+    | provided for you; however, you are free to change this as needed.
+    |
+    */
+
+    'table' => 'sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Sweeping Lottery
+    |--------------------------------------------------------------------------
+    |
+    | Some session drivers must manually sweep their storage location to get
+    | rid of old sessions from storage. Here are the chances that it will
+    | happen on a given request. By default, the odds are 2 out of 100.
+    |
+    */
+
+    'lottery' => array(2, 100),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the name of the cookie used to identify a session
+    | instance by ID. The name specified here will get used every time a
+    | new session cookie is created by the framework for every driver.
+    |
+    */
+
+    'cookie' => 'snipeit_session',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Path
+    |--------------------------------------------------------------------------
+    |
+    | The session cookie path determines the path for which the cookie will
+    | be regarded as available. Typically, this will be the root path of
+    | your application but you are free to change this when necessary.
+    |
+    */
+
+    'path' => '/',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Domain
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the domain of the cookie used to identify a session
+    | in your application. This will determine which domains the cookie is
+    | available to in your application. A sensible default has been set.
+    |
+    */
+
+    'domain' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | HTTPS Only Cookies
+    |--------------------------------------------------------------------------
+    |
+    | By setting this option to true, session cookies will only be sent back
+    | to the server if the browser has a HTTPS connection. This will keep
+    | the cookie from being sent to you if it can not be done securely.
+    |
+    */
+
+    'secure' => false,
+
+);
--- a/app/config/packages/cartalyst/sentry/config.php
+++ b/app/config/packages/cartalyst/sentry/config.php
@@ -134,7 +134,7 @@ return array(
 		|
 		*/

-		'login_attribute' => 'email',
+		'login_attribute' => 'username',

 	),

--- a/app/config/packages/chumper/datatable/.gitkeep
+++ b/app/config/packages/chumper/datatable/.gitkeep
--- a/app/config/packages/chumper/datatable/config.php
+++ b/app/config/packages/chumper/datatable/config.php
@@ -0,0 +1,210 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Table specific configuration options.
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'table' => array(
+
+        /*
+        |--------------------------------------------------------------------------
+        | Table class
+        |--------------------------------------------------------------------------
+        |
+        | Class(es) added to the table
+        | Supported: string
+        |
+        */
+
+        'class' => 'table table-bordered',
+
+        /*
+        |--------------------------------------------------------------------------
+        | Table ID
+        |--------------------------------------------------------------------------
+        |
+        | ID given to the table. Used for connecting the table and the Datatables
+        | jQuery plugin. If left empty a random ID will be generated.
+        | Supported: string
+        |
+        */
+
+        'id' => '',
+
+        /*
+        |--------------------------------------------------------------------------
+        | DataTable options
+        |--------------------------------------------------------------------------
+        |
+        | jQuery dataTable plugin options. The array will be json_encoded and
+        | passed through to the plugin. See https://datatables.net/usage/options
+        | for more information.
+        | Supported: array
+        |
+        */
+
+        'options' => array(
+
+            "pagingType" => "full_numbers",
+            'processing'=>true,
+            'language'=>array(
+                   'processing'=>'<i class="fa fa-spinner fa-spin"></i> Loading...'
+            ),
+            'deferRender'=> true,
+            'stateSave'=> true,
+            'paging'=>true,
+            'pageLength'=> Setting::getSettings()->per_page,
+            'lengthMenu'=>array(array(10,25,50,75,100,125,150,-1), array(10,25,50,75,100,125,150,'All')),
+            'tableTools' => array(
+                'sSwfPath'=> Config::get('app.url').'/assets/swf/copy_csv_xls_pdf.swf',
+                'aButtons'=>array(
+                    array(
+                        'sExtends'=>'copy',
+                        'sButtonText'=>'Copy',
+                        'mColumns'=>'visible',
+                        'bFooter'=>false,
+                        ),
+                    array(
+                        'sExtends'=>'print',
+                        'sButtonText'=>'Print',
+                        'mColumns'=>'visible',
+                        'bShowAll'=>true,
+                        ),
+                    array(
+                        'sExtends'=>'collection',
+                        'sButtonText'=>'Export',
+                        'aButtons'=>array(
+                            array(
+                                'sExtends'=>'csv',
+                                'sButtonText'=>'csv',
+                                'mColumns'=>'visible',
+                                'bFooter'=>false,
+                                ),
+                            array(
+                                'sExtends'=>'xls',
+                                'sButtonText'=>'XLS',
+                                'mColumns'=>'visible',
+                                'bFooter'=>false,
+                                ),
+                            array(
+                                'sExtends'=>'pdf',
+                                'sButtonText'=>'PDF',
+                                'mColumns'=>'visible',
+                                'bFooter'=>false,
+                                )
+                            )
+                        )
+                    ) 
+                ),
+
+        ),
+
+        /*
+        |--------------------------------------------------------------------------
+        | DataTable callbacks
+        |--------------------------------------------------------------------------
+        |
+        | jQuery dataTable plugin callbacks. The array will be json_encoded and
+        | passed through to the plugin. See https://datatables.net/usage/callbacks
+        | for more information.
+        | Supported: array
+        |
+        */
+
+        'callbacks' => array(
+            "stateSaveCallback"=>"function (oSettings, oData) {
+                    localStorage.setItem('DataTables_'+window.location.pathname, JSON.stringify(oData));
+                }",
+            "stateLoadCallback"=>"function (oSettings) {
+                    return JSON.parse(localStorage.getItem('DataTables_'+window.location.pathname));
+                }",
+        ),
+
+        /*
+        |--------------------------------------------------------------------------
+        | Skip javascript in table template
+        |--------------------------------------------------------------------------
+        |
+        | Determines if the template should echo the javascript
+        | Supported: boolean
+        |
+        */
+
+        'noScript' => false,
+
+
+        /*
+        |--------------------------------------------------------------------------
+        | Table view
+        |--------------------------------------------------------------------------
+        |
+        | Template used to render the table
+        | Supported: string
+        |
+        */
+
+        'table_view' => 'datatable::template',
+
+
+        /*
+        |--------------------------------------------------------------------------
+        | Script view
+        |--------------------------------------------------------------------------
+        |
+        | Template used to render the javascript
+        | Supported: string
+        |
+        */
+
+        'script_view' => 'datatable::javascript',
+
+
+    ),
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Engine specific configuration options.
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'engine' => array(
+
+        /*
+        |--------------------------------------------------------------------------
+        | Search for exact words
+        |--------------------------------------------------------------------------
+        |
+        | If the search should be done with exact matching
+        | Supported: boolean
+        |
+        */
+
+        'exactWordSearch' => false,
+        
+        /*
+        |--------------------------------------------------------------------------
+        | Enable to display all records.  
+        |--------------------------------------------------------------------------
+        |
+        | Be careful! It may be overloaded with large record.
+        | Supported: boolean
+        |
+        */
+        'enableDisplayAll' => false,
+        /*
+        |--------------------------------------------------------------------------
+        | Limit display when iDisplayLength invaild
+        |--------------------------------------------------------------------------
+        */
+        'defaultDisplayLength' => 10,
+    )
+
+
+);
--- a/app/config/packages/fideloper/proxy/config.example.php
+++ b/app/config/packages/fideloper/proxy/config.example.php
@@ -0,0 +1,31 @@
+<?php
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Trusted Proxies
+    |--------------------------------------------------------------------------
+    |
+    | Set an array of trusted proxies, so Laravel knows to grab the client's
+    | information via the X-Forwarded-* headers.
+    |
+    | To trust all proxies, use the value '*':
+    |
+    | 'proxies' => '*'
+    |
+    |
+    | To trust only specific proxies (recommended), set an array of those
+    | proxies' IP addresses:
+    |
+    | 'proxies' => array('192.168.1.1', '192.168.1.2')
+    |
+    |
+    | Or use CIDR notation:
+    |
+    | 'proxies' => array('192.168.12.0/23')
+    |
+    */
+
+    'proxies' => '*',
+
+);
--- a/app/config/packages/maknz/slack/.gitkeep
+++ b/app/config/packages/maknz/slack/.gitkeep
--- a/app/config/packages/maknz/slack/config.php
+++ b/app/config/packages/maknz/slack/config.php
@@ -0,0 +1,122 @@
+<?php
+
+return [
+
+  /*
+  |-------------------------------------------------------------
+  | Incoming webhook endpoint
+  |-------------------------------------------------------------
+  |
+  | The endpoint which Slack generates when creating a
+  | new incoming webhook. It will look something like
+  | https://hooks.slack.com/services/XXXXXXXX/XXXXXXXX/XXXXXXXXXXXXXX
+  |
+  */
+
+  'endpoint' => '',
+
+  /*
+  |-------------------------------------------------------------
+  | Default channel
+  |-------------------------------------------------------------
+  |
+  | The default channel we should post to. The channel can either be a
+  | channel like #general, a private #group, or a @username. Set to
+  | null to use the default set on the Slack webhook
+  |
+  */
+
+  'channel' => '#general',
+
+  /*
+  |-------------------------------------------------------------
+  | Default username
+  |-------------------------------------------------------------
+  |
+  | The default username we should post as. Set to null to use
+  | the default set on the Slack webhook
+  |
+  */
+
+  'username' => 'Snipe-IT Bot',
+
+  /*
+  |-------------------------------------------------------------
+  | Default icon
+  |-------------------------------------------------------------
+  |
+  | The default icon to use. This can either be a URL to an image or Slack
+  | emoji like :ghost: or :heart_eyes:. Set to null to use the default
+  | set on the Slack webhook
+  |
+  */
+
+  'icon' => null,
+
+  /*
+  |-------------------------------------------------------------
+  | Link names
+  |-------------------------------------------------------------
+  |
+  | Whether names like @regan should be converted into links
+  | by Slack
+  |
+  */
+
+  'link_names' => false,
+
+  /*
+  |-------------------------------------------------------------
+  | Unfurl links
+  |-------------------------------------------------------------
+  |
+  | Whether Slack should unfurl links to text-based content
+  |
+  */
+
+  'unfurl_links' => false,
+
+  /*
+  |-------------------------------------------------------------
+  | Unfurl media
+  |-------------------------------------------------------------
+  |
+  | Whether Slack should unfurl links to media content such
+  | as images and YouTube videos
+  |
+  */
+
+  'unfurl_media' => true,
+
+  /*
+  |-------------------------------------------------------------
+  | Markdown in message text
+  |-------------------------------------------------------------
+  |
+  | Whether message text should be interpreted in Slack's Markdown-like
+  | language. For formatting options, see Slack's help article: http://goo.gl/r4fsdO
+  |
+  */
+
+  'allow_markdown' => true,
+
+  /*
+  |-------------------------------------------------------------
+  | Markdown in attachments
+  |-------------------------------------------------------------
+  |
+  | Which attachment fields should be interpreted in Slack's Markdown-like
+  | language. By default, Slack assumes that no fields in an attachment
+  | should be formatted as Markdown. 
+  |
+  */
+
+  'markdown_in_attachments' => [],
+
+  // Allow Markdown in just the text and title fields
+  // 'markdown_in_attachments' => ['text', 'title']
+
+  // Allow Markdown in all fields
+  // 'markdown_in_attachments' => ['pretext', 'text', 'title', 'fields', 'fallback']
+
+];
--- a/app/config/packages/schickling/backup/config.example.php
+++ b/app/config/packages/schickling/backup/config.example.php
@@ -0,0 +1,15 @@
+<?php
+return array(
+	'path' => storage_path() . '/dumps/',
+
+	'mysql' => array(
+		'dump_command_path' => '',
+		'restore_command_path' => '',
+	),
+
+	's3' => array(
+		'path' => ''
+	),
+
+    'compress' => false,
+);
--- a/app/config/permissions.php
+++ b/app/config/permissions.php
@@ -16,4 +16,12 @@ return array(
        ),
    ),

+    'Reporting' => array(
+        array(
+            'permission' => 'reports',
+            'label'      => 'View Reports',
+        ),
+    ),
+
+
 );
--- a/app/config/production/app.example.php
+++ b/app/config/production/app.example.php
@@ -13,7 +13,7 @@ return array(
    |
    */

-    'debug' => true,
+    'debug' => false,

    /*
    |--------------------------------------------------------------------------
@@ -26,7 +26,7 @@ return array(
    |
    */

-    'url' => 'http://staging.yourserver.com',
+    'url' => 'https://production.yourserver.com',

    /*
    |--------------------------------------------------------------------------
--- a/app/config/production/mail.example.php
+++ b/app/config/production/mail.example.php
@@ -28,7 +28,7 @@ return array(
    |
    */

-    'host' => 'smtp.mailgun.org',
+    'host' => 'smtp.mandrillapp.com',

    /*
    |--------------------------------------------------------------------------
--- a/app/config/production/session.example.php
+++ b/app/config/production/session.example.php
@@ -0,0 +1,154 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Session Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default session "driver" that will be used on
+    | requests. By default, we will use the lightweight native driver but
+    | you may specify any of the other wonderful drivers provided here.
+    |
+    | Supported: "file", "cookie", "database", "apc",
+    |            "memcached", "redis", "array"
+    |
+    */
+
+    'driver' => 'file',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Lifetime
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the number of minutes that you wish the session
+    | to be allowed to remain idle before it expires. If you want them
+    | to immediately expire on the browser closing, set that option.
+    |
+    */
+
+    'lifetime' => 12000,
+
+    'expire_on_close' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session File Location
+    |--------------------------------------------------------------------------
+    |
+    | When using the native session driver, we need a location where session
+    | files may be stored. A default has been set for you but a different
+    | location may be specified. This is only needed for file sessions.
+    |
+    */
+
+    'files' => storage_path().'/sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Connection
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" or "redis" session drivers, you may specify a
+    | connection that should be used to manage these sessions. This should
+    | correspond to a connection in your database configuration options.
+    |
+    */
+
+    'connection' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Table
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" session driver, you may specify the table we
+    | should use to manage the sessions. Of course, a sensible default is
+    | provided for you; however, you are free to change this as needed.
+    |
+    */
+
+    'table' => 'sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Sweeping Lottery
+    |--------------------------------------------------------------------------
+    |
+    | Some session drivers must manually sweep their storage location to get
+    | rid of old sessions from storage. Here are the chances that it will
+    | happen on a given request. By default, the odds are 2 out of 100.
+    |
+    */
+
+    'lottery' => array(2, 100),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the name of the cookie used to identify a session
+    | instance by ID. The name specified here will get used every time a
+    | new session cookie is created by the framework for every driver.
+    |
+    */
+
+    'cookie' => 'snipeit_session',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Path
+    |--------------------------------------------------------------------------
+    |
+    | The session cookie path determines the path for which the cookie will
+    | be regarded as available. Typically, this will be the root path of
+    | your application but you are free to change this when necessary.
+    |
+    */
+
+    'path' => '/',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Domain
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the domain of the cookie used to identify a session
+    | in your application. This will determine which domains the cookie is
+    | available to in your application. A sensible default has been set.
+    |
+    */
+
+    'domain' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | HTTPS Only Cookies
+    |--------------------------------------------------------------------------
+    |
+    | By setting this option to true, session cookies will only be sent back
+    | to the server if the browser has a HTTPS connection. This will keep
+    | the cookie from being sent to you if it can not be done securely.
+    |
+    */
+
+    'secure' => false,
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Allow multiple logins from different devices at the same time
+    |--------------------------------------------------------------------------
+    |
+    | By default, if a user logs into an account where someone is already
+    | logged in, the previous user will be logged out. We recommend leaving
+    | this set to false for security reasons.
+    |
+    */
+
+    'multi_login' => false,
+
+);
--- a/app/config/staging/mail.example.php
+++ b/app/config/staging/mail.example.php
@@ -28,7 +28,7 @@ return array(
    |
    */

-    'host' => 'smtp.mailgun.org',
+    'host' => 'smtp.mandrillapp.com',

    /*
    |--------------------------------------------------------------------------
--- a/app/config/staging/session.example.php
+++ b/app/config/staging/session.example.php
@@ -0,0 +1,154 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Session Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default session "driver" that will be used on
+    | requests. By default, we will use the lightweight native driver but
+    | you may specify any of the other wonderful drivers provided here.
+    |
+    | Supported: "file", "cookie", "database", "apc",
+    |            "memcached", "redis", "array"
+    |
+    */
+
+    'driver' => 'file',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Lifetime
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the number of minutes that you wish the session
+    | to be allowed to remain idle before it expires. If you want them
+    | to immediately expire on the browser closing, set that option.
+    |
+    */
+
+    'lifetime' => 12000,
+
+    'expire_on_close' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session File Location
+    |--------------------------------------------------------------------------
+    |
+    | When using the native session driver, we need a location where session
+    | files may be stored. A default has been set for you but a different
+    | location may be specified. This is only needed for file sessions.
+    |
+    */
+
+    'files' => storage_path().'/sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Connection
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" or "redis" session drivers, you may specify a
+    | connection that should be used to manage these sessions. This should
+    | correspond to a connection in your database configuration options.
+    |
+    */
+
+    'connection' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Table
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" session driver, you may specify the table we
+    | should use to manage the sessions. Of course, a sensible default is
+    | provided for you; however, you are free to change this as needed.
+    |
+    */
+
+    'table' => 'sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Sweeping Lottery
+    |--------------------------------------------------------------------------
+    |
+    | Some session drivers must manually sweep their storage location to get
+    | rid of old sessions from storage. Here are the chances that it will
+    | happen on a given request. By default, the odds are 2 out of 100.
+    |
+    */
+
+    'lottery' => array(2, 100),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the name of the cookie used to identify a session
+    | instance by ID. The name specified here will get used every time a
+    | new session cookie is created by the framework for every driver.
+    |
+    */
+
+    'cookie' => 'snipeit_session',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Path
+    |--------------------------------------------------------------------------
+    |
+    | The session cookie path determines the path for which the cookie will
+    | be regarded as available. Typically, this will be the root path of
+    | your application but you are free to change this when necessary.
+    |
+    */
+
+    'path' => '/',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Domain
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the domain of the cookie used to identify a session
+    | in your application. This will determine which domains the cookie is
+    | available to in your application. A sensible default has been set.
+    |
+    */
+
+    'domain' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | HTTPS Only Cookies
+    |--------------------------------------------------------------------------
+    |
+    | By setting this option to true, session cookies will only be sent back
+    | to the server if the browser has a HTTPS connection. This will keep
+    | the cookie from being sent to you if it can not be done securely.
+    |
+    */
+
+    'secure' => true,
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Allow multiple logins from different devices at the same time
+    |--------------------------------------------------------------------------
+    |
+    | By default, if a user logs into an account where someone is already
+    | logged in, the previous user will be logged out. We recommend leaving
+    | this set to false for security reasons.
+    |
+    */
+
+    'multi_login' => true,
+
+);
--- a/app/config/testing/database.example.php
+++ b/app/config/testing/database.example.php
@@ -26,7 +26,7 @@ return array(
    |
    */

-    'default' => 'sqlite',
+    'default' => 'mysql',

    /*
    |--------------------------------------------------------------------------
@@ -50,6 +50,18 @@ return array(
            'database' => ':memory:',
            'prefix'   => ''
        ),
+
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_laravel',
+            'username'  => 'travis',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),
+
    ),

    /*
--- a/app/config/testing/mail.example.php
+++ b/app/config/testing/mail.example.php
@@ -28,7 +28,7 @@ return array(
    |
    */

-    'host' => 'smtp.mailgun.org',
+    'host' => 'smtp.mandrillapp.com',

    /*
    |--------------------------------------------------------------------------
@@ -119,6 +119,6 @@ return array(
    |
    */

-    'pretend' => false,
+    'pretend' => true,

 );
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -0,0 +1,5 @@
+<?php
+return array (
+  'app_version' => 'v2.0-beta',
+  'hash_version' => 'v2.0-beta-4-g7e5f32c',
+);
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -7,10 +7,13 @@ class AdminController extends AuthorizedController
     *
     * @return void
     */
+
    public function __construct()
    {
+    	// These have been moved into the routes for more granular control
        // Apply the admin auth filter
-        $this->beforeFilter('admin-auth');
+        //$this->beforeFilter('admin-auth', array('except' => $this->whitelist));
+
    }


--- a/app/controllers/AuthController.php
+++ b/app/controllers/AuthController.php
@@ -27,7 +27,7 @@ class AuthController extends BaseController
    {
        // Declare the rules for the form validation
        $rules = array(
-            'email'    => 'required|email',
+            'username'    => 'required',
            'password' => 'required',
        );

@@ -42,7 +42,7 @@ class AuthController extends BaseController

        try {
            // Try to log the user in
-            Sentry::authenticate(Input::only('email', 'password'), Input::get('remember-me', 0));
+            Sentry::authenticate(Input::only('username', 'password'), Input::get('remember-me', 0));

            // Get the page we were before
            $redirect = Session::get('loginRedirect', 'account');
@@ -53,91 +53,19 @@ class AuthController extends BaseController
            // Redirect to the users page
            return Redirect::to($redirect)->with('success', Lang::get('auth/message.signin.success'));
        } catch (Cartalyst\Sentry\Users\UserNotFoundException $e) {
-            $this->messageBag->add('email', Lang::get('auth/message.account_not_found'));
+            $this->messageBag->add('username', Lang::get('auth/message.account_not_found'));
        } catch (Cartalyst\Sentry\Users\UserNotActivatedException $e) {
-            $this->messageBag->add('email', Lang::get('auth/message.account_not_activated'));
+            $this->messageBag->add('username', Lang::get('auth/message.account_not_activated'));
        } catch (Cartalyst\Sentry\Throttling\UserSuspendedException $e) {
-            $this->messageBag->add('email', Lang::get('auth/message.account_suspended'));
+            $this->messageBag->add('username', Lang::get('auth/message.account_suspended'));
        } catch (Cartalyst\Sentry\Throttling\UserBannedException $e) {
-            $this->messageBag->add('email', Lang::get('auth/message.account_banned'));
+            $this->messageBag->add('username', Lang::get('auth/message.account_banned'));
        }

        // Ooops.. something went wrong
        return Redirect::back()->withInput()->withErrors($this->messageBag);
    }

-    /**
-     * Account sign up.
-     *
-     * @return View
-     */
-    public function getSignup()
-    {
-        // Is the user logged in?
-        if (Sentry::check()) {
-            return Redirect::route('account');
-        }
-
-        // Show the page
-        return View::make('frontend.auth.signup');
-    }
-
-    /**
-     * Account sign up form processing.
-     *
-     * @return Redirect
-     */
-    public function postSignup()
-    {
-        // Declare the rules for the form validation
-        $rules = array(
-            'first_name'       => 'required|min:2',
-            'last_name'        => 'required|min:2',
-            'email'            => 'required|email|unique:users',
-            'email_confirm'    => 'required|email|same:email',
-            'password'         => 'required|between:10,32',
-            'password_confirm' => 'required|same:password',
-        );
-
-        // 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);
-        }
-
-        try {
-            // Register the user
-            $user = Sentry::register(array(
-                'first_name' => Input::get('first_name'),
-                'last_name'  => Input::get('last_name'),
-                'email'      => Input::get('email'),
-                'password'   => Input::get('password'),
-            ));
-
-            // Data to be used on the email view
-            $data = array(
-                'user'          => $user,
-                'activationUrl' => URL::route('activate', $user->getActivationCode()),
-            );
-
-            // Send the activation code through email
-            Mail::send('emails.register-activate', $data, function ($m) use ($user) {
-                $m->to($user->email, $user->first_name . ' ' . $user->last_name);
-                $m->subject('Welcome ' . $user->first_name);
-            });
-
-            // Redirect to the register page
-            return Redirect::back()->with('success', Lang::get('auth/message.signup.success'));
-        } catch (Cartalyst\Sentry\Users\UserExistsException $e) {
-            $this->messageBag->add('email', Lang::get('auth/message.account_already_exists'));
-        }
-
-        // Ooops.. something went wrong
-        return Redirect::back()->withInput()->withErrors($this->messageBag);
-    }

    /**
     * User account activation page.
@@ -192,7 +120,7 @@ class AuthController extends BaseController
    {
        // Declare the rules for the validator
        $rules = array(
-            'email' => 'required|email',
+            'username' => 'required',
        );

        // Create a new validator instance from our dynamic rules
@@ -206,22 +134,22 @@ class AuthController extends BaseController

        try {
            // Get the user password recovery code
-            $user = Sentry::getUserProvider()->findByLogin(Input::get('email'));
+            $user = Sentry::getUserProvider()->findByLogin(Input::get('username'));

-            // Data to be used on the email view
+            // Data to be used on the username view
            $data = array(
                'user'              => $user,
                'forgotPasswordUrl' => URL::route('forgot-password-confirm', $user->getResetPasswordCode()),
            );

-            // Send the activation code through email
-            Mail::send('emails.forgot-password', $data, function ($m) use ($user) {
-                $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+            // 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');
            });
        } catch (Cartalyst\Sentry\Users\UserNotFoundException $e) {
-            // Even though the email was not found, we will pretend
-            // we have sent the password reset code through email,
+            // Even though the username was not found, we will pretend
+            // we have sent the password reset code through username,
            // this is a security measure against hackers.
        }

--- a/app/controllers/account/ChangeEmailController.php
+++ b/app/controllers/account/ChangeEmailController.php
@@ -6,6 +6,8 @@ use Redirect;
 use Sentry;
 use Validator;
 use View;
+use Config;
+use Lang;

 class ChangeEmailController extends AuthorizedController
 {
@@ -30,40 +32,47 @@ class ChangeEmailController extends AuthorizedController
     */
    public function postIndex()
    {
-        // Declare the rules for the form validation
-        $rules = array(
-            'current_password' => 'required|between:3,32',
-            'email'            => 'required|email|unique:users,email,'.Sentry::getUser()->email.',email',
-            'email_confirm'    => 'required|same:email',
-        );
+        
+        
+        if (Config::get('app.lock_passwords')) {
+			return Redirect::route('change-password')->with('error',  Lang::get('admin/users/table.lock_passwords'));
+		} else {
+			
+			// Declare the rules for the form validation
+	        $rules = array(
+	            'current_password' => 'required|between:3,32',
+	            'email'            => 'required|email|unique:users,email,'.Sentry::getUser()->email.',email',
+	            'email_confirm'    => 'required|same:email',
+	        );

-        // 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);
-        }
-
-        // Grab the user
-        $user = Sentry::getUser();
-
-        // Check the user current password
-        if ( ! $user->checkPassword(Input::get('current_password'))) {
-            // Set the error message
-            $this->messageBag->add('current_password', 'Your current password is incorrect');
-
-            // Redirect to the change email page
-            return Redirect::route('change-email')->withErrors($this->messageBag);
-        }
-
-        // Update the user email
-        $user->email = Input::get('email');
-        $user->save();
-
-        // Redirect to the settings page
-        return Redirect::route('change-email')->with('success', 'Email successfully updated');
+	        // 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);
+	        }
+	
+	        // Grab the user
+	        $user = Sentry::getUser();
+	
+	        // Check the user current password
+	        if ( ! $user->checkPassword(Input::get('current_password'))) {
+	            // Set the error message
+	            $this->messageBag->add('current_password', 'Your current password is incorrect');
+	
+	            // Redirect to the change email page
+	            return Redirect::route('change-email')->withErrors($this->messageBag);
+	        }
+	
+	        // Update the user email
+	        $user->email = Input::get('email');
+	        $user->save();
+	
+	        // Redirect to the settings page
+	        return Redirect::route('change-email')->with('success', 'Email successfully updated');
+	     }
    }

 }
--- a/app/controllers/account/ChangePasswordController.php
+++ b/app/controllers/account/ChangePasswordController.php
@@ -6,6 +6,8 @@ use Redirect;
 use Sentry;
 use Validator;
 use View;
+use Config;
+use Lang;

 class ChangePasswordController extends AuthorizedController
 {
@@ -30,13 +32,19 @@ class ChangePasswordController extends AuthorizedController
     */
    protected function postIndex()
    {
-        // Declare the rules for the form validation
+        
+
+		if (Config::get('app.lock_passwords')) {
+			return Redirect::route('change-password')->with('error',  Lang::get('admin/users/table.lock_passwords'));
+		} else {
+			
+		// Declare the rules for the form validation
        $rules = array(
            'old_password'     => 'required|min:6',
            'password'         => 'required|min:6',
            'password_confirm' => 'required|same:password',
        );
-
+        
        // Create a new validator instance from our validation rules
        $validator = Validator::make(Input::all(), $rules);

@@ -61,6 +69,7 @@ class ChangePasswordController extends AuthorizedController
        // Update the user password
        $user->password = Input::get('password');
        $user->save();
+        }

        // Redirect to the change-password page
        return Redirect::route('change-password')->with('success', 'Password successfully updated');
--- a/app/controllers/account/ProfileController.php
+++ b/app/controllers/account/ProfileController.php
@@ -1,6 +1,7 @@
 <?php namespace Controllers\Account;

 use AuthorizedController;
+use Image;
 use Input;
 use Redirect;
 use Sentry;
@@ -62,6 +63,19 @@ class ProfileController extends AuthorizedController
        $user->website    = Input::get('website');
        $user->location_id    = Input::get('location_id');
        $user->gravatar   = Input::get('gravatar');
+		
+		if (Input::file('avatar')) {
+            $image = Input::file('avatar');
+            $file_name = $user->first_name."-".$user->last_name.".".$image->getClientOriginalExtension();
+            $path = public_path('uploads/avatars/'.$file_name);
+            Image::make($image->getRealPath())->resize(84, 84)->save($path);
+            $user->avatar = $file_name;
+        }
+
+        if (Input::get('avatar_delete') == 1 && Input::file('avatar') == "") {
+            $user->avatar = NULL;
+        }
+		
        $user->save();

        // Redirect to the settings page
--- a/app/controllers/account/ViewAssetsController.php
+++ b/app/controllers/account/ViewAssetsController.php
@@ -7,6 +7,11 @@ use Sentry;
 use Validator;
 use Location;
 use View;
+use Asset;
+use Actionlog;
+use Lang;
+use Accessory;
+use DB;

 class ViewAssetsController extends AuthorizedController
 {
@@ -33,4 +38,127 @@ class ViewAssetsController extends AuthorizedController
 	}


+	public function getRequestableIndex() {
+
+		$assets = Asset::with('model','defaultLoc')->Hardware()->RequestableAssets()->get();
+        return View::make('frontend/account/requestable-assets', compact('user','assets'));
+    }
+
+
+    public function getRequestAsset($assetId = null) {
+
+    	// Check if the asset exists
+        if (is_null($asset = Asset::find($assetId))) {
+            // Redirect to the asset management page
+            return Redirect::to('frontend/account/view-assets')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
+        } else {
+
+
+			 return View::make('frontend/account/view-assets', compact('asset'));
+        }
+
+
+    }
+    
+    
+    
+    // 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')) {     
+	        $item = License::find($findlog->asset_id);
+	    // accessories    
+	    } elseif ($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);
+        
+        
+
+	    
+    }
+    
+    // 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'));
+        }
+        
+    	$user = Sentry::getUser();
+		$logaction = new Actionlog();
+			
+		// 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')) {     
+	        $logaction->asset_id = $findlog->asset_id;
+        	$logaction->accessory_id = NULL;
+        	$logaction->asset_type = 'software';
+        	
+		// accessories    
+	    } elseif ($findlog->accessory_id!='') {
+		    $logaction->asset_id = NULL;
+        	$logaction->accessory_id = $findlog->accessory_id;
+        	$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');
+		
+      
+		$update_checkout = DB::table('asset_logs')
+			->where('id',$findlog->id)
+			->update(array('accepted_id' => $logaction->id));
+		
+		if ($update_checkout ) {
+			return Redirect::to('account/view-assets')->with('success', 'You have successfully accept this asset.');
+			
+		} else {
+			return Redirect::to('account/view-assets')->with('error', 'Something went wrong ');
+		}
+		
+		
+
+  
+	    
+    }
+    
+
+
+
 }
--- a/app/controllers/admin/AccessoriesController.php
+++ b/app/controllers/admin/AccessoriesController.php
@@ -0,0 +1,493 @@
+<?php namespace Controllers\Admin;
+
+use AdminController;
+use Input;
+use Lang;
+use Accessory;
+use Redirect;
+use Setting;
+use DB;
+use Sentry;
+use Str;
+use Validator;
+use View;
+use User;
+use Actionlog;
+use Mail;
+use Datatable;
+use Slack;
+use Config;
+
+class AccessoriesController extends AdminController
+{
+    /**
+     * Show a list of all the accessories.
+     *
+     * @return View
+     */
+
+    public function getIndex()
+    {
+        return View::make('backend/accessories/index');
+    }
+
+
+    /**
+     * Accessory create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        // Show the page
+        $category_list = array('' => '') + DB::table('categories')->where('category_type','=','accessory')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
+        return View::make('backend/accessories/edit')->with('accessory',new Accessory)->with('category_list',$category_list);
+    }
+
+
+    /**
+     * Accessory create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {
+
+        // create a new model instance
+        $accessory = new Accessory();
+
+        $validator = Validator::make(Input::all(), $accessory->rules);
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        else{
+
+            // Update the accessory data
+            $accessory->name            		= e(Input::get('name'));
+            $accessory->category_id            	= e(Input::get('category_id'));
+            $accessory->qty            			= e(Input::get('qty'));
+            $accessory->user_id          		= Sentry::getId();
+
+            // Was the accessory created?
+            if($accessory->save()) {
+                // Redirect to the new accessory  page
+                return Redirect::to("admin/accessories")->with('success', Lang::get('admin/accessories/message.create.success'));
+            }
+        }
+
+        // Redirect to the accessory create page
+        return Redirect::to('admin/accessories/create')->with('error', Lang::get('admin/accessories/message.create.error'));
+
+
+    }
+
+    /**
+     * Accessory update.
+     *
+     * @param  int  $accessoryId
+     * @return View
+     */
+    public function getEdit($accessoryId = null)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.does_not_exist'));
+        }
+
+		$category_list = array('' => '') + DB::table('categories')->where('category_type','=','accessory')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
+        return View::make('backend/accessories/edit', compact('accessory'))->with('category_list',$category_list);
+    }
+
+
+    /**
+     * Accessory update form processing page.
+     *
+     * @param  int  $accessoryId
+     * @return Redirect
+     */
+    public function postEdit($accessoryId = null)
+    {
+        // Check if the blog post exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.does_not_exist'));
+        }
+
+
+        // get the POST data
+        $new = Input::all();
+
+        // attempt validation
+        $validator = Validator::make(Input::all(), $accessory->validationRules($accessoryId));
+
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {
+
+            // Update the accessory data
+            $accessory->name            		= e(Input::get('name'));
+            $accessory->category_id            	= e(Input::get('category_id'));
+            $accessory->qty            			= e(Input::get('qty'));
+
+            // Was the accessory created?
+            if($accessory->save()) {
+                // Redirect to the new accessory page
+                return Redirect::to("admin/accessories")->with('success', Lang::get('admin/accessories/message.update.success'));
+            }
+        }
+
+        // Redirect to the accessory management page
+        return Redirect::to("admin/accessories/$accessoryID/edit")->with('error', Lang::get('admin/accessories/message.update.error'));
+
+    }
+
+    /**
+     * Delete the given accessory.
+     *
+     * @param  int  $accessoryId
+     * @return Redirect
+     */
+    public function getDelete($accessoryId)
+    {
+        // Check if the blog post exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
+        }
+
+
+		if ($accessory->hasUsers() > 0) {
+			 return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.assoc_users', array('count'=> $accessory->hasUsers())));
+		} else {
+			$accessory->delete();
+
+            // Redirect to the locations management page
+            return Redirect::to('admin/accessories')->with('success', Lang::get('admin/accessories/message.delete.success'));
+
+		}
+
+
+
+
+
+    }
+
+
+
+    /**
+    *  Get the accessory information to present to the accessory view page
+    *
+    * @param  int  $accessoryId
+    * @return View
+    **/
+    public function getView($accessoryID = null)
+    {
+        $accessory = Accessory::find($accessoryID);
+
+        if (isset($accessory->id)) {
+                return View::make('backend/accessories/view', compact('accessory'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/accessories/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('accessories')->with('error', $error);
+        }
+
+
+    }
+
+    /**
+    * Check out the accessory to a person
+    **/
+    public function getCheckout($accessoryId)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the accessory management page with error
+            return Redirect::to('accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
+        }
+
+        // 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');
+
+        return View::make('backend/accessories/checkout', compact('accessory'))->with('users_list',$users_list);
+
+    }
+
+    /**
+    * Check out the accessory to a person
+    **/
+    public function postCheckout($accessoryId)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the accessory management page with error
+            return Redirect::to('accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
+        }
+
+		$admin_user = Sentry::getUser();
+        $assigned_to = e(Input::get('assigned_to'));
+
+
+        // Declare the rules for the form validation
+        $rules = array(
+            'assigned_to'   => 'required|min:1'
+        );
+
+        // 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 accessory management page with error
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.user_does_not_exist'));
+        }
+
+        // Update the accessory data
+        $accessory->assigned_to            		= e(Input::get('assigned_to'));
+
+        $accessory->users()->attach($accessory->id, array(
+        'accessory_id' => $accessory->id,
+        'assigned_to' => e(Input::get('assigned_to'))));
+
+            $logaction = new Actionlog();
+            $logaction->accessory_id = $accessory->id;
+            $logaction->checkedout_to = $accessory->assigned_to;
+            $logaction->asset_type = 'accessory';
+            $logaction->location_id = $user->location_id;
+            $logaction->user_id = Sentry::getUser()->id;
+            $logaction->note = e(Input::get('note'));
+
+            $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).' <'.Config::get('app.url').'/admin/accessories/'.$accessory->id.'/view'.'|'.$accessory->name.'> checked out to <'.Config::get('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.Config::get('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+						        ],
+						        [
+						            'title' => 'Note:',
+						            'value' => e($logaction->note)
+						        ],
+
+
+
+						    ]
+						])->send('Accessory Checked Out');
+
+					} catch (Exception $e) {
+
+					}
+
+			}
+
+
+
+            $log = $logaction->logaction('checkout');
+
+            $accessory_user = DB::table('accessories_users')->where('assigned_to','=',$accessory->assigned_to)->where('accessory_id','=',$accessory->id)->first();
+
+            $data['log_id'] = $logaction->id;
+            $data['eula'] = $accessory->getEula();
+            $data['first_name'] = $user->first_name;
+            $data['item_name'] = $accessory->name;
+            $data['require_acceptance'] = $accessory->requireAcceptance();
+
+
+            if (($accessory->requireAcceptance()=='1')  || ($accessory->getEula())) {
+
+	            Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
+	                $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+	                $m->subject('Confirm accessory delivery');
+	            });
+            }
+
+            // Redirect to the new accessory page
+            return Redirect::to("admin/accessories")->with('success', Lang::get('admin/accessories/message.checkout.success'));
+
+
+
+    }
+
+
+    /**
+    * Check the accessory back into inventory
+    *
+    * @param  int  $accessoryId
+    * @return View
+    **/
+    public function getCheckin($accessoryUserId = null, $backto = null)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
+            // Redirect to the accessory management page with error
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
+        }
+
+		$accessory = Accessory::find($accessory_user->accessory_id);
+        return View::make('backend/accessories/checkin', compact('accessory'))->with('backto',$backto);
+    }
+
+
+    /**
+    * Check in the item so that it can be checked out again to someone else
+    *
+    * @param  int  $accessoryId
+    * @return View
+    **/
+    public function postCheckin($accessoryUserId = null, $backto = null)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
+            // Redirect to the accessory management page with error
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
+        }
+
+
+		$accessory = Accessory::find($accessory_user->accessory_id);
+        $logaction = new Actionlog();
+        $logaction->checkedout_to = $accessory_user->assigned_to;
+        $return_to = $accessory_user->assigned_to;
+        $admin_user = Sentry::getUser();
+
+
+        // Was the accessory updated?
+        if(DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
+
+            $logaction->accessory_id = $accessory->id;
+            $logaction->location_id = NULL;
+            $logaction->asset_type = 'accessory';
+            $logaction->user_id = $admin_user->id;
+            $logaction->note = e(Input::get('note'));
+
+            $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 In:',
+						            'value' => strtoupper($logaction->asset_type).' <'.Config::get('app.url').'/admin/accessories/'.$accessory->id.'/view'.'|'.$accessory->name.'> checked in by <'.Config::get('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+						        ],
+						        [
+						            'title' => 'Note:',
+						            'value' => e($logaction->note)
+						        ],
+
+						    ]
+						])->send('Accessory 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/accessories/message.checkin.success'));
+			} else {
+				return Redirect::to("admin/accessories/".$accessory->id."/view")->with('success', Lang::get('admin/accessories/message.checkin.success'));
+			}
+        }
+
+        // Redirect to the accessory management page with error
+        return Redirect::to("admin/accessories")->with('error', Lang::get('admin/accessories/message.checkin.error'));
+    }
+
+    public function getDatatable()
+    {
+        $accessories = Accessory::select(array('id','name','qty'))
+        ->whereNull('deleted_at')
+        ->orderBy('created_at', 'DESC');
+
+        $accessories = $accessories->get();
+
+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions',function($accessories)
+            {
+                return '<a href="'.route('checkout/accessory', $accessories->id).'" style="margin-right:5px;" class="btn btn-info btn-sm" '.(($accessories->numRemaining() > 0 ) ? '' : ' disabled').'>'.Lang::get('general.checkout').'</a><a href="'.route('update/accessory', $accessories->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/accessory', $accessories->id).'" data-content="'.Lang::get('admin/accessories/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($accessories->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            });
+
+        return Datatable::collection($accessories)
+        ->addColumn('name',function($accessories)
+            {
+                return link_to('admin/accessories/'.$accessories->id.'/view', $accessories->name);
+            })
+        ->addColumn('qty',function($accessories)
+            {
+                return $accessories->qty;
+            })
+        ->addColumn('numRemaining',function($accessories)
+            {
+                return $accessories->numRemaining();
+            })
+        ->addColumn($actions)
+        ->searchColumns('name','qty','numRemaining','actions')
+        ->orderColumns('name','qty','numRemaining','actions')
+        ->make();
+    }
+
+	public function getDataView($accessoryID)
+	{
+		$accessory = Accessory::find($accessoryID);
+        $accessory_users = $accessory->users;
+
+		$actions = new \Chumper\Datatable\Columns\FunctionColumn('actions',function($accessory_users){
+			return '<a href="'.route('checkin/accessory', $accessory_users->pivot->id).'" class="btn-flat info">Checkin</a>';
+		});
+
+		return Datatable::collection($accessory_users)
+		->addColumn('name',function($accessory_users)
+			{
+				return link_to('/admin/users/'.$accessory_users->id.'/view', $accessory_users->fullName());
+			})
+		->addColumn($actions)
+		->make();
+    }
+
+}
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
--- a/app/controllers/admin/CategoriesController.php
+++ b/app/controllers/admin/CategoriesController.php
@@ -11,6 +11,7 @@ use Sentry;
 use Str;
 use Validator;
 use View;
+use Datatable;

 class CategoriesController extends AdminController
 {
@@ -22,11 +23,8 @@ class CategoriesController extends AdminController

    public function getIndex()
    {
-        // Grab all the categories
-        $categories = Category::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
-
        // Show the page
-        return View::make('backend/categories/index', compact('categories'));
+        return View::make('backend/categories/index');
    }


@@ -38,7 +36,9 @@ class CategoriesController extends AdminController
    public function getCreate()
    {
        // Show the page
-        return View::make('backend/categories/edit')->with('category',new Category);
+         $category_types= array('' => '', 'asset' => 'Asset', 'accessory' => 'Accessory', 'consumable' => 'Consumable');
+        return View::make('backend/categories/edit')->with('category',new Category)
+        ->with('category_types',$category_types);
    }


@@ -52,26 +52,30 @@ class CategoriesController extends AdminController

        // create a new model instance
        $category = new Category();
-        
+
        $validator = Validator::make(Input::all(), $category->rules);

        if ($validator->fails())
        {
-            // The given data did not pass validation            
+            // The given data did not pass validation
            return Redirect::back()->withInput()->withErrors($validator->messages());
        }
        else{

            // Update the category data
-            $category->name            = e(Input::get('name'));
-            $category->user_id          = Sentry::getId();
+            $category->name            		= e(Input::get('name'));
+            $category->category_type        = e(Input::get('category_type'));
+            $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->user_id          	= Sentry::getId();

            // Was the asset created?
            if($category->save()) {
                // Redirect to the new category  page
                return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.create.success'));
            }
-        } 
+        }

        // Redirect to the category create page
        return Redirect::to('admin/settings/categories/create')->with('error', Lang::get('admin/categories/message.create.error'));
@@ -97,7 +101,11 @@ class CategoriesController extends AdminController
        //$category_options = array('' => 'Top Level') + Category::lists('name', 'id');

        $category_options = array('' => 'Top Level') + DB::table('categories')->where('id', '!=', $categoryId)->lists('name', 'id');
-        return View::make('backend/categories/edit', compact('category'))->with('category_options',$category_options);
+        $category_types= array('' => '', 'asset' => 'Asset', 'accessory' => 'Accessory', 'consumable' => 'Consumable');
+
+        return View::make('backend/categories/edit', compact('category'))
+        ->with('category_options',$category_options)
+        ->with('category_types',$category_types);
    }


@@ -119,9 +127,9 @@ class CategoriesController extends AdminController
        // get the POST data
        $new = Input::all();

-        // attempt validation       
+        // attempt validation
        $validator = Validator::make(Input::all(), $category->validationRules($categoryId));
-       
+

        if ($validator->fails())
        {
@@ -133,13 +141,17 @@ class CategoriesController extends AdminController

            // Update the category data
            $category->name            = e(Input::get('name'));
+            $category->category_type        = e(Input::get('category_type'));
+            $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'));

            // Was the asset created?
            if($category->save()) {
                // Redirect to the new category page
                return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.update.success'));
            }
-        } 
+        }

        // Redirect to the category management page
        return Redirect::to("admin/settings/categories/$categoryID/edit")->with('error', Lang::get('admin/categories/message.update.error'));
@@ -154,7 +166,7 @@ class CategoriesController extends AdminController
     */
    public function getDelete($categoryId)
    {
-        // Check if the blog post exists
+        // Check if the category exists
        if (is_null($category = Category::find($categoryId))) {
            // Redirect to the blogs management page
            return Redirect::to('admin/settings/categories')->with('error', Lang::get('admin/categories/message.not_found'));
@@ -178,4 +190,88 @@ class CategoriesController extends AdminController



+    /**
+    *  Get the asset information to present to the category view page
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getView($categoryID = null)
+    {
+        $category = Category::find($categoryID);
+
+        if (isset($category->id)) {
+                return View::make('backend/categories/view', compact('category'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/categories/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('categories')->with('error', $error);
+        }
+
+
+    }
+
+    public function getDatatable()
+    {
+        // Grab all the categories
+        $categories = Category::orderBy('created_at', 'DESC')->get();
+
+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function($categories) {
+            return '<a href="'.route('update/category', $categories->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/category', $categories->id).'" data-content="'.Lang::get('admin/categories/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($categories->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+        });
+
+        return Datatable::collection($categories)
+        ->showColumns('name')
+        ->addColumn('category_type', function($categories) {
+            return ucwords($categories->category_type);
+        })
+        ->addColumn('count', function($categories) {
+            return ($categories->category_type=='asset') ? link_to('/admin/settings/categories/'.$categories->id.'/view', $categories->assetscount()) : $categories->accessoriescount();
+        })
+        ->addColumn('acceptance', function($categories) {
+            return ($categories->require_acceptance=='1') ? '<i class="fa fa-check" style="margin-right:50%;margin-left:50%;"></i>' : '';
+        })
+        ->addColumn('eula', function($categories) {
+            return ($categories->getEula()) ? '<i class="fa fa-check" style="margin-right:50%;margin-left:50%;"></i></a>' : '';
+        })
+        ->addColumn($actions)
+        ->searchColumns('name','category_type','count','acceptance','eula','actions')
+        ->orderColumns('name','category_type','count','acceptance','eula','actions')
+        ->make();
+    }
+
+    public function getDataView($categoryID) {
+        $category = Category::find($categoryID);
+        $categoryassets = $category->assets;
+
+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($categoryassets)
+            {
+                if (($categoryassets->assigned_to !='') && ($categoryassets->assigned_to > 0)) {
+                    return '<a href="'.route('checkin/hardware', $categoryassets->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
+                } else {
+                    return '<a href="'.route('checkout/hardware', $categoryassets->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
+                }
+            });
+
+        return Datatable::collection($categoryassets)
+        ->addColumn('name', function ($categoryassets) {
+            return link_to('/hardware/'.$categoryassets->id.'/view', $categoryassets->name);
+        })
+        ->addColumn('asset_tag', function ($categoryassets) {
+            return link_to('/hardware/'.$categoryassets->id.'/view', $categoryassets->asset_tag);
+        })
+        ->addColumn('assigned_to', function ($categoryassets) {
+            if ($categoryassets->assigned_to) {
+                return link_to('/admin/users/'.$categoryassets->assigned_to.'/view', $categoryassets->assigneduser->fullName());
+            }
+        })
+        ->addColumn($actions)
+        ->searchColumns('name','asset_tag','assigned_to','actions')
+        ->orderColumns('name','asset_tag','assigned_to','actions')
+        ->make();
+    }
+
+
 }
--- a/app/controllers/admin/ConsumablesController.php
+++ b/app/controllers/admin/ConsumablesController.php
@@ -0,0 +1,390 @@
+<?php namespace Controllers\Admin;
+
+use AdminController;
+use Input;
+use Lang;
+use Redirect;
+use Setting;
+use DB;
+use Sentry;
+use Consumable;
+use Str;
+use Validator;
+use View;
+use User;
+use Actionlog;
+use Mail;
+use Datatable;
+use Slack;
+use Config;
+
+class ConsumablesController extends AdminController
+{
+    /**
+     * Show a list of all the consumables.
+     *
+     * @return View
+     */
+
+    public function getIndex()
+    {
+        return View::make('backend/consumables/index');
+    }
+
+
+    /**
+     * Consumable create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        // Show the page
+        $category_list = array('' => '') + DB::table('categories')->where('category_type','=','consumable')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
+        return View::make('backend/consumables/edit')->with('consumable',new Consumable)->with('category_list',$category_list);
+    }
+
+
+    /**
+     * Consumable create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {
+
+        // create a new model instance
+        $consumable = new Consumable();
+
+        $validator = Validator::make(Input::all(), $consumable->rules);
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        else{
+
+            // Update the consumable data
+            $consumable->name            		= e(Input::get('name'));
+            $consumable->category_id            	= e(Input::get('category_id'));
+            $consumable->qty            			= e(Input::get('qty'));
+            $consumable->user_id          		= Sentry::getId();
+
+            // Was the consumable created?
+            if($consumable->save()) {
+                // Redirect to the new consumable  page
+                return Redirect::to("admin/consumables")->with('success', Lang::get('admin/consumables/message.create.success'));
+            }
+        }
+
+        // Redirect to the consumable create page
+        return Redirect::to('admin/consumables/create')->with('error', Lang::get('admin/consumables/message.create.error'));
+
+
+    }
+
+    /**
+     * Consumable update.
+     *
+     * @param  int  $consumableId
+     * @return View
+     */
+    public function getEdit($consumableId = null)
+    {
+        // Check if the consumable exists
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.does_not_exist'));
+        }
+
+		$category_list = array('' => '') + DB::table('categories')->where('category_type','=','consumable')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
+        return View::make('backend/consumables/edit', compact('consumable'))->with('category_list',$category_list);
+    }
+
+
+    /**
+     * Consumable update form processing page.
+     *
+     * @param  int  $consumableId
+     * @return Redirect
+     */
+    public function postEdit($consumableId = null)
+    {
+        // Check if the blog post exists
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.does_not_exist'));
+        }
+
+
+        // get the POST data
+        $new = Input::all();
+
+        // attempt validation
+        $validator = Validator::make(Input::all(), $consumable->validationRules($consumableId));
+
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {
+
+            // Update the consumable data
+            $consumable->name            		= e(Input::get('name'));
+            $consumable->category_id            	= e(Input::get('category_id'));
+            $consumable->qty            			= e(Input::get('qty'));
+
+            // Was the consumable created?
+            if($consumable->save()) {
+                // Redirect to the new consumable page
+                return Redirect::to("admin/consumables")->with('success', Lang::get('admin/consumables/message.update.success'));
+            }
+        }
+
+        // Redirect to the consumable management page
+        return Redirect::to("admin/consumables/$consumableID/edit")->with('error', Lang::get('admin/consumables/message.update.error'));
+
+    }
+
+    /**
+     * Delete the given consumable.
+     *
+     * @param  int  $consumableId
+     * @return Redirect
+     */
+    public function getDelete($consumableId)
+    {
+        // Check if the blog post exists
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            // Redirect to the blogs management page
+            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'));
+
+		}
+
+
+
+
+
+    }
+
+
+
+    /**
+    *  Get the consumable information to present to the consumable view page
+    *
+    * @param  int  $consumableId
+    * @return View
+    **/
+    public function getView($consumableID = null)
+    {
+        $consumable = Consumable::find($consumableID);
+
+        if (isset($consumable->id)) {
+                return View::make('backend/consumables/view', compact('consumable'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/consumables/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('consumables')->with('error', $error);
+        }
+
+
+    }
+
+    /**
+    * Check out the consumable to a person
+    **/
+    public function getCheckout($consumableId)
+    {
+        // Check if the consumable exists
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            // Redirect to the consumable management page with error
+            return Redirect::to('consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
+        }
+
+        // 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');
+
+        return View::make('backend/consumables/checkout', compact('consumable'))->with('users_list',$users_list);
+
+    }
+
+    /**
+    * Check out the consumable to a person
+    **/
+    public function postCheckout($consumableId)
+    {
+        // Check if the consumable exists
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            // Redirect to the consumable management page with error
+            return Redirect::to('consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
+        }
+
+		$admin_user = Sentry::getUser();
+        $assigned_to = e(Input::get('assigned_to'));
+
+
+        // Declare the rules for the form validation
+        $rules = array(
+            'assigned_to'   => 'required|min:1'
+        );
+
+        // 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 consumable management page with error
+            return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.user_does_not_exist'));
+        }
+
+        // Update the consumable data
+        $consumable->assigned_to            		= e(Input::get('assigned_to'));
+
+        $consumable->users()->attach($consumable->id, array(
+        'consumable_id' => $consumable->id,
+        'assigned_to' => e(Input::get('assigned_to'))));
+
+            $logaction = new Actionlog();
+            $logaction->consumable_id = $consumable->id;
+            $logaction->checkedout_to = $consumable->assigned_to;
+            $logaction->asset_type = 'consumable';
+            $logaction->location_id = $user->location_id;
+            $logaction->user_id = Sentry::getUser()->id;
+            $logaction->note = e(Input::get('note'));
+
+            $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).' <'.Config::get('app.url').'/admin/consumables/'.$consumable->id.'/view'.'|'.$consumable->name.'> checked out to <'.Config::get('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.Config::get('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+						        ],
+						        [
+						            'title' => 'Note:',
+						            'value' => e($logaction->note)
+						        ],
+
+
+
+						    ]
+						])->send('Consumable Checked Out');
+
+					} catch (Exception $e) {
+
+					}
+
+			}
+
+
+
+            $log = $logaction->logaction('checkout');
+
+            $consumable_user = DB::table('consumables_users')->where('assigned_to','=',$consumable->assigned_to)->where('consumable_id','=',$consumable->id)->first();
+
+            $data['log_id'] = $logaction->id;
+            $data['eula'] = $consumable->getEula();
+            $data['first_name'] = $user->first_name;
+            $data['item_name'] = $consumable->name;
+            $data['require_acceptance'] = $consumable->requireAcceptance();
+
+
+            if (($consumable->requireAcceptance()=='1')  || ($consumable->getEula())) {
+
+	            Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
+	                $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+	                $m->subject('Confirm consumable delivery');
+	            });
+            }
+
+            // Redirect to the new consumable page
+            return Redirect::to("admin/consumables")->with('success', Lang::get('admin/consumables/message.checkout.success'));
+
+
+
+    }
+
+
+    public function getDatatable()
+    {
+        $consumables = Consumable::select(array('id','name','qty'))
+        ->whereNull('deleted_at')
+        ->orderBy('created_at', 'DESC');
+
+        $consumables = $consumables->get();
+
+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions',function($consumables)
+            {
+                return '<a href="'.route('checkout/consumable', $consumables->id).'" style="margin-right:5px;" class="btn btn-info btn-sm" '.(($consumables->numRemaining() > 0 ) ? '' : ' disabled').'>'.Lang::get('general.checkout').'</a><a href="'.route('update/consumable', $consumables->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/consumable', $consumables->id).'" data-content="'.Lang::get('admin/consumables/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($consumables->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            });
+
+        return Datatable::collection($consumables)
+        ->addColumn('name',function($consumables)
+            {
+                return link_to('admin/consumables/'.$consumables->id.'/view', $consumables->name);
+            })
+        ->addColumn('qty',function($consumables)
+            {
+                return $consumables->qty;
+            })
+        ->addColumn('numRemaining',function($consumables)
+            {
+                return $consumables->numRemaining();
+            })
+        ->addColumn($actions)
+        ->searchColumns('name','qty','numRemaining','actions')
+        ->orderColumns('name','qty','numRemaining','actions')
+        ->make();
+    }
+
+	public function getDataView($consumableID)
+	{
+		$consumable = Consumable::find($consumableID);
+        $consumable_users = $consumable->users;
+
+
+		return Datatable::collection($consumable_users)
+		->addColumn('name',function($consumable_users)
+			{
+				return link_to('/admin/users/'.$consumable_users->id.'/view', $consumable_users->fullName());
+			})
+		->make();
+    }
+
+}
--- a/app/controllers/admin/DashboardController.php
+++ b/app/controllers/admin/DashboardController.php
@@ -2,6 +2,8 @@

 use AdminController;
 use View;
+use Asset;
+use Actionlog;

 class DashboardController extends AdminController
 {
@@ -13,7 +15,57 @@ class DashboardController extends AdminController
    public function getIndex()
    {
        // Show the page
-        return View::make('backend/dashboard');
+
+        $recent_activity = Actionlog::orderBy('created_at','DESC')->with('accessorylog','consumablelog','licenselog','assetlog','adminlog','userlog')->take(7)->get();
+
+
+        $asset_stats['total'] = Asset::Hardware()->count();
+
+        $asset_stats['rtd']['total'] = Asset::Hardware()->RTD()->count();
+
+        if ($asset_stats['rtd']['total'] > 0) {
+	        $asset_stats['rtd']['percent'] = round(($asset_stats['rtd']['total']/$asset_stats['total']) * 100);
+        } else {
+	        $asset_stats['rtd']['percent'] = 0;
+        }
+
+
+        $asset_stats['pending']['total'] = Asset::Hardware()->Pending()->count();
+
+        if ($asset_stats['pending']['total'] > 0) {
+	        $asset_stats['pending']['percent'] = round(($asset_stats['pending']['total']/$asset_stats['total']) * 100);
+        } else {
+	        $asset_stats['pending']['percent'] = 0;
+        }
+
+
+        $asset_stats['deployed']['total'] = Asset::Hardware()->Deployed()->count();
+
+        if ($asset_stats['deployed']['total'] > 0) {
+	         $asset_stats['deployed']['percent'] = round(($asset_stats['deployed']['total']/$asset_stats['total']) * 100);
+        } else {
+	        $asset_stats['deployed']['percent'] = 0;
+        }
+
+
+        $asset_stats['undeployable']['total'] = Asset::Hardware()->Undeployable()->count();
+
+        if ($asset_stats['undeployable']['total'] > 0) {
+	        $asset_stats['undeployable']['percent'] = round(($asset_stats['undeployable']['total']/$asset_stats['total']) * 100);
+        } else {
+	        $asset_stats['undeployable']['percent'] = 0;
+        }
+
+        $asset_stats['archived']['total'] = Asset::Hardware()->Archived()->count();
+
+        if ($asset_stats['archived']['total'] > 0) {
+	        $asset_stats['archived']['percent'] = round(($asset_stats['archived']['total']/$asset_stats['total']) * 100);
+        } else {
+	        $asset_stats['archived']['percent'] = 0;
+        }
+
+
+        return View::make('backend/dashboard')->with('asset_stats',$asset_stats)->with('recent_activity',$recent_activity);
    }

 }
--- a/app/controllers/admin/DepreciationsController.php
+++ b/app/controllers/admin/DepreciationsController.php
@@ -23,7 +23,7 @@ class DepreciationsController extends AdminController
    public function getIndex()
    {
        // Grab all the depreciations
-        $depreciations = Depreciation::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
+        $depreciations = Depreciation::orderBy('created_at', 'DESC')->get();

        // Show the page
        return View::make('backend/depreciations/index', compact('depreciations'));
--- a/app/controllers/admin/GroupsController.php
+++ b/app/controllers/admin/GroupsController.php
@@ -161,21 +161,27 @@ class GroupsController extends AdminController
            return Redirect::back()->withInput()->withErrors($validator);
        }

-        try {
-            // Update the group data
-            $group->name        = Input::get('name');
-            $group->permissions = Input::get('permissions');
+        if (!Config::get('app.lock_passwords')) {

-            // Was the group updated?
-            if ($group->save()) {
-                // Redirect to the group page
-                return Redirect::route('update/group', $id)->with('success', Lang::get('admin/groups/message.success.update'));
-            } else {
-                // Redirect to the group page
-                return Redirect::route('update/group', $id)->with('error', Lang::get('admin/groups/message.error.update'));
+                try {
+                // Update the group data
+                $group->name        = Input::get('name');
+                $group->permissions = Input::get('permissions');
+
+                // Was the group updated?
+                if ($group->save()) {
+                    // Redirect to the group page
+                    return Redirect::route('update/group', $id)->with('success', Lang::get('admin/groups/message.success.update'));
+                } else {
+                    // Redirect to the group page
+                    return Redirect::route('update/group', $id)->with('error', Lang::get('admin/groups/message.error.update'));
+                }
+            } catch (NameRequiredException $e) {
+                $error = Lang::get('admin/group/message.group_name_required');
            }
-        } catch (NameRequiredException $e) {
-            $error = Lang::get('admin/group/message.group_name_required');
+
+        } else {
+            return Redirect::route('update/group', $id)->withInput()->with('error', 'Denied! Editing groups is not allowed in the demo.');
        }

        // Redirect to the group page
--- a/app/controllers/admin/LicensesController.php
+++ b/app/controllers/admin/LicensesController.php
@@ -15,9 +15,14 @@ use Depreciation;
 use Setting;
 use Sentry;
 use Str;
+use Supplier;
 use Validator;
 use View;
-
+use Response;
+use Datatable;
+use Slack;
+use Config;
+use Session;

 class LicensesController extends AdminController
 {
@@ -32,11 +37,8 @@ class LicensesController extends AdminController

    public function getIndex()
    {
-        // Grab all the licenses
-        $licenses = License::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
-
        // Show the page
-        return View::make('backend/licenses/index', compact('licenses'));
+        return View::make('backend/licenses/index');
    }


@@ -49,10 +51,16 @@ class LicensesController extends AdminController
    {
        // Show the page
        $license_options = array('0' => 'Top Level') + License::lists('name', 'id');
-
        // Show the page
        $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
-        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('license',new License);
+        $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+        $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
+        return View::make('backend/licenses/edit')
+            ->with('license_options',$license_options)
+            ->with('depreciation_list',$depreciation_list)
+            ->with('supplier_list',$supplier_list)
+            ->with('maintained_list',$maintained_list)
+            ->with('license',new License);
    }


@@ -74,45 +82,68 @@ class LicensesController extends AdminController
        // attempt validation
        if ($license->validate($new)) {

-                        if ( e(Input::get('purchase_cost')) == '') {
+            if ( e(Input::get('purchase_cost')) == '') {
                    $license->purchase_cost =  NULL;
            } else {
                    $license->purchase_cost = ParseFloat(e(Input::get('purchase_cost')));
                    //$license->purchase_cost = e(Input::get('purchase_cost'));
            }

+            if ( e(Input::get('supplier_id')) == '') {
+                $license->supplier_id = NULL;
+            } else {
+                $license->supplier_id = e(Input::get('supplier_id'));
+            }
+
+            if ( e(Input::get('maintained')) == '') {
+                $license->maintained = 0;
+            } else {
+                $license->maintained = e(Input::get('maintained'));
+            }
+
+            if ( e(Input::get('purchase_order')) == '') {
+                $license->purchase_order = '';
+            } else {
+                $license->purchase_order = e(Input::get('purchase_order'));
+            }
+
            // Save the license data
-            $license->name 				= e(Input::get('name'));
-            $license->serial 			= e(Input::get('serial'));
-            $license->license_email 	= e(Input::get('license_email'));
-            $license->license_name 		= e(Input::get('license_name'));
-            $license->notes 			= e(Input::get('notes'));
-            $license->order_number 		= e(Input::get('order_number'));
-            $license->seats 			= e(Input::get('seats'));
-            $license->purchase_date 	= e(Input::get('purchase_date'));
-            //$license->purchase_cost 	= e(Input::get('purchase_cost'));
-            $license->depreciation_id 	= e(Input::get('depreciation_id'));
-            //$license->asset_id 			= e(Input::get('asset_id'));
-            $license->user_id 			= Sentry::getId();
+            $license->name              = e(Input::get('name'));
+            $license->serial            = e(Input::get('serial'));
+            $license->license_email     = e(Input::get('license_email'));
+            $license->license_name      = e(Input::get('license_name'));
+            $license->notes             = e(Input::get('notes'));
+            $license->order_number      = e(Input::get('order_number'));
+            $license->seats             = e(Input::get('seats'));
+            $license->purchase_date     = e(Input::get('purchase_date'));
+            $license->purchase_order    = e(Input::get('purchase_order'));
+            $license->depreciation_id   = e(Input::get('depreciation_id'));
+            $license->expiration_date   = e(Input::get('expiration_date'));
+            $license->user_id           = Sentry::getId();

            if (($license->purchase_date == "") || ($license->purchase_date == "0000-00-00")) {
                $license->purchase_date = NULL;
            }

+            if (($license->expiration_date == "") || ($license->expiration_date == "0000-00-00")) {
+                $license->expiration_date = NULL;
+            }
+
            if (($license->purchase_cost == "") || ($license->purchase_cost == "0.00")) {
                $license->purchase_cost = NULL;
            }

            // Was the license created?
            if($license->save()) {
+	            
                $insertedId = $license->id;
                // Save the license seat data
                for ($x=0; $x<$license->seats; $x++) {
                    $license_seat = new LicenseSeat();
-                    $license_seat->license_id 		= $insertedId;
-                    $license_seat->user_id 			= Sentry::getId();
-                    $license_seat->assigned_to 		= 0;
-                    $license_seat->notes 			= NULL;
+                    $license_seat->license_id       = $insertedId;
+                    $license_seat->user_id          = Sentry::getId();
+                    $license_seat->assigned_to      = NULL;
+                    $license_seat->notes            = NULL;
                    $license_seat->save();
                }

@@ -156,7 +187,13 @@ class LicensesController extends AdminController
        // Show the page
        $license_options = array('' => 'Top Level') + DB::table('assets')->where('id', '!=', $licenseId)->lists('name', 'id');
        $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
-        return View::make('backend/licenses/edit', compact('license'))->with('license_options',$license_options)->with('depreciation_list',$depreciation_list);
+        $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+        $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
+        return View::make('backend/licenses/edit', compact('license'))
+            ->with('license_options',$license_options)
+            ->with('depreciation_list',$depreciation_list)
+            ->with('supplier_list',$supplier_list)
+            ->with('maintained_list',$maintained_list);
    }


@@ -184,14 +221,22 @@ class LicensesController extends AdminController
        if ($license->validate($new)) {

            // Update the license data
-            $license->name 				= e(Input::get('name'));
-            $license->serial 			= e(Input::get('serial'));
-            $license->license_email 	= e(Input::get('license_email'));
-            $license->license_name 		= e(Input::get('license_name'));
-            $license->notes 			= e(Input::get('notes'));
-            $license->order_number 		= e(Input::get('order_number'));
-            $license->depreciation_id 	= e(Input::get('depreciation_id'));
+            $license->name              = e(Input::get('name'));
+            $license->serial            = e(Input::get('serial'));
+            $license->license_email     = e(Input::get('license_email'));
+            $license->license_name      = e(Input::get('license_name'));
+            $license->notes             = e(Input::get('notes'));
+            $license->order_number      = e(Input::get('order_number'));
+            $license->depreciation_id   = e(Input::get('depreciation_id'));
+            $license->purchase_order    = e(Input::get('purchase_order'));
+            $license->maintained        = e(Input::get('maintained'));
+            $license->reassignable      = e(Input::get('reassignable'));

+            if ( e(Input::get('supplier_id')) == '') {
+                $license->supplier_id = NULL;
+            } else {
+                $license->supplier_id = e(Input::get('supplier_id'));
+            }

            // Update the asset data
            if ( e(Input::get('purchase_date')) == '') {
@@ -200,6 +245,19 @@ class LicensesController extends AdminController
                    $license->purchase_date = e(Input::get('purchase_date'));
            }

+            if ( e(Input::get('expiration_date')) == '') {
+                $license->expiration_date = NULL;
+            } else {
+                $license->expiration_date = e(Input::get('expiration_date'));
+            }
+
+            // Update the asset data
+            if ( e(Input::get('termination_date')) == '') {
+                $license->termination_date =  NULL;
+            } else {
+                $license->termination_date = e(Input::get('termination_date'));
+            }
+
            if ( e(Input::get('purchase_cost')) == '') {
                    $license->purchase_cost =  NULL;
            } else {
@@ -207,6 +265,24 @@ class LicensesController extends AdminController
                    //$license->purchase_cost = e(Input::get('purchase_cost'));
            }

+            if ( e(Input::get('maintained')) == '') {
+                $license->maintained = 0;
+            } else {
+                $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 {
+                $license->purchase_order = e(Input::get('purchase_order'));
+            }
+

            //Are we changing the total number of seats?
            if( $license->seats != e(Input::get('seats'))) {
@@ -245,10 +321,10 @@ class LicensesController extends AdminController
                    for ($i=1; $i <= $difference; $i++) {
                        //Create a seat for this license
                        $license_seat = new LicenseSeat();
-                        $license_seat->license_id 		= $license->id;
-                        $license_seat->user_id 			= Sentry::getId();
-                        $license_seat->assigned_to 		= 0;
-                        $license_seat->notes 			= NULL;
+                        $license_seat->license_id       = $license->id;
+                        $license_seat->user_id          = Sentry::getId();
+                        $license_seat->assigned_to      = NULL;
+                        $license_seat->notes            = NULL;
                        $license_seat->save();
                    }

@@ -260,7 +336,7 @@ class LicensesController extends AdminController
                    $logaction->note = abs($difference)." seats";
                    $log = $logaction->logaction('add seats');
                }
-                $license->seats 			= e(Input::get('seats'));
+                $license->seats             = e(Input::get('seats'));
            }

            // Was the asset created?
@@ -301,11 +377,17 @@ class LicensesController extends AdminController
        } else {

            // Delete the license and the associated license seats
+            DB::table('license_seats')
+            ->where('id', $license->id)
+            ->update(array('assigned_to' => NULL,'asset_id' => NULL));
+
            $licenseseats = $license->licenseseats();
            $licenseseats->delete();
            $license->delete();


+
+
            // Redirect to the licenses management page
            return Redirect::to('admin/licenses')->with('success', Lang::get('admin/licenses/message.delete.success'));
        }
@@ -326,30 +408,32 @@ 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 (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
+         $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');

-		// Left join to get a list of assets and some other helpful info
-		$asset = DB::table('assets')
-			->leftJoin('users', 'users.id', '=', 'assets.assigned_to')
-			->select('assets.id', 'name', 'first_name', 'last_name','asset_tag',
-			DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id'))
-			->whereNull('assets.deleted_at')
-			->get();

-			$asset_array = json_decode(json_encode($asset), true);
-			$asset_element[''] = 'Please select an asset';
+        // 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();

-			// Build a list out of the data results
-			for ($x=0; $x<count($asset_array); $x++) {
+            $asset_array = json_decode(json_encode($asset), true);
+            $asset_element[''] = 'Please select an asset';

-				if ($asset_array[$x]['full_name']!='') {
-					$full_name = ' ('.$asset_array[$x]['full_name'].')';
-				} else {
-					$full_name = ' (Unassigned)';
-				}
-				$asset_element[$asset_array[$x]['id']] = $asset_array[$x]['asset_tag'].' - '.$asset_array[$x]['name'].$full_name;
+            // 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;
+
+            }

        return View::make('backend/licenses/checkout', compact('licenseseat'))->with('users_list',$users_list)->with('asset_list',$asset_element);

@@ -366,13 +450,13 @@ class LicensesController extends AdminController

        $assigned_to = e(Input::get('assigned_to'));
        $asset_id = e(Input::get('asset_id'));
+        $user = Sentry::getUser();

        // Declare the rules for the form validation
        $rules = array(

            'note'   => 'alpha_space',
-//            'asset_id'	=> 'required_without:assigned_to:min:1',
-            'asset_id'	=> 'required',
+            'asset_id'  => 'required_without:assigned_to',
        );

        // Create a new validator instance from our validation rules
@@ -384,37 +468,41 @@ class LicensesController extends AdminController
            return Redirect::back()->withInput()->withErrors($validator);
        }

-		if ($assigned_to!='') {
+        if ($assigned_to!='') {
        // Check if the user exists
-			if (is_null($is_assigned_to = User::find($assigned_to))) {
-				// Redirect to the asset management page with error
-				return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.user_does_not_exist'));
-			}
+            if (is_null($is_assigned_to = User::find($assigned_to))) {
+                // Redirect to the asset management page with error
+                return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.user_does_not_exist'));
+            }
        }

        if ($asset_id!='') {

-			if (is_null($is_asset_id = Asset::find($asset_id))) {
-				// Redirect to the asset management page with error
-				return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.asset_does_not_exist'));
-			}
+            if (is_null($is_asset_id = Asset::find($asset_id))) {
+                // Redirect to the asset management page with error
+                return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.asset_does_not_exist'));
+            }

-			if (($is_asset_id->assigned_to!=$assigned_to) && ($assigned_to!=''))  {
-				//echo 'asset assigned to: '.$is_asset_id->assigned_to.'<br>license assigned to: '.$assigned_to;
-				return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.owner_doesnt_match_asset'));
-			}
+            if (($is_asset_id->assigned_to!=$assigned_to) && ($assigned_to!=''))  {
+                //echo 'asset assigned to: '.$is_asset_id->assigned_to.'<br>license assigned to: '.$assigned_to;
+                return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.owner_doesnt_match_asset'));
+            }

        }



-// Check if the asset exists
+		// Check if the asset exists
        if (is_null($licenseseat = LicenseSeat::find($seatId))) {
            // Redirect to the asset management page with error
            return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
        }

-		 $licenseseat->asset_id = e(Input::get('asset_id'));
+		if (Input::get('asset_id') == '') {
+            $licenseseat->asset_id = NULL;
+        } else {
+            $licenseseat->asset_id = e(Input::get('asset_id'));
+        }

        // Update the asset data
        if ( e(Input::get('assigned_to')) == '') {
@@ -433,14 +521,58 @@ class LicensesController extends AdminController
            $logaction->asset_type = 'software';
            $logaction->user_id = Sentry::getUser()->id;
            $logaction->note = e(Input::get('note'));
+            $logaction->asset_id = $licenseseat->license_id;
+
+
+			$license = License::find($licenseseat->license_id);          
+            $settings = Setting::getSettings();


            // Update the asset data
            if ( e(Input::get('assigned_to')) == '') {
-                    $logaction->checkedout_to = NULL;
+                $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',
+						    'fields' => [
+						        [
+						            'title' => 'Checked Out:',
+						            'value' => $slack_msg
+						        ],
+						        [
+						            'title' => 'Note:',
+						            'value' => e($logaction->note)
+						        ],
+
+						        
+						        				   
+						    ]
+						])->send('License Checked Out');
+					
+					} catch (Exception $e) {
+						
+					}
+
+			}

            $log = $logaction->logaction('checkout');

@@ -457,14 +589,14 @@ class LicensesController extends AdminController
    /**
    * Check the license back into inventory
    **/
-    public function getCheckin($seatId)
+    public function getCheckin($seatId = null, $backto = null)
    {
        // Check if the asset exists
        if (is_null($licenseseat = LicenseSeat::find($seatId))) {
            // Redirect to the asset management page with error
            return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
        }
-        return View::make('backend/licenses/checkin', compact('licenseseat'));
+        return View::make('backend/licenses/checkin', compact('licenseseat'))->with('backto',$backto);

    }

@@ -473,14 +605,22 @@ class LicensesController extends AdminController
    /**
    * Check in the item so that it can be checked out again to someone else
    **/
-    public function postCheckin($seatId)
+    public function postCheckin($seatId = null, $backto = null)
    {
        // Check if the asset exists
        if (is_null($licenseseat = LicenseSeat::find($seatId))) {
            // 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) {
+            // Not allowed to checkin
+            Session::flash('error', 'License not reassignable.');
+            return Redirect::back()->withInput();
+        }
+        
        // Declare the rules for the form validation
        $rules = array(
            'note'   => 'alpha_space',
@@ -495,25 +635,70 @@ class LicensesController extends AdminController
            // Ooops.. something went wrong
            return Redirect::back()->withInput()->withErrors($validator);
        }
-
+		$return_to = $licenseseat->assigned_to;
        $logaction = new Actionlog();
        $logaction->checkedout_to = $licenseseat->assigned_to;

        // Update the asset data
-        $licenseseat->assigned_to            		= '0';
-        $licenseseat->asset_id            			= NULL;
+        $licenseseat->assigned_to                   = NULL;
+        $licenseseat->asset_id                      = NULL;
+        
+        $user = Sentry::getUser();

        // Was the asset updated?
        if($licenseseat->save()) {
-            $logaction->asset_id = NULL;
+            $logaction->asset_id = $licenseseat->license_id;
            $logaction->location_id = NULL;
            $logaction->asset_type = 'software';
            $logaction->note = e(Input::get('note'));
-            $logaction->user_id = Sentry::getUser()->id;
-            $log = $logaction->logaction('checkin from');
+            $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',
+						    'fields' => [
+						        [
+						            'title' => 'Checked In:',
+						            'value' => strtoupper($logaction->asset_type).' <'.Config::get('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked in by <'.Config::get('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.'
+						        ],
+						        [
+						            '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'));
+			} else {
+				return Redirect::to("admin/licenses/".$licenseseat->license_id."/view")->with('success', Lang::get('admin/licenses/message.checkin.success'));
+			}

-            // Redirect to the license page
-            return Redirect::to("admin/licenses")->with('success', Lang::get('admin/licenses/message.checkin.success'));
        }

        // Redirect to the license page with error
@@ -551,7 +736,7 @@ class LicensesController extends AdminController

          // Show the page
        $license_options = array('0' => 'Top Level') + License::lists('name', 'id');
-
+		$maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
        //clone the orig
        $license = clone $license_to_clone;
        $license->id = null;
@@ -559,7 +744,168 @@ class LicensesController extends AdminController

        // Show the page
        $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
-        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('license',$license);
+        $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',$license)->with('maintained_list',$maintained_list);

    }
+
+
+    /**
+    *  Upload the file to the server
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function postUpload($licenseId = null)
+    {
+        $license = License::find($licenseId);
+
+		// the license is valid
+		$destinationPath = app_path().'/private_uploads';
+
+        if (isset($license->id)) {
+
+        	if (Input::hasFile('licensefile')) {
+
+				foreach(Input::file('licensefile') as $file) {
+
+				$rules = array(
+				   'licensefile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt,zip,rar|max:2000'
+				);
+				$validator = Validator::make(array('licensefile'=> $file), $rules);
+
+					if($validator->passes()){
+
+						$extension = $file->getClientOriginalExtension();
+						$filename = 'license-'.$license->id.'-'.str_random(8);
+						$filename .= '-'.Str::slug($file->getClientOriginalName()).'.'.$extension;
+						$upload_success = $file->move($destinationPath, $filename);
+
+						//Log the deletion of seats to the log
+						$logaction = new Actionlog();
+						$logaction->asset_id = $license->id;
+						$logaction->asset_type = 'software';
+						$logaction->user_id = Sentry::getUser()->id;
+						$logaction->note = e(Input::get('notes'));
+						$logaction->checkedout_to =  NULL;
+						$logaction->created_at =  date("Y-m-d h:i:s");
+						$logaction->filename =  $filename;
+						$log = $logaction->logaction('uploaded');
+					} else {
+						 return Redirect::back()->with('error', Lang::get('admin/licenses/message.upload.invalidfiles'));
+					}
+
+
+				}
+
+				if ($upload_success) {
+				  	return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.success'));
+				} else {
+				   return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.error'));
+				}
+
+			} else {
+				 return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.nofiles'));
+			}
+
+
+
+
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
+
+
+    /**
+    *  Delete the associated file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getDeleteFile($licenseId = null, $fileId = null)
+    {
+        $license = License::find($licenseId);
+        $destinationPath = app_path().'/private_uploads';
+
+		// the license is valid
+        if (isset($license->id)) {
+
+			$log = Actionlog::find($fileId);
+			$full_filename = $destinationPath.'/'.$log->filename;
+			if (file_exists($full_filename)) {
+				unlink($destinationPath.'/'.$log->filename);
+			}
+			$log->delete();
+			return Redirect::back()->with('success', Lang::get('admin/licenses/message.deletefile.success'));
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
+
+
+
+    /**
+    *  Display/download the uploaded file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function displayFile($licenseId = null, $fileId = null)
+    {
+
+        $license = License::find($licenseId);
+
+		// the license is valid
+        if (isset($license->id)) {
+				$log = Actionlog::find($fileId);
+				$file = $log->get_src();
+				return Response::download($file);
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
+
+    public function getDatatable() {
+        $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 Datatable::collection($licenses)
+        ->addColumn('name', function($licenses) {
+            return link_to('/admin/licenses/'.$licenses->id.'/view', $licenses->name);
+        })
+        ->addColumn('serial', function($licenses) {
+            return link_to('/admin/licenses/'.$licenses->id.'/view', mb_strimwidth($licenses->serial, 0, 50, "..."));
+        })
+        ->addColumn('totalSeats', function($licenses) {
+            return $licenses->totalSeatsByLicenseID();
+        })
+        ->addColumn('remaining', function($licenses) {
+            return $licenses->remaincount();
+        })
+        ->addColumn('purchase_date', function($licenses) {
+            return $licenses->purchase_date;
+        })
+        ->addColumn($actions)
+        ->searchColumns('name','serial','totalSeats','remaining','purchase_date','actions')
+        ->orderColumns('name','serial','totalSeats','remaining','purchase_date','actions')
+        ->make();
+    }
 }
--- a/app/controllers/admin/LocationsController.php
+++ b/app/controllers/admin/LocationsController.php
@@ -23,7 +23,7 @@ class LocationsController extends AdminController
    public function getIndex()
    {
        // Grab all the locations
-        $locations = Location::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
+        $locations = Location::orderBy('created_at', 'DESC')->with('parent','assets','assignedassets')->get();

        // Show the page
        return View::make('backend/locations/index', compact('locations'));
@@ -37,9 +37,15 @@ class LocationsController extends AdminController
     */
    public function getCreate()
    {
-        // Show the page
-        $location_options = array('0' => 'Top Level') + Location::lists('name', 'id');
-        return View::make('backend/locations/edit')->with('location_options',$location_options)->with('location',new Location);
+        $locations = Location::orderBy('name','ASC')->get();
+
+        $location_options_array = Location::getLocationHierarchy($locations);
+        $location_options = Location::flattenLocationsArray($location_options_array);
+        $location_options = array('' => 'Top Level') + $location_options;
+
+        return View::make('backend/locations/edit')
+        ->with('location_options',$location_options)
+        ->with('location',new Location);
    }


@@ -62,12 +68,18 @@ class LocationsController extends AdminController

            // 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			= 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->zip    			= e(Input::get('zip'));
            $location->user_id          = Sentry::getId();

            // Was the asset created?
@@ -97,14 +109,15 @@ class LocationsController extends AdminController
    {
        // Check if the location exists
        if (is_null($location = Location::find($locationId))) {
-            // Redirect to the blogs management page
            return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.does_not_exist'));
        }

        // Show the page
-        //$location_options = array('' => 'Top Level') + Location::lists('name', 'id');
+        $locations = Location::orderBy('name','ASC')->get();
+        $location_options_array = Location::getLocationHierarchy($locations);
+        $location_options = Location::flattenLocationsArray($location_options_array);
+        $location_options = array('' => 'Top Level') + $location_options;

-        $location_options = array('' => 'Top Level') + DB::table('locations')->where('id', '!=', $locationId)->lists('name', 'id');
        return View::make('backend/locations/edit', compact('location'))->with('location_options',$location_options);
    }

@@ -128,27 +141,33 @@ class LocationsController extends AdminController

        if ($validator->fails())
        {
-            // The given data did not pass validation            
+            // The given data did not pass validation
            return Redirect::back()->withInput()->withErrors($validator->messages());
        }
        // attempt validation
        else {

            // Update the location data
-            $location->name            	= e(Input::get('name'));
+            $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			= 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->country    	= e(Input::get('country'));
+            $location->zip    		  = e(Input::get('zip'));

            // Was the asset created?
            if($location->save()) {
                // Redirect to the saved location page
                return Redirect::to("admin/settings/locations/")->with('success', Lang::get('admin/locations/message.update.success'));
            }
-        } 
+        }

        // Redirect to the location management page
        return Redirect::to("admin/settings/locations/$locationId/edit")->with('error', Lang::get('admin/locations/message.update.error'));
@@ -170,15 +189,12 @@ class LocationsController extends AdminController
        }


-        if ($location->has_users() > 0) {
-
-            // Redirect to the asset management page
+        if ($location->has_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'));
        } else {
-
            $location->delete();
-
-            // Redirect to the locations management page
            return Redirect::to('admin/settings/locations')->with('success', Lang::get('admin/locations/message.delete.success'));
        }

--- a/app/controllers/admin/ManufacturersController.php
+++ b/app/controllers/admin/ManufacturersController.php
@@ -21,7 +21,7 @@ class ManufacturersController extends AdminController
    public function getIndex()
    {
        // Grab all the manufacturers
-        $manufacturers = Manufacturer::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
+        $manufacturers = Manufacturer::orderBy('created_at', 'DESC')->get();

        // Show the page
        return View::make('backend/manufacturers/index', compact('manufacturers'));
@@ -113,7 +113,7 @@ class ManufacturersController extends AdminController

        if ($validator->fails())
        {
-            // The given data did not pass validation           
+            // The given data did not pass validation
            return Redirect::back()->withInput()->withErrors($validator->messages());
        }
        // attempt validation
@@ -126,7 +126,7 @@ class ManufacturersController extends AdminController
                // Redirect to the new manufacturer page
                return Redirect::to("admin/settings/manufacturers")->with('success', Lang::get('admin/manufacturers/message.update.success'));
            }
-        } 
+        }

        // Redirect to the manufacturer management page
        return Redirect::to("admin/settings/manufacturers/$manufacturerId/edit")->with('error', Lang::get('admin/manufacturers/message.update.error'));
@@ -169,5 +169,30 @@ class ManufacturersController extends AdminController



+    /**
+    *  Get the asset information to present to the category view page
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getView($manufacturerID = null)
+    {
+        $manufacturer = Manufacturer::find($manufacturerID);
+
+        if (isset($manufacturer->id)) {
+                return View::make('backend/manufacturers/view', compact('manufacturer'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/manufacturers/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('manufacturers')->with('error', $error);
+        }
+
+
+    }
+
+
+

 }
--- a/app/controllers/admin/ModelsController.php
+++ b/app/controllers/admin/ModelsController.php
@@ -1,6 +1,7 @@
 <?php namespace Controllers\Admin;

 use AdminController;
+use Image;
 use Input;
 use Lang;
 use Model;
@@ -13,6 +14,7 @@ use Manufacturer;
 use Str;
 use Validator;
 use View;
+use Datatable;

 class ModelsController extends AdminController
 {
@@ -23,11 +25,8 @@ class ModelsController extends AdminController
     */
    public function getIndex()
    {
-        // Grab all the models
-        $models = Model::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
-
        // Show the page
-        return View::make('backend/models/index', compact('models'));
+        return View::make('backend/models/index');
    }

 /**
@@ -58,21 +57,26 @@ class ModelsController extends AdminController
    public function postCreate()
    {

-        // get the POST data
-        $new = Input::all();
-
        // Create a new manufacturer
        $model = new Model;

+        $validator = Validator::make(Input::all(), $model->validationRules());
+
        // attempt validation
-        if ($model->validate($new)) {
-             
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {
+
            if ( e(Input::get('depreciation_id')) == '') {
                $model->depreciation_id =  0;
            } else {
                $model->depreciation_id = e(Input::get('depreciation_id'));
            }
-            
+
             if ( e(Input::get('eol')) == '') {
                $model->eol =  0;
            } else {
@@ -82,22 +86,28 @@ class ModelsController extends AdminController
            // Save the model data
            $model->name            	= e(Input::get('name'));
            $model->modelno            	= e(Input::get('modelno'));
-            //$model->depreciation_id    	= e(Input::get('depreciation_id'));
            $model->manufacturer_id    	= e(Input::get('manufacturer_id'));
            $model->category_id    		= e(Input::get('category_id'));
            $model->user_id          	= Sentry::getId();
-            //$model->eol    				= e(Input::get('eol'));
+            $model->show_mac_address 	= e(Input::get('show_mac_address', '0'));


+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/models/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $model->image = $file_name;
+            }
+
            // Was it created?
            if($model->save()) {
                // Redirect to the new model  page
                return Redirect::to("hardware/models")->with('success', Lang::get('admin/models/message.create.success'));
            }
-        } else {
-            // failure
-            $errors = $model->errors();
-            return Redirect::back()->withInput()->withErrors($errors);
        }

        // Redirect to the model create page
@@ -149,18 +159,18 @@ class ModelsController extends AdminController

        if ($validator->fails())
        {
-            // The given data did not pass validation           
+            // The given data did not pass validation
            return Redirect::back()->withInput()->withErrors($validator->messages());
        }
        // attempt validation
        else {
-            
+
            if ( e(Input::get('depreciation_id')) == '') {
                $model->depreciation_id =  0;
            } else {
                $model->depreciation_id = e(Input::get('depreciation_id'));
            }
-            
+
             if ( e(Input::get('eol')) == '') {
                $model->eol =  0;
            } else {
@@ -169,16 +179,32 @@ class ModelsController extends AdminController

            // Update the model data
            $model->name            	= e(Input::get('name'));
-            $model->modelno            	= e(Input::get('modelno'));           
+            $model->modelno            	= e(Input::get('modelno'));
            $model->manufacturer_id    	= e(Input::get('manufacturer_id'));
            $model->category_id    		= e(Input::get('category_id'));
-      
+            $model->show_mac_address 	= e(Input::get('show_mac_address', '0'));
+
+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/models/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $model->image = $file_name;
+            }
+
+            if (Input::get('image_delete') == 1 && Input::file('image') == "") {
+                $model->image = NULL;
+            }
+
            // Was it created?
            if($model->save()) {
                // Redirect to the new model  page
                return Redirect::to("hardware/models")->with('success', Lang::get('admin/models/message.update.success'));
            }
-        } 
+        }

        // Redirect to the model create page
        return Redirect::to("hardware/models/$modelId/edit")->with('error', Lang::get('admin/models/message.update.error'));
@@ -212,6 +238,29 @@ class ModelsController extends AdminController
        }
    }

+    public function getRestore($modelId = null)
+    {
+
+		// Get user information
+		$model = Model::withTrashed()->find($modelId);
+
+		 if (isset($model->id)) {
+
+			// Restore the model
+			$model->restore();
+
+			// Prepare the success message
+			$success = Lang::get('admin/models/message.restore.success');
+
+			// Redirect back
+			return Redirect::back()->with('success', $success);
+
+		 } else {
+			 return Redirect::back()->with('error', Lang::get('admin/models/message.not_found'));
+		 }
+
+    }
+

    /**
    *  Get the asset information to present to the model view page
@@ -221,7 +270,7 @@ class ModelsController extends AdminController
    **/
    public function getView($modelId = null)
    {
-        $model = Model::find($modelId);
+        $model = Model::withTrashed()->find($modelId);

        if (isset($model->id)) {
                return View::make('backend/models/view', compact('model'));
@@ -235,7 +284,7 @@ class ModelsController extends AdminController


    }
-    
+
        public function getClone($modelId = null)
    {
        // Check if the model exists
@@ -243,10 +292,10 @@ class ModelsController extends AdminController
            // Redirect to the model management page
            return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.does_not_exist'));
        }
-        
+
        $model = clone $model_to_clone;
        $model->id = null;
-        
+
        // Show the page
        $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
        $manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
@@ -258,8 +307,82 @@ class ModelsController extends AdminController
        $view->with('model',$model);
        $view->with('clone_model',$model_to_clone);
        return $view;
-        
+
+    }
+
+    public function getDatatable($status = null)
+    {
+        $models = Model::orderBy('created_at', 'DESC')->with('category','assets','depreciation');
+        ($status != 'Deleted') ?: $models->withTrashed()->Deleted();;
+        $models = $models->get();
+
+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function($models) {
+            if($models->deleted_at=='') {
+                return '<a href="'.route('update/model', $models->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/model', $models->id).'" data-content="'.Lang::get('admin/models/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($models->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            } else {
+                return '<a href="'.route('restore/model', $models->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
+            }
+        });
+
+        return Datatable::collection($models)
+        ->addColumn('manufacturer', function($models) {
+            return $models->manufacturer->name;
+        })
+        ->addColumn('name', function ($models) {
+            return link_to('/hardware/models/'.$models->id.'/view', $models->name);
+        })
+        ->showColumns('modelno')
+        ->addColumn('asset_count', function($models) {
+            return $models->assets->count();
+        })
+        ->addColumn('depreciation', function($models) {
+            return (($models->depreciation)&&($models->depreciation->id > 0)) ? $models->depreciation->name.' ('.$models->depreciation->months.')' : Lang::get('general.no_depreciation');
+        })
+        ->addColumn('category', function($models) {
+            return ($models->category) ? $models->category->name : '';
+        })
+        ->addColumn('eol', function($models) {
+            return ($models->eol) ? $models->eol.' '.Lang::get('general.months') : '';
+        })
+        ->addColumn($actions)
+        ->searchColumns('name','modelno','asset_count','depreciation','category','eol','actions')
+        ->orderColumns('name','modelno','asset_count','depreciation','category','eol','actions')
+        ->make();
    }


+    public function getDataView($modelID)
+    {
+        $model = Model::withTrashed()->find($modelID);
+        $modelassets = $model->assets;
+
+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($modelassets)
+            {
+                if (($modelassets->assigned_to !='') && ($modelassets->assigned_to > 0)) {
+                    return '<a href="'.route('checkin/hardware', $modelassets->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
+                } else {
+                    return '<a href="'.route('checkout/hardware', $modelassets->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
+                }
+            });
+
+        return Datatable::collection($modelassets)
+        ->addColumn('name', function ($modelassets) {
+           return link_to('/hardware/'.$modelassets->id.'/view', $modelassets->showAssetName());
+          // return $modelassets->name;
+        })
+        ->addColumn('asset_tag', function ($modelassets) {
+            return link_to('/hardware/'.$modelassets->id.'/view', $modelassets->asset_tag);
+        })
+        ->showColumns('serial')
+        ->addColumn('assigned_to', function ($modelassets) {
+            if ($modelassets->assigned_to) {
+                return link_to('/admin/users/'.$modelassets->assigned_to.'/view', $modelassets->assigneduser->fullName());
+            }
+        })
+        ->addColumn($actions)
+        ->searchColumns('name','asset_tag','serial','assigned_to','actions')
+        ->orderColumns('name','asset_tag','serial','assigned_to','actions')
+        ->make();
+    }
+
 }
--- a/app/controllers/admin/ReportsController.php
+++ b/app/controllers/admin/ReportsController.php
@@ -0,0 +1,481 @@
+<?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 Actionlog;
+use Setting;
+use League\Csv\Writer;
+use League\Csv\Reader;
+
+class ReportsController extends AdminController
+{
+    /**
+     * Show Asset Report
+     *
+     * @return View
+     */
+    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'));
+    }
+
+    /**
+     * Export Asset Report as CSV
+     *
+     * @return file download
+     */
+    public function exportAssetReport()
+    {
+        // Grab all the assets
+        $assets = Asset::orderBy('created_at', 'DESC')->get();
+
+        $rows = array();
+
+        // 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, ',');
+
+        // Create a row per asset
+        foreach ($assets as $asset) {
+            $row = array();
+            $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->name;
+            $row[] = $asset->serial;
+            if ($asset->assetstatus) {
+                $row[] = $asset->assetstatus->name;
+            } else {
+                $row[] = '';
+            }
+            $row[] = $asset->purchase_date;
+            $row[] = '"'.number_format($asset->purchase_cost).'"';
+            if ($asset->order_number) {
+                $row[] = $asset->order_number;
+            } else {
+                $row[] = '';
+            }
+            if ($asset->supplier_id) {
+                $row[] = $asset->supplier->name;
+            } else {
+                $row[] = '';
+            }
+
+            if ($asset->assigned_to > 0) {
+                $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 ($location->name) {
+                    $row[] = $location->name;
+                } else {
+                    $row[] = '';
+                }
+            } elseif ($asset->rtd_location_id) {
+                $location = Location::find($asset->rtd_location_id);
+                if ($location->name) {
+                    $row[] = $location->name;
+                } else {
+                    $row[] = '';
+                }
+            } else {
+                $row[] = '';  // Empty string if location is not set
+            }
+
+            $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;
+    }
+
+    /**
+     * Show Depreciation Report for Assets
+     *
+     * @return View
+     */
+    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'));
+    }
+
+    /**
+     * Export Depreciation Report as CSV
+     *
+     * @return file download
+     */
+    public function exportDeprecationReport()
+    {
+        // Grab all the assets
+        $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);
+
+        $rows = array();
+
+        // 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')
+        );
+
+        //we insert the CSV header
+        $csv->insertOne($header);
+
+        // Create a row per asset
+        foreach ($assets as $asset) {
+            $row = array();
+            $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 {
+                $row[] = ''; // Empty string if unassigned
+            }
+
+            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) {
+                    $row[] = $location->name;
+                } else {
+                    $row[] = '';
+                }
+            } else {
+                $row[] = '';  // Empty string if location is not set
+            }
+
+
+
+            if ($asset->assetloc) {
+                $currency =  $asset->assetloc->currency;
+            } else {
+                $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);
+        }
+
+        $csv->output('depreciation-report-'.date('Y-m-d').'.csv');
+        die;
+
+    }
+
+	/**
+     * Show Report for Activity
+     *
+     * @return View
+     */
+
+	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'));
+    }
+
+
+    /**
+     * Show Report for Licenses
+     *
+     * @return View
+     */
+    public function getLicenseReport()
+    {
+        $licenses = License::orderBy('created_at', 'DESC')->get();
+        return View::make('backend/reports/licenses', compact('licenses'));
+    }
+
+    /**
+     * Export License Report as CSV
+     *
+     * @return file download
+     */
+    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, ', ');
+
+        // Row per license
+        foreach ($licenses as $license) {
+            $row = array();
+            $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).'"';
+
+            $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;
+    }
+
+    public function getCustomReport()
+    {
+        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')
+        {
+            $header[] = 'Asset Name';
+        }
+        if (e(Input::get('asset_tag')) == '1')
+        {
+            $header[] = 'Asset Tag';
+        }
+        if (e(Input::get('manufacturer')) == '1')
+        {
+            $header[] = 'Manufacturer';
+        }
+        if (e(Input::get('model')) == '1')
+        {
+            $header[] = 'Model';
+            $header[] = 'Model Number';
+        }
+        if (e(Input::get('serial')) == '1')
+        {
+            $header[] = 'Serial';
+        }
+        if (e(Input::get('purchase_date')) == '1')
+        {
+            $header[] = 'Purchase Date';
+        }
+        if ((e(Input::get('purchase_cost')) == '1') && (e(Input::get('depreciation')) == '0'))
+        {
+            $header[] = 'Purchase Cost';
+        }
+        if (e(Input::get('order')) == '1')
+        {
+            $header[] = 'Order Number';
+        }
+        if (e(Input::get('supplier')) == '1')
+        {
+            $header[] = 'Supplier';
+        }
+        if (e(Input::get('location')) == '1')
+        {
+            $header[] = 'Location';
+        }
+        if (e(Input::get('assigned_to')) == '1')
+        {
+            $header[] = 'Assigned To';
+        }
+        if (e(Input::get('status')) == '1')
+        {
+            $header[] = 'Status';
+        }
+        if (e(Input::get('warranty')) == '1')
+        {
+            $header[] = 'Warranty';
+            $header[] = 'Warranty Expires';
+        }
+        if (e(Input::get('depreciation')) == '1')
+        {
+            $header[] = 'Purchase Cost';
+            $header[] = 'Value';
+            $header[] = 'Diff';
+        }
+
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ',');
+
+        foreach($assets as $asset) {
+            $row = array();
+            if (e(Input::get('asset_name')) == '1') {
+                $row[] = $asset->name;
+            }
+            if (e(Input::get('asset_tag')) == '1') {
+                $row[] = $asset->asset_tag;
+            }
+            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('serial')) == '1') {
+                $row[] = $asset->serial;
+            }
+            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('order')) == '1') {
+                if ($asset->order_number) {
+                    $row[] = $asset->order_number;
+                } else {
+                    $row[] = '';
+                }
+            }
+            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 ($location->name) {
+                        $row[] = $location->name;
+                    } else {
+                        $row[] = '';
+                    }
+                } elseif ($asset->rtd_location_id) {
+                    $location = Location::find($asset->rtd_location_id);
+                    if ($location->name) {
+                        $row[] = $location->name;
+                    } else {
+                        $row[] = '';
+                    }
+                } else {
+                    $row[] = '';  // Empty string if location is not set
+                }
+            }
+            if (e(Input::get('assigned_to')) == '1') {
+                if ($asset->assigned_to > 0) {
+                    $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');
+                } elseif ($asset->assetstatus) {
+                    $row[] = $asset->assetstatus->name;
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('warranty')) == '1') {
+                if ($asset->warranty_months) {
+                    $row[] = $asset->warranty_months;
+                    $row[] = $asset->warrantee_expires();
+                } else {
+                    $row[] = '';
+                    $row[] = '';
+                }
+            }
+            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).'"';
+            }
+            $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');
+            return $response;
+        } else {
+            return Redirect::to("reports/custom")->with('error', Lang::get('admin/reports/message.error'));
+        }
+    }
+}
--- a/app/controllers/admin/SettingsController.php
+++ b/app/controllers/admin/SettingsController.php
@@ -10,6 +10,9 @@ use Sentry;
 use Str;
 use Validator;
 use View;
+use Image;
+use Config;
+use Response;

 class SettingsController extends AdminController
 {
@@ -62,11 +65,22 @@ class SettingsController extends AdminController


        // Declare the rules for the form validation
+
        $rules = array(
-        "site_name" 	=> 'required|min:3',
-        "per_page"   		=> 'required|min:1|numeric',
-        "qr_text"		=> 'min:1|max:31'
-        );
+	        "per_page"   	=> 'required|min:1|numeric',
+	        "qr_text"		=> 'min:1|max:31',
+	        "logo"   		=> 'mimes:jpeg,bmp,png,gif',
+	        "alert_email"   => 'email',
+	        "slack_endpoint"   => 'url',
+            "default_currency"   => 'required',
+	        "slack_channel"   => 'regex:/(?<!\w)#\w+/',
+	        "slack_botname"   => 'alpha_dash',
+	        );
+
+        if (Config::get('app.lock_passwords')==false) {
+	        $rules['site_name'] = 'required|min:3';
+
+	    }

        // Create a new validator instance from our validation rules
        $validator = Validator::make(Input::all(), $rules);
@@ -78,13 +92,45 @@ class SettingsController extends AdminController
            return Redirect::back()->withInput()->withErrors($validator);
        }

+        if (Input::get('clear_logo')=='1') {
+	        $setting->logo = NULL;
+        } elseif (Input::file('logo')) {
+            if (!Config::get('app.lock_passwords')) {
+                $image = Input::file('logo');
+                $file_name = "logo.".$image->getClientOriginalExtension();
+                $path = public_path('uploads/'.$file_name);
+                Image::make($image->getRealPath())->resize(null, 40, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $setting->logo = $file_name;
+            }
+        }
+
+
        // Update the asset data
            $setting->id = '1';
-            $setting->site_name = e(Input::get('site_name'));
-            $setting->display_asset_name = e(Input::get('display_asset_name', '0'));
+
+             if (Config::get('app.lock_passwords')==false) {
+	             $setting->site_name = e(Input::get('site_name'));
+             }
+
            $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->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'));
+            $setting->alert_email = e(Input::get('alert_email'));
+            $setting->alerts_enabled = e(Input::get('alerts_enabled', '0'));
+            $setting->header_color = e(Input::get('header_color'));
+            $setting->default_eula_text = e(Input::get('default_eula_text'));
+            $setting->slack_endpoint = e(Input::get('slack_endpoint'));
+            $setting->slack_channel = e(Input::get('slack_channel'));
+            $setting->slack_botname = e(Input::get('slack_botname'));
+

            // Was the asset updated?
            if($setting->save()) {
@@ -98,6 +144,63 @@ class SettingsController extends AdminController
    }


+    /**
+    * Generate the backup page
+    *
+    * @return View
+    **/
+
+    public function getBackups()
+    {
+        $path = Config::get('backup::path');
+        $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)=='zip') {
+                    $files[] = array(
+                            'filename' => $entry,
+                            'filesize' => Setting::fileSizeConvert(filesize(Config::get('backup::path').$entry)),
+                            'modified' => filemtime(Config::get('backup::path').$entry)
+                        );
+                }
+
+            }
+            closedir($handle);
+        }
+
+
+        return View::make('backend/settings/backups', compact('path','files'));
+    }
+
+    /**
+    * Download the dump file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function downloadFile($filename = null)
+    {
+
+        $file = Config::get('backup::path').'/'.$filename;
+
+
+		// the license is valid
+        if (file_exists($file)) {
+				return Response::download($file);
+        } 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);
+        }
+    }
+
+


 }
--- a/app/controllers/admin/StatuslabelsController.php
+++ b/app/controllers/admin/StatuslabelsController.php
@@ -23,7 +23,7 @@ class StatuslabelsController extends AdminController
    public function getIndex()
    {
        // Grab all the statuslabels
-        $statuslabels = Statuslabel::orderBy('created_at', 'DESC')->paginate(10);
+        $statuslabels = Statuslabel::orderBy('created_at', 'DESC')->get();

        // Show the page
        return View::make('backend/statuslabels/index', compact('statuslabels'));
@@ -38,7 +38,12 @@ class StatuslabelsController extends AdminController
    public function getCreate()
    {
        // Show the page
-        return View::make('backend/statuslabels/edit')->with('statuslabel',new Statuslabel);
+		$statuslabel = new Statuslabel;
+		$use_statuslabel_type = $statuslabel->getStatuslabelType();
+
+    	$statuslabel_types = array('' => Lang::get('admin/hardware/form.select_statustype')) + array('undeployable' => Lang::get('admin/hardware/general.undeployable')) + array('pending' => Lang::get('admin/hardware/general.pending')) + array('archived' => Lang::get('admin/hardware/general.archived')) + array('deployable' => Lang::get('admin/hardware/general.deployable'));
+
+        return View::make('backend/statuslabels/edit', compact('statuslabel_types','statuslabel'))->with('use_statuslabel_type',$use_statuslabel_type);
    }


@@ -59,9 +64,15 @@ class StatuslabelsController extends AdminController
        // attempt validation
        if ($statuslabel->validate($new)) {

+        	$statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
+
            // Save the Statuslabel data
            $statuslabel->name            	= e(Input::get('name'));
            $statuslabel->user_id          = Sentry::getId();
+            $statuslabel->notes          =  e(Input::get('notes'));
+            $statuslabel->deployable          =  $statustype['deployable'];
+            $statuslabel->pending          =  $statustype['pending'];
+            $statuslabel->archived          =  $statustype['archived'];

            // Was the asset created?
            if($statuslabel->save()) {
@@ -94,8 +105,11 @@ class StatuslabelsController extends AdminController
            return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.does_not_exist'));
        }

+		$use_statuslabel_type = $statuslabel->getStatuslabelType();

-        return View::make('backend/statuslabels/edit', compact('statuslabel'));
+		$statuslabel_types = array('' => Lang::get('admin/hardware/form.select_statustype')) + array('undeployable' => Lang::get('admin/hardware/general.undeployable')) + array('pending' => Lang::get('admin/hardware/general.pending')) + array('archived' => Lang::get('admin/hardware/general.archived')) + array('deployable' => Lang::get('admin/hardware/general.deployable'));
+
+        return View::make('backend/statuslabels/edit', compact('statuslabel','statuslabel_types'))->with('use_statuslabel_type',$use_statuslabel_type);
    }


@@ -118,20 +132,27 @@ class StatuslabelsController extends AdminController

        if ($validator->fails())
        {
-            // The given data did not pass validation            
+            // The given data did not pass validation
            return Redirect::back()->withInput()->withErrors($validator->messages());
        }
        // attempt validation
        else {
            // Update the Statuslabel data
+            $statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
+
            $statuslabel->name            	= e(Input::get('name'));
+            $statuslabel->notes          =  e(Input::get('notes'));
+            $statuslabel->deployable          =  $statustype['deployable'];
+            $statuslabel->pending          =  $statustype['pending'];
+            $statuslabel->archived          =  $statustype['archived'];
+

            // Was the asset created?
            if($statuslabel->save()) {
                // Redirect to the saved Statuslabel page
                return Redirect::to("admin/settings/statuslabels/")->with('success', Lang::get('admin/statuslabels/message.update.success'));
            }
-        } 
+        }

        // Redirect to the Statuslabel management page
        return Redirect::to("admin/settings/statuslabels/$statuslabelId/edit")->with('error', Lang::get('admin/statuslabels/message.update.error'));
--- a/app/controllers/admin/SuppliersController.php
+++ b/app/controllers/admin/SuppliersController.php
@@ -1,6 +1,7 @@
 <?php namespace Controllers\Admin;

 use AdminController;
+use Image;
 use Input;
 use Lang;
 use Supplier;
@@ -21,7 +22,7 @@ class SuppliersController extends AdminController
    public function getIndex()
    {
        // Grab all the suppliers
-        $suppliers = Supplier::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
+        $suppliers = Supplier::orderBy('created_at', 'DESC')->get();

        // Show the page
        return View::make('backend/suppliers/index', compact('suppliers'));
@@ -57,20 +58,31 @@ class SuppliersController extends AdminController
        if ($supplier->validate($new)) {

            // Save the location data
-            $supplier->name            		= e(Input::get('name'));
-            $supplier->address          	= e(Input::get('address'));
-            $supplier->address2          	= e(Input::get('address2'));
-            $supplier->city          		= e(Input::get('city'));
-            $supplier->state          		= e(Input::get('state'));
-            $supplier->country          	= e(Input::get('country'));
-            $supplier->zip          		= e(Input::get('zip'));
-            $supplier->contact          	= e(Input::get('contact'));
-            $supplier->phone          		= e(Input::get('phone'));
-            $supplier->fax         	 		= e(Input::get('fax'));
-            $supplier->email          		= e(Input::get('email'));
-            $supplier->notes          		= e(Input::get('notes'));
-            $supplier->url          		= $supplier->addhttp(e(Input::get('url')));
-            $supplier->user_id          	= Sentry::getId();
+            $supplier->name                 = e(Input::get('name'));
+            $supplier->address              = e(Input::get('address'));
+            $supplier->address2             = e(Input::get('address2'));
+            $supplier->city                 = e(Input::get('city'));
+            $supplier->state                = e(Input::get('state'));
+            $supplier->country              = e(Input::get('country'));
+            $supplier->zip                  = e(Input::get('zip'));
+            $supplier->contact              = e(Input::get('contact'));
+            $supplier->phone                = e(Input::get('phone'));
+            $supplier->fax                  = e(Input::get('fax'));
+            $supplier->email                = e(Input::get('email'));
+            $supplier->notes                = e(Input::get('notes'));
+            $supplier->url                  = $supplier->addhttp(e(Input::get('url')));
+            $supplier->user_id              = Sentry::getId();
+
+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/suppliers/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $supplier->image = $file_name;
+            }

            // Was it created?
            if($supplier->save()) {
@@ -134,20 +146,34 @@ class SuppliersController extends AdminController
        else {

            // Save the  data
-            $supplier->name            		= e(Input::get('name'));
-            $supplier->address          	= e(Input::get('address'));
-            $supplier->address2          	= e(Input::get('address2'));
-            $supplier->city          		= e(Input::get('city'));
-            $supplier->state          		= e(Input::get('state'));
-            $supplier->country          	= e(Input::get('country'));
-            $supplier->zip          		= e(Input::get('zip'));
-            $supplier->contact          	= e(Input::get('contact'));
-            $supplier->phone          		= e(Input::get('phone'));
-            $supplier->fax          		= e(Input::get('fax'));
-            $supplier->email          		= e(Input::get('email'));
-            $supplier->url          		= $supplier->addhttp(e(Input::get('url')));
-            $supplier->notes          		= e(Input::get('notes'));
+            $supplier->name                 = e(Input::get('name'));
+            $supplier->address              = e(Input::get('address'));
+            $supplier->address2             = e(Input::get('address2'));
+            $supplier->city                 = e(Input::get('city'));
+            $supplier->state                = e(Input::get('state'));
+            $supplier->country              = e(Input::get('country'));
+            $supplier->zip                  = e(Input::get('zip'));
+            $supplier->contact              = e(Input::get('contact'));
+            $supplier->phone                = e(Input::get('phone'));
+            $supplier->fax                  = e(Input::get('fax'));
+            $supplier->email                = e(Input::get('email'));
+            $supplier->url                  = $supplier->addhttp(e(Input::get('url')));
+            $supplier->notes                = e(Input::get('notes'));

+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/suppliers/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $supplier->image = $file_name;
+            }
+
+            if (Input::get('image_delete') == 1 && Input::file('image') == "") {
+                $supplier->image = NULL;
+            }

            // Was it created?
            if($supplier->save()) {
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -20,7 +20,9 @@ use Redirect;
 use Sentry;
 use Validator;
 use View;
-use Chumper\Datatable\Facades\Datatable;
+use Datatable;
+use League\Csv\Reader;
+use Mail;

 class UsersController extends AdminController
 {
@@ -32,8 +34,9 @@ class UsersController extends AdminController
    protected $validationRules = array(
        'first_name'       => 'required|alpha_space|min:2',
        'last_name'        => 'required|alpha_space|min:2',
-		'location_id'      => 'required',
-        'email'            => 'required|email|unique:users,email',
+		'location_id'      => 'numeric',
+        'username'         => 'required|min:2|unique:users,username',
+        'email'            => 'email|unique:users,email',
        'password'         => 'required|min:6',
        'password_confirm' => 'required|min:6|same:password',
    );
@@ -45,41 +48,9 @@ class UsersController extends AdminController
     */
    public function getIndex()
    {
-        // Grab all the users - depending on the scope to include
-        $users = Sentry::getUserProvider()->createModel();
-
-        // Do we want to include the deleted users?
-	// the with and onlyTrashed calls currently do not work - returns an
-	// inconsistent array which cannot be displayed by the blade output
-
-        if (Input::get('withTrashed')) {
-
-            $users = $users->withTrashed();
-            //$users = Sentry::getUserProvider()->createModel()->paginate();
-
-        } elseif (Input::get('onlyTrashed')) {
-
-	// this is a tempoary 'fix' to display NO deleted users.
-            //$users = Sentry::getUserProvider()->createModel()->whereNotNull('deleted_at')->paginate();
-            //$users = Sentry::findAllUsers();
-            //$users = users::deletedUsers()->paginate();
-            $users = Sentry::getUserProvider()->createModel()->onlyTrashed();
-            //$users = users::whereNotNull('deleted_at')->paginate();
-            //$users = $users->onlyTrashed();
-            //$users = Users::onlyTrashed()->get();
-            //$users = Sentry::getUserProvider()->createModel();
-        }
-
-
-        // Paginate the users
-        $users = $users->paginate(100000)
-            ->appends(array(
-                'withTrashed' => Input::get('withTrashed'),
-                'onlyTrashed' => Input::get('onlyTrashed'),
-            ));

        // Show the page
-        return View::make('backend/users/index', compact('users'));
+        return View::make('backend/users/index');
    }

    /**
@@ -149,7 +120,7 @@ class UsersController extends AdminController
            // permissions here before we create the user.

            // Get the inputs, with some exceptions
-            $inputs = Input::except('csrf_token', 'password_confirm', 'groups');
+            $inputs = Input::except('csrf_token', 'password_confirm', 'groups','email_user');

 			// @TODO: Figure out WTF I need to do this.
            if ($inputs['manager_id']=='') {
@@ -174,6 +145,22 @@ class UsersController extends AdminController

                // Redirect to the new user page
                //return Redirect::route('update/user', $user->id)->with('success', $success);
+
+                if (Input::get('email_user')==1) {
+					// Send the credentials through email
+
+					$data = array();
+					$data['email'] = e(Input::get('email'));
+					$data['first_name'] = e(Input::get('first_name'));
+					$data['password'] = e(Input::get('password'));
+
+		            Mail::send('emails.send-login', $data, function ($m) use ($user) {
+		                $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+		                $m->subject('Welcome ' . $user->first_name);
+		            });
+				}
+
+
                return Redirect::route('users')->with('success', $success);
            }

@@ -259,6 +246,11 @@ class UsersController extends AdminController
        $this->decodePermissions($permissions);
        app('request')->request->set('permissions', $permissions);

+        // Only update the email address if locking is set to false
+        if (Config::get('app.lock_passwords')) {
+            return Redirect::route('users')->with('error', 'Denied! You cannot update user information on the demo.');
+        }
+
        try {
            // Get the user information
            $user = Sentry::getUserProvider()->findById($id);
@@ -270,8 +262,15 @@ class UsersController extends AdminController
            return Redirect::route('users')->with('error', $error);
        }

-        //
-        $this->validationRules['email'] = "required|email|unique:users,email,{$user->email},email";
+        //Check if username is the same then unset validationRules
+        if (Input::get('username') == $user->username) {
+           unset($this->validationRules['username']);
+        }
+
+        //Check if email is the same then unset validationRules
+        if ($user->email == Input::get('email')) {
+            unset($this->validationRules['email']);
+        }

        // Do we want to update the user password?
        if ( ! $password = Input::get('password')) {
@@ -293,9 +292,10 @@ class UsersController extends AdminController

        try {
            // Update the user
-            $user->first_name  		= Input::get('first_name');
+           $user->first_name  		= Input::get('first_name');
            $user->last_name   		= Input::get('last_name');
-            $user->email       		= Input::get('email');
+            $user->username         = Input::get('username');
+            $user->email            = Input::get('email');
            $user->employee_num		= Input::get('employee_num');
            $user->activated   		= Input::get('activated', $user->activated);
            $user->permissions 		= Input::get('permissions');
@@ -303,6 +303,7 @@ class UsersController extends AdminController
            $user->phone 			= Input::get('phone');
            $user->location_id 		= Input::get('location_id');
            $user->manager_id 		= Input::get('manager_id');
+            $user->notes            = Input::get('notes');

            if ($user->manager_id == "") {
                $user->manager_id = NULL;
@@ -314,7 +315,7 @@ class UsersController extends AdminController


            // Do we want to update the user password?
-            if ($password) {
+            if (($password)  && (!Config::get('app.lock_passwords'))) {
                $user->password = $password;
            }

@@ -329,19 +330,21 @@ class UsersController extends AdminController
            $groupsToAdd    = array_diff($selectedGroups, $userGroups);
            $groupsToRemove = array_diff($userGroups, $selectedGroups);

-            // Assign the user to groups
-            foreach ($groupsToAdd as $groupId) {
-                $group = Sentry::getGroupProvider()->findById($groupId);
+			if (!Config::get('app.lock_passwords')) {

-                $user->addGroup($group);
-            }
+	            // Assign the user to groups
+	            foreach ($groupsToAdd as $groupId) {
+	                $group = Sentry::getGroupProvider()->findById($groupId);
+	                $user->addGroup($group);
+	            }

-            // Remove the user from groups
-            foreach ($groupsToRemove as $groupId) {
-                $group = Sentry::getGroupProvider()->findById($groupId);
+	            // Remove the user from groups
+	            foreach ($groupsToRemove as $groupId) {
+	                $group = Sentry::getGroupProvider()->findById($groupId);

-                $user->removeGroup($group);
-            }
+	                $user->removeGroup($group);
+	            }
+	         }

            // Was the user updated?
            if ($user->save()) {
@@ -385,7 +388,7 @@ class UsersController extends AdminController


            // Do we have permission to delete this user?
-            if ($user->isSuperUser() and ! Sentry::getUser()->isSuperUser()) {
+            if ((!Sentry::getUser()->isSuperUser()) || (Config::get('app.lock_passwords'))) {
                // Redirect to the user management page
                return Redirect::route('users')->with('error', 'Insufficient permissions!');
            }
@@ -458,10 +461,12 @@ class UsersController extends AdminController
    public function getView($userId = null)
    {

-        $user = Sentry::getUserProvider()->createModel()->withTrashed()->find($userId);
+        $user = User::with('assets','assets.model','consumables','accessories','licenses','userloc')->find($userId);
+
+        $userlog = $user->userlog->load('assetlog','consumablelog','assetlog.model','licenselog','accessorylog','userlog','adminlog');

            if (isset($user->id)) {
-                return View::make('backend/users/view', compact('user'));
+                return View::make('backend/users/view', compact('user','userlog'));
            } else {
                // Prepare the error message
                $error = Lang::get('admin/users/message.user_not_found', compact('id' ));
@@ -472,33 +477,6 @@ class UsersController extends AdminController

    }

-    public function getDatatable()
-    {
-        return Datatable::collection(User::all())
-        ->addColumn('name',function ($model) {
-                $name = HTML::image($model->gravatar(), $model->first_name, array('class'=>'img-circle avatar hidden-phone', 'style'=>'max-width: 45px'));
-                $name .= HTML::link(URL::action('Controllers\Admin\UsersController@getView', $model->id), $model->first_name . ' ' . $model->last_name, array('class' => 'name'));
-                return $name;
-            }
-        )
-        ->showColumns('email')
-        ->addColumn('assets', function ($model) {
-                $assets = $model->assets->count();
-                return $assets;
-            }
-        )
-        ->addColumn('licenses', function ($model) {
-                $licenses = $model->licenses->count();
-                return $licenses;
-            }
-        )
-        ->addColumn('activated', function ($model) {
-                $activated = $model->isActivated() ? '<i class="icon-ok"></i>' : '';
-                return $activated;
-            }
-        )
-        ->make();
-    }

    /**
     * Unsuspend the given user.
@@ -602,4 +580,235 @@ class UsersController extends AdminController
        }
    }

+    /**
+	 * User import.
+	 *
+	 * @return View
+	 */
+	public function getImport()
+	{
+		// Get all the available groups
+		$groups = Sentry::getGroupProvider()->findAll();
+		// Selected groups
+		$selectedGroups = Input::old('groups', array());
+		// Get all the available permissions
+		$permissions = Config::get('permissions');
+		$this->encodeAllPermissions($permissions);
+		// Selected permissions
+		$selectedPermissions = Input::old('permissions', array('superuser' => -1));
+		$this->encodePermissions($selectedPermissions);
+		// Show the page
+		return View::make('backend/users/import', compact('groups', 'selectedGroups', 'permissions', 'selectedPermissions'));
+	}
+
+
+	/**
+	 * User import form processing.
+	 *
+	 * @return Redirect
+	 */
+	public function postImport()
+	{
+
+		if (! ini_get("auto_detect_line_endings")) {
+			ini_set("auto_detect_line_endings", '1');
+		}
+
+		$csv = Reader::createFromPath(Input::file('user_import_csv'));
+		$csv->setNewline("\r\n");
+
+		if (Input::get('has_headers')==1) {
+			$csv->setOffset(1);
+		}
+
+		$duplicates = '';
+
+		$nbInsert = $csv->each(function ($row) use ($duplicates) {
+
+			if (array_key_exists(2, $row)) {
+
+				if (Input::get('activate')==1) {
+					$activated = '1';
+				} else {
+					$activated = '0';
+				}
+
+				$pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10);
+
+
+
+				try {
+						// Check if this email already exists in the system
+						$user = DB::table('users')->where('username', $row[2])->first();
+						if ($user) {
+							$duplicates .= $row[2].', ';
+						} else {
+
+                            $newuser = array(
+                                'first_name' => $row[0],
+                                'last_name' => $row[1],
+                                'username' => $row[2],
+                                'email' => $row[3],
+                                'password' => $pass,
+                                'activated' => $activated,
+                                'location_id' => $row[4],
+                                'permissions'	=> '{"user":1}',
+                                'notes'     => 'Imported user'
+                            );
+
+							DB::table('users')->insert($newuser);
+
+							$updateuser = Sentry::findUserByLogin($row[2]);
+
+						    // Update the user details
+						    $updateuser->password = $pass;
+
+						    // Update the user
+						    $updateuser->save();
+
+
+							if (((Input::get('email_user')==1) && !Config::get('app.lock_passwords'))) {
+								// Send the credentials through email
+                                if ($row[3]!='') {
+    								$data = array();
+    								$data['username'] = $row[2];
+    								$data['first_name'] = $row[0];
+    								$data['password'] = $pass;
+
+    					            Mail::send('emails.send-login', $data, function ($m) use ($newuser) {
+    					                $m->to($newuser['email'], $newuser['first_name'] . ' ' . $newuser['last_name']);
+    					                $m->subject('Welcome ' . $newuser['first_name']);
+    					            });
+                                }
+							}
+						}
+
+
+				} catch (Exception $e) {
+					echo 'Caught exception: ',  $e->getMessage(), "\n";
+				}
+				return true;
+			}
+
+		});
+
+
+		return Redirect::route('users')->with('duplicates',$duplicates)->with('success', 'Success');
+
+	}
+
+
+	public function getDatatable($status = null)
+    {
+
+	$users = User::with('assets','accessories','consumables','licenses','manager','sentryThrottle','groups','userloc');
+
+	switch ($status) {
+		case 'deleted':
+			$users->GetDeleted();
+			break;
+		case '':
+			$users->GetNotDeleted();
+			break;
+	}
+
+	$users = $users->orderBy('created_at', 'DESC')->get();
+
+    $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($users)
+        	{
+	        	$action_buttons = '';
+
+
+                if ( ! is_null($users->deleted_at)) {
+                	$action_buttons .= '<a href="'.route('restore/user', $users->id).'" class="btn btn-warning btn-sm"><i class="fa fa-share icon-white"></i></a> ';
+                } else {
+	                if ($users->accountStatus()=='suspended') {
+			               $action_buttons .= '<a href="'.route('unsuspend/user', $users->id).'" class="btn btn-warning btn-sm"><span class="fa fa-time icon-white"></span></a> ';
+					}
+
+                	$action_buttons .= '<a href="'.route('update/user', $users->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> ';
+
+					if ((Sentry::getId() !== $users->id) && (!Config::get('app.lock_passwords'))) {
+	                	$action_buttons .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/user', $users->id).'" data-content="Are you sure you wish to delete this user?" data-title="Delete '.htmlspecialchars($users->first_name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a> ';
+	                } else {
+	                	$action_buttons .= ' <span class="btn delete-asset btn-danger btn-sm disabled"><i class="fa fa-trash icon-white"></i></span>';
+	                }
+                }
+                return $action_buttons;
+
+	        });
+
+
+        return Datatable::collection($users)
+        ->addColumn('name',function($users)
+	        {
+		        return '<a title="'.$users->fullName().'" href="users/'.$users->id.'/view">'.$users->fullName().'</a>';
+	        })
+
+	     ->addColumn('email',function($users)
+	        {
+                if ($users->email) {
+                    return '<div class="text-center"><a title="'.$users->email.'" href="mailto:'.$users->email.'"><i class="fa fa-envelope fa-lg"></i></div>';
+                } else {
+                    return '';
+                }
+
+	        })
+
+	     ->addColumn('manager',function($users)
+	        {
+		        if ($users->manager) {
+		       	 return '<a title="'.$users->manager->fullName().'" href="users/'.$users->manager->id.'/view">'.$users->manager->fullName().'</a>';
+		       	}
+	        })
+
+        ->addColumn('location',function($users)
+	        {
+                if ($users->userloc) {
+                    return $users->userloc->name;
+                }
+
+	        })
+
+		->addColumn('assets',function($users)
+	        {
+		        return $users->assets->count();
+	        })
+
+		->addColumn('licenses',function($users)
+	        {
+		        return $users->licenses->count();
+	        })
+
+	    ->addColumn('accessories',function($users)
+	        {
+		        return $users->accessories->count();
+	        })
+        ->addColumn('consumables',function($users)
+    	        {
+    		        return $users->consumables->count();
+    	        })
+
+
+	    ->addColumn('groups',function($users)
+	        {
+		        $group_names = '';
+		        foreach ($users->groups as $group) {
+			        $group_names .= '<a href="'.Config::get('app.url').'/admin/groups/'.$group->id.'/edit" class="label  label-default">'.$group->name.'</a> ';
+		        }
+		        return $group_names;
+	        })
+
+
+	    ->addColumn($actions)
+        ->searchColumns('name','email','manager','activated','groups','location')
+        ->orderColumns('name','email','manager','activated', 'licenses','assets','accessories','consumables','groups','location')
+        ->make();
+
+		}
+
+
+
+
+
 }
--- a/app/database/migrations/2013_11_18_164423_set_nullvalues_for_user.php
+++ b/app/database/migrations/2013_11_18_164423_set_nullvalues_for_user.php
@@ -9,12 +9,13 @@ class SetNullvaluesForUser extends Migration
     *
     * @return void
     */
+	
    public function up()
    {
        //
-
-        DB::statement('ALTER TABLE users MODIFY phone varchar(20) null');
-        DB::statement('ALTER TABLE users MODIFY jobtitle varchar(50) null');
+		$prefix = DB::getTablePrefix();
+        DB::statement('ALTER TABLE '.$prefix.'users MODIFY phone varchar(20) null');
+        DB::statement('ALTER TABLE '.$prefix.'users MODIFY jobtitle varchar(50) null');

    }

--- a/app/database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php
+++ b/app/database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php
@@ -11,7 +11,7 @@ class EditAddedOnAssetLogsTable extends Migration
     */
    public function up()
    {
-        DB::statement('ALTER TABLE asset_logs MODIFY added_on timestamp null');
+        DB::statement('ALTER TABLE  ' . DB::getTablePrefix() . 'asset_logs MODIFY added_on timestamp null');

    }

--- a/app/database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php
+++ b/app/database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php
@@ -11,8 +11,9 @@ class EditLocationIdAssetLogsTable extends Migration
     */
    public function up()
    {
-        DB::statement('ALTER TABLE asset_logs MODIFY location_id int(11) null');
-        DB::statement('ALTER TABLE asset_logs MODIFY added_on timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP');
+		$prefix=DB::getTablePrefix();
+        DB::statement('ALTER TABLE '.$prefix.'asset_logs MODIFY location_id int(11) null');
+        DB::statement('ALTER TABLE '.$prefix.'asset_logs MODIFY added_on timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP');

    }

--- a/app/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php
+++ b/app/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php
@@ -11,7 +11,7 @@ class AlterWarrantyColumnOnAssets extends Migration
     */
    public function up()
    {
-        DB::statement('ALTER TABLE assets CHANGE warrantee_months warranty_months int (3)');
+        DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'assets CHANGE warrantee_months warranty_months int (3)');
    }

    /**
--- a/app/database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php
+++ b/app/database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php
@@ -11,11 +11,11 @@ class AddNullableToLicensesTable extends Migration
     */
    public function up()
    {
-        //
-        DB::statement('ALTER TABLE licenses MODIFY order_number varchar(50) null');
-        DB::statement('ALTER TABLE licenses MODIFY notes varchar(255) null');
-        DB::statement('ALTER TABLE licenses MODIFY license_name varchar(100) null');
-        DB::statement('ALTER TABLE licenses MODIFY license_email varchar(120) null');
+        $prefix = DB::getTablePrefix();
+        DB::statement('ALTER TABLE ' . $prefix . 'licenses MODIFY order_number varchar(50) null');
+        DB::statement('ALTER TABLE ' . $prefix . 'licenses MODIFY notes varchar(255) null');
+        DB::statement('ALTER TABLE ' . $prefix . 'licenses MODIFY license_name varchar(100) null');
+        DB::statement('ALTER TABLE ' . $prefix . 'licenses MODIFY license_email varchar(120) null');
    }

    /**
--- a/app/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php
+++ b/app/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php
@@ -13,7 +13,7 @@ class AlterDefaultLicenseDepreciationId extends Migration
    public function up()
    {
        //
-        DB::statement('ALTER TABLE licenses MODIFY column depreciation_id tinyint(1) NOT NULL DEFAULT "0"');
+        DB::statement('ALTER TABLE '.DB::getTablePrefix().'licenses MODIFY column depreciation_id tinyint(1) NOT NULL DEFAULT "0"');

    }

--- a/app/database/migrations/2014_05_27_231658_alter_default_values_licenses.php
+++ b/app/database/migrations/2014_05_27_231658_alter_default_values_licenses.php
@@ -13,7 +13,7 @@ class AlterDefaultValuesLicenses extends Migration
    public function up()
    {
        //
-        DB::statement('ALTER TABLE license_seats MODIFY column notes text NULL');
+        DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'license_seats MODIFY column notes text NULL');
    }

    /**
--- a/app/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php
+++ b/app/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php
@@ -13,7 +13,7 @@ class MakeAssetLogCheckedoutToNullable extends Migration
    public function up()
    {
        //
-        DB::statement('ALTER TABLE asset_logs MODIFY column checkedout_to int(11) NULL');
+        DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column checkedout_to int(11) NULL');
    }

    /**
--- a/app/database/migrations/2014_06_20_005050_make_asset_log_purchasedate_to_nullable.php
+++ b/app/database/migrations/2014_06_20_005050_make_asset_log_purchasedate_to_nullable.php
@@ -13,7 +13,7 @@ class MakeAssetLogPurchasedateToNullable extends Migration
    public function up()
    {
        //
-        DB::statement('ALTER TABLE licenses MODIFY column purchase_date date NULL');
+        DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'licenses MODIFY column purchase_date date NULL');
    }

    /**
--- a/app/database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php
+++ b/app/database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php
@@ -13,7 +13,7 @@ class MakeAssetIdInLogsNullable extends Migration {
 	public function up()
 	{
 		//
-		DB::statement('ALTER TABLE asset_logs MODIFY column asset_id int NULL');
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column asset_id int NULL');
 	}

 	/**
--- a/app/database/migrations/2014_08_12_053504_alpha_0_4_2_release.php
+++ b/app/database/migrations/2014_08_12_053504_alpha_0_4_2_release.php
@@ -12,21 +12,22 @@ class Alpha042Release extends Migration {
 	 */
 	public function up()
 	{
+		$prefix = DB::getTablePrefix();
 		Schema::table('assets', function(Blueprint $table)
 		{
 			//
 		});
                
-                DB::statement('UPDATE assets SET status_id="0" where status_id is null');
-                DB::statement('UPDATE assets SET purchase_cost=0 where purchase_cost is null');
-                DB::statement('UPDATE models SET eol=0 where eol is null');
-                DB::statement('UPDATE users SET location_id=0 where location_id is null');
-                DB::statement('UPDATE assets SET asset_tag=" " WHERE asset_tag is null');
-                DB::statement('UPDATE locations SET state=" " where state is null');
-                DB::statement('UPDATE models SET manufacturer_id="0" where manufacturer_id is null');
-                DB::statement('UPDATE models SET category_id="0" where category_id is null');
+                DB::statement('UPDATE '.$prefix.'assets SET status_id="0" where status_id is null');
+                DB::statement('UPDATE '.$prefix.'assets SET purchase_cost=0 where purchase_cost is null');
+                DB::statement('UPDATE '.$prefix.'models SET eol=0 where eol is null');
+                DB::statement('UPDATE '.$prefix.'users SET location_id=0 where location_id is null');
+                DB::statement('UPDATE '.$prefix.'assets SET asset_tag=" " WHERE asset_tag is null');
+                DB::statement('UPDATE '.$prefix.'locations SET state=" " where state is null');
+                DB::statement('UPDATE '.$prefix.'models SET manufacturer_id="0" where manufacturer_id is null');
+                DB::statement('UPDATE '.$prefix.'models SET category_id="0" where category_id is null');

-                DB::statement('ALTER TABLE assets '
+                DB::statement('ALTER TABLE '.$prefix.'assets '
                    . 'MODIFY COLUMN name VARCHAR(255) NULL , '
                    . 'MODIFY COLUMN asset_tag VARCHAR(255) NOT NULL , '
                    . 'MODIFY COLUMN purchase_cost DECIMAL(13,4) NOT NULL DEFAULT "0" , '
@@ -36,26 +37,26 @@ class Alpha042Release extends Migration {
                    . 'MODIFY COLUMN archived TINYINT(1) NOT NULL DEFAULT "0" , '
                    . 'MODIFY COLUMN depreciate TINYINT(1) NOT NULL DEFAULT "0"');

-                DB::statement('ALTER TABLE licenses '
+                DB::statement('ALTER TABLE '.$prefix.'licenses '
                    . 'MODIFY COLUMN purchase_cost DECIMAL(13,4) NULL , '
                    . 'MODIFY COLUMN depreciate TINYINT(1) NULL DEFAULT "0"');

-                DB::statement('ALTER TABLE license_seats '
+                DB::statement('ALTER TABLE '.$prefix.'license_seats '
                    . 'MODIFY COLUMN assigned_to INT(11) NULL ');

-                DB::statement('ALTER TABLE locations '
+                DB::statement('ALTER TABLE '.$prefix.'locations '
                    . 'MODIFY COLUMN state VARCHAR(255) NOT NULL ,'
                    . 'MODIFY COLUMN address2 VARCHAR(255) NULL ,'
                    . 'MODIFY COLUMN zip VARCHAR(10) NULL ');

-                DB::statement('ALTER TABLE models '
+                DB::statement('ALTER TABLE '.$prefix.'models '
                    . 'MODIFY COLUMN modelno VARCHAR(255) NULL , '
                    . 'MODIFY COLUMN manufacturer_id INT(11) NOT NULL , '
                    . 'MODIFY COLUMN category_id INT(11) NOT NULL , '
                    . 'MODIFY COLUMN depreciation_id INT(11) NOT NULL DEFAULT "0" , '
                    . 'MODIFY COLUMN eol INT(11) NULL DEFAULT "0"');

-                DB::statement('ALTER TABLE users '
+                DB::statement('ALTER TABLE '.$prefix.'users '
                    . 'MODIFY COLUMN first_name VARCHAR(255) NOT NULL , '
                    . 'MODIFY COLUMN last_name VARCHAR(255) NOT NULL , '
                    . 'MODIFY COLUMN location_id INT(11) NOT NULL');
--- a/app/database/migrations/2014_08_17_083523_make_location_id_nullable.php
+++ b/app/database/migrations/2014_08_17_083523_make_location_id_nullable.php
@@ -13,7 +13,7 @@ class MakeLocationIdNullable extends Migration {
 	public function up()
 	{
 		//
-		DB::statement('ALTER TABLE users MODIFY column location_id int NULL');
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column location_id int NULL');
 	}

 	/**
--- a/app/database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php
+++ b/app/database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AlterSupplierStateTo32 extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'suppliers MODIFY column state varchar(32) null');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'suppliers MODIFY column state varchar(2) null');
+	}
+
+}
--- a/app/database/migrations/2014_10_24_015641_add_display_checkout_date.php
+++ b/app/database/migrations/2014_10_24_015641_add_display_checkout_date.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddDisplayCheckoutDate extends Migration {
+    
+     /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function ($table) {
+            $table->integer('display_checkout_date')->nullable()->default(NULL);
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function ($table) {
+            $table->dropColumn('display_checkout_date');
+        });
+    }
+
+}
--- a/app/database/migrations/2014_10_28_222654_add_avatar_field_to_users_table.php
+++ b/app/database/migrations/2014_10_28_222654_add_avatar_field_to_users_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class AddAvatarFieldToUsersTable extends Migration {
+
+	/**
+	 * Make changes to the table.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{	
+		Schema::table('users', function(Blueprint $table) {		
+			
+			$table->string('avatar')->nullable();
+
+		});
+
+	}
+
+	/**
+	 * Revert the changes to the table.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('users', function(Blueprint $table) {
+
+			$table->dropColumn('avatar');
+
+		});
+	}
+
+}
--- a/app/database/migrations/2014_10_29_045924_add_image_field_to_models_table.php
+++ b/app/database/migrations/2014_10_29_045924_add_image_field_to_models_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddImageFieldToModelsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{	
+		Schema::table('models', function(Blueprint $table) {		
+			
+			$table->string('image')->nullable();
+
+		});
+
+	}
+
+	/**
+	 * Revert the changes to the table.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('models', function(Blueprint $table) {
+
+			$table->dropColumn('image');
+
+		});
+	}
+
+}
--- a/app/database/migrations/2014_11_01_214955_add_eol_display_to_settings.php
+++ b/app/database/migrations/2014_11_01_214955_add_eol_display_to_settings.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddEolDisplayToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+    {
+        Schema::table('settings', function ($table) {
+            $table->integer('display_eol')->nullable()->default(NULL);
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function ($table) {
+            $table->dropColumn('display_eol');
+        });
+    }
+
+}
--- a/app/database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
+++ b/app/database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateGroupFieldForReporting extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		$prefix = DB::getTablePrefix();
+		Schema::table('groups', function(Blueprint $table)
+		{
+			//
+		});
+
+                DB::statement('UPDATE '.$prefix.'groups SET permissions="{\"admin\":1,\"users\":1,\"reports\":1}" where id=1');
+                DB::statement('UPDATE '.$prefix.'groups SET permissions="{\"users\":1,\"reports\":1}" where id=2');
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}
--- a/app/database/migrations/2014_11_05_212408_add_fields_to_licenses.php
+++ b/app/database/migrations/2014_11_05_212408_add_fields_to_licenses.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddFieldsToLicenses extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('licenses', function ($table) {
+            $table->integer('supplier_id')->nullable()->default(NULL);
+            $table->date('expiration_date')->nullable();
+            $table->string('purchase_order');
+        });
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('licenses', function ($table) {
+            $table->dropColumn('supplier_id');
+            $table->dropColumn('expiration_date');
+            $table->dropColumn('purchase_order');
+        });
+	}
+
+}
--- a/app/database/migrations/2014_11_07_021042_add_image_to_supplier.php
+++ b/app/database/migrations/2014_11_07_021042_add_image_to_supplier.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddImageToSupplier extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{	
+		Schema::table('suppliers', function(Blueprint $table) {		
+			
+			$table->string('image')->nullable();
+
+		});
+
+	}
+
+	/**
+	 * Revert the changes to the table.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('suppliers', function(Blueprint $table) {
+
+			$table->dropColumn('image');
+
+		});
+	}
+
+}
--- a/app/database/migrations/2014_11_20_203007_add_username_to_user.php
+++ b/app/database/migrations/2014_11_20_203007_add_username_to_user.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddUsernameToUser extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('users', function(Blueprint $table) {
+
+			$table->string('username')->nullable()->default(NULL);
+
+		});
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('users', function(Blueprint $table) {
+
+			$table->dropColumn('username');
+
+		});
+	}
+
+}
--- a/app/database/migrations/2014_11_20_223947_add_auto_to_settings.php
+++ b/app/database/migrations/2014_11_20_223947_add_auto_to_settings.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAutoToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->integer('auto_increment_assets')->default(0);
+
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->dropColumn('auto_increment_assets');
+
+		});
+	}
+
+}
--- a/app/database/migrations/2014_11_20_224421_add_prefix_to_settings.php
+++ b/app/database/migrations/2014_11_20_224421_add_prefix_to_settings.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddPrefixToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->string('auto_increment_prefix')->default(0);
+
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->dropColumn('auto_increment_prefix');
+
+		});
+	}
+
+}
--- a/app/database/migrations/2014_11_21_104401_change_licence_type.php
+++ b/app/database/migrations/2014_11_21_104401_change_licence_type.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeLicenceType extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		$prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN serial TEXT');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		 $prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN serial VARCHAR(255)');
+	}
+
+}
--- a/app/database/migrations/2014_12_09_082500_add_fields_maintained_term_to_licenses.php
+++ b/app/database/migrations/2014_12_09_082500_add_fields_maintained_term_to_licenses.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddFieldsMaintainedTermToLicenses extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('licenses', function ($table) {
+			$table->date('termination_date')->nullable();
+			$table->boolean('maintained');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('licenses', function ($table) {
+			$table->dropColumn('termination_date');
+			$table->dropColumn('maintained');
+		});
+	}
+
+}
--- a/app/database/migrations/2015_02_04_155757_increase_user_field_lengths.php
+++ b/app/database/migrations/2015_02_04_155757_increase_user_field_lengths.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class IncreaseUserFieldLengths extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column jobtitle varchar(100) null');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column jobtitle varchar(50) null');
+	}
+
+}
--- a/app/database/migrations/2015_02_07_013537_add_soft_deleted_to_log.php
+++ b/app/database/migrations/2015_02_07_013537_add_soft_deleted_to_log.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSoftDeletedToLog extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column asset_type varchar(100) null');
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column added_on timestamp default "0000-00-00 00:00:00"');
+		Schema::table('asset_logs', function ($table) {
+			$table->renameColumn('added_on', 'created_at');
+			$table->timestamp('updated_at');
+            $table->softDeletes();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('asset_logs', function ($table) {
+			$table->renameColumn('created_at', 'added_on');
+			$table->dropColumn('updated_at');
+			$table->dropSoftDeletes();
+		});
+	}
+
+}
--- a/app/database/migrations/2015_02_10_040958_fix_bad_assigned_to_ids.php
+++ b/app/database/migrations/2015_02_10_040958_fix_bad_assigned_to_ids.php
@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FixBadAssignedToIds extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::update('update ' . DB::getTablePrefix() . 'assets SET assigned_to=NULL where assigned_to=0');
+
+		Schema::table('status_labels', function ($table) {
+			$table->boolean('deployable')->default(0);
+			$table->boolean('pending')->default(0);
+			$table->boolean('archived')->default(0);
+			$table->text('notes')->nullable();
+		});
+
+		DB::statement('INSERT into ' . DB::getTablePrefix() . 'status_labels (user_id, name, deployable, pending, archived, notes) VALUES (1,"Pending",0,1,0,"These assets are not yet ready to be deployed, usually because of configuration or waiting on parts.")');
+		DB::statement('INSERT into ' . DB::getTablePrefix() . 'status_labels (user_id, name, deployable, pending, archived, notes) VALUES (1,"Ready to Deploy",1,0,0,"These assets are ready to deploy.")');
+		DB::statement('INSERT into ' . DB::getTablePrefix() . 'status_labels (user_id, name, deployable, pending, archived, notes) VALUES (1,"Archived",0,0,1,"These assets are no longer in circulation or viable.")');
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('status_labels', function ($table) {
+			$table->dropColumn('deployable');
+			$table->dropColumn('pending');
+			$table->dropColumn('archived');
+			$table->dropColumn('notes');
+
+		});
+	}
+
+}
--- a/app/database/migrations/2015_02_10_053310_migrate_data_to_new_statuses.php
+++ b/app/database/migrations/2015_02_10_053310_migrate_data_to_new_statuses.php
@@ -0,0 +1,60 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MigrateDataToNewStatuses extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		// get newly added statuses from last migration
+		$statuses = DB::select('select * from ' . DB::getTablePrefix() . 'status_labels where name="Pending" OR name="Ready to Deploy"');
+
+
+		foreach ($statuses as $status) {
+			if ($status->name =="Pending") {
+				$pending_id = array($status->id);
+			} elseif ($status->name =="Ready to Deploy") {
+				$rtd_id = array($status->id);
+			}
+		}
+
+		// Pending
+		$pendings = DB::select('select * from ' . DB::getTablePrefix() . 'assets where status_id IS NULL AND physical=1 ');
+
+			foreach ($pendings as $pending) {
+				DB::update('update ' . DB::getTablePrefix() . 'assets set status_id = ? where status_id IS NULL AND physical=1',$pending_id);
+
+			}
+
+
+		// Ready to Deploy
+		$rtds = DB::select('select * from ' . DB::getTablePrefix() . 'assets where status_id = 0 AND physical=1 ');
+
+		foreach ($rtds as $rtd) {
+				//DB::update('update users set votes = 100 where name = ?', array('John'));
+				DB::update('update ' . DB::getTablePrefix() . 'assets set status_id = ? where status_id = 0 AND physical=1',$rtd_id);
+
+			}
+
+
+
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}
--- a/app/database/migrations/2015_02_11_044104_migrate_make_license_assigned_null.php
+++ b/app/database/migrations/2015_02_11_044104_migrate_make_license_assigned_null.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MigrateMakeLicenseAssignedNull extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::update('update ' . DB::getTablePrefix() . 'license_seats SET assigned_to=NULL where assigned_to=0');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}
--- a/app/database/migrations/2015_02_11_104406_migrate_create_requests_table.php
+++ b/app/database/migrations/2015_02_11_104406_migrate_create_requests_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MigrateCreateRequestsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::create('requests', function ($table) {
+            $table->increments('id');
+            $table->integer('asset_id');
+            $table->integer('user_id');
+            $table->text('request_code');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		 Schema::drop('requests');
+	}
+
+}
--- a/app/database/migrations/2015_02_12_001312_add_mac_address_to_asset.php
+++ b/app/database/migrations/2015_02_12_001312_add_mac_address_to_asset.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddMacAddressToAsset extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('assets', function ($table) {
+			$table->string('mac_address')->nullable()->default(NULL);
+		});
+
+		Schema::table('models', function ($table) {
+			$table->boolean('show_mac_address')->default(0);
+		});
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('assets', function ($table) {
+			$table->dropColumn('mac_address');
+		});
+
+		Schema::table('models', function ($table) {
+			$table->dropColumn('show_mac_address');
+		});
+	}
+
+}
--- a/app/database/migrations/2015_02_12_024100_change_license_notes_type.php
+++ b/app/database/migrations/2015_02_12_024100_change_license_notes_type.php
@@ -0,0 +1,27 @@
+<?php
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+class ChangeLicenseNotesType extends Migration {
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		$prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN notes TEXT');
+	}
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		$prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN notes VARCHAR(255)');
+	}
+}
--- a/app/database/migrations/2015_02_17_231020_add_localonly_to_settings.php
+++ b/app/database/migrations/2015_02_17_231020_add_localonly_to_settings.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddLocalonlyToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->boolean('load_remote')->default(1);
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->dropColumn('load_remote');
+		});
+
+	}
+
+}
--- a/app/database/migrations/2015_02_19_222322_add_logo_and_colors_to_settings.php
+++ b/app/database/migrations/2015_02_19_222322_add_logo_and_colors_to_settings.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddLogoAndColorsToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->string('logo')->nullable()->default(NULL);
+			$table->string('header_color')->nullable()->default(NULL);
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->dropColumn('logo');
+			$table->dropColumn('header_color');
+		});
+
+	}
+
+}
--- a/app/database/migrations/2015_02_24_072043_add_alerts_to_settings.php
+++ b/app/database/migrations/2015_02_24_072043_add_alerts_to_settings.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAlertsToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->string('alert_email')->nullable()->default(NULL);
+			$table->boolean('alerts_enabled')->default(1);
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->dropColumn('alert_email');
+			$table->dropColumn('alerts_enabled');
+		});
+	}
+
+}
--- a/app/database/migrations/2015_02_25_022931_add_eula_fields.php
+++ b/app/database/migrations/2015_02_25_022931_add_eula_fields.php
@@ -0,0 +1,69 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddEulaFields extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->longText('default_eula_text')->nullable()->default(NULL);
+		});
+
+		Schema::table('categories', function ($table) {
+			$table->longText('eula_text')->nullable()->default(NULL);
+			$table->boolean('use_default_eula')->default(0);
+			$table->boolean('require_acceptance')->default(0);
+		});
+
+		Schema::table('asset_logs', function ($table) {
+			$table->dateTime('requested_at')->nullable()->default(NULL);
+			$table->dateTime('accepted_at')->nullable()->default(NULL);
+		});
+
+
+        Schema::create('requested_assets', function ($table) {
+            $table->increments('id');
+            $table->integer('asset_id')->default(NULL);
+            $table->integer('user_id')->default(NULL);
+            $table->dateTime('accepted_at')->nullable()->default(NULL);
+            $table->dateTime('denied_at')->nullable()->default(NULL);
+            $table->string('notes')->default(NULL);
+            $table->timestamps();
+        });
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->dropColumn('default_eula_text');
+		});
+
+		Schema::table('categories', function ($table) {
+			$table->dropColumn('eula_text');
+			$table->dropColumn('use_default_eula');
+			$table->dropColumn('require_acceptance');
+		});
+
+		Schema::table('asset_logs', function ($table) {
+			$table->dropColumn('requested_at');
+			$table->dropColumn('accepted_at');
+		});
+
+		Schema::drop('requested_assets');
+	}
+
+}
--- a/app/database/migrations/2015_02_25_204513_add_accessories_table.php
+++ b/app/database/migrations/2015_02_25_204513_add_accessories_table.php
@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAccessoriesTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		 Schema::create('accessories', function ($table) {
+            $table->increments('id');
+            $table->string('name')->nullable()->default(NULL);
+            $table->integer('category_id')->nullable()->default(NULL);
+            $table->integer('user_id')->nullable()->default(NULL);
+            $table->integer('qty')->default(0);
+            $table->boolean('requestable')->default(0);
+            $table->timestamps();
+            $table->softDeletes();
+        });
+
+        Schema::table('asset_logs', function ($table) {
+			$table->integer('accessory_id')->nullable()->default(NULL);
+		});
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::drop('accessories');
+
+		Schema::table('asset_logs', function ($table) {
+			$table->dropColumn('accessory_id');
+		});
+	}
+
+}
--- a/app/database/migrations/2015_02_26_091228_add_accessories_user_table.php
+++ b/app/database/migrations/2015_02_26_091228_add_accessories_user_table.php
@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAccessoriesUserTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::create('accessories_users', function ($table) {
+            $table->increments('id');
+            $table->integer('user_id')->nullable()->default(NULL); 
+            $table->integer('accessory_id')->nullable()->default(NULL);    
+            $table->integer('assigned_to')->nullable()->default(NULL);       
+            $table->timestamps();
+        });
+        
+        Schema::table('accessories', function ($table) {
+			$table->integer('location_id')->nullable()->default(NULL);
+		});
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::drop('accessories_users');
+		
+		Schema::table('accessories', function ($table) {
+			$table->dropColumn('location_id');
+		});
+
+	}
+
+}
--- a/app/database/migrations/2015_02_26_115128_add_deleted_at_models.php
+++ b/app/database/migrations/2015_02_26_115128_add_deleted_at_models.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddDeletedAtModels extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('models', function ($table){
+            $table->softDeletes();
+        });
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('models', function ($table){
+            $table->dropColumn('deleted_at');
+        });
+	}
+
+}
--- a/app/database/migrations/2015_02_26_233005_add_category_type.php
+++ b/app/database/migrations/2015_02_26_233005_add_category_type.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddCategoryType extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('categories', function ($table) {
+			$table->string('category_type')->nullable()->default('asset');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('categories', function ($table) {
+			$table->dropColumn('category_type');
+		});
+	}
+
+}
--- a/app/database/migrations/2015_03_01_231912_update_accepted_at_to_acceptance_id.php
+++ b/app/database/migrations/2015_03_01_231912_update_accepted_at_to_acceptance_id.php
@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateAcceptedAtToAcceptanceId extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+
+		Schema::table('asset_logs', function ($table) {
+			$table->integer('accepted_id')->nullable()->default(NULL);
+		});
+
+		$results = DB::select('select invitation.id AS invitation_id, acceptance.id AS acceptance_id FROM asset_logs invitation INNER JOIN asset_logs acceptance ON (invitation.checkedout_to=acceptance.checkedout_to AND invitation.asset_id=acceptance.asset_id) WHERE invitation.action_type="checkout" AND acceptance.action_type="accepted"');
+
+
+		foreach ($results as $result) {
+			$update = DB::update('update asset_logs set accepted_id=? where id=?', [$result->acceptance_id, $result->invitation_id]);
+		}
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('asset_logs', function ($table) {
+			$table->dropColumn('accepted_id');
+		});
+
+	}
+
+}
--- a/app/database/migrations/2015_03_05_011929_add_qr_type_to_settings.php
+++ b/app/database/migrations/2015_03_05_011929_add_qr_type_to_settings.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddQrTypeToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->string('barcode_type')->nullable()->default('QRCODE');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function ($table) {
+			$table->dropColumn('barcode_type');
+		});
+	}
+
+}
--- a/Show More
+++ b/Show More