Merge pull request #436 from rashivkp/fix-435

fixed #435. using namespace with route groups to increase the readability

.bash_history

@@ -0,0 +1,37 @@
+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

.gitignore

@@ -10,6 +10,10 @@ composer.phar
 /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/
+/app/storage/debugbar/
+/bin/
+.idea

.travis.yml

@@ -17,9 +17,7 @@ before_script:
   - 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
-  - php composer.phar self-update
-  - php composer.phar validate
-  - php composer.phar install --prefer-source --no-interaction --dev
+  - composer install --prefer-source --no-interaction --no-dev
   - php artisan key:generate
   - php artisan migrate:install
   - php artisan migrate --package cartalyst/sentry

CHANGELOG.md

@@ -1,13 +1,70 @@
 
 
-###  v0.3.9-alpha - Released Jul 03, 2014 04:08:38
+###  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 
+* <a href="http://github.com/snipe/snipe-it/commit/5266d9a30a9663fa80ff764b25ff71726e5c4f4c">view</a> &bull; Fixed title tag for user list view 
+* <a href="http://github.com/snipe/snipe-it/commit/43485e1a51330ef585a65b469d7eb85ae7bde13a">view</a> &bull; Fixed language definition 
+* <a href="http://github.com/snipe/snipe-it/commit/6b5a552d95ff6f6d5567275b50fcd487fb793820">view</a> &bull; Fixed #186 - Bug with select box not retaining selections on edit screen 
+* <a href="http://github.com/snipe/snipe-it/commit/90eb883b671919ea360122c2bf44433995a12144">view</a> &bull; Fixed #187 - replaced dummy site name with site name from admin panel preferences 
+* <a href="http://github.com/snipe/snipe-it/commit/f22f23f21dc11d393854849580f0c1229cec9827">view</a> &bull; Fixed button label on forgotten password page 
+* <a href="http://github.com/snipe/snipe-it/commit/2b9494ed8271254f8f84e016f238d518e6109842">view</a> &bull; Fixed inconsistent password requirements across admin user creation, user profile and forgotten password 
+* <a href="http://github.com/snipe/snipe-it/commit/9dc40a3a9c161267fd8c88aacc1fbf536c1ec2de">view</a> &bull; Fixed a few CSS quirks 
+* <a href="http://github.com/snipe/snipe-it/commit/99003e126a8fd0ad9aaea5a550e0af5e306fc1bb">view</a> &bull; Fixed bug with edit (supplier_id), added requestable field for assets 
+* <a href="http://github.com/snipe/snipe-it/commit/21251b462308f2d783b83be1a331a0faf0813d16">view</a> &bull; Fixed #190, where depreciation on licenses would not be saved 
+* <a href="http://github.com/snipe/snipe-it/commit/89000440f344f766a31adc69718d7f66df235abf">view</a> &bull; Added admin ability to unsuspend locked accounts #changelog 
+* <a href="http://github.com/snipe/snipe-it/commit/e203fc516fadf6218f5ce87c070d0cdba9fca188">view</a> &bull; Fixes #194 
+
+
+###  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 
@@ -20,17 +77,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 
@@ -42,12 +99,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 
@@ -55,7 +112,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 
@@ -82,7 +139,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 
@@ -92,7 +149,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 
@@ -105,12 +162,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 

README.md

@@ -1,4 +1,4 @@
-[![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
@@ -7,7 +7,7 @@ This is a FOSS project for asset management in IT Operations. Knowing who has wh
 
 It is built on [Laravel 4.1](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.php).)
 
 __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.
 
@@ -16,10 +16,10 @@ __This is web-based software__. This means there there is no executable file (ak
 
 __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!
 
-[![Build Status](https://www.gitbook.io/button/status/book/snipe/snipe-it-manual)](https://www.gitbook.io/book/snipe/snipe-it-manual/activity)
-
 We'll be adding a long-overdue user's manual soon as well.
 
+__To deploy on Ubuntu using Ansible and Vagrant, be sure to check out the [Snipe-IT Installation scripts](https://github.com/GR360RY/snipeit-ansible) created by [@GR360RY](https://github.com/GR360RY/).__
+
 -----
 ### Bug Reports & Feature Requests
 
@@ -34,11 +34,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)
 
 -----
 

app/commands/AppCommand.php

@@ -223,7 +223,8 @@ class AppCommand extends Command
                 'name'        => 'Admin',
                 'permissions' => array(
                     'admin' => 1,
-                    'users' => 1
+                    'users' => 1,
+                    'reports' => 1
                 )
             ));
 
@@ -242,7 +243,8 @@ class AppCommand extends Command
                 'name'        => 'Reporting',
                 'permissions' => array(
                     'admin' => 0,
-                    'users' => 1
+                    'users' => 1,
+                    'reports' => 1,
                 )
             ));
 
@@ -260,7 +262,8 @@ class AppCommand extends Command
                 'name'        => 'Users',
                 'permissions' => array(
                     'admin' => 0,
-                    'users' => 1
+                    'users' => 1,
+                    'reports' => 0,
                 )
             ));
 

app/config/app.php

@@ -67,7 +67,6 @@ return array(
         'Illuminate\Validation\ValidationServiceProvider',
         'Illuminate\View\ViewServiceProvider',
         'Illuminate\Workbench\WorkbenchServiceProvider',
-
         'Barryvdh\Debugbar\ServiceProvider',
         'Cartalyst\Sentry\SentryServiceProvider',
         'Chumper\Datatable\DatatableServiceProvider',
@@ -118,6 +117,7 @@ return array(
             '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',

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 artisand key:generate --env=staging to create a random one
+    | Run a php artisan key:generate --env=staging to create a random one
     */
 
     'key' => 'Change_this_key_or_snipe_will_get_ya',

app/config/packages/barryvdh/laravel-debugbar/config.php

@@ -0,0 +1,146 @@
+<?php
+
+use Illuminate\Support\Facades\Config;
+
+return array(
+
+    /*
+     |--------------------------------------------------------------------------
+     | Debugbar Settings
+     |--------------------------------------------------------------------------
+     |
+     | Debugbar is enabled by default, when debug is set to true in app.php.
+     |
+     */
+
+    'enabled' => Config::get('app.debug'),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Storage settings
+     |--------------------------------------------------------------------------
+     |
+     | DebugBar stores data for session/ajax requests in a directory.
+     | You can disable this, so the debugbar stores data in headers/session,
+     | but this can cause problems with large data collectors.
+     |
+     */
+    'storage' => array(
+        'enabled' => true,
+        'path' => storage_path() . '/debugbar',
+    ),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Vendors
+     |--------------------------------------------------------------------------
+     |
+     | Vendor files are included by default, but can be set to false.
+     | This can also be set to 'js' or 'css', to only include javascript or css vendor files.
+     | Vendor files are for css: font-awesome (including fonts) and highlight.js (css files)
+     | and for js: jquery and and highlight.js
+     | So if you want syntax highlighting, set it to true. 
+     | jQuery is set to not conflict with existing jQuery scripts.
+     |
+     */
+
+    'include_vendors' => true,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Capture Ajax Requests
+     |--------------------------------------------------------------------------
+     |
+     | The Debugbar can capture Ajax requests and display them. If you don't want this (ie. because of errors),
+     | you can use this option to disable sending the data through the headers.
+     |
+     */
+
+    'capture_ajax' => true,
+    
+    /*
+     |--------------------------------------------------------------------------
+     | Capture Console Commands
+     |--------------------------------------------------------------------------
+     |
+     | The Debugbar can listen to Artisan commands. You can view them with the browse button in the Debugbar.
+     |
+     */
+
+    'capture_console' => false,
+
+    /*
+     |--------------------------------------------------------------------------
+     | DataCollectors
+     |--------------------------------------------------------------------------
+     |
+     | Enable/disable DataCollectors
+     |
+     */
+
+    'collectors' => array(
+        'phpinfo'         => true,  // Php version
+        'messages'        => true,  // Messages
+        'time'            => true,  // Time Datalogger
+        'memory'          => true,  // Memory usage
+        'exceptions'      => true,  // Exception displayer
+        'log'             => true,  // Logs from Monolog (merged in messages if enabled)
+        'db'              => true,  // Show database (PDO) queries and bindings
+        'views'           => true,  // Views with their data
+        'route'           => true,  // Current route information
+        'laravel'         => false, // Laravel version and environment
+        'events'          => false, // All events fired
+        'default_request' => false, // Regular or special Symfony request logger
+        'symfony_request' => true,  // Only one can be enabled..
+        'mail'            => true,  // Catch mail messages
+        'logs'            => false, // Add the latest log messages
+        'files'           => false, // Show the included files
+        'config'          => false, // Display config settings
+        'auth'            => false, // Display Laravel authentication status
+    ),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Extra options
+     |--------------------------------------------------------------------------
+     |
+     | Configure some DataCollectors
+     |
+     */
+
+    'options' => array(
+        'auth' => array(
+            'show_name' => false,   // Also show the users name/email in the debugbar
+        ),
+        'db' => array(
+            'with_params'       => true,   // Render SQL with the parameters substituted
+            'timeline'          => false,   // Add the queries to the timeline
+        ),
+        'mail' => array(
+            'full_log' => false
+        ),
+        'views' => array(
+            'data' => false,    //Note: Can slow down the application, because the data can be quite large..
+        ),
+        'route' => array(
+            'label' => true  // show complete route on bar
+        ),
+        'logs' => array(
+            'file' => null
+        ),
+    ),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Inject Debugbar in Response
+     |--------------------------------------------------------------------------
+     |
+     | Usually, the debugbar is added just before <body>, by listening to the
+     | Response after the App is done. If you disable this, you have to add them
+     | in your template yourself. See http://phpdebugbar.com/docs/rendering.html
+     |
+     */
+
+    'inject' => true,
+
+);

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

@@ -20,159 +20,203 @@
 
 return array(
 
-    /*
-    |--------------------------------------------------------------------------
-    | Default Authentication Driver
-    |--------------------------------------------------------------------------
-    |
-    | This option controls the authentication driver that will be utilized.
-    | This drivers manages the retrieval and authentication of the users
-    | attempting to get access to protected areas of your application.
-    |
-    | Supported: "eloquent" (more coming soon).
-    |
-    */
+	/*
+	|--------------------------------------------------------------------------
+	| Default Authentication Driver
+	|--------------------------------------------------------------------------
+	|
+	| This option controls the authentication driver that will be utilized.
+	| This drivers manages the retrieval and authentication of the users
+	| attempting to get access to protected areas of your application.
+	|
+	| Supported: "eloquent" (more coming soon).
+	|
+	*/
 
-    'driver' => 'eloquent',
+	'driver' => 'eloquent',
 
-    /*
-    |--------------------------------------------------------------------------
-    | Default Hasher
-    |--------------------------------------------------------------------------
-    |
-    | This option allows you to specify the default hasher used by Sentry
-    |
-    | Supported: "native", "bcrypt", "sha256"
-    |
-    */
+	/*
+	|--------------------------------------------------------------------------
+	| Default Hasher
+	|--------------------------------------------------------------------------
+	|
+	| This option allows you to specify the default hasher used by Sentry
+	|
+	| Supported: "native", "bcrypt", "sha256", "whirlpool"
+	|
+	*/
 
-    'hasher' => 'native',
+	'hasher' => 'native',
 
-    /*
-    |--------------------------------------------------------------------------
-    | Groups
-    |--------------------------------------------------------------------------
-    |
-    | Configuration specific to the group management component of Sentry.
-    |
-    */
-    'groups' => array(
+	/*
+	|--------------------------------------------------------------------------
+	| Cookie
+	|--------------------------------------------------------------------------
+	|
+	| Configuration specific to the cookie component of Sentry.
+	|
+	*/
 
-        /*
-        |--------------------------------------------------------------------------
-        | Model
-        |--------------------------------------------------------------------------
-        |
-        | When using the "eloquent" driver, we need to know which
-        | Eloquent models should be used throughout Sentry.
-        |
-        */
+	'cookie' => array(
 
-        'model' => 'Cartalyst\Sentry\Groups\Eloquent\Group',
+		/*
+		|--------------------------------------------------------------------------
+		| Default Cookie Key
+		|--------------------------------------------------------------------------
+		|
+		| This option allows you to specify the default cookie key used by Sentry.
+		|
+		| Supported: string
+		|
+		*/
 
-    ),
+		'key' => 'cartalyst_sentry',
 
-    /*
-    |--------------------------------------------------------------------------
-    | Users
-    |--------------------------------------------------------------------------
-    |
-    | Configuration specific to the user management component of Sentry.
-    |
-    */
-    'users' => array(
+ 	),
 
-        /*
-        |--------------------------------------------------------------------------
-        | Model
-        |--------------------------------------------------------------------------
-        |
-        | When using the "eloquent" driver, we need to know which
-        | Eloquent models should be used throughout Sentry.
-        |
-        */
+	/*
+	|--------------------------------------------------------------------------
+	| Groups
+	|--------------------------------------------------------------------------
+	|
+	| Configuration specific to the group management component of Sentry.
+	|
+	*/
 
-        'model' => 'User',
+	'groups' => array(
 
-        /*
-        |--------------------------------------------------------------------------
-        | Login Attribute
-        |--------------------------------------------------------------------------
-        |
-        | If you're the "eloquent" driver and extending the base Eloquent model,
-        | we allow you to globally override the login attribute without even
-        | subclassing the model, simply by specifying the attribute below.
-        |
-        */
+		/*
+		|--------------------------------------------------------------------------
+		| Model
+		|--------------------------------------------------------------------------
+		|
+		| When using the "eloquent" driver, we need to know which
+		| Eloquent models should be used throughout Sentry.
+		|
+		*/
 
-        'login_attribute' => 'email',
+		'model' => 'Cartalyst\Sentry\Groups\Eloquent\Group',
 
-    ),
+	),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Throttling
-    |--------------------------------------------------------------------------
-    |
-    | Throttling is an optional security feature for authentication, which
-    | enables limiting of login attempts and the suspension & banning of users.
-    |
-    */
-    'throttling' => array(
+	/*
+	|--------------------------------------------------------------------------
+	| Users
+	|--------------------------------------------------------------------------
+	|
+	| Configuration specific to the user management component of Sentry.
+	|
+	*/
 
-        /*
-        |--------------------------------------------------------------------------
-        | Throttling
-        |--------------------------------------------------------------------------
-        |
-        | Enable throttling or not. Throttling is where users are only allowed a
-        | certain number of login attempts before they are suspended. Suspension
-        | must be removed before a new login attempt is allowed.
-        |
-        */
+	'users' => array(
 
-        'enabled' => true,
+		/*
+		|--------------------------------------------------------------------------
+		| Model
+		|--------------------------------------------------------------------------
+		|
+		| When using the "eloquent" driver, we need to know which
+		| Eloquent models should be used throughout Sentry.
+		|
+		*/
 
-        /*
-        |--------------------------------------------------------------------------
-        | Model
-        |--------------------------------------------------------------------------
-        |
-        | When using the "eloquent" driver, we need to know which
-        | Eloquent models should be used throughout Sentry.
-        |
-        */
+		//'model' => 'Cartalyst\Sentry\Users\Eloquent\User',
+		'model' => 'User',
 
-        'model' => 'Cartalyst\Sentry\Throttling\Eloquent\Throttle',
+		/*
+		|--------------------------------------------------------------------------
+		| Login Attribute
+		|--------------------------------------------------------------------------
+		|
+		| If you're using the "eloquent" driver and extending the base Eloquent
+		| model, we allow you to globally override the login attribute without
+		| even subclassing the model, simply by specifying the attribute below.
+		|
+		*/
 
-        /*
-        |--------------------------------------------------------------------------
-        | Attempts Limit
-        |--------------------------------------------------------------------------
-        |
-        | When using the "eloquent" driver and extending the base Eloquent model,
-        | you have the option to globally set the login attempts.
-        |
-        | Supported: int
-        |
-        */
+		'login_attribute' => 'email',
 
-        'attempt_limit' => 5,
+	),
 
-        /*
-        |--------------------------------------------------------------------------
-        | Suspension Time
-        |--------------------------------------------------------------------------
-        |
-        | When using the "eloquent" driver and extending the base Eloquent model,
-        | you have the option to globally set the suspension time, in minutes.
-        |
-        | Supported: int
-        |
-        */
+	/*
+	|--------------------------------------------------------------------------
+	| User Groups Pivot Table
+	|--------------------------------------------------------------------------
+	|
+	| When using the "eloquent" driver, you can specify the table name
+	| for the user groups pivot table.
+	|
+	| Default: users_groups
+	|
+	*/
 
-        'suspension_time' => 15,
+	'user_groups_pivot_table' => 'users_groups',
 
-    ),
+	/*
+	|--------------------------------------------------------------------------
+	| Throttling
+	|--------------------------------------------------------------------------
+	|
+	| Throttling is an optional security feature for authentication, which
+	| enables limiting of login attempts and the suspension & banning of users.
+	|
+	*/
+
+	'throttling' => array(
+
+		/*
+		|--------------------------------------------------------------------------
+		| Throttling
+		|--------------------------------------------------------------------------
+		|
+		| Enable throttling or not. Throttling is where users are only allowed a
+		| certain number of login attempts before they are suspended. Suspension
+		| must be removed before a new login attempt is allowed.
+		|
+		*/
+
+		'enabled' => true,
+
+		/*
+		|--------------------------------------------------------------------------
+		| Model
+		|--------------------------------------------------------------------------
+		|
+		| When using the "eloquent" driver, we need to know which
+		| Eloquent models should be used throughout Sentry.
+		|
+		*/
+
+		'model' => 'Cartalyst\Sentry\Throttling\Eloquent\Throttle',
+
+		/*
+		|--------------------------------------------------------------------------
+		| Attempts Limit
+		|--------------------------------------------------------------------------
+		|
+		| When using the "eloquent" driver and extending the base Eloquent model,
+		| you have the option to globally set the login attempts.
+		|
+		| Supported: int
+		|
+		*/
+
+		'attempt_limit' => 5,
+
+		/*
+		|--------------------------------------------------------------------------
+		| Suspension Time
+		|--------------------------------------------------------------------------
+		|
+		| When using the "eloquent" driver and extending the base Eloquent model,
+		| you have the option to globally set the suspension time, in minutes.
+		|
+		| Supported: int
+		|
+		*/
+
+		'suspension_time' => 15,
+
+	),
 
 );

app/config/permissions.php

@@ -16,4 +16,12 @@ return array(
         ),
     ),
 
+    'Reporting' => array(
+        array(
+            'permission' => 'reports',
+            'label'      => 'View Reports',
+        ),
+    ),
+
+
 );

app/config/production/app.example.php

@@ -13,7 +13,7 @@ return array(
     |
     */
 
-    'debug' => false,
+    'debug' => true,
 
     /*
     |--------------------------------------------------------------------------
@@ -26,7 +26,7 @@ return array(
     |
     */
 
-    'url' => 'http://www.yourserver.com',
+    'url' => 'http://staging.yourserver.com',
 
     /*
     |--------------------------------------------------------------------------
@@ -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 artisand key:generate --env=staging to create a random one
+    | Run a php artisan key:generate --env=staging to create a random one
     */
 
     'key' => 'Change_this_key_or_snipe_will_get_ya',

app/config/staging/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 artisand key:generate --env=staging to create a random one
+    | Run a php artisan key:generate --env=staging to create a random one
     */
 
     'key' => 'Change_this_key_or_snipe_will_get_ya',

app/config/testing/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 artisand key:generate --env=staging to create a random one
+    | Run a php artisan key:generate --env=staging to create a random one
     */
 
     'key' => 'Change_this_key_or_snipe_will_get_ya',

app/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));
+
     }
 
 

app/controllers/account/ChangePasswordController.php

@@ -32,8 +32,8 @@ class ChangePasswordController extends AuthorizedController
     {
         // Declare the rules for the form validation
         $rules = array(
-            'old_password'     => 'required|between:3,32',
-            'password'         => 'required|between:10,32',
+            'old_password'     => 'required|min:6',
+            'password'         => 'required|min:6',
             'password_confirm' => 'required|same:password',
         );
 

app/controllers/account/ProfileController.php

@@ -1,6 +1,7 @@
 <?php namespace Controllers\Account;
 
 use AuthorizedController;
+use Image;
 use Input;
 use Redirect;
 use Sentry;
@@ -37,10 +38,10 @@ class ProfileController extends AuthorizedController
     {
         // Declare the rules for the form validation
         $rules = array(
-            'first_name' => 'required|min:3',
-            'last_name'  => 'required|min:3',
+            'first_name' => 'required|alpha_space|min:2',
+            'last_name'  => 'required|alpha_space|min:2',
             'location_id'  => 'required',
-            'website'    => 'url',
+            'website'    => 'url|alpha_space|min:10',
             'gravatar'   => 'email',
         );
 
@@ -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

app/controllers/admin/AssetsController.php

@@ -40,15 +40,36 @@ class AssetsController extends AdminController
 
         // Filter results
         if (Input::get('Pending')) {
-            $assets = Asset::orderBy('asset_tag', 'ASC')->whereNull('status_id','and')->where('assigned_to','=','0')->where('physical', '=', 1)->get();
+        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
+        	->whereNull('status_id','and')
+        	->where('assigned_to','=','0')
+        	->where('physical', '=', 1)
+        	->get();
         } elseif (Input::get('RTD')) {
-            $assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '=', 0)->where('assigned_to','=','0')->where('physical', '=', 1)->get();
+        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
+        	->where('status_id', '=', 0)
+        	->where('assigned_to', '=', '0')
+        	->where('physical', '=', 1)
+        	->orderBy('asset_tag', 'ASC')
+        	->get();
         } elseif (Input::get('Undeployable')) {
-            $assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '>', 1)->where('physical', '=', 1)->get();
+        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
+        	->where('status_id', '>', 1)
+        	->where('physical', '=', 1)
+        	->orderBy('asset_tag', 'ASC')
+        	->get();
         } elseif (Input::get('Deployed')) {
-            $assets = Asset::orderBy('asset_tag', 'ASC')->where('status_id', '=', 0)->where('assigned_to','>','0')->where('physical', '=', 1)->get();
+        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
+        	->where('status_id', '=', 0)
+        	->where('physical', '=', 1)
+        	->where('assigned_to','>','0')
+        	->orderBy('asset_tag', 'ASC')
+        	->get();
         } else {
-            $assets = Asset::orderBy('asset_tag', 'ASC')->where('physical', '=', 1)->get();
+        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc')
+        	->where('physical', '=', 1)
+        	->orderBy('asset_tag', 'ASC')
+        	->get();
         }
 
         // Paginate the users
@@ -64,102 +85,49 @@ class AssetsController extends AdminController
         return View::make('backend/hardware/index', compact('assets'));
     }
 
-    public function getReports()
-    {
-        // Grab all the assets
-        $assets = Asset::orderBy('created_at', 'DESC')->get();
-        return View::make('backend/reports/index', compact('assets'));
-    }
-
-    public function exportReports()
-    {
-        // @todo - It may be worthwhile creating a separate controller for reporting
-
-        // 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/table.title'),
-            Lang::get('admin/hardware/table.serial'),
-            Lang::get('admin/hardware/table.checkoutto'),
-            Lang::get('admin/hardware/table.location'),
-            Lang::get('admin/hardware/table.purchase_date'),
-            Lang::get('admin/hardware/table.purchase_cost'),
-            Lang::get('admin/hardware/table.book_value'),
-            Lang::get('admin/hardware/table.diff')
-        );
-        $header = array_map('trim', $header);
-        $rows[] = implode($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
-            }
-
-            $depreciation = $asset->depreciate();
-
-            $row[] = $asset->purchase_date;
-            $row[] = '"'.number_format($asset->purchase_cost).'"';
-            $row[] = '"'.number_format($depreciation).'"';
-            $row[] = '"'.number_format($asset->purchase_cost - $depreciation).'"';
-            $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;
-    }
-
     /**
      * Asset create.
      *
+     * @param null $model_id
+     *
      * @return View
      */
-    public function getCreate()
+    public function getCreate($model_id = null)
     {
+
         // Grab the dropdown list of models
-        $model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id');
+        //$model_list = array('' => 'Select a Model') + Model::orderBy('name', 'asc')->lists('name'.' '. 'modelno', 'id');
+
+        $model_list = array('' => 'Select a Model') + DB::table('models')
+        ->select(DB::raw('concat(name," / ",modelno) as name, id'))->orderBy('name', 'asc')
+        ->orderBy('modelno', 'asc')
+        ->lists('name', 'id');
+
+
         $supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+        $assigned_to = 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');
+        $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id');
+
 
         // Grab the dropdown list of status
         $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
 
-        return View::make('backend/hardware/edit')->with('supplier_list',$supplier_list)->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list)->with('asset',new Asset);
+        $view = View::make('backend/hardware/edit');
+        $view->with('supplier_list',$supplier_list);
+        $view->with('model_list',$model_list);
+        $view->with('statuslabel_list',$statuslabel_list);
+        $view->with('assigned_to',$assigned_to);
+        $view->with('location_list',$location_list);
+        $view->with('asset',new Asset);
 
+        if (!is_null($model_id)) {
+            $selected_model = Model::find($model_id);
+            $view->with('selected_model',$selected_model);
+        }
+
+        return $view;
     }
 
-
     /**
      * Asset create form processing.
      *
@@ -167,15 +135,19 @@ class AssetsController extends AdminController
      */
     public function postCreate()
     {
-
-        // get the POST data
-        $new = Input::all();
-
         // create a new model instance
         $asset = new Asset();
 
+        //attempt to validate
+        $validator = Validator::make(Input::all(), $asset->validationRules());
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
         // attempt validation
-        if ($asset->validate($new)) {
+        else {
 
             if ( e(Input::get('status_id')) == '') {
                 $asset->status_id =  NULL;
@@ -192,7 +164,7 @@ class AssetsController extends AdminController
             if (e(Input::get('purchase_cost')) == '') {
                 $asset->purchase_cost =  NULL;
             } else {
-                $asset->purchase_cost        = e(Input::get('purchase_cost'));
+                $asset->purchase_cost = ParseFloat(e(Input::get('purchase_cost')));
             }
 
             if (e(Input::get('purchase_date')) == '') {
@@ -201,6 +173,30 @@ class AssetsController extends AdminController
                 $asset->purchase_date        = e(Input::get('purchase_date'));
             }
 
+            if (e(Input::get('assigned_to')) == '') {
+                $asset->assigned_to =  0;
+            } else {
+                $asset->assigned_to        = e(Input::get('assigned_to'));
+            }
+
+            if (e(Input::get('supplier_id')) == '') {
+                $asset->supplier_id =  0;
+            } else {
+                $asset->supplier_id        = e(Input::get('supplier_id'));
+            }
+
+            if (e(Input::get('requestable')) == '') {
+                $asset->requestable =  0;
+            } else {
+                $asset->requestable        = e(Input::get('requestable'));
+            }
+
+            if (e(Input::get('rtd_location_id')) == '') {
+                $asset->rtd_location_id = NULL;
+            } else {
+                $asset->rtd_location_id     = e(Input::get('rtd_location_id'));
+            }
+
             // Save the asset data
             $asset->name            		= e(Input::get('name'));
             $asset->serial            		= e(Input::get('serial'));
@@ -208,24 +204,17 @@ class AssetsController extends AdminController
             $asset->order_number            = e(Input::get('order_number'));
             $asset->notes            		= e(Input::get('notes'));
             $asset->asset_tag            	= e(Input::get('asset_tag'));
-            $asset->supplier_id            	= e(Input::get('supplier_id'));
+
             $asset->user_id          		= Sentry::getId();
-            $asset->assigned_to          		= '0';
             $asset->archived          			= '0';
             $asset->physical            		= '1';
             $asset->depreciate          		= '0';
-            $asset->requestable            	= e(Input::get('requestable'));
-
 
             // Was the asset created?
             if($asset->save()) {
                 // Redirect to the asset listing page
                 return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.create.success'));
             }
-        } else {
-            // failure
-            $errors = $asset->errors();
-            return Redirect::back()->withInput()->withErrors($errors);
         }
 
         // Redirect to the asset create page with an error
@@ -248,14 +237,16 @@ class AssetsController extends AdminController
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
+
         // Grab the dropdown list of models
         $model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id');
         $supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+        $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id');
 
         // Grab the dropdown list of status
         $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
 
-        return View::make('backend/hardware/edit', compact('asset'))->with('model_list',$model_list)->with('supplier_list',$supplier_list)->with('statuslabel_list',$statuslabel_list);
+        return View::make('backend/hardware/edit', compact('asset'))->with('model_list',$model_list)->with('supplier_list',$supplier_list)->with('location_list',$location_list)->with('statuslabel_list',$statuslabel_list);
     }
 
 
@@ -273,27 +264,19 @@ class AssetsController extends AdminController
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
 
+        //attempt to validate
+        $validator = Validator::make(Input::all(), $asset->validationRules($assetId));
 
-        // Declare the rules for the form validation
-        $rules = array(
-        'name'   => 'alpha_space|min:3',
-        'asset_tag'   => 'required|alpha_space|min:3',
-        'model_id'   => 'required',
-        'serial'   => 'alpha_space|min:3',
-        'warranty_months'   => 'integer',
-        'notes'   => 'alpha_space',
-        );
-
-        // Create a new validator instance from our validation rules
-        $validator = Validator::make(Input::all(), $rules);
-
-        // If validation fails, we'll exit the operation now.
-        if ($validator->fails()) {
-            // Ooops.. something went wrong
-            return Redirect::back()->withInput()->withErrors($validator);
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
         }
+        // attempt validation
+        else {
 
-            if ( e(Input::get('status_id')) == '') {
+
+            if ( e(Input::get('status_id')) == '' ) {
                 $asset->status_id =  NULL;
             } else {
                 $asset->status_id = e(Input::get('status_id'));
@@ -308,7 +291,7 @@ class AssetsController extends AdminController
             if (e(Input::get('purchase_cost')) == '') {
                 $asset->purchase_cost =  NULL;
             } else {
-                $asset->purchase_cost        = e(Input::get('purchase_cost'));
+                $asset->purchase_cost = ParseFloat(e(Input::get('purchase_cost')));
             }
 
             if (e(Input::get('purchase_date')) == '') {
@@ -323,22 +306,37 @@ class AssetsController extends AdminController
                 $asset->supplier_id        = e(Input::get('supplier_id'));
             }
 
+             if (e(Input::get('requestable')) == '') {
+                $asset->requestable =  0;
+            } else {
+                $asset->requestable        = e(Input::get('requestable'));
+            }
+
+            if (e(Input::get('rtd_location_id')) == '') {
+                $asset->rtd_location_id = 0;
+            } else {
+                $asset->rtd_location_id     = e(Input::get('rtd_location_id'));
+            }
 
             // Update the asset data
             $asset->name            		= e(Input::get('name'));
             $asset->serial            		= e(Input::get('serial'));
             $asset->model_id           		= e(Input::get('model_id'));
-            $asset->order_number            = e(Input::get('order_number'));
+            $asset->order_number                = e(Input::get('order_number'));
             $asset->asset_tag           	= e(Input::get('asset_tag'));
             $asset->notes            		= e(Input::get('notes'));
-            $asset->requestable            	= e(Input::get('requestable'));
             $asset->physical            	= '1';
 
             // Was the asset updated?
             if($asset->save()) {
                 // Redirect to the new asset page
-                return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.update.success'));
+                return Redirect::to("hardware/$assetId/view")->with('success', Lang::get('admin/hardware/message.update.success'));
             }
+            else
+            {
+                 return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
+             }
+        }
 
 
         // Redirect to the asset management page with error
@@ -387,9 +385,8 @@ class AssetsController 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')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
 
-        //print_r($users);
         return View::make('backend/hardware/checkout', compact('asset'))->with('users_list',$users_list);
 
     }
@@ -589,7 +586,7 @@ class AssetsController extends AdminController
     public function getClone($assetId = null)
     {
         // Check if the asset exists
-        if (is_null($asset = Asset::find($assetId))) {
+        if (is_null($asset_to_clone = Asset::find($assetId))) {
             // Redirect to the asset management page
             return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
         }
@@ -600,11 +597,17 @@ class AssetsController extends AdminController
         // Grab the dropdown list of status
         $statuslabel_list = array('' => 'Pending') + array('0' => 'Ready to Deploy') + Statuslabel::lists('name', 'id');
 
+         $location_list = array('' => '') + Location::lists('name', 'id');
+
         // get depreciation list
         $depreciation_list = array('' => '') + Depreciation::lists('name', 'id');
+        $supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+        $assigned_to = 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');
+
+        $asset = clone $asset_to_clone;
+        $asset->id = null;
+        $asset->asset_tag = '';
+        return View::make('backend/hardware/edit')->with('supplier_list',$supplier_list)->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list)->with('assigned_to',$assigned_to)->with('asset',$asset)->with('location_list',$location_list);
 
-        return View::make('backend/hardware/clone', compact('asset'))->with('model_list',$model_list)->with('depreciation_list',$depreciation_list)->with('statuslabel_list',$statuslabel_list);
     }
-
-
 }

app/controllers/admin/CategoriesController.php

@@ -23,7 +23,7 @@ class CategoriesController extends AdminController
     public function getIndex()
     {
         // Grab all the categories
-        $categories = Category::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
+        $categories = Category::orderBy('created_at', 'DESC')->get();
 
         // Show the page
         return View::make('backend/categories/index', compact('categories'));
@@ -50,14 +50,17 @@ class CategoriesController extends AdminController
     public function postCreate()
     {
 
-        // get the POST data
-        $new = Input::all();
-
         // create a new model instance
         $category = new Category();
+        
+        $validator = Validator::make(Input::all(), $category->rules);
 
-        // attempt validation
-        if ($category->validate($new)) {
+        if ($validator->fails())
+        {
+            // 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'));
@@ -68,11 +71,7 @@ class CategoriesController extends AdminController
                 // Redirect to the new category  page
                 return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.create.success'));
             }
-        } else {
-            // failure
-            $errors = $category->errors();
-            return Redirect::back()->withInput()->withErrors($errors);
-        }
+        } 
 
         // Redirect to the category create page
         return Redirect::to('admin/settings/categories/create')->with('error', Lang::get('admin/categories/message.create.error'));
@@ -120,8 +119,17 @@ class CategoriesController extends AdminController
         // get the POST data
         $new = Input::all();
 
+        // attempt validation       
+        $validator = Validator::make(Input::all(), $category->validationRules($categoryId));
+       
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
         // attempt validation
-        if ($category->validate($new)) {
+        else {
 
             // Update the category data
             $category->name            = e(Input::get('name'));
@@ -131,11 +139,7 @@ class CategoriesController extends AdminController
                 // Redirect to the new category page
                 return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.update.success'));
             }
-        } else {
-            // failure
-            $errors = $category->errors();
-            return Redirect::back()->withInput()->withErrors($errors);
-        }
+        } 
 
         // Redirect to the category management page
         return Redirect::to("admin/settings/categories/$categoryID/edit")->with('error', Lang::get('admin/categories/message.update.error'));

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'));
@@ -118,27 +118,26 @@ class DepreciationsController extends AdminController
         }
 
 
+//attempt to validate
+        $validator = Validator::make(Input::all(), $depreciation->validationRules($depreciationId));
 
-        // get the POST data
-        $new = Input::all();
-
+        if ($validator->fails())
+        {
+            // The given data did not pass validation            
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
         // attempt validation
-        if ($depreciation->validate($new)) {
-
+        else {
             // Depreciation data
-            $depreciation->name            = e(Input::get('name'));
+            $depreciation->name      = e(Input::get('name'));
             $depreciation->months    = e(Input::get('months'));
 
             // Was the asset created?
             if($depreciation->save()) {
                 // Redirect to the depreciation page
-                return Redirect::to("admin/settings/depreciations/$depreciationId/edit")->with('success', Lang::get('admin/depreciations/message.update.success'));
+                return Redirect::to("admin/settings/depreciations/")->with('success', Lang::get('admin/depreciations/message.update.success'));
             }
-        } else {
-            // failure
-            $errors = $depreciation->errors();
-            return Redirect::back()->withInput()->withErrors($errors);
-        }
+        } 
 
         // Redirect to the depreciation management page
         return Redirect::to("admin/settings/depreciations/$depreciationId/edit")->with('error', Lang::get('admin/depreciations/message.update.error'));

app/controllers/admin/LicensesController.php

@@ -1,5 +1,6 @@
 <?php namespace Controllers\Admin;
 
+use Assets;
 use AdminController;
 use Input;
 use Lang;
@@ -14,9 +15,11 @@ use Depreciation;
 use Setting;
 use Sentry;
 use Str;
+use Supplier;
 use Validator;
 use View;
 
+
 class LicensesController extends AdminController
 {
     /**
@@ -25,10 +28,13 @@ class LicensesController extends AdminController
      * @return View
      */
 
+
+
+
     public function getIndex()
     {
         // Grab all the licenses
-        $licenses = License::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
+        $licenses = License::orderBy('created_at', 'DESC')->get();
 
         // Show the page
         return View::make('backend/licenses/index', compact('licenses'));
@@ -46,7 +52,14 @@ class LicensesController extends AdminController
         $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);
     }
 
 
@@ -68,23 +81,43 @@ class LicensesController extends AdminController
         // attempt validation
         if ($license->validate($new)) {
 
+            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'));
+            }
+
             // 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->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->purchase_cost   = e(Input::get('purchase_cost'));
+            $license->depreciation_id   = e(Input::get('depreciation_id'));
+            $license->expiration_date   = e(Input::get('expiration_date'));
+            //$license->asset_id            = e(Input::get('asset_id'));
+            $license->user_id           = Sentry::getId();
 
             if (($license->purchase_date == "") || ($license->purchase_date == "0000-00-00")) {
                 $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;
             }
@@ -95,10 +128,10 @@ class LicensesController extends AdminController
                 // 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      = 0;
+                    $license_seat->notes            = NULL;
                     $license_seat->save();
                 }
 
@@ -142,7 +175,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);
     }
 
 
@@ -170,13 +209,21 @@ 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'));
+
+            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')) == '') {
@@ -185,10 +232,24 @@ 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 {
-                    $license->purchase_cost = e(Input::get('purchase_cost'));
+                    $license->purchase_cost = ParseFloat(e(Input::get('purchase_cost')));
+                    //$license->purchase_cost = e(Input::get('purchase_cost'));
             }
 
 
@@ -229,10 +290,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      = 0;
+                        $license_seat->notes            = NULL;
                         $license_seat->save();
                     }
 
@@ -244,7 +305,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?
@@ -312,8 +373,30 @@ 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');
 
-        //print_r($users);
-        return View::make('backend/licenses/checkout', compact('licenseseat'))->with('users_list',$users_list);
+        // 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';
+
+            // 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'].')';
+                } else {
+                    $full_name = ' (Unassigned)';
+                }
+                $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);
 
     }
 
@@ -324,18 +407,16 @@ class LicensesController extends AdminController
     **/
     public function postCheckout($seatId)
     {
-        // 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'));
-        }
+
 
         $assigned_to = e(Input::get('assigned_to'));
+        $asset_id = e(Input::get('asset_id'));
 
         // Declare the rules for the form validation
         $rules = array(
-            'assigned_to'   => 'required|integer|min:1',
+
             'note'   => 'alpha_space',
+            'asset_id'  => 'required_without:assigned_to',
         );
 
         // Create a new validator instance from our validation rules
@@ -347,17 +428,46 @@ class LicensesController extends AdminController
             return Redirect::back()->withInput()->withErrors($validator);
         }
 
-
+        if ($assigned_to!='') {
         // Check if the user exists
-        if (is_null($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_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
+        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'));
+        }
+    
+    if ( e(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')) == '') {
                 $licenseseat->assigned_to =  NULL;
+
         } else {
                 $licenseseat->assigned_to = e(Input::get('assigned_to'));
         }
@@ -366,8 +476,8 @@ class LicensesController extends AdminController
         if($licenseseat->save()) {
 
             $logaction = new Actionlog();
-            $logaction->asset_id = $licenseseat->license_id;
-            $logaction->location_id = $assigned_to->location_id;
+
+            //$logaction->location_id = $assigned_to->location_id;
             $logaction->asset_type = 'software';
             $logaction->user_id = Sentry::getUser()->id;
             $logaction->note = e(Input::get('note'));
@@ -438,11 +548,12 @@ class LicensesController extends AdminController
         $logaction->checkedout_to = $licenseseat->assigned_to;
 
         // Update the asset data
-        $licenseseat->assigned_to            		= '0';
+        $licenseseat->assigned_to                   = '0';
+        $licenseseat->asset_id                      = NULL;
 
         // Was the asset updated?
         if($licenseseat->save()) {
-            $logaction->asset_id = $licenseseat->license_id;
+            $logaction->asset_id = NULL;
             $logaction->location_id = NULL;
             $logaction->asset_type = 'software';
             $logaction->note = e(Input::get('note'));
@@ -478,5 +589,26 @@ class LicensesController extends AdminController
         }
     }
 
+    public function getClone($licenseId = null)
+    {
+         // Check if the license exists
+        if (is_null($license_to_clone = License::find($licenseId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.does_not_exist'));
+        }
 
+          // Show the page
+        $license_options = array('0' => 'Top Level') + License::lists('name', 'id');
+
+        //clone the orig
+        $license = clone $license_to_clone;
+        $license->id = null;
+        $license->serial = null;
+
+        // Show the page
+        $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
+        $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',$license);
+
+    }
 }

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')->get();
 
         // Show the page
         return View::make('backend/locations/index', compact('locations'));
@@ -123,14 +123,16 @@ class LocationsController extends AdminController
             return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.does_not_exist'));
         }
 
+        //attempt to validate
+        $validator = Validator::make(Input::all(), $location->validationRules($locationId));
 
-
-        // get the POST data
-        $new = Input::all();
-
-
+        if ($validator->fails())
+        {
+            // The given data did not pass validation            
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
         // attempt validation
-        if ($location->validate($new)) {
+        else {
 
             // Update the location data
             $location->name            	= e(Input::get('name'));
@@ -144,13 +146,9 @@ class LocationsController extends AdminController
             // Was the asset created?
             if($location->save()) {
                 // Redirect to the saved location page
-                return Redirect::to("admin/settings/locations/$locationId/edit")->with('success', Lang::get('admin/locations/message.update.success'));
+                return Redirect::to("admin/settings/locations/")->with('success', Lang::get('admin/locations/message.update.success'));
             }
-        } else {
-            // failure
-            $errors = $location->errors();
-            return Redirect::back()->withInput()->withErrors($errors);
-        }
+        } 
 
         // Redirect to the location management page
         return Redirect::to("admin/settings/locations/$locationId/edit")->with('error', Lang::get('admin/locations/message.update.error'));

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'));
@@ -109,13 +109,15 @@ class ManufacturersController extends AdminController
             return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.does_not_exist'));
         }
 
+        $validator = Validator::make(Input::all(), $manufacturer->validationRules($manufacturerId));
 
-        // get the POST data
-        $new = Input::all();
-
+        if ($validator->fails())
+        {
+            // The given data did not pass validation           
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
         // attempt validation
-        if ($manufacturer->validate($new)) {
-
+        else {
             // Save the  data
             $manufacturer->name 	= e(Input::get('name'));
 
@@ -124,11 +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'));
             }
-        } else {
-            // failure
-            $errors = $manufacturer->errors();
-            return Redirect::back()->withInput()->withErrors($errors);
-        }
+        } 
 
         // Redirect to the manufacturer management page
         return Redirect::to("admin/settings/manufacturers/$manufacturerId/edit")->with('error', Lang::get('admin/manufacturers/message.update.error'));

app/controllers/admin/ModelsController.php

@@ -1,6 +1,7 @@
 <?php namespace Controllers\Admin;
 
 use AdminController;
+use Image;
 use Input;
 use Lang;
 use Model;
@@ -24,7 +25,7 @@ class ModelsController extends AdminController
     public function getIndex()
     {
         // Grab all the models
-        $models = Model::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
+        $models = Model::orderBy('created_at', 'DESC')->get();
 
         // Show the page
         return View::make('backend/models/index', compact('models'));
@@ -66,16 +67,38 @@ class ModelsController extends AdminController
 
         // attempt validation
         if ($model->validate($new)) {
+             
+            if ( e(Input::get('depreciation_id')) == '') {
+                $model->depreciation_id =  0;
+            } else {
+                $model->depreciation_id = e(Input::get('depreciation_id'));
+            }
+            
+             if ( e(Input::get('eol')) == '') {
+                $model->eol =  0;
+            } else {
+                $model->eol = e(Input::get('eol'));
+            }
 
             // 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->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->eol    				= e(Input::get('eol'));
 
+            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()) {
@@ -132,31 +155,56 @@ class ModelsController extends AdminController
             return Redirect::to('admin/models')->with('error', Lang::get('admin/models/message.does_not_exist'));
         }
 
-        // get the POST data
-        $new = Input::all();
+          //attempt to validate
+        $validator = Validator::make(Input::all(), $model->validationRules($modelId));
 
+        if ($validator->fails())
+        {
+            // The given data did not pass validation           
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
         // attempt validation
-        if ($model->validate($new)) {
+        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 {
+                $model->eol = e(Input::get('eol'));
+            }
 
             // Update the model data
             $model->name            	= e(Input::get('name'));
-            $model->modelno            	= e(Input::get('modelno'));
-            $model->depreciation_id    	= e(Input::get('depreciation_id'));
+            $model->modelno            	= e(Input::get('modelno'));           
             $model->manufacturer_id    	= e(Input::get('manufacturer_id'));
             $model->category_id    		= e(Input::get('category_id'));
-            $model->eol    				= e(Input::get('eol'));
 
+            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'));
             }
-        } else {
-            // failure
-            $errors = $model->errors();
-            return Redirect::back()->withInput()->withErrors($errors);
-        }
+        } 
 
         // Redirect to the model create page
         return Redirect::to("hardware/models/$modelId/edit")->with('error', Lang::get('admin/models/message.update.error'));
@@ -212,6 +260,31 @@ class ModelsController extends AdminController
         }
 
 
+    }
+    
+        public function getClone($modelId = null)
+    {
+        // Check if the model exists
+        if (is_null($model_to_clone = Model::find($modelId))) {
+            // 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');
+        $category_list = array('' => '') + DB::table('categories')->whereNull('deleted_at')->lists('name', 'id');
+        $view = View::make('backend/models/edit');
+        $view->with('category_list',$category_list);
+        $view->with('depreciation_list',$depreciation_list);
+        $view->with('manufacturer_list',$manufacturer_list);
+        $view->with('model',$model);
+        $view->with('clone_model',$model_to_clone);
+        return $view;
+        
     }
 
 

app/controllers/admin/ReportsController.php

@@ -0,0 +1,458 @@
+<?php namespace Controllers\Admin;
+
+use AdminController;
+use Input;
+use Lang;
+use License;
+use Asset;
+use User;
+use View;
+use Location;
+use Redirect;
+use Response;
+
+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('admin/hardware/table.purchase_date'),
+            Lang::get('admin/hardware/table.purchase_cost'),
+            Lang::get('admin/hardware/form.order'),
+            Lang::get('admin/hardware/form.supplier'),
+            Lang::get('admin/hardware/table.checkoutto'),
+            Lang::get('admin/hardware/table.location'),
+            Lang::get('general.status')
+        );
+        $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;
+            $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
+            }
+
+            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[] = '';
+            }
+
+            $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()
+    {
+        // @todo - It may be worthwhile creating a separate controller for reporting
+
+        // 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/table.title'),
+            Lang::get('admin/hardware/table.serial'),
+            Lang::get('admin/hardware/table.checkoutto'),
+            Lang::get('admin/hardware/table.location'),
+            Lang::get('admin/hardware/table.purchase_date'),
+            Lang::get('admin/hardware/table.purchase_cost'),
+            Lang::get('admin/hardware/table.book_value'),
+            Lang::get('admin/hardware/table.diff')
+        );
+        $header = array_map('trim', $header);
+        $rows[] = implode($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
+            }
+
+            $depreciation = $asset->depreciate();
+
+            $row[] = $asset->purchase_date;
+            $row[] = '"'.number_format($asset->purchase_cost).'"';
+            $row[] = '"'.number_format($depreciation).'"';
+            $row[] = '"'.number_format($asset->purchase_cost - $depreciation).'"';
+            $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 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') && (e(Input::get('depreciation')) == '0')) {
+                $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->depreciate();
+                $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'));
+        }
+    }
+}

app/controllers/admin/SettingsController.php

@@ -82,9 +82,13 @@ class SettingsController extends AdminController
             $setting->id = '1';
             $setting->site_name = e(Input::get('site_name'));
             $setting->display_asset_name = e(Input::get('display_asset_name', '0'));
+            $setting->display_checkout_date = e(Input::get('display_checkout_date', '0'));
             $setting->per_page = e(Input::get('per_page'));
             $setting->qr_code = e(Input::get('qr_code', '0'));
+            $setting->display_eol = e(Input::get('display_eol', '0'));
             $setting->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'));
 
             // Was the asset updated?
             if($setting->save()) {

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'));
@@ -113,28 +113,25 @@ class StatuslabelsController extends AdminController
             return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.does_not_exist'));
         }
 
+        //attempt to validate
+        $validator = Validator::make(Input::all(), $statuslabel->validationRules($statuslabelId));
 
-
-        // get the POST data
-        $new = Input::all();
-
-
+        if ($validator->fails())
+        {
+            // The given data did not pass validation            
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
         // attempt validation
-        if ($statuslabel->validate($new)) {
-
+        else {
             // Update the Statuslabel data
             $statuslabel->name            	= e(Input::get('name'));
 
             // Was the asset created?
             if($statuslabel->save()) {
                 // Redirect to the saved Statuslabel page
-                return Redirect::to("admin/settings/statuslabels/$statuslabelId/edit")->with('success', Lang::get('admin/statuslabels/message.update.success'));
+                return Redirect::to("admin/settings/statuslabels/")->with('success', Lang::get('admin/statuslabels/message.update.success'));
             }
-        } else {
-            // failure
-            $errors = $statuslabel->errors();
-            return Redirect::back()->withInput()->withErrors($errors);
-        }
+        } 
 
         // Redirect to the Statuslabel management page
         return Redirect::to("admin/settings/statuslabels/$statuslabelId/edit")->with('error', Lang::get('admin/statuslabels/message.update.error'));

app/controllers/admin/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()) {
@@ -122,39 +134,53 @@ class SuppliersController extends AdminController
         }
 
 
-        // get the POST data
-        $new = Input::all();
-
+          //attempt to validate
+        $validator = Validator::make(Input::all(), $supplier->validationRules($supplierId));
 
+        if ($validator->fails())
+        {
+            // The given data did not pass validation           
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
         // attempt validation
-        if ($supplier->validate($new)) {
+        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()) {
                 // Redirect to the new supplier page
                 return Redirect::to("admin/settings/suppliers")->with('success', Lang::get('admin/suppliers/message.update.success'));
             }
-        } else {
-            // failure
-            $errors = $supplier->errors();
-            return Redirect::back()->withInput()->withErrors($errors);
-        }
+        } 
 
         // Redirect to the supplier management page
         return Redirect::to("admin/settings/suppliers/$supplierId/edit")->with('error', Lang::get('admin/suppliers/message.update.error'));

app/controllers/admin/UsersController.php

@@ -32,9 +32,10 @@ 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',
-        'password'         => 'required|between:10,32',
-        'password_confirm' => 'required|between:10,32|same:password',
+        'password'         => 'required|min:6',
+        'password_confirm' => 'required|min:6|same:password',
     );
 
     /**
@@ -44,14 +45,29 @@ class UsersController extends AdminController
      */
     public function getIndex()
     {
-        // Grab all the users
+        // 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')) {
-            $users = $users->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();
         }
 
 
@@ -62,7 +78,6 @@ class UsersController extends AdminController
                 'onlyTrashed' => Input::get('onlyTrashed'),
             ));
 
-
         // Show the page
         return View::make('backend/users/index', compact('users'));
     }
@@ -158,7 +173,8 @@ class UsersController extends AdminController
                 $success = Lang::get('admin/users/message.success.create');
 
                 // Redirect to the new user page
-                return Redirect::route('update/user', $user->id)->with('success', $success);
+                //return Redirect::route('update/user', $user->id)->with('success', $success);
+                return Redirect::route('users')->with('success', $success);
             }
 
 
@@ -333,7 +349,7 @@ class UsersController extends AdminController
                 $success = Lang::get('admin/users/message.success.update');
 
                 // Redirect to the user page
-                return Redirect::route('update/user', $id)->with('success', $success);
+                return Redirect::route('view/user', $id)->with('success', $success);
             }
 
             // Prepare the error message
@@ -529,4 +545,61 @@ class UsersController extends AdminController
         }
     }
 
+    public function getClone($id = null)
+    {
+        // We need to reverse the UI specific logic for our
+        // permissions here before we update the user.
+        $permissions = Input::get('permissions', array());
+        $this->decodePermissions($permissions);
+        app('request')->request->set('permissions', $permissions);
+
+
+        try {
+            // Get the user information
+            $user_to_clone = Sentry::getUserProvider()->findById($id);
+            $user = clone $user_to_clone;
+            $user->first_name = '';
+            $user->last_name = '';
+            $user->email = substr($user->email, ($pos = strpos($user->email, '@')) !== false ? $pos  : 0);;
+            $user->id = null;
+
+            // Get this user groups
+            $userGroups = $user_to_clone->groups()->lists('group_id', 'name');
+
+            // Get this user permissions
+            $userPermissions = array_merge(Input::old('permissions', array('superuser' => -1)), $user_to_clone->getPermissions());
+            $this->encodePermissions($userPermissions);
+
+            // Get a list of all the available groups
+            $groups = Sentry::getGroupProvider()->findAll();
+
+            // Get all the available permissions
+            $permissions = Config::get('permissions');
+            $this->encodeAllPermissions($permissions);
+
+            $location_list = array('' => '') + Location::lists('name', 'id');
+            $manager_list = array('' => 'Select a User') + DB::table('users')
+            ->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))
+            ->whereNull('deleted_at')
+            ->where('id','!=',$id)
+            ->orderBy('last_name', 'asc')
+            ->orderBy('first_name', 'asc')
+            ->lists('full_name', 'id');
+
+                // Show the page
+            return View::make('backend/users/edit', compact('groups', 'userGroups', 'permissions', 'userPermissions'))
+                ->with('location_list',$location_list)
+                ->with('manager_list',$manager_list)
+                ->with('user',$user)
+                ->with('clone_user',$user_to_clone);
+
+        } catch (UserNotFoundException $e) {
+            // Prepare the error message
+            $error = Lang::get('admin/users/message.user_not_found', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('users')->with('error', $error);
+        }
+    }
+
 }

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');
 
     }
 

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');
 
     }
 

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');
 
     }
 

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)');
     }
 
     /**

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');
     }
 
     /**

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"');
 
     }
 

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');
     }
 
     /**

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');
     }
 
     /**

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');
     }
 
     /**