Merge branch 'develop'

Re: https://stackoverflow.com/a/45029309/200021
via @robertpearce

.all-contributorsrc

@@ -755,6 +755,51 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "imjennyli",
+      "name": "Jenny Li",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/404729?v=4",
+      "profile": "https://github.com/imjennyli",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "GeoffYoung",
+      "name": "Geoff Young",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/869227?v=4",
+      "profile": "https://github.com/GeoffYoung",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "BlueHatbRit",
+      "name": "Elliot Blackburn",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1068477?v=4",
+      "profile": "http://www.elliotblackburn.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "TonisOrmisson",
+      "name": "Tõnis Ormisson",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/6357451?v=4",
+      "profile": "http://andmemasin.eu",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "thakilla",
+      "name": "Nicolai Essig",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/449411?v=4",
+      "profile": "http://www.nicolai-essig.de",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

.env.example

@@ -8,7 +8,6 @@ APP_URL=null
 APP_TIMEZONE='UTC'
 APP_LOCALE=en
 
-
 # --------------------------------------------
 # REQUIRED: DATABASE SETTINGS
 # --------------------------------------------
@@ -31,7 +30,6 @@ DB_SSL_CERT_PATH=null
 DB_SSL_CA_PATH=null
 DB_SSL_CIPHER=null
 
-
 # --------------------------------------------
 # REQUIRED: OUTGOING MAIL SERVER SETTINGS
 # --------------------------------------------
@@ -46,14 +44,12 @@ MAIL_FROM_NAME='Snipe-IT'
 MAIL_REPLYTO_ADDR=you@example.com
 MAIL_REPLYTO_NAME='Snipe-IT'
 
-
 # --------------------------------------------
 # REQUIRED: IMAGE LIBRARY
 # This should be gd or imagick
 # --------------------------------------------
 IMAGE_LIB=gd
 
-
 # --------------------------------------------
 # OPTIONAL: SESSION SETTINGS
 # --------------------------------------------
@@ -64,14 +60,12 @@ COOKIE_NAME=snipeit_session
 COOKIE_DOMAIN=null
 SECURE_COOKIES=false
 
-
 # --------------------------------------------
 # OPTIONAL: SECURITY HEADER SETTINGS
 # --------------------------------------------
 REFERRER_POLICY=same-origin
 ENABLE_CSP=false
 
-
 # --------------------------------------------
 # OPTIONAL: CACHE SETTINGS
 # --------------------------------------------
@@ -79,6 +73,12 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
+# --------------------------------------------
+# OPTIONAL: REDIS SETTINGS
+# --------------------------------------------
+REDIS_HOST=null
+REDIS_PASSWORD=null
+REDIS_PORT-null
 
 # --------------------------------------------
 # OPTIONAL: AWS S3 SETTINGS
@@ -97,7 +97,8 @@ LOGIN_LOCKOUT_DURATION=60
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-APP_LOG=single
+APP_LOG=daily
+APP_LOG_MAX_FILES=10
 APP_LOCKED=false
 FILESYSTEM_DISK=local
 APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1

.gitignore

@@ -27,6 +27,7 @@ public/uploads/logo.png
 public/uploads/logo.svg
 public/uploads/models/*
 public/uploads/suppliers/*
+public/uploads/accessories/*
 public/uploads/users/*
 storage/app/private_uploads/users/*
 storage/debugbar/

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
+reported by contacting the project team at abuse@snipeitapp.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 ### Contributing
 
-Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing).
+Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing-overview).
 
 
 Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.

README.md

@@ -1,5 +1,5 @@
-[![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+for+dev&title=Ready+for+development)](http://waffle.io/snipe/snipe-it) [![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]() [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.png)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeyhead.svg?style=social)](https://twitter.com/snipeyhead) [![Zenhub](https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png)](https://zenhub.io) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-81-orange.svg?style=flat-square)](#contributors)
+[![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+for+dev&title=Ready+for+development)](http://waffle.io/snipe/snipe-it) [![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]() [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeyhead.svg?style=social)](https://twitter.com/snipeyhead) [![Zenhub](https://img.shields.io/badge/Shipping_faster_with-ZenHub-5e60ba.svg)](https://zenhub.io) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade)
+[![All Contributors](https://img.shields.io/badge/all_contributors-86-orange.svg?style=flat-square)](#contributors)
 
 
 ## Snipe-IT - Open Source Asset Management System
@@ -67,7 +67,8 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars0.githubusercontent.com/u/8341172?v=3" width="110px;"/><br /><sub>Jay Richards</sub>](http://www.cordeos.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=technogenus "Code") | [<img src="https://avatars2.githubusercontent.com/u/7295127?v=3" width="110px;"/><br /><sub>Alexander Innes</sub>](https://necurity.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leostat "Code") | [<img src="https://avatars2.githubusercontent.com/u/334485?v=3" width="110px;"/><br /><sub>Danny Garcia</sub>](https://buzzedword.codes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=buzzedword "Code") | [<img src="https://avatars2.githubusercontent.com/u/366855?v=3" width="110px;"/><br /><sub>archpoint</sub>](https://github.com/archpoint)<br />[💻](https://github.com/snipe/snipe-it/commits?author=archpoint "Code") | [<img src="https://avatars1.githubusercontent.com/u/67991?v=3" width="110px;"/><br /><sub>Jake McGraw</sub>](http://www.jakemcgraw.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jakemcgraw "Code") | [<img src="https://avatars1.githubusercontent.com/u/1714374?v=3" width="110px;"/><br /><sub>FleischKarussel</sub>](https://github.com/FleischKarussel)<br />[📖](https://github.com/snipe/snipe-it/commits?author=FleischKarussel "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/319644?v=3" width="110px;"/><br /><sub>Dylan Yi</sub>](https://github.com/feeva)<br />[💻](https://github.com/snipe/snipe-it/commits?author=feeva "Code") |
 | [<img src="https://avatars2.githubusercontent.com/u/857740?v=3" width="110px;"/><br /><sub>Gil Rutkowski</sub>](http://FlashingCursor.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=flashingcursor "Code") | [<img src="https://avatars3.githubusercontent.com/u/129360?v=3" width="110px;"/><br /><sub>Desmond Morris</sub>](http://www.desmondmorris.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=desmondmorris "Code") | [<img src="https://avatars2.githubusercontent.com/u/52936?v=3" width="110px;"/><br /><sub>Nick Peelman</sub>](http://peelman.us)<br />[💻](https://github.com/snipe/snipe-it/commits?author=peelman "Code") | [<img src="https://avatars0.githubusercontent.com/u/53161?v=3" width="110px;"/><br /><sub>Abraham Vegh</sub>](https://abrahamvegh.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=abrahamvegh "Code") | [<img src="https://avatars0.githubusercontent.com/u/2818680?v=3" width="110px;"/><br /><sub>Mohamed Rashid</sub>](https://github.com/rashivkp)<br />[📖](https://github.com/snipe/snipe-it/commits?author=rashivkp "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/1509456?v=3" width="110px;"/><br /><sub>Kasey</sub>](http://hinchk.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=HinchK "Code") | [<img src="https://avatars2.githubusercontent.com/u/10522541?v=3" width="110px;"/><br /><sub>Brett</sub>](https://github.com/BrettFagerlund)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=BrettFagerlund "Tests") |
 | [<img src="https://avatars2.githubusercontent.com/u/16108587?v=3" width="110px;"/><br /><sub>Jason Spriggs</sub>](http://jasonspriggs.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jasonspriggs "Code") | [<img src="https://avatars2.githubusercontent.com/u/1134568?v=3" width="110px;"/><br /><sub>Nate Felton</sub>](http://n8felton.wordpress.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=n8felton "Code") | [<img src="https://avatars2.githubusercontent.com/u/14036694?v=3" width="110px;"/><br /><sub>Manasses Ferreira</sub>](http://homepages.dcc.ufmg.br/~manassesferreira)<br />[💻](https://github.com/snipe/snipe-it/commits?author=manassesferreira "Code") | [<img src="https://avatars0.githubusercontent.com/u/15913949?v=3" width="110px;"/><br /><sub>Steve</sub>](https://github.com/steveelwood)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=steveelwood "Tests") | [<img src="https://avatars1.githubusercontent.com/u/3361683?v=3" width="110px;"/><br /><sub>matc</sub>](http://twitter.com/matc)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=matc "Tests") | [<img src="https://avatars3.githubusercontent.com/u/7405702?v=3" width="110px;"/><br /><sub>Cole R. Davis</sub>](http://www.davisracingteam.com)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=VanillaNinjaD "Tests") | [<img src="https://avatars2.githubusercontent.com/u/10167681?v=3" width="110px;"/><br /><sub>gibsonjoshua55</sub>](https://github.com/gibsonjoshua55)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gibsonjoshua55 "Code") |
-| [<img src="https://avatars2.githubusercontent.com/u/2809241?v=4" width="110px;"/><br /><sub>Robin Temme</sub>](https://github.com/zwerch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zwerch "Code") | [<img src="https://avatars0.githubusercontent.com/u/6961695?v=4" width="110px;"/><br /><sub>Iman</sub>](https://github.com/imanghafoori1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=imanghafoori1 "Code") | [<img src="https://avatars1.githubusercontent.com/u/6551003?v=4" width="110px;"/><br /><sub>Richard Hofman</sub>](https://github.com/richardhofman6)<br />[💻](https://github.com/snipe/snipe-it/commits?author=richardhofman6 "Code") | [<img src="https://avatars0.githubusercontent.com/u/3697569?v=4" width="110px;"/><br /><sub>gizzmojr</sub>](https://github.com/gizzmojr)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gizzmojr "Code") |
+| [<img src="https://avatars2.githubusercontent.com/u/2809241?v=4" width="110px;"/><br /><sub>Robin Temme</sub>](https://github.com/zwerch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zwerch "Code") | [<img src="https://avatars0.githubusercontent.com/u/6961695?v=4" width="110px;"/><br /><sub>Iman</sub>](https://github.com/imanghafoori1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=imanghafoori1 "Code") | [<img src="https://avatars1.githubusercontent.com/u/6551003?v=4" width="110px;"/><br /><sub>Richard Hofman</sub>](https://github.com/richardhofman6)<br />[💻](https://github.com/snipe/snipe-it/commits?author=richardhofman6 "Code") | [<img src="https://avatars0.githubusercontent.com/u/3697569?v=4" width="110px;"/><br /><sub>gizzmojr</sub>](https://github.com/gizzmojr)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gizzmojr "Code") | [<img src="https://avatars3.githubusercontent.com/u/404729?v=4" width="110px;"/><br /><sub>Jenny Li</sub>](https://github.com/imjennyli)<br />[📖](https://github.com/snipe/snipe-it/commits?author=imjennyli "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/869227?v=4" width="110px;"/><br /><sub>Geoff Young</sub>](https://github.com/GeoffYoung)<br />[💻](https://github.com/snipe/snipe-it/commits?author=GeoffYoung "Code") | [<img src="https://avatars3.githubusercontent.com/u/1068477?v=4" width="110px;"/><br /><sub>Elliot Blackburn</sub>](http://www.elliotblackburn.com)<br />[📖](https://github.com/snipe/snipe-it/commits?author=BlueHatbRit "Documentation") |
+| [<img src="https://avatars1.githubusercontent.com/u/6357451?v=4" width="110px;"/><br /><sub>Tõnis Ormisson</sub>](http://andmemasin.eu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TonisOrmisson "Code") | [<img src="https://avatars0.githubusercontent.com/u/449411?v=4" width="110px;"/><br /><sub>Nicolai Essig</sub>](http://www.nicolai-essig.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thakilla "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

app/Console/Commands/LdapSync.php

@@ -16,7 +16,7 @@ class LdapSync extends Command
      *
      * @var string
      */
-    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=} {--summary}';
+    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=} {--summary} {--json_summary}';
 
     /**
      * The console command description.
@@ -55,27 +55,35 @@ class LdapSync extends Command
 
         try {
             $ldapconn = Ldap::connectToLdap();
-        } catch (\Exception $e) {
-            LOG::error($e);
-        }
-
-        try {
             Ldap::bindAdminToLdap($ldapconn);
         } catch (\Exception $e) {
+            if ($this->option('json_summary')) {
+                $json_summary = [ "error" => true, "error_message" => $e->getMessage(), "summary" => [] ];
+                $this->info(json_encode($json_summary));
+            }
             LOG::error($e);
+            return [];
         }
 
         $summary = array();
 
         $results = Ldap::findLdapUsers();
 
-        $ldap_ou_locations = Location::whereNotNull('ldap_ou')->get();
-
+        // Retrieve locations with a mapped OU, and sort them from the shallowest to deepest OU (see #3993)
+        $ldap_ou_locations = Location::where('ldap_ou', '!=', '')->get()->toArray();
+        $ldap_ou_lengths = array();
+        
+        foreach ($ldap_ou_locations as $location) {
+            $ldap_ou_lengths[] = strlen($location["ldap_ou"]);
+        }
+        
+        array_multisort($ldap_ou_lengths, SORT_ASC, $ldap_ou_locations);
+        
         if (sizeof($ldap_ou_locations) > 0) {
             LOG::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.');
         }
 
-        $results = Ldap::findLdapUsers();
+        // Inject location information fields
         for ($i = 0; $i < $results["count"]; $i++) {
             $results[$i]["ldap_location_override"] = false;
             $results[$i]["location_id"] = 0;
@@ -90,8 +98,8 @@ class LdapSync extends Command
             LOG::debug('Location ID '.$this->option('location_id').' passed');
             LOG::debug('Importing to '.$location->name.' ('.$location->id.')');
         } else {
-	    $location = NULL;
-	}
+	        $location = NULL;
+	    }
 
         if (!isset($location)) {
             LOG::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
@@ -99,11 +107,11 @@ class LdapSync extends Command
 
         // Grab subsets based on location-specific DNs, and overwrite location for these users.
         foreach ($ldap_ou_locations as $ldap_loc) {
-            $location_users = Ldap::findLdapUsers($ldap_loc->ldap_ou);
+            $location_users = Ldap::findLdapUsers($ldap_loc["ldap_ou"]);
             $usernames = array();
             for ($i = 0; $i < $location_users["count"]; $i++) {
                 $location_users[$i]["ldap_location_override"] = true;
-                $location_users[$i]["location_id"] = $ldap_loc->id;
+                $location_users[$i]["location_id"] = $ldap_loc["id"];
                 $usernames[] = $location_users[$i][$ldap_result_username][0];
             }
 
@@ -135,6 +143,14 @@ class LdapSync extends Command
                 $item["ldap_location_override"] = isset($results[$i]["ldap_location_override"]) ? $results[$i]["ldap_location_override"]:"";
                 $item["location_id"] = isset($results[$i]["location_id"]) ? $results[$i]["location_id"]:"";
 
+                if ( array_key_exists('useraccountcontrol', $results[$i]) ) {
+                    $enabled_accounts = [
+                        '512', '544', '66048', '66080', '262656', '262688', '328192', '328224'
+                    ];
+                    $item['activated'] = ( in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts) ) ? 1 : 0;
+                } else {
+                    $item['activated'] = 0;
+                }
 
                 // User exists
                 $item["createorupdate"] = 'updated';
@@ -145,14 +161,12 @@ class LdapSync extends Command
                 }
 
                 // Create the user if they don't exist.
-
-
                 $user->first_name = e($item["firstname"]);
                 $user->last_name = e($item["lastname"]);
                 $user->username = e($item["username"]);
                 $user->email = e($item["email"]);
                 $user->employee_num = e($item["employee_number"]);
-                $user->activated = 1;
+                $user->activated = $item['activated'];
 
                 if ($item['ldap_location_override'] == true) {
                     $user->location_id = $item['location_id'];
@@ -188,13 +202,12 @@ class LdapSync extends Command
                 } else {
                     $this->info('User '.$summary[$x]['firstname'].' '.$summary[$x]['lastname'].' (username:  '.$summary[$x]['username'].' was '.strtoupper($summary[$x]['createorupdate']).'.');
                 }
-
             }
+        } else if ($this->option('json_summary')) {
+            $json_summary = [ "error" => false, "error_message" => "", "summary" => $summary ];
+            $this->info(json_encode($json_summary));
         } else {
             return $summary;
         }
-
-
-
     }
 }

app/Console/Commands/RecryptFromMcrypt.php

@@ -16,7 +16,8 @@ class RecryptFromMcrypt extends Command
      *
      * @var string
      */
-    protected $signature = 'snipeit:legacy-recrypt';
+    protected $signature = 'snipeit:legacy-recrypt 
+                {--force : Force a re-crypt of encrypted data from MCRYPT.}';
 
     /**
      * The console command description.
@@ -48,6 +49,7 @@ class RecryptFromMcrypt extends Command
         // If not, we can try to use the current APP_KEY if looks like it's old
         $legacy_key = env('LEGACY_APP_KEY');
         $key_parts = explode(':', $legacy_key);
+        $legacy_cipher = env('LEGACY_CIPHER');
         $errors = array();
 
         if (!$legacy_key) {
@@ -60,6 +62,7 @@ class RecryptFromMcrypt extends Command
         if (strlen($legacy_key) == 32) {
             $legacy_length_check = true;
         } elseif (array_key_exists('1', $key_parts) && (strlen($key_parts[1])==44)) {
+            $legacy_key = base64_decode($key_parts[1],true);
             $legacy_length_check = true;
         } else {
             $legacy_length_check = false;
@@ -79,7 +82,9 @@ class RecryptFromMcrypt extends Command
         $this->error('================================!!!! WARNING !!!!================================');
         $this->comment("This tool will attempt to decrypt your old Snipe-IT (mcrypt, now deprecated) encrypted data and re-encrypt it using OpenSSL. \n\nYou should only continue if you have backed up any and all old APP_KEYs and have backed up your data.");
 
-        if ($this->confirm("Are you SURE you wish to continue?")) {
+        $force = ($this->option('force')) ? true : false;
+
+        if ($force || ($this->confirm("Are you SURE you wish to continue?"))) {
 
             $backup_file = 'backups/env-backups/'.'app_key-'.date('Y-m-d-gis');
 
@@ -91,13 +96,21 @@ class RecryptFromMcrypt extends Command
             }
 
 
-            $mcrypter = new McryptEncrypter($legacy_key);
+            if ($legacy_cipher){
+                $mcrypter = new McryptEncrypter($legacy_key,$legacy_cipher);
+            }else{
+                $mcrypter = new McryptEncrypter($legacy_key);
+            }
             $settings = Setting::getSettings();
 
-            if ($settings->ldap_password=='') {
+            if ($settings->ldap_pword=='') {
                 $this->comment('INFO: No LDAP password found. Skipping... ');
+            } else {
+                $decrypted_ldap_pword = $mcrypter->decrypt($settings->ldap_pword);
+                $settings->ldap_pword = \Crypt::encrypt($decrypted_ldap_pword);
+                $settings->save();
             }
-
+            /** @var CustomField[] $custom_fields */
             $custom_fields = CustomField::where('field_encrypted','=', 1)->get();
             $this->comment('INFO: Retrieving encrypted custom fields...');
 
@@ -110,32 +123,22 @@ class RecryptFromMcrypt extends Command
 
 
             // Get all assets with a value in any of the fields that were encrypted
+            /** @var Asset[] $assets */
             $assets = $query->get();
 
             $bar = $this->output->createProgressBar(count($assets));
 
-            foreach ($custom_fields as $encrypted_field) {
-
-                // Try to decrypt the payload using the legacy app key
-                try {
-                    $decrypted_field = $mcrypter->decrypt($encrypted_field);
-                    $this->comment($decrypted_field);
-                } catch (\Exception $e) {
-                    $errors[] = ' - ERROR: Could not decrypt field ['.$encrypted_field->name.']: '.$e->getMessage();
-                }
-                $bar->advance();
-            }
-
 
             foreach ($assets as $asset) {
                 foreach ($custom_fields as $encrypted_field) {
+                    $columnName = $encrypted_field->db_column;
 
                     // Make sure the value isn't null
-                    if ($asset->{$encrypted_field}!='') {
+                    if ($asset->{$columnName}!='') {
                         // Try to decrypt the payload using the legacy app key
                         try {
-                            $decrypted_field = $mcrypter->decrypt($asset->{$encrypted_field});
-                            $asset->{$encrypted_field} = \Crypt::encrypt($decrypted_field);
+                            $decrypted_field = $mcrypter->decrypt($asset->{$columnName});
+                            $asset->{$columnName} = \Crypt::encrypt($decrypted_field);
                             $this->comment($decrypted_field);
                         } catch (\Exception $e) {
                             $errors[] = ' - ERROR: Could not decrypt field ['.$encrypted_field->name.']: '.$e->getMessage();

app/Console/Commands/ResetDemoSettings.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Console\Commands;
+
+
+use Illuminate\Console\Command;
+use App\Models\Setting;
+use App\Models\User;
+
+class ResetDemoSettings extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:demo-settings';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This will reset the Snipe-IT demo settings back to default. ';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+
+        $this->info('Resetting the demo settings.');
+        $settings = Setting::first();
+        $settings->per_page = 20;
+        $settings->site_name = 'Snipe-IT Asset Management Demo';
+        $settings->auto_increment_assets = 1;
+        $settings->logo = 'snipe-logo.png';
+        $settings->alert_email = 'service@snipe-it.io';
+        $settings->header_color = null;
+        $settings->barcode_type = 'QRCODE';
+        $settings->default_currency = 'USD';
+        $settings->brand = 3;
+        $settings->ldap_enabled = 0;
+        $settings->full_multiple_companies_support = 1;
+        $settings->alt_barcode = 'C128';
+        $settings->email_domain = 'snipeitapp.com';
+        $settings->email_format = 'filastname';
+        $settings->username_format = 'filastname';
+        $settings->date_display_format = 'D M d, Y';
+        $settings->time_display_format = 'g:iA';
+        $settings->thumbnail_max_h = '30';
+        $settings->locale = 'en';
+        $settings->save();
+
+        if ($user = User::where('username', '=', 'admin')->first()) {
+            $user->locale = 'en';
+            $user->save();
+        }
+
+        
+    }
+
+}

app/Console/Kernel.php

@@ -25,7 +25,8 @@ class Kernel extends ConsoleKernel
         Commands\Purge::class,
         Commands\LdapSync::class,
         Commands\FixDoubleEscape::class,
-        Commands\RecryptFromMcrypt::class
+        Commands\RecryptFromMcrypt::class,
+        Commands\ResetDemoSettings::class
     ];
 
     /**
@@ -39,7 +40,7 @@ class Kernel extends ConsoleKernel
 
         $schedule->command('snipeit:inventory-alerts')->daily();
         $schedule->command('snipeit:expiring-alerts')->daily();
-        $schedule->command('snipeit:expected-checkins')->daily();
+        $schedule->command('snipeit:expected-checkin')->daily();
         $schedule->command('snipeit:backup')->weekly();
         $schedule->command('backup:clean')->daily();
     }

app/Exceptions/CheckoutNotAllowed.php

@@ -7,6 +7,6 @@ class CheckoutNotAllowed extends Exception
 {
     public function __toString()
     {
-        "A checkout is not allowed under these circumstances";
+       return "A checkout is not allowed under these circumstances";
     }
 }

app/Http/Controllers/AccessoriesController.php

@@ -18,6 +18,8 @@ use Illuminate\Http\Request;
 use Slack;
 use Str;
 use View;
+use Image;
+use App\Http\Requests\ImageUploadRequest;
 
 /** This controller handles all actions related to Accessories for
  * the Snipe-IT Asset Management application.
@@ -57,6 +59,7 @@ class AccessoriesController extends Controller
           ->with('item', new Accessory)
           ->with('category_list', Helper::categoryList('accessory'))
           ->with('company_list', Helper::companyList())
+          ->with('supplier_list', Helper::suppliersList())
           ->with('location_list', Helper::locationsList())
           ->with('manufacturer_list', Helper::manufacturerList());
     }
@@ -68,7 +71,7 @@ class AccessoriesController extends Controller
    * @author [A. Gianotto] [<snipe@snipe.net>]
    * @return Redirect
    */
-    public function store(Request $request)
+    public function store(ImageUploadRequest $request)
     {
         $this->authorize(Accessory::class);
         // create a new model instance
@@ -87,6 +90,28 @@ class AccessoriesController extends Controller
         $accessory->purchase_cost           = Helper::ParseFloat(request('purchase_cost'));
         $accessory->qty                     = request('qty');
         $accessory->user_id                 = Auth::user()->id;
+        $accessory->supplier_id             = request('supplier_id');
+
+        if ($request->hasFile('image')) {
+
+            if (!config('app.lock_passwords')) {
+                $image = $request->file('image');
+                $ext = $image->getClientOriginalExtension();
+                $file_name = "accessory-".str_random(18).'.'.$ext;
+                $path = public_path('/uploads/accessories');
+                if ($image->getClientOriginalExtension()!='svg') {
+                    Image::make($image->getRealPath())->resize(null, 250, function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    })->save($path.'/'.$file_name);
+                } else {
+                    $image->move($path, $file_name);
+                }
+                $accessory->image = $file_name;
+            }
+        }
+
+
 
         // Was the accessory created?
         if ($accessory->save()) {
@@ -116,6 +141,7 @@ class AccessoriesController extends Controller
           ->with('category_list', Helper::categoryList('accessory'))
           ->with('company_list', Helper::companyList())
           ->with('location_list', Helper::locationsList())
+          ->with('supplier_list', Helper::suppliersList())
           ->with('manufacturer_list', Helper::manufacturerList());
     }
 
@@ -127,7 +153,7 @@ class AccessoriesController extends Controller
    * @param  int  $accessoryId
    * @return Redirect
    */
-    public function update(Request $request, $accessoryId = null)
+    public function update(ImageUploadRequest $request, $accessoryId = null)
     {
         if (is_null($accessory = Accessory::find($accessoryId))) {
             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
@@ -144,11 +170,38 @@ class AccessoriesController extends Controller
         $accessory->manufacturer_id         = request('manufacturer_id');
         $accessory->order_number            = request('order_number');
         $accessory->model_number            = request('model_number');
-        $accessory->purchase_date       = request('purchase_date');
-        $accessory->purchase_cost       = request('purchase_cost');
+        $accessory->purchase_date           = request('purchase_date');
+        $accessory->purchase_cost           = request('purchase_cost');
         $accessory->qty                     = request('qty');
+        $accessory->supplier_id             = request('supplier_id');
 
-      // Was the accessory updated?
+        if ($request->hasFile('image')) {
+            
+            if (!config('app.lock_passwords')) {
+                
+                
+                $image = $request->file('image');
+                $ext = $image->getClientOriginalExtension();
+                $file_name = "accessory-".str_random(18).'.'.$ext;
+                $path = public_path('/uploads/accessories');
+                if ($image->getClientOriginalExtension()!='svg') {
+                    Image::make($image->getRealPath())->resize(null, 250, function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    })->save($path.'/'.$file_name);
+                } else {
+                    $image->move($path, $file_name);
+                }
+                if (($accessory->image) && (file_exists($path.'/'.$accessory->image))) {
+                    unlink($path.'/'.$accessory->image);
+                }
+
+                $accessory->image = $file_name;
+            }
+        }
+
+
+        // Was the accessory updated?
         if ($accessory->save()) {
             return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
         }
@@ -197,11 +250,7 @@ class AccessoriesController extends Controller
         if (isset($accessory->id)) {
             return view('accessories/view', compact('accessory'));
         }
-        // Prepare the error message
-        $error = trans('admin/accessories/message.does_not_exist', compact('id'));
-
-        // Redirect to the user management page
-        return redirect()->route('accessories')->with('error', $error);
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist', compact('id')));
     }
 
   /**
@@ -369,143 +418,5 @@ class AccessoriesController extends Controller
         return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkin.error'));
     }
 
-    /**
-     * Generates the JSON response for accessories listing view.
-     *
-     * Example:
-     * {
-     *  "actions": "(links to available actions)",
-     *  "category": "(link to category)",
-     *  "company": "My Company",
-     *  "location":  "My Location",
-     *  "min_amt": 2,
-     *  "name":  "(link to accessory),
-     *  "numRemaining": 6,
-     *  "order_number": null,
-     *  "purchase_cost": "0.00",
-     *  "purchase_date": null,
-     *  "qty": 7
-     *  },
-     *
-     * The names of the fields in the returns JSON correspond directly to the the
-     * names of the fields in the bootstrap-tables in the view.
-     *
-     * For debugging, see at /api/accessories/list
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param Request $request
-     * @return string JSON containing accessories and their associated atrributes.
-     * @internal param int $accessoryId
-     */
-    public function getDatatable(Request $request)
-    {
-        $this->authorize('index', Accessory::class);
-        $accessories = Company::scopeCompanyables(
-            Accessory::select('accessories.*')
-            ->whereNull('accessories.deleted_at')
-            ->with('category', 'company', 'manufacturer', 'users', 'location')
-        );
-        if (Input::has('search')) {
-            $accessories = $accessories->TextSearch(e(Input::get('search')));
-        }
-        $offset = request('offset', 0);
-        $limit = request('limit', 50);
 
-        $allowed_columns = ['name','min_amt','order_number','purchase_date','purchase_cost','company','category','model_number', 'manufacturer', 'location'];
-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
-
-        switch ($sort) {
-            case 'category':
-                $accessories = $accessories->OrderCategory($order);
-                break;
-            case 'company':
-                $accessories = $accessories->OrderCompany($order);
-                break;
-            case 'location':
-                $accessories = $accessories->OrderLocation($order);
-                break;
-            case 'manufacturer':
-                $accessories = $accessories->OrderManufacturer($order);
-                break;
-            default:
-                $accessories = $accessories->orderBy($sort, $order);
-                break;
-        }
-
-        $accessCount = $accessories->count();
-        $accessories = $accessories->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        foreach ($accessories as $accessory) {
-            $rows[] = $accessory->present()->forDataTable();
-        }
-
-        $data = array('total'=>$accessCount, 'rows'=>$rows);
-
-        return $data;
-    }
-
-
-  /**
-  * Generates the JSON response for accessory detail view.
-  *
-  * Example:
-  * <code>
-  * {
-  * "rows": [
-  * {
-  * "actions": "(link to available actions)",
-  * "name": "(link to user)"
-  * }
-  * ],
-  * "total": 1
-  * }
-  * </code>
-  *
-  * The names of the fields in the returns JSON correspond directly to the the
-  * names of the fields in the bootstrap-tables in the view.
-  *
-  * For debugging, see at /api/accessories/$accessoryID/view
-  *
-  * @author [A. Gianotto] [<snipe@snipe.net>]
-  * @param  int  $accessoryId
-  * @return string JSON containing accessories and their associated atrributes.
-  **/
-    public function getDataView(Request $request, $accessoryID)
-    {
-        $accessory = Accessory::find($accessoryID);
-
-        if (!Company::isCurrentUserHasAccess($accessory)) {
-            return ['total' => 0, 'rows' => []];
-        }
-
-        $accessory_users = $accessory->users;
-        $count = $accessory_users->count();
-
-        $rows = array();
-
-        foreach ($accessory_users as $user) {
-            $actions = '';
-            if (Gate::allows('checkin', $accessory)) {
-                $actions .= Helper::generateDatatableButton('checkin', route('checkin/accessory', $user->pivot->id));
-            }
-
-            if (Gate::allows('view', $user)) {
-                $name = (string) link_to_route('users.show', e($user->present()->fullName()), [$user->id]);
-            } else {
-                $name = e($user->present()->fullName());
-            }
-
-            $rows[] = array(
-              'name'          => $name,
-              'actions'       => $actions
-              );
-        }
-
-        $data = array('total'=>$count, 'rows'=>$rows);
-
-        return $data;
-    }
 }

app/Http/Controllers/Api/AccessoriesController.php

@@ -38,6 +38,10 @@ class AccessoriesController extends Controller
             $accessories->where('manufacturer_id','=',$request->input('manufacturer_id'));
         }
 
+        if ($request->has('supplier_id')) {
+            $accessories->where('supplier_id','=',$request->input('supplier_id'));
+        }
+
         $offset = $request->input('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/AssetsController.php

@@ -86,19 +86,19 @@ class AssetsController extends Controller
         $assets = Company::scopeCompanyables(Asset::select('assets.*'))->with(
             'assetloc', 'assetstatus', 'defaultLoc', 'assetlog', 'company',
             'model.category', 'model.manufacturer', 'model.fieldset','supplier');
-        // If we should search on everything
-        if (($request->has('search')) && (count($filter) == 0)) {
+
+
+        if (count($filter) > 0) {
+            $assets->ByFilter($filter);
+        } elseif ($request->has('search')) {
             $assets->TextSearch($request->input('search'));
-        // otherwise loop through the filters and search strictly on them
-        } else {
-            if (count($filter) > 0) {
-                $assets->ByFilter($filter);
-            }
         }
 
+
+
         // These are used by the API to query against specific ID numbers
         if ($request->has('status_id')) {
-            $assets->where('status_id', '=', $request->input('status_id'));
+            $assets->where('assets.status_id', '=', $request->input('status_id'));
         }
 
         if ($request->has('model_id')) {
@@ -125,7 +125,11 @@ class AssetsController extends Controller
             $assets->ByManufacturer($request->input('manufacturer_id'));
         }
 
-        $request->has('order_number') ? $assets = $assets->where('order_number', '=', e($request->get('order_number'))) : '';
+        if ($request->has('depreciation_id')) {
+            $assets->ByDepreciationId($request->input('depreciation_id'));
+        }
+
+        $request->has('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : '';
 
         $offset = request('offset', 0);
         $limit = $request->input('limit', 50);
@@ -133,36 +137,76 @@ class AssetsController extends Controller
 
 
         // This is used by the sidenav, mostly
+
+        // We switched from using query scopes here because of a Laravel bug
+        // related to fulltext searches on complex queries.
+        // I am sad. :(
         switch ($request->input('status')) {
             case 'Deleted':
                 $assets->withTrashed()->Deleted();
                 break;
             case 'Pending':
-                $assets->Pending();
+                $assets->join('status_labels AS status_alias',function ($join) {
+                    $join->on('status_alias.id', "=", "assets.status_id")
+                        ->where('status_alias.deployable','=',0)
+                        ->where('status_alias.pending','=',1)
+                        ->where('status_alias.archived', '=', 0);
+                });
                 break;
             case 'RTD':
-                $assets->RTD();
+                $assets->whereNull('assets.assigned_to')
+                ->join('status_labels AS status_alias',function ($join) {
+                    $join->on('status_alias.id', "=", "assets.status_id")
+                        ->where('status_alias.deployable','=',1)
+                        ->where('status_alias.pending','=',0)
+                        ->where('status_alias.archived', '=', 0);
+                });
                 break;
             case 'Undeployable':
                 $assets->Undeployable();
                 break;
             case 'Archived':
-                $assets->Archived();
+                $assets->join('status_labels AS status_alias',function ($join) {
+                    $join->on('status_alias.id', "=", "assets.status_id")
+                        ->where('status_alias.deployable','=',0)
+                        ->where('status_alias.pending','=',0)
+                        ->where('status_alias.archived', '=', 1);
+                });
                 break;
             case 'Requestable':
-                $assets->RequestableAssets();
+                $assets->where('assets.requestable', '=', 1)
+                    ->join('status_labels AS status_alias',function ($join) {
+                    $join->on('status_alias.id', "=", "assets.status_id")
+                        ->where('status_alias.deployable','=',1)
+                        ->where('status_alias.pending','=',0)
+                        ->where('status_alias.archived', '=', 0);
+                });
+
                 break;
             case 'Deployed':
-                $assets->Deployed();
+                // more sad, horrible workarounds for laravel bugs when doing full text searches
+                $assets->where('assets.assigned_to', '>', '0');
                 break;
+            default:
+                // terrible workaround for complex-query Laravel bug in fulltext
+                $assets->join('status_labels AS status_alias',function ($join) {
+                    $join->on('status_alias.id', "=", "assets.status_id")
+                        ->where('status_alias.archived', '=', 0);
+                });
         }
 
 
+        // This is kinda gross, but we need to do this because the Bootstrap Tables
+        // API passes custom field ordering as custom_fields.fieldname, and we have to strip
+        // that out to let the default sorter below order them correctly on the assets table.
+        $sort_override = str_replace('custom_fields.','', $request->input('sort')) ;
 
-        // This handles all of the pivot sorting (versus the assets.* fields in the allowed_columns array)
-        $column_sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'assets.created_at';
-
-        switch ($request->input('sort')) {
+        // This handles all of the pivot sorting (versus the assets.* fields
+        // in the allowed_columns array)
+        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.created_at';
+        
+        
+        switch ($sort_override) {
             case 'model':
                 $assets->OrderModels($order);
                 break;
@@ -413,16 +457,28 @@ class AssetsController extends Controller
 
         $this->authorize('checkout', $asset);
 
+        $error_payload = [];
+        $error_payload['asset'] = [
+            'id' => $asset->id,
+            'asset_tag' => $asset->asset_tag,
+        ];
         if ($request->has('user_id')) {
             $target = User::find($request->input('user_id'));
+            $error_payload['target_id'] = $request->input('user_id');
+            $error_payload['target_type'] = User::class;
+        // Don't let the user check an asset out to itself
         } elseif ($request->has('asset_id')) {
-            $target = Asset::find($request->input('asset_id'));
+            $target = Asset::where('id','!=',$asset_id)->find($request->input('asset_id'));
+            $error_payload['target_id'] = $request->input('asset_id');
+            $error_payload['target_type'] = Asset::class;
         } elseif ($request->has('location_id')) {
             $target = Location::find($request->input('location_id'));
+            $error_payload['target_id'] = $request->input('location_id');
+            $error_payload['target_type'] = Location::class;
         }
 
         if (!isset($target)) {
-            return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], 'No valid checkout target specified for asset '.e($asset->asset_tag).'.'));
+            return response()->json(Helper::formatStandardApiResponse('error', $error_payload, 'No valid checkout target specified for asset '.e($asset->asset_tag).'.'));
         }
 
         $checkout_at = request('checkout_at', date("Y-m-d H:i:s"));
@@ -481,6 +537,9 @@ class AssetsController extends Controller
             $data['item_tag'] = $asset->asset_tag;
             $data['item_serial'] = $asset->serial;
             $data['note'] = $logaction->note;
+            $data['manufacturer_name'] = $asset->model->manufacturer->name;
+            $data['model_name'] = $asset->model->name;
+            $data['model_number'] = $asset->model->model_number;
 
             if ((($asset->checkin_email()=='1')) && (isset($user)) && (!config('app.lock_passwords'))) {
                 Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {

app/Http/Controllers/Api/CategoriesController.php

@@ -20,9 +20,9 @@ class CategoriesController extends Controller
     public function index(Request $request)
     {
         $this->authorize('view', Category::class);
-        $allowed_columns = ['id', 'name','category_type','use_default_eula','require_acceptance','checkin_email'];
+        $allowed_columns = ['id', 'name','category_type','use_default_eula','eula_text', 'require_acceptance','checkin_email', 'assets_count', 'accessories_count', 'consumables_count', 'components_count'];
 
-        $categories = Category::select(['id', 'created_at', 'updated_at', 'name','category_type','use_default_eula','require_acceptance','checkin_email'])
+        $categories = Category::select(['id', 'created_at', 'updated_at', 'name','category_type','use_default_eula','eula_text', 'require_acceptance','checkin_email'])
             ->withCount('assets', 'accessories', 'consumables', 'components');
 
         if ($request->has('search')) {
@@ -32,7 +32,7 @@ class CategoriesController extends Controller
         $offset = $request->input('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'assets_count';
         $categories->orderBy($sort, $order);
 
         $total = $categories->count();

app/Http/Controllers/Api/ComponentsController.php

@@ -158,6 +158,6 @@ class ComponentsController extends Controller
         $limit = $request->input('limit', 50);
         $total = $assets->count();
         $assets = $assets->skip($offset)->take($limit)->get();
-        return (new ComponentsAssetsTransformer)->transformAssets($assets, $total);
+        return (new ComponentsTransformer)->transformCheckedoutComponents($assets, $total);
     }
 }

app/Http/Controllers/Api/SettingsController.php

@@ -5,6 +5,9 @@ namespace App\Http\Controllers\Api;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Ldap;
+use Validator;
+use App\Models\Setting;
+use Mail;
 
 class SettingsController extends Controller
 {
@@ -75,8 +78,14 @@ class SettingsController extends Controller
         //
     }
 
-    public function getLdapTest()
+    public function ldaptest()
     {
+
+        if (Setting::getSettings()->ldap_enabled!='1') {
+            \Log::debug('LDAP is not enabled cannot test.');
+            return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400);
+        }
+
         \Log::debug('Preparing to test LDAP connection');
 
         try {
@@ -98,4 +107,85 @@ class SettingsController extends Controller
 
     }
 
+    public function ldaptestlogin(Request $request)
+    {
+
+        if (Setting::getSettings()->ldap_enabled!='1') {
+            \Log::debug('LDAP is not enabled. Cannot test.');
+            return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400);
+        }
+
+
+        $rules = array(
+            'ldaptest_user' => 'required',
+            'ldaptest_password' => 'required'
+        );
+
+        $validator = Validator::make($request->all(), $rules);
+        if ($validator->fails()) {
+            \Log::debug('LDAP Validation test failed.');
+            $validation_errors = implode(' ',$validator->errors()->all());
+            return response()->json(['message' => $validator->errors()->all()], 400);
+        }
+        
+
+        \Log::debug('Preparing to test LDAP login');
+        try {
+            $connection = Ldap::connectToLdap();
+            try {
+                Ldap::bindAdminToLdap($connection);
+                \Log::debug('Attempting to bind to LDAP for LDAP test');
+                try {
+                    $ldap_user = Ldap::findAndBindUserLdap($request->input('ldaptest_user'), $request->input('ldaptest_password'));
+                    if ($ldap_user) {
+                        \Log::debug('It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.');
+                        return response()->json(['message' => 'It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.'], 200);
+                    }
+                    return response()->json(['message' => 'Login Failed. '. $request->input('ldaptest_user').' did not successfully bind to LDAP.'], 400);
+
+                } catch (\Exception $e) {
+                    \Log::debug('LDAP login failed');
+                    return response()->json(['message' => $e->getMessage()], 400);
+                }
+
+            } catch (\Exception $e) {
+                \Log::debug('Bind failed');
+                return response()->json(['message' => $e->getMessage()], 400);
+                //return response()->json(['message' => $e->getMessage()], 500);
+            }
+        } catch (\Exception $e) {
+            \Log::debug('Connection failed');
+            return response()->json(['message' => $e->getMessage()], 500);
+        }
+
+
+    }
+
+    /**
+     * Test the email configuration
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return Redirect
+     */
+    public function ajaxTestEmail()
+    {
+        if (!config('app.lock_passwords')) {
+            try {
+                Mail::send('emails.test', [], function ($m) {
+                    $m->to(config('mail.from.address'), config('mail.from.name'));
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.test_email'));
+                });
+                return response()->json(['message' => 'Mail sent to '.config('mail.from.address')], 200);
+            } catch (Exception $e) {
+                return response()->json(['message' => $e->getMessage()], 500);
+            }
+        }
+        return response()->json(['message' => 'Mail would have been sent, but this application is in demo mode! '], 200);
+
+    }
+
+
+
 }

app/Http/Controllers/Api/StatuslabelsController.php

@@ -22,7 +22,7 @@ class StatuslabelsController extends Controller
     public function index(Request $request)
     {
         $this->authorize('view', Statuslabel::class);
-        $allowed_columns = ['id','name','created_at'];
+        $allowed_columns = ['id','name','created_at', 'assets_count'];
 
         $statuslabels = Statuslabel::withCount('assets');
 
@@ -137,8 +137,14 @@ class StatuslabelsController extends Controller
         $this->authorize('delete', Statuslabel::class);
         $statuslabel = Statuslabel::findOrFail($id);
         $this->authorize('delete', $statuslabel);
-        $statuslabel->delete();
-        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/statuslabels/message.delete.success')));
+
+        // Check that there are no assets associated
+        if ($statuslabel->assets()->count() == 0) {
+            $statuslabel->delete();
+            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/statuslabels/message.delete.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/statuslabels/message.assoc_assets')));
 
     }
 
@@ -155,7 +161,7 @@ class StatuslabelsController extends Controller
     public function getAssetCountByStatuslabel()
     {
 
-        $statusLabels = Statuslabel::with('assets')->get();
+        $statusLabels = Statuslabel::get();
         $labels=[];
         $points=[];
         $colors=[];
@@ -168,9 +174,7 @@ class StatuslabelsController extends Controller
                 }
             }
         }
-        $labels[]='Deployed';
-        $points[]=Asset::whereNotNull('assigned_to')->count();
-
+        
         $colors_array = array_merge($colors, Helper::chartColors());
 
         $result= [

app/Http/Controllers/Api/SuppliersController.php

@@ -20,11 +20,11 @@ class SuppliersController extends Controller
     public function index(Request $request)
     {
         $this->authorize('view', Supplier::class);
-        $allowed_columns = ['id','name','address','phone','contact','fax','email'];
+        $allowed_columns = ['id','name','address','phone','contact','fax','email','image','assets_count','licenses_count', 'accessories_count'];
         
         $suppliers = Supplier::select(
                 array('id','name','address','address2','city','state','country','fax', 'phone','email','contact','created_at','updated_at','deleted_at')
-            )->withCount('assets')->withCount('licenses')->whereNull('deleted_at');
+            )->withCount('assets')->withCount('licenses')->withCount('accessories')->whereNull('deleted_at');
 
 
         if ($request->has('search')) {
@@ -113,8 +113,22 @@ class SuppliersController extends Controller
     public function destroy($id)
     {
         $this->authorize('delete', Supplier::class);
-        $supplier = Supplier::findOrFail($id);
+        $supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances','assets', 'licenses')->findOrFail($id);
         $this->authorize('delete', $supplier);
+
+
+        if ($supplier->assets_count > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count])));
+        }
+
+        if ($supplier->asset_maintenances_count > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count])));
+        }
+
+        if ($supplier->licenses_count > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count])));
+        }
+
         $supplier->delete();
         return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/suppliers/message.delete.success')));
 

app/Http/Controllers/Api/UsersController.php

@@ -31,6 +31,7 @@ class UsersController extends Controller
             'users.two_factor_enrolled',
             'users.jobtitle',
             'users.email',
+            'users.phone',
             'users.username',
             'users.location_id',
             'users.manager_id',
@@ -57,7 +58,6 @@ class UsersController extends Controller
             $users = $users->GetDeleted();
         }
 
-
         if ($request->has('company_id')) {
             $users = $users->where('company_id', '=', $request->input('company_id'));
         }
@@ -65,6 +65,10 @@ class UsersController extends Controller
         if ($request->has('location_id')) {
             $users = $users->where('location_id', '=', $request->input('location_id'));
         }
+        
+        if ($request->has('group_id')) {
+            $users = $users->ByGroup($request->has('group_id'));
+        }
 
         if ($request->has('department_id')) {
             $users = $users->where('department_id','=',$request->input('department_id'));
@@ -89,7 +93,8 @@ class UsersController extends Controller
                     [
                         'last_name','first_name','email','jobtitle','username','employee_num',
                         'assets','accessories', 'consumables','licenses','groups','activated','created_at',
-                        'two_factor_enrolled','two_factor_optin','last_login'
+                        'two_factor_enrolled','two_factor_optin','last_login', 'assets_count', 'licenses_count',
+                        'consumables_count', 'accessories_count', 'phone'
                     ];
 
                 $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'first_name';

app/Http/Controllers/AssetModelsController.php

@@ -17,6 +17,7 @@ use App\Models\Company;
 use Config;
 use App\Helpers\Helper;
 use Illuminate\Http\Request;
+use App\Http\Requests\ImageUploadRequest;
 
 use Symfony\Component\HttpFoundation\JsonResponse;
 
@@ -68,7 +69,7 @@ class AssetModelsController extends Controller
     * @since [v1.0]
     * @return Redirect
     */
-    public function store(Request $request)
+    public function store(ImageUploadRequest $request)
     {
 
         // Create a new asset model
@@ -90,14 +91,21 @@ class AssetModelsController extends Controller
         }
 
         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(500, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
+            $file_name = str_random(25) . "." . $image->getClientOriginalExtension();
+            $path = public_path('uploads/models/');
+
+            if ($image->getClientOriginalExtension()!='svg') {
+                Image::make($image->getRealPath())->resize(500, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path.'/'.$file_name);
+            } else {
+                $image->move($path, $file_name);
+            }
             $model->image = $file_name;
+
         }
 
             // Was it created?
@@ -180,7 +188,7 @@ class AssetModelsController extends Controller
     * @param int $modelId
     * @return Redirect
     */
-    public function update(Request $request, $modelId = null)
+    public function update(ImageUploadRequest $request, $modelId = null)
     {
         // Check if the model exists
         if (is_null($model = AssetModel::find($modelId))) {
@@ -206,13 +214,19 @@ class AssetModelsController extends Controller
 
         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);
+            $file_name = str_random(25) . "." . $image->getClientOriginalExtension();
+            $path = public_path('uploads/models/');
+
+            if ($image->getClientOriginalExtension()!='svg') {
+                Image::make($image->getRealPath())->resize(500, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path.'/'.$file_name);
+            } else {
+                $image->move($path, $file_name);
+            }
             $model->image = $file_name;
+
         }
 
         if ($request->input('image_delete') == 1 && Input::file('image') == "") {
@@ -352,49 +366,6 @@ class AssetModelsController extends Controller
 
 
 
-    /**
-     * Get the asset information to present to the model view detail page
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v2.0]
-     * @param Request $request
-     * @param $modelID
-     * @return String JSON
-     * @internal param int $modelId
-     */
-    public function getDataView(Request $request, $modelID)
-    {
-        $assets = Asset::where('model_id', '=', $modelID)->with('company', 'assetstatus');
-
-        if (Input::has('search')) {
-            $assets = $assets->TextSearch(e($request->input('search')));
-        }
-        $offset = request('offset', 0);
-        $limit = request('limit', 50);
-
-
-        $allowed_columns = ['name', 'serial','asset_tag'];
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
-
-        $assets = $assets->orderBy($sort, $order);
-
-        $assetsCount = $assets->count();
-        $assets = $assets->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        $all_custom_fields = CustomField::all();
-        foreach ($assets as $asset) {
-
-            $rows[] = $asset->present()->forDataTable($all_custom_fields);
-        }
-
-        $data = array('total' => $assetsCount, 'rows' => $rows);
-
-        return $data;
-    }
-
 
     /**
      * Returns a view that allows the user to bulk edit model attrbutes
@@ -405,13 +376,16 @@ class AssetModelsController extends Controller
      */
     public function postBulkEdit(Request $request)
     {
+        
         $models_raw_array = Input::get('ids');
-        $models = AssetModel::whereIn('id', $models_raw_array)->get();
-        $nochange = ['NC' => 'No Change'];
-        $fieldset_list = $nochange + Helper::customFieldsetList();
-        $depreciation_list = $nochange + Helper::depreciationList();
-        $category_list = $nochange + Helper::categoryList('asset');
-        $manufacturer_list = $nochange + Helper::manufacturerList();
+
+        if (is_array($models_raw_array)) {
+            $models = AssetModel::whereIn('id', $models_raw_array)->get();
+            $nochange = ['NC' => 'No Change'];
+            $fieldset_list = $nochange + Helper::customFieldsetList();
+            $depreciation_list = $nochange + Helper::depreciationList();
+            $category_list = $nochange + Helper::categoryList('asset');
+            $manufacturer_list = $nochange + Helper::manufacturerList();
 
         
              return view('models/bulk-edit', compact('models'))
@@ -419,6 +393,10 @@ class AssetModelsController extends Controller
                 ->with('category_list', $category_list)
                 ->with('fieldset_list', $fieldset_list)
                 ->with('depreciation_list', $depreciation_list);
+        }
+
+        return redirect()->route('models.index')
+            ->with('error', 'You must select at least one model to edit.');
 
     }
 

app/Http/Controllers/AssetsController.php

@@ -432,7 +432,7 @@ class AssetsController extends Controller
         // Get the dropdown of users and then pass it to the checkout view
         return view('hardware/checkout', compact('asset'))
             ->with('users_list', Helper::usersList())
-            ->with('assets_list', Helper::assetsList())
+            ->with('assets_list', Helper::detailedAssetList())
             ->with('locations_list', Helper::locationsList());
     }
 
@@ -458,7 +458,7 @@ class AssetsController extends Controller
         if (request('assigned_user')) {
             $target = User::find(request('assigned_user'));
         } elseif (request('assigned_asset')) {
-            $target = Asset::find(request('assigned_asset'));
+            $target = Asset::where('id','!=',$assetId)->find(request('assigned_asset'));
         } elseif (request('assigned_location')) {
             $target = Location::find(request('assigned_location'));
         }
@@ -558,6 +558,9 @@ class AssetsController extends Controller
             $data['item_tag'] = $asset->asset_tag;
             $data['item_serial'] = $asset->serial;
             $data['note'] = $logaction->note;
+            $data['manufacturer_name'] = $asset->model->manufacturer->name;
+            $data['model_name'] = $asset->model->name;
+            $data['model_number'] = $asset->model->model_number;
 
             if ((($asset->checkin_email()=='1')) && (isset($user)) && (!empty($user->email)) && (!config('app.lock_passwords'))) {
                 Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {
@@ -634,7 +637,7 @@ class AssetsController extends Controller
         $settings = Setting::getSettings();
 
         if ($settings->qr_code == '1') {
-            $asset = Asset::find($assetId);
+            $asset = Asset::withTrashed()->find($assetId);
             $size = Helper::barcodeDimensions($settings->barcode_type);
             $qr_file = public_path().'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png';
 
@@ -672,8 +675,12 @@ class AssetsController extends Controller
                 $header = ['Content-type' => 'image/png'];
                 return response()->file($barcode_file, $header);
             } else {
+                // Calculate barcode width in pixel based on label width (inch)
+                $barcode_width = ($settings->labels_width - $settings->labels_display_sgutter) * 96.000000000001;
+
                 $barcode = new \Com\Tecnick\Barcode\Barcode();
-                $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode, $asset->asset_tag, 250, 20);
+                $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode,$asset->asset_tag,($barcode_width < 300 ? $barcode_width : 300),50);
+
                 file_put_contents($barcode_file, $barcode_obj->getPngData());
                 return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
             }
@@ -1175,6 +1182,9 @@ class AssetsController extends Controller
         $user = User::find(e(Input::get('assigned_to')));
         $admin = Auth::user();
 
+        if (!is_array(Input::get('selected_assets'))) {
+            return redirect()->route('hardware/bulkcheckout')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
+        }
         $asset_ids = array_filter(Input::get('selected_assets'));
 
         if ((Input::has('checkout_at')) && (Input::get('checkout_at')!= date("Y-m-d"))) {

app/Http/Controllers/CategoriesController.php

@@ -98,10 +98,8 @@ class CategoriesController extends Controller
      */
     public function edit($categoryId = null)
     {
-        // Check if the category exists
         if (is_null($item = Category::find($categoryId))) {
-            // Redirect to the blogs management page
-            return redirect()->to('admin/settings/categories')->with('error', trans('admin/categories/message.does_not_exist'));
+            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
         }
         $category_types= Helper::categoryTypeList();
 
@@ -158,22 +156,22 @@ class CategoriesController extends Controller
     {
         // Check if the category exists
         if (is_null($category = Category::find($categoryId))) {
-            return redirect()->to('admin/settings/categories')->with('error', trans('admin/categories/message.not_found'));
+            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found'));
         }
 
         if ($category->has_models() > 0) {
-            return redirect()->to('admin/settings/categories')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'model']));
+            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'model']));
         } elseif ($category->accessories()->count() > 0) {
-                return redirect()->to('admin/settings/categories')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'accessory']));
+                return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'accessory']));
         } elseif ($category->consumables()->count() > 0) {
-                return redirect()->to('admin/settings/categories')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'consumable']));
+                return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'consumable']));
         } elseif ($category->components()->count() > 0) {
-                return redirect()->to('admin/settings/categories')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'component']));
+                return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type'=>'component']));
         }
 
         $category->delete();
         // Redirect to the locations management page
-        return redirect()->to(route('categories.index'))->with('success', trans('admin/categories/message.delete.success'));
+        return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.success'));
     }
 
 

app/Http/Controllers/ComponentsController.php

@@ -288,35 +288,4 @@ class ComponentsController extends Controller
     }
 
 
-    /**
-    * Return JSON data to populate the components view,
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ComponentsController::getView() method that returns the view.
-    * @since [v3.0]
-    * @param int $componentId
-    * @return string JSON
-    */
-    public function getDataView($componentId)
-    {
-        if (is_null($component = Component::with('assets')->find($componentId))) {
-            // Redirect to the component management page with error
-            return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
-        }
-
-        if (!Company::isCurrentUserHasAccess($component)) {
-            return ['total' => 0, 'rows' => []];
-        }
-        $this->authorize('view', $component);
-
-        $rows = array();
-        $all_custom_fields = CustomField::all(); // Cached for table;
-        foreach ($component->assets as $component_assignment) {
-            $rows[] = $component_assignment->present()->forDataTable($all_custom_fields);
-        }
-
-        $componentCount = $component->assets->count();
-        $data = array('total' => $componentCount, 'rows' => $rows);
-        return $data;
-    }
 }

app/Http/Controllers/ConsumablesController.php

@@ -194,7 +194,7 @@ class ConsumablesController extends Controller
         if (isset($consumable->id)) {
             return view('consumables/view', compact('consumable'));
         }
-        return redirect()->route('consumables')->with('error', trans('admin/consumables/message.does_not_exist', compact('id')));
+        return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist', compact('id')));
     }
 
     /**
@@ -209,7 +209,7 @@ class ConsumablesController extends Controller
     public function getCheckout($consumableId)
     {
         if (is_null($consumable = Consumable::find($consumableId))) {
-            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.not_found'));
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
         }
         $this->authorize('checkout', $consumable);
         return view('consumables/checkout', compact('consumable'))->with('users_list', Helper::usersList());

app/Http/Controllers/DashboardController.php

@@ -39,8 +39,8 @@ class DashboardController extends Controller
             $counts['grand_total'] =  $counts['asset'] +  $counts['accessory'] +  $counts['license'] +  $counts['consumable'];
 
             if ((!file_exists(storage_path().'/oauth-private.key')) || (!file_exists(storage_path().'/oauth-public.key'))) {
-                \Artisan::call('passport:install');
                 \Artisan::call('migrate', ['--force' => true]);
+                \Artisan::call('passport:install');
             }
 
             return view('dashboard')->with('asset_stats', $asset_stats)->with('counts', $counts);

app/Http/Controllers/DepartmentsController.php

@@ -27,13 +27,11 @@ class DepartmentsController extends Controller
     public function index(Request $request)
     {
         $this->authorize('index', Department::class);
+        $company = null;
         if ($request->has('company_id')) {
             $company = Company::find($request->input('company_id'));
-        } else {
-            $company = null;
         }
-        return view('departments/index')->with('company',$company);
-
+        return view('departments/index')->with('company', $company);
     }
 
 
@@ -53,12 +51,10 @@ class DepartmentsController extends Controller
         $department->user_id = Auth::user()->id;
         $department->manager_id = ($request->has('manager_id' ) ? $request->input('manager_id') : null);
 
-
         if ($department->save()) {
             return redirect()->route("departments.index")->with('success', trans('admin/departments/message.create.success'));
         }
         return redirect()->back()->withInput()->withErrors($department->getErrors());
-
     }
 
     /**
@@ -140,25 +136,20 @@ class DepartmentsController extends Controller
             ->with('location_list', Helper::locationsList())
             ->with('company_list', Helper::companyList());
     }
-    
-    
+
     public function update(Request $request, $id) {
 
         $this->authorize('create', Department::class);
         if (is_null($department = Department::find($id))) {
-            return redirect()->to('admin/settings/departments')->with('error', trans('admin/departments/message.does_not_exist'));
+            return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist'));
         }
 
-
         $department->fill($request->all());
         $department->manager_id = ($request->has('manager_id' ) ? $request->input('manager_id') : null);
 
         if ($department->save()) {
             return redirect()->route("departments.index")->with('success', trans('admin/departments/message.update.success'));
         }
-        
         return redirect()->back()->withInput()->withErrors($department->getErrors());
     }
-    
-
 }

app/Http/Controllers/DepreciationsController.php

@@ -155,5 +155,24 @@ class DepreciationsController extends Controller
         return redirect()->route('depreciations.index')->with('success', trans('admin/depreciations/message.delete.success'));
     }
 
+    /**
+     * Returns a view that displays a form to display depreciation listing
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net]
+     * @see DepreciationsController::postEdit()
+     * @param int $depreciationId
+     * @since [v1.0]
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function show($id)
+    {
+        if (is_null($depreciation = Depreciation::find($id))) {
+            // Redirect to the blogs management page
+            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
+        }
+
+        return view('depreciations/view', compact('depreciation'));
+    }
+
 
 }

app/Http/Controllers/GroupsController.php

@@ -87,10 +87,15 @@ class GroupsController extends Controller
     public function edit($id = null)
     {
         $group = Group::find($id);
-        $permissions = config('permissions');
-        $groupPermissions = $group->decodePermissions();
-        $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
-        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
+
+        if ($group) {
+            $permissions = config('permissions');
+            $groupPermissions = $group->decodePermissions();
+            $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
+            return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
+        }
+
+        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
     }
 
     /**
@@ -142,4 +147,24 @@ class GroupsController extends Controller
         return redirect()->route('groups.index')->with('error', trans('general.feature_disabled'));
     }
 
+    /**
+     * Returns a view that invokes the ajax tables which actually contains
+     * the content for the group detail page.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $locationId
+     * @since [v4.0.11]
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function show($id)
+    {
+        $group = Group::find($id);
+
+        if ($group) {
+            return view('groups/view', compact('group'));
+        }
+
+        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
+    }
+
 }

app/Http/Controllers/LicensesController.php

@@ -187,6 +187,7 @@ class LicensesController extends Controller
         $license->termination_date  = $request->input('termination_date');
         $license->seats             = e($request->input('seats'));
         $license->manufacturer_id   =  $request->input('manufacturer_id');
+        $license->supplier_id       = $request->input('supplier_id');
 
         if ($license->save()) {
             return redirect()->route('licenses.show', ['license' => $licenseId])->with('success', trans('admin/licenses/message.update.success'));
@@ -440,17 +441,15 @@ class LicensesController extends Controller
     public function show($licenseId = null)
     {
 
-        $license = License::find($licenseId);
-        $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset');
+        $license = License::with('assignedusers', 'licenseSeats.user', 'licenseSeats.asset')->find($licenseId);
 
-        if (isset($license->id)) {
-            $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset');
+        if ($license) {
             $this->authorize('view', $license);
             return view('licenses/view', compact('license'));
         }
-        $error = trans('admin/licenses/message.does_not_exist', compact('id'));
-        return redirect()->route('licenses.index')->with('error', $error);
+        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist', compact('id')));
     }
+    
 
     public function getClone($licenseId = null)
     {
@@ -591,61 +590,10 @@ class LicensesController extends Controller
             $file = $log->get_src('licenses');
             return Response::download($file);
         }
-        // Prepare the error message
-        $error = trans('admin/licenses/message.does_not_exist', compact('id'));
-        // Redirect to the licence management page
-        return redirect()->route('licenses.index')->with('error', $error);
+        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist', compact('id')));
     }
 
 
-    /**
-    * Generates a JSON response to populate the licence index datatables.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see LicensesController::getIndex() method that provides the view
-    * @since [v1.0]
-    * @return String JSON
-    */
-    public function getDatatable(Request $request)
-    {
-        $this->authorize('view', License::class);
-        $licenses = Company::scopeCompanyables(License::with('company', 'licenseSeatsRelation', 'manufacturer'));
-
-        if (Input::has('search')) {
-            $licenses = $licenses->TextSearch($request->input('search'));
-        }
-        $offset = request('offset', 0);
-        $limit = request('limit', 50);
-
-        $allowed_columns = ['id','name','purchase_cost','expiration_date','purchase_order','order_number','notes','purchase_date','serial','manufacturer','company'];
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
-
-        switch ($sort) {
-            case 'manufacturer':
-                $licenses = $licenses->OrderManufacturer($order);
-                break;
-            case 'company':
-                $licenses = $licenses->OrderCompany($order);
-                break;
-            default:
-                $licenses = $licenses->orderBy($sort, $order);
-                break;
-        }
-
-        $licenseCount = $licenses->count();
-        $licenses = $licenses->skip($offset)->take($limit)->get();
-
-        $rows = array();
-
-        foreach ($licenses as $license) {
-            $rows[] = $license->present()->forDataTable();
-        }
-
-        $data = array('total' => $licenseCount, 'rows' => $rows);
-
-        return $data;
-    }
 
     /**
     * Generates the next free seat ID for checkout.

app/Http/Controllers/LocationsController.php

@@ -89,6 +89,7 @@ class LocationsController extends Controller
         $location->state            = Input::get('state');
         $location->country          = Input::get('country');
         $location->zip              = Input::get('zip');
+        $location->ldap_ou          = Input::get('ldap_ou');
         $location->manager_id       = Input::get('manager_id');
         $location->user_id          = Auth::id();
 
@@ -147,7 +148,7 @@ class LocationsController extends Controller
     {
         // Check if the location exists
         if (is_null($item = Location::find($locationId))) {
-            return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.does_not_exist'));
+            return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
         }
 
         // Show the page
@@ -156,7 +157,6 @@ class LocationsController extends Controller
         $location_options = Location::flattenLocationsArray($location_options_array);
         $location_options = array('' => 'Top Level') + $location_options;
 
-
         return view('locations/edit', compact('item'))
             ->with('location_options', $location_options)
             ->with('manager_list', Helper::managerList());
@@ -176,7 +176,7 @@ class LocationsController extends Controller
     {
         // Check if the location exists
         if (is_null($location = Location::find($locationId))) {
-            return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.does_not_exist'));
+            return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
         }
 
         // Update the location data
@@ -217,7 +217,6 @@ class LocationsController extends Controller
             return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.not_found'));
         }
 
-
         if ($location->users->count() > 0) {
             return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_users'));
         } elseif ($location->childLocations->count() > 0) {

app/Http/Controllers/ManufacturersController.php

@@ -212,116 +212,5 @@ class ManufacturersController extends Controller
 
     }
 
-    protected function getDataAssetsView(Manufacturer $manufacturer, Request $request)
-    {
-        $manufacturer = $manufacturer->load('assets.model', 'assets.assignedTo', 'assets.assetstatus', 'assets.company');
-        $manufacturer_assets = $manufacturer->assets();
 
-        if ($request->has('search')) {
-            $manufacturer_assets = $manufacturer_assets->TextSearch(e($request->input('search')));
-        }
-
-        $offset = request('offset', 0);
-        $limit = request('limit', 50);
-
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-
-        $allowed_columns = ['id','name','serial','asset_tag'];
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
-        $count = $manufacturer_assets->count();
-        $manufacturer_assets = $manufacturer_assets->skip($offset)->take($limit)->get();
-        $rows = array();
-        $all_custom_fields = CustomField::all(); // cached;
-        foreach ($manufacturer_assets as $asset) {
-            $rows[] = $asset->present()->forDataTable($all_custom_fields);
-        }
-
-        $data = array('total' => $count, 'rows' => $rows);
-        return $data;
-    }
-
-    protected function getDataLicensesView(Manufacturer $manufacturer, Request $request)
-    {
-        $manufacturer = $manufacturer->load('licenses.company', 'licenses.manufacturer', 'licenses.licenseSeatsRelation');
-        $licenses = $manufacturer->licenses;
-
-        if ($request->has('search')) {
-            $licenses = $licenses->TextSearch($request->input('search'));
-        }
-
-        $licenseCount = $licenses->count();
-
-        $rows = array();
-
-        foreach ($licenses as $license) {
-            $rows[] = $license->present()->forDataTable();
-        }
-
-        $data = array('total' => $licenseCount, 'rows' => $rows);
-
-        return $data;
-    }
-
-    public function getDataAccessoriesView(Manufacturer $manufacturer, Request $request)
-    {
-        $manufacturer = $manufacturer->load(
-            'accessories.location',
-            'accessories.company',
-            'accessories.category',
-            'accessories.manufacturer',
-            'accessories.users'
-        );
-        $accessories = $manufacturer->accessories();
-
-        if ($request->has('search')) {
-            $accessories = $accessories->TextSearch(e($request->input('search')));
-        }
-
-        $offset = request('offset', 0);
-        $limit = request('limit', 50);
-
-        $accessCount = $accessories->count();
-        $accessories = $accessories->skip($offset)->take($limit)->get();
-        $rows = array();
-
-        foreach ($accessories as $accessory) {
-            $rows[] = $accessory->present()->forDataTable();
-        }
-
-        $data = array('total'=>$accessCount, 'rows'=>$rows);
-
-        return $data;
-    }
-
-    public function getDataConsumablesView($manufacturer, Request $request)
-    {
-        $manufacturer = $manufacturer->load(
-            'consumables.location',
-            'consumables.company',
-            'consumables.category',
-            'consumables.manufacturer',
-            'consumables.users'
-        );
-        $consumables = $manufacturer->consumables();
-
-        if ($request->has('search')) {
-            $consumables = $consumables->TextSearch(e($request->input('search')));
-        }
-
-        $offset = request('offset', 0);
-        $limit = request('limit', 50);
-
-
-        $consumCount = $consumables->count();
-        $consumables = $consumables->skip($offset)->take($limit)->get();
-        $rows = array();
-
-        foreach ($consumables as $consumable) {
-            $rows[] = $consumable->present()->forDataTable();
-        }
-
-        $data = array('total' => $consumCount, 'rows' => $rows);
-
-        return $data;
-    }
 }

app/Http/Controllers/SettingsController.php

@@ -21,6 +21,7 @@ use App\Models\User;
 use App\Http\Requests\SetupUserRequest;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\SettingsLdapRequest;
+use App\Helpers\Helper;
 
 /**
  * This controller handles all actions related to Settings for
@@ -136,28 +137,6 @@ class SettingsController extends Controller
         ->with('section', 'Pre-Flight Check');
     }
 
-    /**
-    * Test the email configuration
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v3.0]
-    * @return Redirect
-    */
-    public function ajaxTestEmail()
-    {
-
-        try {
-            Mail::send('emails.test', [], function ($m) {
-                $m->to(config('mail.from.address'), config('mail.from.name'));
-                $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
-                $m->subject(trans('mail.test_email'));
-            });
-            return 'success';
-        } catch (Exception $e) {
-            return 'error';
-        }
-
-    }
 
     /**
     * Save the first admin user from Setup.
@@ -263,8 +242,8 @@ class SettingsController extends Controller
         $output = Artisan::output();
 
         if ((!file_exists(storage_path().'/oauth-private.key')) || (!file_exists(storage_path().'/oauth-public.key'))) {
-            Artisan::call('passport:install');
             Artisan::call('migrate', ['--force' => true]);
+            Artisan::call('passport:install');
         }
 
 
@@ -391,6 +370,7 @@ class SettingsController extends Controller
 
         $setting->brand = $request->input('brand', '1');
         $setting->header_color = $request->input('header_color');
+        $setting->show_url_in_emails = $request->input('show_url_in_emails', '0');
 
 
         // Only allow the site name and CSS to be changed if lock_passwords is false
@@ -846,6 +826,7 @@ class SettingsController extends Controller
         $setting->is_ad = $request->input('is_ad', '0');
         $setting->ldap_tls = $request->input('ldap_tls', '0');
         $setting->ldap_pw_sync = $request->input('ldap_pw_sync', '0');
+        $setting->custom_forgot_pass_url = $request->input('custom_forgot_pass_url');
 
         if ($setting->save()) {
             return redirect()->route('settings.index')
@@ -1023,4 +1004,28 @@ class SettingsController extends Controller
     public function api() {
         return view('settings.api');
     }
+
+
+
+    /**
+     * Test the email configuration
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return Redirect
+     */
+    public function ajaxTestEmail()
+    {
+        try {
+            Mail::send('emails.test', [], function ($m) {
+                $m->to(config('mail.from.address'), config('mail.from.name'));
+                $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                $m->subject(trans('mail.test_email'));
+            });
+            return response()->json(Helper::formatStandardApiResponse('success', null, 'Maiol sent!'));
+        } catch (Exception $e) {
+            return response()->json(Helper::formatStandardApiResponse('success', null, $e->getMessage()));
+        }
+
+    }
 }

app/Http/Controllers/StatuslabelsController.php

@@ -200,17 +200,15 @@ class StatuslabelsController extends Controller
     {
         // Check if the Statuslabel exists
         if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
-            // Redirect to the blogs management page
             return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.not_found'));
         }
 
-
-        if ($statuslabel->has_assets() == 0) {
+        // Check that there are no assets associated
+        if ($statuslabel->assets()->count() == 0) {
             $statuslabel->delete();
-            // Redirect to the statuslabels management page
             return redirect()->route('statuslabels.index')->with('success', trans('admin/statuslabels/message.delete.success'));
         }
-        // Redirect to the asset management page
+
         return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.assoc_assets'));
     }
 

app/Http/Controllers/SuppliersController.php

@@ -13,6 +13,7 @@ use Str;
 use View;
 use Auth;
 use Illuminate\Http\Request;
+use App\Http\Requests\ImageUploadRequest;
 
 use Symfony\Component\HttpFoundation\JsonResponse;
 
@@ -56,7 +57,7 @@ class SuppliersController extends Controller
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function store(Request $request)
+    public function store(ImageUploadRequest $request)
     {
         // Create a new supplier
         $supplier = new Supplier;
@@ -135,7 +136,7 @@ class SuppliersController extends Controller
      * @param  int  $supplierId
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function update($supplierId = null, Request $request)
+    public function update($supplierId = null, ImageUploadRequest $request)
     {
         // Check if the supplier exists
         if (is_null($supplier = Supplier::find($supplierId))) {
@@ -158,18 +159,17 @@ class SuppliersController extends Controller
         $supplier->url                  = $supplier->addhttp(request('url'));
         $supplier->notes                = request('notes');
 
+
         if (Input::file('image')) {
             $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
+            $file_name = 'suppliers-'.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 (request('image_delete') == 1 && $request->file('image') == "") {
+        } elseif (request('image_delete') == 1) {
             $supplier->image = null;
         }
 
@@ -189,23 +189,29 @@ class SuppliersController extends Controller
      */
     public function destroy($supplierId)
     {
-        // Check if the supplier exists
-        if (is_null($supplier = Supplier::find($supplierId))) {
-            // Redirect to the suppliers page
+        if (is_null($supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances','assets','licenses')->find($supplierId))) {
             return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.not_found'));
         }
 
-        if ($supplier->num_assets() == 0) {
-            // Delete the supplier
-            $supplier->delete();
-            // Redirect to the suppliers management page
-            return redirect()->route('suppliers.index')->with(
-                'success',
-                trans('admin/suppliers/message.delete.success')
-            );
+
+        if ($supplier->assets_count > 0) {
+            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count]));
         }
-        // Redirect to the asset management page
-        return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.assoc_users'));
+
+        if ($supplier->asset_maintenances_count > 0) {
+            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count]));
+        }
+
+        if ($supplier->licenses_count > 0) {
+            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count]));
+        }
+
+        $supplier->delete();
+        return redirect()->route('suppliers.index')->with('success',
+            trans('admin/suppliers/message.delete.success')
+        );
+
+
     }
 
 

app/Http/Controllers/UsersController.php

@@ -33,6 +33,7 @@ use URL;
 use View;
 use Illuminate\Http\Request;
 use Gate;
+use Artisan;
 
 /**
  * This controller handles all actions related to Users for
@@ -1029,128 +1030,20 @@ class UsersController extends Controller
      */
     public function postLDAP(Request $request)
     {
-        $this->authorize('update', User::class);
-        ini_set('max_execution_time', 600); //600 seconds = 10 minutes
-        ini_set('memory_limit', '500M');
+        // Call Artisan LDAP import command.
+        $location_id = $request->input('location_id');
+        Artisan::call('snipeit:ldap-sync', ['--location_id' => $location_id, '--json_summary' => true]);
 
-        $ldap_result_username = Setting::getSettings()->ldap_username_field;
-        $ldap_result_last_name = Setting::getSettings()->ldap_lname_field;
-        $ldap_result_first_name = Setting::getSettings()->ldap_fname_field;
+        // Collect and parse JSON summary.
+        $ldap_results_json = Artisan::output();
+        $ldap_results = json_decode($ldap_results_json, true);
 
-        $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag_field;
-        $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num;
-        $ldap_result_email = Setting::getSettings()->ldap_email;
-
-        try {
-            $ldapconn = Ldap::connectToLdap();
-        } catch (\Exception $e) {
-            return redirect()->back()->withInput()->with('error', $e->getMessage());
+        // Direct user to appropriate status page.
+        if ($ldap_results['error']) {
+            return redirect()->back()->withInput()->with('error', $ldap_results['error_message']);
+        } else {
+            return redirect()->route('ldap/user')->with('success', "LDAP Import successful.")->with('summary', $ldap_results['summary']);
         }
-
-        try {
-            Ldap::bindAdminToLdap($ldapconn);
-        } catch (\Exception $e) {
-            return redirect()->back()->withInput()->with('error', $e->getMessage());
-        }
-
-        $summary = array();
-
-        $ldap_ou_locations = Location::whereNotNull('ldap_ou')->get();
-
-        $results = Ldap::findLdapUsers();
-
-        // Inject location information fields
-        for ($i = 0; $i < $results["count"]; $i++) {
-            $results[$i]["ldap_location_override"] = false;
-            $results[$i]["location_id"] = 0;
-        }
-
-        // Grab subsets based on location-specific DNs, and overwrite location for these users.
-        foreach ($ldap_ou_locations as $ldap_loc) {
-            $location_users = Ldap::findLdapUsers($ldap_loc->ldap_ou);
-            $usernames = array();
-            for ($i = 0; $i < $location_users["count"]; $i++) {
-                $location_users[$i]["ldap_location_override"] = true;
-                $location_users[$i]["location_id"] = $ldap_loc->id;
-                $usernames[] = $location_users[$i][$ldap_result_username][0];
-            }
-
-            // Delete located users from the general group.
-            foreach ($results as $key => $generic_entry) {
-                if (in_array($generic_entry[$ldap_result_username][0], $location_users)) {
-                    unset($results[$key]);
-                }
-            }
-
-            $global_count = $results['count'];
-            $results = array_merge($location_users, $results);
-            $results['count'] = $global_count;
-        }
-
-        $tmp_pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20);
-        $pass = bcrypt($tmp_pass);
-
-        for ($i = 0; $i < $results["count"]; $i++) {
-            if (empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == "TRUE") {
-
-                $item = array();
-                $item["username"] = isset($results[$i][$ldap_result_username][0]) ? $results[$i][$ldap_result_username][0] : "";
-                $item["employee_number"] = isset($results[$i][$ldap_result_emp_num][0]) ? $results[$i][$ldap_result_emp_num][0] : "";
-                $item["lastname"] = isset($results[$i][$ldap_result_last_name][0]) ? $results[$i][$ldap_result_last_name][0] : "";
-                $item["firstname"] = isset($results[$i][$ldap_result_first_name][0]) ? $results[$i][$ldap_result_first_name][0] : "";
-                $item["email"] = isset($results[$i][$ldap_result_email][0]) ? $results[$i][$ldap_result_email][0] : "" ;
-                $item["ldap_location_override"] = isset($results[$i]["ldap_location_override"]) ? $results[$i]["ldap_location_override"]:"";
-                $item["location_id"] = isset($results[$i]["location_id"]) ? $results[$i]["location_id"]:"";
-
-                if( array_key_exists('useraccountcontrol', $results[$i]) ) {
-                $enabled_accounts = [
-                        '512', '544', '66048', '66080', '262656', '262688', '328192', '328224'
-                    ];
-                    $item['activated'] = ( in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts) ) ? 1 : 0;
-                } else {
-                    $item['activated'] = 0;
-                }
-
-                // User exists
-                $item["createorupdate"] = 'updated';
-                if (!$user = User::where('username', $item["username"])->first()) {
-                    $user = new User;
-                    $user->password = $pass;
-                    $item["createorupdate"] = 'created';
-                }
-
-                 // Create the user if they don't exist.
-                $user->first_name = $item["firstname"];
-                $user->last_name = $item["lastname"];
-                $user->username = $item["username"];
-                $user->email = $item["email"];
-                $user->employee_num = e($item["employee_number"]);
-                $user->activated = $item['activated'];
-                
-                if ($item['ldap_location_override'] == true) {
-                    $user->location_id = $item['location_id'];
-                } else if ($request->input('location_id')!='') {
-                    $user->location_id = e($request->input('location_id'));
-                }
-                $user->notes = 'Imported from LDAP';
-                $user->ldap_import = 1;
-
-                $errors = '';
-
-                if ($user->save()) {
-                    $item["note"] = $item["createorupdate"];
-                    $item["status"]='success';
-                } else {
-                    foreach ($user->getErrors()->getMessages() as $key => $err) {
-                        $errors .='<li>'.$err[0];
-                    }
-                    $item["note"] = $errors;
-                    $item["status"]='error';
-                }
-                array_push($summary, $item);
-            }
-        }
-        return redirect()->route('ldap/user')->with('success', "LDAP Import successful.")->with('summary', $summary);
     }
     
 

app/Http/Requests/AssetCheckoutRequest.php

@@ -23,10 +23,13 @@ class AssetCheckoutRequest extends Request
      */
     public function rules()
     {
-        return [
+        $rules = [
             "assigned_user"   => 'required_without_all:assigned_asset,assigned_location',
-            "assigned_asset"   => 'required_without_all:assigned_user,assigned_location',
+            "assigned_asset"   => 'required_without_all:assigned_user,assigned_location|different:'.$this->id,
             "assigned_location"   => 'required_without_all:assigned_user,assigned_asset',
         ];
+
+
+        return $rules;
     }
 }

app/Http/Transformers/AccessoriesTransformer.php

@@ -25,6 +25,7 @@ class AccessoriesTransformer
             'name' => e($accessory->name),
             'company' => ($accessory->company) ? ['id' => $accessory->company->id,'name'=> e($accessory->company->name)] : null,
             'manufacturer' => ($accessory->manufacturer) ? ['id' => $accessory->manufacturer->id,'name'=> e($accessory->manufacturer->name)] : null,
+            'supplier' => ($accessory->supplier) ? ['id' => $accessory->supplier->id,'name'=> e($accessory->supplier->name)] : null,
             'model_number' => ($accessory->model_number) ? e($accessory->model_number) : null,
             'category' => ($accessory->category) ? ['id' => $accessory->category->id,'name'=> e($accessory->category->name)] : null,
             'location' => ($accessory->location) ? ['id' => $accessory->location->id,'name'=> e($accessory->location->name)] : null,
@@ -35,6 +36,7 @@ class AccessoriesTransformer
             'order_number' => ($accessory->order_number) ? e($accessory->order_number) : null,
             'min_qty' => ($accessory->min_amt) ? (int) $accessory->min_amt : null,
             'remaining_qty' => $accessory->numRemaining(),
+            'image' => ($accessory->image) ? url('/').'/uploads/accessories/'.e($accessory->image) : null,
             'created_at' => Helper::getFormattedDateObject($accessory->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($accessory->updated_at, 'datetime'),
 
@@ -79,8 +81,6 @@ class AccessoriesTransformer
 
         }
 
-
-
         return (new DatatablesTransformer)->transformDatatables($array, $total);
     }
 

app/Http/Transformers/CategoriesTransformer.php

@@ -26,7 +26,7 @@ class CategoriesTransformer
                 'id' => (int) $category->id,
                 'name' => e($category->name),
                 'type' => e($category->category_type),
-                'use_default_eula' => ($category->use_default_eula =='1') ? true : false,
+                'eula' => ($category->getEula()) ? true : false,
                 'checkin_email' => ($category->checkin_email =='1') ? true : false,
                 'require_acceptance' => ($category->require_acceptance =='1') ? true : false,
                 'assets_count' => $category->assets_count,
@@ -39,7 +39,7 @@ class CategoriesTransformer
 
             $permissions_array['available_actions'] = [
                 'update' => Gate::allows('update', Category::class) ? true : false,
-                'delete' => Gate::allows('delete', Category::class) ? true : false,
+                'delete' => (Gate::allows('delete', Category::class) && ($category->assets_count == 0) && ($category->accessories_count == 0) && ($category->consumables_count == 0) && ($category->components_count == 0)) ? true : false,
             ];
 
             $array += $permissions_array;

app/Http/Transformers/ComponentsTransformer.php

@@ -58,12 +58,22 @@ class ComponentsTransformer
     }
 
 
-    public function transformCheckedoutComponents(Collection $components_users, $total)
+    public function transformCheckedoutComponents(Collection $components_assets, $total)
     {
         $array = array();
-        foreach ($components_users as $user) {
-            $array[] = (new UsersTransformer)->transformUser($user);
+        foreach ($components_assets as $asset) {
+            $array[] = [
+                'assigned_pivot_id' => $asset->pivot->id,
+                'id' => (int) $asset->id,
+                'name' =>  e($asset->model->present()->name) .' '.e($asset->present()->name),
+                'qty' => $asset->pivot->assigned_qty,
+                'type' => 'asset',
+                'created_at' => Helper::getFormattedDateObject($asset->pivot->created_at, 'datetime'),
+                'available_actions' => ['checkin' => true]
+            ];
+
         }
+
         return (new DatatablesTransformer)->transformDatatables($array, $total);
     }
 }

app/Http/Transformers/StatuslabelsTransformer.php

@@ -26,6 +26,7 @@ class StatuslabelsTransformer
             'type' => $statuslabel->getStatuslabelType(),
             'color' => ($statuslabel->color) ? e($statuslabel->color) : null,
             'show_in_nav' => ($statuslabel->show_in_nav=='1') ? true : false,
+            'assets_count' => (int) $statuslabel->assets_count,
             'notes' => e($statuslabel->notes),
             'created_at' => Helper::getFormattedDateObject($statuslabel->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($statuslabel->updated_at, 'datetime'),
@@ -33,7 +34,7 @@ class StatuslabelsTransformer
 
         $permissions_array['available_actions'] = [
             'update' => Gate::allows('update', Statuslabel::class) ? true : false,
-            'delete' => Gate::allows('delete', Statuslabel::class) ? true : false,
+            'delete' => (Gate::allows('delete', Statuslabel::class) && ($statuslabel->assets_count == 0)) ? true : false,
         ];
         $array += $permissions_array;
 

app/Http/Transformers/SuppliersTransformer.php

@@ -36,8 +36,9 @@ class SuppliersTransformer
                 'email' => ($supplier->email) ? e($supplier->email) : null,
                 'contact' => ($supplier->contact) ? e($supplier->contact) : null,
                 'assets_count' => (int) $supplier->assets_count,
+                'accessories_count' => (int) $supplier->accessories_count,
                 'licenses_count' => (int) $supplier->licenses_count,
-                'image' =>   ($supplier->image) ? e($supplier->image) : null,
+                'image' =>   ($supplier->image) ? url('/').'/uploads/suppliers/'.e($supplier->image) : null,
                 'notes' => ($supplier->notes) ? e($supplier->notes) : null,
                 'created_at' => Helper::getFormattedDateObject($supplier->created_at, 'datetime'),
                 'updated_at' => Helper::getFormattedDateObject($supplier->updated_at, 'datetime'),
@@ -46,7 +47,7 @@ class SuppliersTransformer
 
             $permissions_array['available_actions'] = [
                 'update' => Gate::allows('update', Supplier::class) ? true : false,
-                'delete' => Gate::allows('delete', Supplier::class) ? true : false,
+                'delete' => (Gate::allows('delete', Supplier::class) && ($supplier->assets_count == 0) && ($supplier->licenses_count == 0)  && ($supplier->accessories_count == 0)) ? true : false,
             ];
 
             $array += $permissions_array;

app/Http/Transformers/UsersTransformer.php

@@ -33,6 +33,7 @@ class UsersTransformer
                     'name'=> e($user->manager->username)
                 ]  : null,
                 'jobtitle' => ($user->jobtitle) ? e($user->jobtitle) : null,
+                'phone' => ($user->phone) ? e($user->phone) : null,
                 'email' => e($user->email),
                 'department' => ($user->department) ? [
                     'id' => (int) $user->department->id,
@@ -42,6 +43,7 @@ class UsersTransformer
                     'id' => (int) $user->userloc->id,
                     'name'=> e($user->userloc->name)
                 ]  : null,
+                'notes'=> e($user->notes),
                 'permissions' => $user->decodePermissions(),
                 'activated' => ($user->activated =='1') ? true : false,
                 'two_factor_activated' => ($user->two_factor_active()) ? true : false,
@@ -57,7 +59,7 @@ class UsersTransformer
 
         $permissions_array['available_actions'] = [
             'update' => (Gate::allows('update', User::class) && ($user->deleted_at==''))  ? true : false,
-            'delete' => (Gate::allows('delete', User::class) && ($user->deleted_at=='')) ? true : false,
+            'delete' => (Gate::allows('delete', User::class) && ($user->deleted_at=='') && ($user->assets_count == 0) && ($user->licenses_count == 0)  && ($user->accessories_count == 0)  && ($user->consumables_count == 0)) ? true : false,
             'clone' => (Gate::allows('create', User::class) && ($user->deleted_at=='')) ,
             'restore' => (Gate::allows('create', User::class) && ($user->deleted_at!='')) ? true : false,
         ];

app/Importer/AssetImporter.php

@@ -23,14 +23,18 @@ class AssetImporter extends ItemImporter
         // ItemImporter handles the general fetching.
         parent::handle($row);
 
-        foreach ($this->customFields as $customField) {
-            $customFieldValue = $this->array_smart_custom_field_fetch($row, $customField);
-            if ($customFieldValue) {
-                $this->item['custom_fields'][$customField->db_column_name()] = $customFieldValue;
-                $this->log('Custom Field '. $customField->name.': '.$customFieldValue);
+        if ($this->customFields) {
+
+            foreach ($this->customFields as $customField) {
+                $customFieldValue = $this->array_smart_custom_field_fetch($row, $customField);
+                if ($customFieldValue) {
+                    $this->item['custom_fields'][$customField->db_column_name()] = $customFieldValue;
+                    $this->log('Custom Field '. $customField->name.': '.$customFieldValue);
+                }
             }
         }
 
+
         $this->createAssetIfNotExists($row);
     }
 

app/Models/Accessory.php

@@ -17,7 +17,7 @@ class Accessory extends SnipeModel
     use Loggable, Presentable;
     use SoftDeletes;
 
-    protected $dates = ['deleted_at', 'purchase_date'];
+    protected $dates = ['deleted_at'];
     protected $table = 'accessories';
     protected $casts = [
         'requestable' => 'boolean'
@@ -61,10 +61,19 @@ class Accessory extends SnipeModel
         'purchase_date',
         'model_number',
         'manufacturer_id',
+        'supplier_id',
+        'image',
         'qty',
         'requestable'
     ];
 
+
+    public function supplier()
+    {
+        return $this->belongsTo('\App\Models\Supplier', 'supplier_id');
+    }
+    
+
     public function setRequestableAttribute($value)
     {
         if ($value == '') {

app/Models/Asset.php

@@ -487,7 +487,7 @@ class Asset extends Depreciable
         } elseif ($this->model->category->use_default_eula == '1') {
             return $Parsedown->text(e(Setting::getSettings()->default_eula_text));
         } else {
-            return null;
+            return false;
         }
     }
 
@@ -781,14 +781,11 @@ class Asset extends Depreciable
                         $query->where('locations.name', 'LIKE', '%'.$search.'%');
                     });
                  })->orWhere(function ($query) use ($search) {
-
-                     $query->whereHas('assignedTo', function ($query) use ($search) {
                          $query->where('users.first_name', 'LIKE', '%'.$search.'%')
                          ->orWhere('users.last_name', 'LIKE', '%'.$search.'%')
                          ->orWhere('users.username', 'LIKE', '%'.$search.'%')
                          ->orWhere('locations.name', 'LIKE', '%'.$search.'%')
                          ->orWhere('assigned_assets.name', 'LIKE', '%'.$search.'%');
-                     });
                 })->orWhere('assets.name', 'LIKE', '%'.$search.'%')
                     ->orWhere('assets.asset_tag', 'LIKE', '%'.$search.'%')
                     ->orWhere('assets.serial', 'LIKE', '%'.$search.'%')
@@ -815,57 +812,60 @@ class Asset extends Depreciable
     {
         return $query->where(function ($query) use ($filter) {
             foreach ($filter as $key => $search_val) {
-                if ($key =='asset_tag') {
+
+                $fieldname = str_replace('custom_fields.','', $key) ;
+
+                if ($fieldname =='asset_tag') {
                     $query->where('assets.asset_tag', 'LIKE', '%'.$search_val.'%');
                 }
 
-                if ($key =='name') {
+                if ($fieldname =='name') {
                     $query->where('assets.name', 'LIKE', '%'.$search_val.'%');
                 }
 
-                if ($key =='product_key') {
+                if ($fieldname =='product_key') {
                     $query->where('assets.serial', 'LIKE', '%'.$search_val.'%');
                 }
 
-                if ($key =='purchase_date') {
+                if ($fieldname =='purchase_date') {
                     $query->where('assets.purchase_date', 'LIKE', '%'.$search_val.'%');
                 }
 
-                if ($key =='purchase_cost') {
+                if ($fieldname =='purchase_cost') {
                     $query->where('assets.purchase_cost', 'LIKE', '%'.$search_val.'%');
                 }
 
-                if ($key =='notes') {
+                if ($fieldname =='notes') {
                     $query->where('assets.notes', 'LIKE', '%'.$search_val.'%');
                 }
 
-                if ($key =='order_number') {
+                if ($fieldname =='order_number') {
                     $query->where('assets.order_number', 'LIKE', '%'.$search_val.'%');
                 }
 
-                if ($key =='status_label') {
+                if ($fieldname =='status_label') {
                     $query->whereHas('assetstatus', function ($query) use ($search_val) {
                         $query->where('status_labels.name', 'LIKE', '%' . $search_val . '%');
                     });
                 }
 
-                if ($key =='location') {
+                if ($fieldname =='location') {
                     $query->whereHas('defaultLoc', function ($query) use ($search_val) {
                         $query->where('locations.name', 'LIKE', '%' . $search_val . '%');
                     });
                 }
 
-                if ($key =='checkedout_to') {
-                    $query->whereHas('assigneduser', function ($query) use ($search) {
-                        $query->where(function ($query) use ($search) {
-                            $query->where('users.first_name', 'LIKE', '%' . $search . '%')
-                                ->orWhere('users.last_name', 'LIKE', '%' . $search . '%');
+                if ($fieldname =='checkedout_to') {
+                    $query->whereHas('assigneduser', function ($query) use ($search_val) {
+                        $query->where(function ($query) use ($search_val) {
+                            $query->where('users.first_name', 'LIKE', '%' . $search_val . '%')
+                                ->orWhere('users.last_name', 'LIKE', '%' . $search_val . '%');
                         });
                     });
                 }
 
 
-                if ($key =='manufacturer') {
+                if ($fieldname =='manufacturer') {
                     $query->whereHas('model', function ($query) use ($search_val) {
                         $query->whereHas('manufacturer', function ($query) use ($search_val) {
                             $query->where(function ($query) use ($search_val) {
@@ -875,9 +875,9 @@ class Asset extends Depreciable
                     });
                 }
 
-                if ($key =='category') {
-                    $query->whereHas('model', function ($query) use ($search) {
-                        $query->whereHas('category', function ($query) use ($search) {
+                if ($fieldname =='category') {
+                    $query->whereHas('model', function ($query) use ($search_val) {
+                        $query->whereHas('category', function ($query) use ($search_val) {
                             $query->where(function ($query) use ($search_val) {
                                 $query->where('categories.name', 'LIKE', '%' . $search_val . '%')
                                     ->orWhere('models.name', 'LIKE', '%' . $search_val . '%')
@@ -887,7 +887,7 @@ class Asset extends Depreciable
                     });
                 }
 
-                if ($key =='model') {
+                if ($fieldname =='model') {
                     $query->where(function ($query) use ($search_val) {
                         $query->whereHas('model', function ($query) use ($search_val) {
                             $query->where('models.name', 'LIKE', '%' . $search_val . '%');
@@ -895,7 +895,7 @@ class Asset extends Depreciable
                     });
                 }
 
-                if ($key =='model_number') {
+                if ($fieldname =='model_number') {
                     $query->where(function ($query) use ($search_val) {
                         $query->whereHas('model', function ($query) use ($search_val) {
                             $query->where('models.model_number', 'LIKE', '%' . $search_val . '%');
@@ -904,7 +904,7 @@ class Asset extends Depreciable
                 }
 
 
-                if ($key =='company') {
+                if ($fieldname =='company') {
                     $query->where(function ($query) use ($search_val) {
                         $query->whereHas('company', function ($query) use ($search_val) {
                             $query->where('companies.name', 'LIKE', '%' . $search_val . '%');
@@ -913,12 +913,12 @@ class Asset extends Depreciable
                 }
             }
 
-            foreach (CustomField::all() as $field) {
-                if (array_key_exists($field->db_column_name(), $filter)) {
-                    $query->orWhere($field->db_column_name(), 'LIKE', "%$search_val%");
-                }
-            }
+
+            $query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
+
+
         });
+
     }
 
 
@@ -1060,7 +1060,7 @@ class Asset extends Depreciable
     */
     public function scopeOrderLocation($query, $order)
     {
-        return $query->join('locations', 'locations.id', '=', 'assets.rtd_location_id')->orderBy('locations.name', $order);
+        return $query->leftJoin('locations', 'locations.id', '=', 'assets.rtd_location_id')->orderBy('locations.name', $order);
     }
 
 
@@ -1103,4 +1103,20 @@ class Asset extends Depreciable
     }
 
 
+    /**
+     * Query builder scope to search on location ID
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $search      Search term
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeByDepreciationId($query, $search)
+    {
+        return $query->join('models', 'assets.model_id', '=', 'models.id')
+            ->join('depreciations', 'models.depreciation_id', '=', 'depreciations.id')->where('models.depreciation_id', '=', $search);
+
+    }
+
+
 }

app/Models/AssetMaintenance.php

@@ -29,7 +29,7 @@ class AssetMaintenance extends Model implements ICompanyableChild
         'title'                  => 'required|max:100',
         'is_warranty'            => 'boolean',
         'start_date'             => 'required|date_format:"Y-m-d"',
-        'completion_date'        => 'date_format:"Y-m-d"',
+        'completion_date'        => 'nullable|date_format:"Y-m-d"',
         'notes'                  => 'string|nullable',
         'cost'                   => 'numeric|nullable'
     ];

app/Models/AssetModel.php

@@ -153,17 +153,17 @@ class AssetModel extends SnipeModel
             ->orWhere('model_number', 'LIKE', "%$search%")
             ->orWhere(function ($query) use ($search) {
                 $query->whereHas('depreciation', function ($query) use ($search) {
-                    $query->where('name', 'LIKE', '%'.$search.'%');
+                    $query->where('depreciations.name', 'LIKE', '%'.$search.'%');
                 });
             })
             ->orWhere(function ($query) use ($search) {
                 $query->whereHas('category', function ($query) use ($search) {
-                    $query->where('name', 'LIKE', '%'.$search.'%');
+                    $query->where('categories.name', 'LIKE', '%'.$search.'%');
                 });
             })
             ->orWhere(function ($query) use ($search) {
                 $query->whereHas('manufacturer', function ($query) use ($search) {
-                    $query->where('name', 'LIKE', '%'.$search.'%');
+                    $query->where('manufacturers.name', 'LIKE', '%'.$search.'%');
                 });
             });
 

app/Models/Component.php

@@ -64,7 +64,7 @@ class Component extends SnipeModel
 
     public function assets()
     {
-        return $this->belongsToMany('\App\Models\Asset', 'components_assets')->withPivot('assigned_qty', 'created_at', 'user_id');
+        return $this->belongsToMany('\App\Models\Asset', 'components_assets')->withPivot('id', 'assigned_qty', 'created_at', 'user_id');
     }
 
     public function admin()

app/Models/CustomField.php

@@ -62,9 +62,18 @@ class CustomField extends Model
                     return true;
                 }
 
-                return Schema::table(CustomField::$table_name, function ($table) use ($custom_field) {
+                $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+                $platform->registerDoctrineTypeMapping('enum', 'string');
+                
+                Schema::table(CustomField::$table_name, function ($table) use ($custom_field) {
                     $table->renameColumn($custom_field->convertUnicodeDbSlug($custom_field->getOriginal("name")), $custom_field->convertUnicodeDbSlug());
                 });
+
+
+                $custom_field->db_column = $custom_field->convertUnicodeDbSlug();
+                $custom_field->save();
+
+                return true;
             }
             return true;
         });

app/Models/Group.php

@@ -36,4 +36,21 @@ class Group extends SnipeModel
     {
         return json_decode($this->permissions, true);
     }
+
+    /**
+     * Query builder scope to search on text
+     *
+     * @param  Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $search      Search term
+     *
+     * @return Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeTextSearch($query, $search)
+    {
+
+        return $query->where(function ($query) use ($search) {
+
+            $query->where('name', 'LIKE', '%'.$search.'%');
+        });
+    }
 }

app/Models/Ldap.php

@@ -77,25 +77,22 @@ class Ldap extends Model
         $connection = Ldap::connectToLdap();
         $ldap_username_field     = $settings->ldap_username_field;
         $baseDn      = $settings->ldap_basedn;
+        $userDn      = $ldap_username_field.'='.$username.','.$settings->ldap_basedn;
 
         if ($settings->is_ad =='1') {
-        // Check if they are using the userprincipalname for the username field.
+            // Check if they are using the userprincipalname for the username field.
             // If they are, we can skip building the UPN to authenticate against AD
             if ($ldap_username_field=='userprincipalname') {
                 $userDn = $username;
             } else {
                 // In case they haven't added an AD domain
-                if ($settings->ad_domain == '') {
-                    $userDn      = $username.'@'.$settings->email_domain;
-                } else {
-                    $userDn      = $username.'@'.$settings->ad_domain;
-                }
+                    $userDn  = ($settings->ad_domain != '') ?  $username.'@'.$settings->ad_domain : $username.'@'.$settings->email_domain;
             }
 
-        } else {
-            $userDn      = $ldap_username_field.'='.$username.','.$settings->ldap_basedn;
         }
 
+        \Log::debug('Attempting to login using distinguished name:'.$userDn);
+
 
         $filterQuery = $settings->ldap_auth_filter_query . $username;
 

app/Models/Location.php

@@ -54,7 +54,7 @@ class Location extends SnipeModel
 
     public function assets()
     {
-        return $this->hasManyThrough('\App\Models\Asset', '\App\Models\User', 'location_id', 'assigned_to', 'id');
+        return $this->hasManyThrough('\App\Models\Asset', '\App\Models\User', 'location_id', 'assigned_to', 'id')->where("assets.assigned_type",User::class);
     }
 
     public function locationAssets()
@@ -83,6 +83,11 @@ class Location extends SnipeModel
         // return $this->hasMany('\App\Models\Asset', 'assigned_to')->withTrashed();
     }
 
+    public function setLdapOuAttribute($ldap_ou)
+    {
+        return $this->attributes['ldap_ou'] = empty($ldap_ou) ? null : $ldap_ou;
+    }
+
     public static function getLocationHierarchy($locations, $parent_id = null)
     {
 

app/Models/Setting.php

@@ -38,6 +38,7 @@ class Setting extends Model
           "pwd_secure_min" => "numeric|required|min:5",
           "audit_warning_days" => "numeric|nullable",
           "audit_interval" => "numeric|nullable",
+          "custom_forgot_pass_url" => "url|nullable",
     ];
 
     protected $fillable = ['site_name','email_domain','email_format','username_format'];

app/Models/Statuslabel.php

@@ -29,16 +29,6 @@ class Statuslabel extends SnipeModel
 
     protected $fillable = ['name', 'deployable', 'pending', 'archived'];
 
-    /**
-     * Show count of assets with status label
-     *
-     * @todo Remove this. It's dumb.
-     * @return \Illuminate\Support\Collection
-     */
-    public function has_assets()
-    {
-        return $this->hasMany('\App\Models\Asset', 'status_id')->count();
-    }
 
     /**
      * Get assets with associated status label
@@ -64,6 +54,27 @@ class Statuslabel extends SnipeModel
         }
     }
 
+    public function scopePending()
+    {
+        return $this->where('pending', '=', 1)
+                    ->where('archived', '=', 0)
+                    ->where('deployable', '=', 0);
+    }
+
+    public function scopeArchived()
+    {
+        return $this->where('pending', '=', 0)
+            ->where('archived', '=', 1)
+            ->where('deployable', '=', 0);
+    }
+
+    public function scopeDeployable()
+    {
+        return $this->where('pending', '=', 0)
+            ->where('archived', '=', 0)
+            ->where('deployable', '=', 1);
+    }
+
 
     public static function getStatuslabelTypesForDB($type)
     {

app/Models/Supplier.php

@@ -68,6 +68,11 @@ class Supplier extends SnipeModel
         return $this->hasMany('\App\Models\Asset', 'supplier_id');
     }
 
+    public function accessories()
+    {
+        return $this->hasMany('\App\Models\Accessory', 'supplier_id');
+    }
+
     public function asset_maintenances()
     {
         return $this->hasMany('\App\Models\AssetMaintenance', 'supplier_id');

app/Models/User.php

@@ -378,6 +378,14 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
         return json_decode($this->permissions, true);
     }
 
+
+    public function scopeByGroup($query, $id) {
+        return $query->whereHas('groups', function ($query) use ($id) {
+            $query->where('id', '=', $id);
+        });
+    }
+
+
     /**
      * Query builder scope to search on text
      *
@@ -395,6 +403,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
                 ->orWhere('users.email', 'LIKE', "%$search%")
                 ->orWhere('users.username', 'LIKE', "%$search%")
                 ->orWhere('users.notes', 'LIKE', "%$search%")
+                ->orWhere('users.phone', 'LIKE', "%$search%")
                 ->orWhere('users.jobtitle', 'LIKE', "%$search%")
                 ->orWhere('users.employee_num', 'LIKE', "%$search%")
                 ->orWhere(function ($query) use ($search) {

app/Notifications/CheckoutNotification.php

@@ -45,13 +45,12 @@ class CheckoutNotification extends Notification
         $item = $this->params['item'];
 
         if (class_basename(get_class($this->params['item']))=='Asset') {
-            $notifyBy[] = 'mail';
+            if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance() == '1'))
+                || (method_exists($item, 'getEula') && ($item->getEula()))
+            ) {
+                $notifyBy[] = 'mail';
+            }
         }
-        // if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance()=='1'))
-        //     || (method_exists($item, 'getEula') && ($item->getEula()))
-        // ) {
-        //     $notifyBy[] = 'mail';
-        // }
         return $notifyBy;
     }
 
@@ -83,6 +82,7 @@ class CheckoutNotification extends Notification
      */
     public function toMail($notifiable)
     {
+        if (class_basename(get_class($this->params['item']))=='Asset') {
 
             //TODO: Expand for non assets.
             $item = $this->params['item'];
@@ -99,11 +99,19 @@ class CheckoutNotification extends Notification
                 'item_serial' => $item->serial,
                 'require_acceptance' => method_exists($item, 'requireAcceptance') ? $item->requireAcceptance() : '',
                 'log_id' => $this->params['log_id'],
+                'manufacturer_name' => $item->model->manufacturer->name,
+                'model_name' => $item->model->name,
+                'model_number' => $item->model->model_number,
             ];
 
-            return (new MailMessage)
-                ->view('emails.accept-asset', $data)
-                ->subject(trans('mail.Confirm_asset_delivery'));
+            if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance() == '1'))
+                || (method_exists($item, 'getEula') && ($item->getEula()))
+            ) {
+                return (new MailMessage)
+                    ->view('emails.accept-asset', $data)
+                    ->subject(trans('mail.Confirm_asset_delivery'));
+            }
+        }
 
 
 

app/Policies/CategoryPolicy.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Company;
+use App\Models\Category;
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class CategoryPolicy
+{
+    use HandlesAuthorization;
+
+
+    public function before(User $user, $category)
+    {
+        // Lets move all company related checks here.
+        if ($category instanceof \App\Models\Category && !Company::isCurrentUserHasAccess($category)) {
+            return false;
+        }
+        // If an admin, they can do all asset related tasks.
+        if ($user->hasAccess('admin')) {
+            return true;
+        }
+    }
+    /**
+     * Determine whether the user can view the category.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Category  $category
+     * @return mixed
+     */
+    public function view(User $user)
+    {
+        return $user->hasAccess('categories.view');
+    }
+
+    /**
+     * Determine whether the user can create categories.
+     *
+     * @param  \App\Models\User  $user
+     * @return mixed
+     */
+    public function create(User $user)
+    {
+        return $user->hasAccess('categories.create');
+    }
+
+    /**
+     * Determine whether the user can update the category.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Category  $category
+     * @return mixed
+     */
+    public function update(User $user)
+    {
+        //
+        return $user->hasAccess('categories.edit');
+    }
+
+    /**
+     * Determine whether the user can delete the category.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Category  $category
+     * @return mixed
+     */
+    public function delete(User $user)
+    {
+        //
+        return $user->hasAccess('categories.delete');
+    }
+
+    /**
+     * Determine whether the user can view the category index.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Category  $category
+     * @return mixed
+     */
+
+    public function index(User $user)
+    {
+        return $user->hasAccess('categories.view');
+    }
+
+    /**
+     * Determine whether the user can manage the category.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Category  $category
+     * @return mixed
+     */
+    public function manage(User $user)
+    {
+        return  $user->hasAccess('categories.edit');
+    }
+}

app/Policies/LocationPolicy.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Company;
+use App\Models\Location;
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class LocationPolicy
+{
+    use HandlesAuthorization;
+
+
+    public function before(User $user, $location)
+    {
+        // Lets move all company related checks here.
+        if ($location instanceof \App\Models\Location && !Company::isCurrentUserHasAccess($location)) {
+            return false;
+        }
+        // If an admin, they can do all asset related tasks.
+        if ($user->hasAccess('admin')) {
+            return true;
+        }
+    }
+    /**
+     * Determine whether the user can view the location.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Location  $location
+     * @return mixed
+     */
+    public function view(User $user)
+    {
+        return $user->hasAccess('locations.view');
+    }
+
+    /**
+     * Determine whether the user can create locations.
+     *
+     * @param  \App\Models\\User  $user
+     * @return mixed
+     */
+    public function create(User $user)
+    {
+        return $user->hasAccess('locations.create');
+    }
+
+    /**
+     * Determine whether the user can update the location.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Location  $location
+     * @return mixed
+     */
+    public function update(User $user)
+    {
+        //
+        return $user->hasAccess('locations.edit');
+    }
+
+    /**
+     * Determine whether the user can delete the location.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Location  $location
+     * @return mixed
+     */
+    public function delete(User $user)
+    {
+        //
+        return $user->hasAccess('locations.delete');
+    }
+
+    /**
+     * Determine whether the user can view the location index.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Accessory  $location
+     * @return mixed
+     */
+
+    public function index(User $user)
+    {
+        return $user->hasAccess('locations.view');
+    }
+
+    /**
+     * Determine whether the user can manage the location.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Location  $location
+     * @return mixed
+     */
+    public function manage(User $user)
+    {
+        return $user->hasAccess('locations.edit');
+    }
+}

app/Presenters/AccessoryPresenter.php

@@ -31,6 +31,14 @@ class AccessoryPresenter extends Presenter
                 "switchable" => true,
                 "title" => trans('general.id'),
                 "visible" => false
+            ],[
+                "field" => "image",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('admin/hardware/table.image'),
+                "visible" => true,
+                "formatter" => "imageFormatter"
             ], [
                 "field" => "company",
                 "searchable" => true,
@@ -63,6 +71,14 @@ class AccessoryPresenter extends Presenter
                 "sortable" => true,
                 "title" => trans('general.manufacturer'),
                 "formatter" => "manufacturersLinkObjFormatter",
+            ], [
+                "field" => "supplier",
+                "searchable" => true,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.supplier'),
+                "visible" => false,
+                "formatter" => "suppliersLinkObjFormatter"
             ], [
                 "field" => "location",
                 "searchable" => true,
@@ -96,6 +112,7 @@ class AccessoryPresenter extends Presenter
                 "searchable" => true,
                 "sortable" => true,
                 "title" => trans('general.purchase_cost'),
+                "footerFormatter" => 'sumFormatter',
             ], [
                 "field" => "order_number",
                 "searchable" => true,
@@ -122,55 +139,6 @@ class AccessoryPresenter extends Presenter
         return json_encode($layout);
     }
 
-    /**
-     * JSON representation of Accessory for datatable.
-     * @return array
-     */
-    public function forDataTable()
-    {
-
-        $actions = '<nobr>';
-        if (Gate::allows('checkout', $this->model)) {
-            $actions .= Helper::generateDatatableButton(
-                'checkout',
-                route('checkout/accessory', $this->id),
-                $this->numRemaining() > 0
-            );
-        }
-        if (Gate::allows('update', $this->model)) {
-            $actions .= Helper::generateDatatableButton('edit', route('accessories.edit', $this->id));
-        }
-        if (Gate::allows('delete', $this->model)) {
-            $actions .= Helper::generateDatatableButton(
-                'delete',
-                route('accessories.destroy', $this->id),
-                true, /*enabled*/
-                trans('admin/accessories/message.delete.confirm'),
-                $this->name
-            );
-        }
-        $actions .= '</nobr>';
-
-        $results = [];
-        $results['name'] = $this->nameUrl();
-        $results['category'] = '';
-        if ($this->model->category) {
-            $results['category'] = $this->model->category->present()->nameUrl();
-        }
-        $results['model_number'] = $this->model_number;
-        $results['qty'] = $this->qty;
-        $results['order_number'] = $this->order_number;
-        $results['min_amt'] = $this->min_amt;
-        $results['location'] = $this->model->location ? $this->model->location->present()->nameUrl() : '';
-        $results['purchase_date'] = $this->purchase_date;
-        $results['purchase_cost'] = Helper::formatCurrencyOutput($this->purchase_cost);
-        $results['numRemaining'] = $this->numRemaining();
-        $results['companyName'] = $this->model->company ? $this->model->company->present()->nameUrl() : '';
-        $results['manufacturer'] = $this->model->manufacturer ? $this->model->manufacturer->present()->nameUrl() : '';
-        $results['actions']       = $actions;
-
-        return $results;
-    }
 
     /**
      * Pregenerated link to this accessories view page.

app/Presenters/AssetPresenter.php

@@ -112,7 +112,7 @@ class AssetPresenter extends Presenter
                 "sortable" => true,
                 "title" => trans('admin/hardware/table.location'),
                 "visible" => true,
-                "formatter" => "locationsLinkObjFormatter"
+                "formatter" => "deployedLocationFormatter"
             ],  [
                 "field" => "manufacturer",
                 "searchable" => true,
@@ -139,6 +139,7 @@ class AssetPresenter extends Presenter
                 "searchable" => true,
                 "sortable" => true,
                 "title" => trans('general.purchase_cost'),
+                "footerFormatter" => 'sumFormatter',
             ], [
                 "field" => "order_number",
                 "searchable" => true,

app/Presenters/CategoryPresenter.php

@@ -41,42 +41,43 @@ class CategoryPresenter extends Presenter
             ], [
                 "field" => "assets_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "title" => trans('general.assets'),
                 "visible" => true
             ], [
                 "field" => "accessories_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "title" => trans('general.accessories'),
                 "visible" => true
             ], [
                 "field" => "consumables_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "title" => trans('general.consumables'),
                 "visible" => true
             ], [
                 "field" => "components_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "title" => trans('general.components'),
                 "visible" => true
             ], [
-                "field" => "use_default_eula",
+                "field" => "eula",
                 "searchable" => false,
                 "sortable" => false,
                 "title" => trans('admin/categories/table.eula_text'),
                 "visible" => false,
                 "formatter" => 'trueFalseFormatter',
-            ], [
+            ],  [
                 "field" => "require_acceptance",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "title" => trans('admin/categories/table.require_acceptance'),
                 "visible" => true,
                 "formatter" => 'trueFalseFormatter',
-            ], [
+            ],
+           [
                 "field" => "actions",
                 "searchable" => false,
                 "sortable" => false,

app/Presenters/ComponentPresenter.php

@@ -85,6 +85,7 @@ class ComponentPresenter extends Presenter
                 "sortable" => true,
                 "title" => trans('general.purchase_cost'),
                 "visible" => true,
+                "footerFormatter" => 'sumFormatter',
             ],
         ];
 
@@ -120,5 +121,14 @@ class ComponentPresenter extends Presenter
         return (string) link_to_route('consumables.show', e($this->name), $this->id);
     }
 
+    /**
+     * Url to view this item.
+     * @return string
+     */
+    public function viewUrl()
+    {
+        return route('accessories.show', $this->id);
+    }
+
 
 }

app/Presenters/ConsumablePresenter.php

@@ -89,6 +89,7 @@ class ConsumablePresenter extends Presenter
                 "sortable" => true,
                 "title" => trans('general.purchase_cost'),
                 "visible" => true,
+                "footerFormatter" => 'sumFormatter',
             ],[
                 "field" => "change",
                 "searchable" => false,

app/Presenters/LicensePresenter.php

@@ -98,6 +98,7 @@ class LicensePresenter extends Presenter
                 "sortable" => true,
                 "visible" => false,
                 "title" => trans('general.purchase_cost'),
+                "footerFormatter" => 'sumFormatter',
             ], [
                 "field" => "purchase_order",
                 "searchable" => true,
@@ -110,6 +111,12 @@ class LicensePresenter extends Presenter
                 "sortable" => true,
                 "visible" => false,
                 "title" => trans('general.order_number'),
+            ], [
+                "field" => "notes",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.notes'),
             ]
         ];
 

app/Presenters/UserPresenter.php

@@ -69,6 +69,14 @@ class UserPresenter extends Presenter
                 "visible" => true,
                 "formatter" => "emailFormatter"
             ],
+            [
+                "field" => "phone",
+                "searchable" => true,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('admin/users/table.phone'),
+                "visible" => true,
+            ],
             [
                 "field" => "username",
                 "searchable" => true,
@@ -115,7 +123,7 @@ class UserPresenter extends Presenter
             [
                 "field" => "assets_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "switchable" => true,
                 "title" => ' <span class="hidden-md hidden-lg">Assets</span>'
                             .'<span class="hidden-xs"><i class="fa fa-barcode fa-lg"></i></span>',
@@ -124,7 +132,7 @@ class UserPresenter extends Presenter
             [
                 "field" => "licenses_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "switchable" => true,
                 "title" => ' <span class="hidden-md hidden-lg">Licenses</span>'
                     .'<span class="hidden-xs"><i class="fa fa-floppy-o fa-lg"></i></span>',
@@ -133,7 +141,7 @@ class UserPresenter extends Presenter
             [
                 "field" => "consumables_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "switchable" => true,
                 "title" => ' <span class="hidden-md hidden-lg">Consumables</span>'
                     .'<span class="hidden-xs"><i class="fa fa-tint fa-lg"></i></span>',
@@ -142,7 +150,7 @@ class UserPresenter extends Presenter
             [
                 "field" => "accessories_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "switchable" => true,
                 "title" => ' <span class="hidden-md hidden-lg">Accessories</span>'
                     .'<span class="hidden-xs"><i class="fa fa-keyboard-o fa-lg"></i></span>',

app/Providers/AppServiceProvider.php

@@ -98,8 +98,8 @@ class AppServiceProvider extends ServiceProvider
         if (config('app.debug')) {
             $log_level = 'debug';
         } else {
-            if (config('log-level')) {
-                $log_level = config('log-level');
+            if (config('app.log_level')) {
+                $log_level = config('app.log_level');
             } else {
                 $log_level = 'error';
             }

app/Providers/AuthServiceProvider.php

@@ -5,7 +5,9 @@ namespace App\Providers;
 use App\Models\Accessory;
 use Carbon\Carbon;
 use App\Models\Asset;
+use App\Models\Location;
 use App\Models\Component;
+use App\Models\Category;
 use App\Models\Consumable;
 use App\Models\License;
 use App\Models\User;
@@ -14,6 +16,8 @@ use App\Policies\AssetPolicy;
 use App\Policies\ComponentPolicy;
 use App\Policies\ConsumablePolicy;
 use App\Policies\LicensePolicy;
+use App\Policies\LocationPolicy;
+use App\Policies\CategoryPolicy;
 use App\Policies\UserPolicy;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Gate;
@@ -33,6 +37,8 @@ class AuthServiceProvider extends ServiceProvider
         Consumable::class => ConsumablePolicy::class,
         License::class => LicensePolicy::class,
         User::class => UserPolicy::class,
+        Location::class => LocationPolicy::class,
+        Category::class => CategoryPolicy::class,
     ];
 
     /**

build/css/AdminLTE.css.map

@@ -1 +1 @@
-{"version":3,"file":"css/AdminLTE.css","sources":[],"mappings":";;;;;;A","sourceRoot":""}
+{"version":3,"file":"css/AdminLTE.css","sources":[],"mappings":";;;;;;","sourceRoot":""}

build/css/app.css.map

@@ -1 +1 @@
-{"version":3,"file":"css/app.css","sources":[],"mappings":";;;;;;;;A","sourceRoot":""}
+{"version":3,"file":"css/app.css","sources":[],"mappings":";;;;;;;;","sourceRoot":""}

build/mix-manifest.json

@@ -1,12 +1,23 @@
 {
-    "/vue.js": "/vue.js",
-    "/css/AdminLTE.css": "/css/AdminLTE.css",
-    "/css/app.css": "/css/app.css",
-    "/css/overrides.css": "/css/overrides.css",
-    "/vue.js.map": "/vue.js.map",
-    "/css/AdminLTE.css.map": "/css/AdminLTE.css.map",
-    "/css/app.css.map": "/css/app.css.map",
-    "/css/overrides.css.map": "/css/overrides.css.map",
-    "/public/css/dist/all.css": "/public/css/dist/all.css",
-    "/public/js/dist/all.js": "/public/js/dist/all.js"
+  "/build/vue.js": "/build/vue.js",
+  "/mix.js": "/mix.js",
+  "/build/app.css": "/build/app.535d8af1016a2377e449920c617f0197.css",
+  "/build/AdminLTE.css": "/build/AdminLTE.3d8a2b2e33baa060b1b324363ad5e1c2.css",
+  "/build/overrides.css": "/build/overrides.617623c6a96be3e0cbd11c5d4039ec10.css",
+  "/css/all.css": "/css/all.css",
+  "/js/all.js": "/js/all.js",
+  "/css/app.css": "/css/app.css",
+  "/css/dist/all.css": "/css/dist/all.css",
+  "/js/dist/all.js": "/js/dist/all.js",
+  "/css/AdminLTE.css": "/css/AdminLTE.css",
+  "/css/overrides.css": "/css/overrides.css",
+  "/css/skin-blue.css": "/css/skin-blue.css",
+  "/vue.js": "/vue.js",
+  "/vue.js.map": "/vue.js.map",
+  "/mix.js.map": "/mix.js.map",
+  "/css/AdminLTE.css.map": "/css/AdminLTE.css.map",
+  "/css/app.css.map": "/css/app.css.map",
+  "/css/overrides.css.map": "/css/overrides.css.map",
+  "public/css/dist/all.css": "public/css/dist/all.css",
+  "public/js/dist/all.js": "public/js/dist/all.js"
 }

composer.json

@@ -18,8 +18,8 @@
     "intervention/image": "^2.3",
     "javiereguiluz/easyslugger": "^1.0",
     "jenssegers/rollbar": "^1.5",
-    "laravel/framework": "5.4.*",
-    "laravel/passport": "^1.0",
+    "laravel/framework": "5.4.29",
+    "laravel/passport": "^3.0",
     "laravel/tinker": "^1.0",
     "laravelcollective/html": "^5.3",
     "league/csv": "^8.1",
@@ -29,6 +29,7 @@
     "phpdocumentor/reflection-docblock": "3.2.2",
     "phpspec/prophecy": "1.6.2",
     "pragmarx/google2fa": "^1.0",
+    "predis/predis": "^1.1",
     "schuppo/password-strength": "~1.5",
     "spatie/laravel-backup": "^3.0.0",
     "tecnickcom/tc-lib-barcode": "^1.15",
@@ -71,6 +72,10 @@
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,
-        "optimize-autoloader": true
+        "optimize-autoloader": true,
+        "platform": {
+          "php": "5.6.4"
+        }
     }
+
 }

composer.lock

@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "0806112cf7a9396f0a7d89649ea7060b",
+    "content-hash": "a1fc66ea043e149e85b4d708f852adbe",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.36.17",
+            "version": "3.36.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "4bf27e8808e5e08a71b7fbdb951f51918c57a1c6"
+                "reference": "7ba49dbd24366647a41cd4a13eab972b2264b8db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4bf27e8808e5e08a71b7fbdb951f51918c57a1c6",
-                "reference": "4bf27e8808e5e08a71b7fbdb951f51918c57a1c6",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7ba49dbd24366647a41cd4a13eab972b2264b8db",
+                "reference": "7ba49dbd24366647a41cd4a13eab972b2264b8db",
                 "shasum": ""
             },
             "require": {
@@ -84,7 +84,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2017-09-29T19:46:41+00:00"
+            "time": "2017-10-23T20:40:28+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -1429,20 +1429,20 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.4.36",
+            "version": "v5.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9"
+                "reference": "4f7588c744eb15e49544c99c6ee90d5598b0b50b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/1062a22232071c3e8636487c86ec1ae75681bbf9",
-                "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/4f7588c744eb15e49544c99c6ee90d5598b0b50b",
+                "reference": "4f7588c744eb15e49544c99c6ee90d5598b0b50b",
                 "shasum": ""
             },
             "require": {
-                "doctrine/inflector": "~1.1",
+                "doctrine/inflector": "~1.0",
                 "erusev/parsedown": "~1.6",
                 "ext-mbstring": "*",
                 "ext-openssl": "*",
@@ -1554,34 +1554,34 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2017-08-30T09:26:16+00:00"
+            "time": "2017-07-19T13:26:57+00:00"
         },
         {
             "name": "laravel/passport",
-            "version": "v1.0.18",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/passport.git",
-                "reference": "f4ec49664be83f2a641cbfbb6d43cfb79f4aa95e"
+                "reference": "d19a6b60503cb416fe55507684699de35239681f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/f4ec49664be83f2a641cbfbb6d43cfb79f4aa95e",
-                "reference": "f4ec49664be83f2a641cbfbb6d43cfb79f4aa95e",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/d19a6b60503cb416fe55507684699de35239681f",
+                "reference": "d19a6b60503cb416fe55507684699de35239681f",
                 "shasum": ""
             },
             "require": {
                 "firebase/php-jwt": "~3.0|~4.0",
                 "guzzlehttp/guzzle": "~6.0",
-                "illuminate/auth": "~5.3",
-                "illuminate/console": "~5.3",
-                "illuminate/container": "~5.3",
-                "illuminate/contracts": "~5.3",
-                "illuminate/database": "~5.3",
-                "illuminate/encryption": "~5.3",
-                "illuminate/http": "~5.3",
-                "illuminate/support": "~5.3",
-                "league/oauth2-server": "~5.0",
+                "illuminate/auth": "~5.4",
+                "illuminate/console": "~5.4",
+                "illuminate/container": "~5.4",
+                "illuminate/contracts": "~5.4",
+                "illuminate/database": "~5.4",
+                "illuminate/encryption": "~5.4",
+                "illuminate/http": "~5.4",
+                "illuminate/support": "~5.4",
+                "league/oauth2-server": "^6.0",
                 "php": ">=5.6.4",
                 "phpseclib/phpseclib": "^2.0",
                 "symfony/psr-http-message-bridge": "~1.0",
@@ -1594,7 +1594,12 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "3.0-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Laravel\\Passport\\PassportServiceProvider"
+                    ]
                 }
             },
             "autoload": {
@@ -1618,7 +1623,7 @@
                 "oauth",
                 "passport"
             ],
-            "time": "2017-07-12T20:03:53+00:00"
+            "time": "2017-08-04T14:03:52+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -1987,16 +1992,16 @@
         },
         {
             "name": "league/oauth2-server",
-            "version": "5.1.5",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-server.git",
-                "reference": "8e5df6d6286d0010861a708b70f00345d074bce9"
+                "reference": "925776958fc3f5278e74363663c20147af32b668"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/8e5df6d6286d0010861a708b70f00345d074bce9",
-                "reference": "8e5df6d6286d0010861a708b70f00345d074bce9",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/925776958fc3f5278e74363663c20147af32b668",
+                "reference": "925776958fc3f5278e74363663c20147af32b668",
                 "shasum": ""
             },
             "require": {
@@ -2005,7 +2010,7 @@
                 "lcobucci/jwt": "^3.1",
                 "league/event": "^2.1",
                 "paragonie/random_compat": "^2.0",
-                "php": ">=5.5.9",
+                "php": ">=5.6.0",
                 "psr/http-message": "^1.0"
             },
             "replace": {
@@ -2013,19 +2018,10 @@
                 "lncd/oauth2": "*"
             },
             "require-dev": {
-                "indigophp/hash-compat": "^1.1",
                 "phpunit/phpunit": "^4.8 || ^5.0",
                 "zendframework/zend-diactoros": "^1.0"
             },
-            "suggest": {
-                "indigophp/hash-compat": "Polyfill for hash_equals function for PHP 5.5"
-            },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-V5-WIP": "5.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "League\\OAuth2\\Server\\": "src/"
@@ -2060,7 +2056,7 @@
                 "secure",
                 "server"
             ],
-            "time": "2017-07-11T06:31:36+00:00"
+            "time": "2017-08-03T15:09:23+00:00"
         },
         {
             "name": "maknz/slack",
@@ -2742,16 +2738,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.6",
+            "version": "2.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "34a7699e6f31b1ef4035ee36444407cecf9f56aa"
+                "reference": "f4b6a522dfa1fd1e477c9cfe5909d5b31f098c0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34a7699e6f31b1ef4035ee36444407cecf9f56aa",
-                "reference": "34a7699e6f31b1ef4035ee36444407cecf9f56aa",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/f4b6a522dfa1fd1e477c9cfe5909d5b31f098c0b",
+                "reference": "f4b6a522dfa1fd1e477c9cfe5909d5b31f098c0b",
                 "shasum": ""
             },
             "require": {
@@ -2830,7 +2826,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2017-06-05T06:31:10+00:00"
+            "time": "2017-10-23T05:04:54+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -2956,6 +2952,56 @@
             ],
             "time": "2016-07-18T20:25:04+00:00"
         },
+        {
+            "name": "predis/predis",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nrk/predis.git",
+                "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1",
+                "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "suggest": {
+                "ext-curl": "Allows access to Webdis when paired with phpiredis",
+                "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Predis\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Daniele Alessandri",
+                    "email": "suppakilla@gmail.com",
+                    "homepage": "http://clorophilla.net"
+                }
+            ],
+            "description": "Flexible and feature-complete Redis client for PHP and HHVM",
+            "homepage": "http://github.com/nrk/predis",
+            "keywords": [
+                "nosql",
+                "predis",
+                "redis"
+            ],
+            "time": "2016-06-16T16:22:20+00:00"
+        },
         {
             "name": "psr/http-message",
             "version": "1.0.1",
@@ -3055,16 +3101,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.8.11",
+            "version": "v0.8.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "b193cd020e8c6b66cea6457826ae005e94e6d2c0"
+                "reference": "cdb5593c3684bab74e10fcfffe4a0c8d1c39695d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b193cd020e8c6b66cea6457826ae005e94e6d2c0",
-                "reference": "b193cd020e8c6b66cea6457826ae005e94e6d2c0",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/cdb5593c3684bab74e10fcfffe4a0c8d1c39695d",
+                "reference": "cdb5593c3684bab74e10fcfffe4a0c8d1c39695d",
                 "shasum": ""
             },
             "require": {
@@ -3124,7 +3170,7 @@
                 "interactive",
                 "shell"
             ],
-            "time": "2017-07-29T19:30:02+00:00"
+            "time": "2017-10-19T06:13:20+00:00"
         },
         {
             "name": "ramsey/uuid",
@@ -3260,16 +3306,16 @@
         },
         {
             "name": "schuppo/password-strength",
-            "version": "v1.9",
+            "version": "v1.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schuppo/PasswordStrengthPackage.git",
-                "reference": "184d65517eb438651b491b116df8895238005b79"
+                "reference": "06198d64e9b1b6c3039b87b9c528fc299408f32d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schuppo/PasswordStrengthPackage/zipball/184d65517eb438651b491b116df8895238005b79",
-                "reference": "184d65517eb438651b491b116df8895238005b79",
+                "url": "https://api.github.com/repos/schuppo/PasswordStrengthPackage/zipball/06198d64e9b1b6c3039b87b9c528fc299408f32d",
+                "reference": "06198d64e9b1b6c3039b87b9c528fc299408f32d",
                 "shasum": ""
             },
             "require": {
@@ -3282,6 +3328,13 @@
                 "phpunit/phpunit": "^4.8"
             },
             "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Schuppo\\PasswordStrength\\PasswordStrengthServiceProvider"
+                    ]
+                }
+            },
             "autoload": {
                 "psr-0": {
                     "Schuppo\\PasswordStrength": "src/"
@@ -3306,7 +3359,7 @@
                 "password strength",
                 "validation"
             ],
-            "time": "2016-10-05T09:57:59+00:00"
+            "time": "2017-10-12T18:46:40+00:00"
         },
         {
             "name": "sebastian/comparator",
@@ -3713,16 +3766,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a1e1b01293a090cb9ae2ddd221a3251a4a7e4abf"
+                "reference": "116bc56e45a8e5572e51eb43ab58c769a352366c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a1e1b01293a090cb9ae2ddd221a3251a4a7e4abf",
-                "reference": "a1e1b01293a090cb9ae2ddd221a3251a4a7e4abf",
+                "url": "https://api.github.com/repos/symfony/console/zipball/116bc56e45a8e5572e51eb43ab58c769a352366c",
+                "reference": "116bc56e45a8e5572e51eb43ab58c769a352366c",
                 "shasum": ""
             },
             "require": {
@@ -3777,7 +3830,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-09-06T16:40:18+00:00"
+            "time": "2017-10-02T06:42:24+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -3834,16 +3887,16 @@
         },
         {
             "name": "symfony/debug",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "8beb24eec70b345c313640962df933499373a944"
+                "reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/8beb24eec70b345c313640962df933499373a944",
-                "reference": "8beb24eec70b345c313640962df933499373a944",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd",
+                "reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd",
                 "shasum": ""
             },
             "require": {
@@ -3886,20 +3939,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2017-09-01T13:23:39+00:00"
+            "time": "2017-10-02T06:42:24+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "54ca9520a00386f83bca145819ad3b619aaa2485"
+                "reference": "d7ba037e4b8221956ab1e221c73c9e27e05dd423"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/54ca9520a00386f83bca145819ad3b619aaa2485",
-                "reference": "54ca9520a00386f83bca145819ad3b619aaa2485",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d7ba037e4b8221956ab1e221c73c9e27e05dd423",
+                "reference": "d7ba037e4b8221956ab1e221c73c9e27e05dd423",
                 "shasum": ""
             },
             "require": {
@@ -3949,20 +4002,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2017-10-02T06:42:24+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e"
+                "reference": "773e19a491d97926f236942484cb541560ce862d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/b2260dbc80f3c4198f903215f91a1ac7fe9fe09e",
-                "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/773e19a491d97926f236942484cb541560ce862d",
+                "reference": "773e19a491d97926f236942484cb541560ce862d",
                 "shasum": ""
             },
             "require": {
@@ -3998,20 +4051,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2017-10-02T06:42:24+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "2cdc7de1921d1a1c805a13dc05e44a2cd58f5ad3"
+                "reference": "22cf9c2b1d9f67cc8e75ae7f4eaa60e4c1eff1f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/2cdc7de1921d1a1c805a13dc05e44a2cd58f5ad3",
-                "reference": "2cdc7de1921d1a1c805a13dc05e44a2cd58f5ad3",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/22cf9c2b1d9f67cc8e75ae7f4eaa60e4c1eff1f8",
+                "reference": "22cf9c2b1d9f67cc8e75ae7f4eaa60e4c1eff1f8",
                 "shasum": ""
             },
             "require": {
@@ -4051,20 +4104,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-09-06T17:07:39+00:00"
+            "time": "2017-10-05T23:10:23+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "70f5bb3cdd737624249953b61023411e26be5db7"
+                "reference": "654f047a78756964bf91b619554f956517394018"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/70f5bb3cdd737624249953b61023411e26be5db7",
-                "reference": "70f5bb3cdd737624249953b61023411e26be5db7",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/654f047a78756964bf91b619554f956517394018",
+                "reference": "654f047a78756964bf91b619554f956517394018",
                 "shasum": ""
             },
             "require": {
@@ -4137,20 +4190,20 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2017-09-11T16:13:23+00:00"
+            "time": "2017-10-05T23:40:19+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.5.0",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803"
+                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
-                "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
+                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
                 "shasum": ""
             },
             "require": {
@@ -4162,7 +4215,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.5-dev"
+                    "dev-master": "1.6-dev"
                 }
             },
             "autoload": {
@@ -4196,20 +4249,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-14T15:44:48+00:00"
+            "time": "2017-10-11T12:05:26+00:00"
         },
         {
             "name": "symfony/polyfill-php56",
-            "version": "v1.5.0",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php56.git",
-                "reference": "e85ebdef569b84e8709864e1a290c40f156b30ca"
+                "reference": "265fc96795492430762c29be291a371494ba3a5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e85ebdef569b84e8709864e1a290c40f156b30ca",
-                "reference": "e85ebdef569b84e8709864e1a290c40f156b30ca",
+                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/265fc96795492430762c29be291a371494ba3a5b",
+                "reference": "265fc96795492430762c29be291a371494ba3a5b",
                 "shasum": ""
             },
             "require": {
@@ -4219,7 +4272,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.5-dev"
+                    "dev-master": "1.6-dev"
                 }
             },
             "autoload": {
@@ -4252,20 +4305,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-14T15:44:48+00:00"
+            "time": "2017-10-11T12:05:26+00:00"
         },
         {
             "name": "symfony/polyfill-util",
-            "version": "v1.5.0",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-util.git",
-                "reference": "67925d1cf0b84bd234a83bebf26d4eb281744c6d"
+                "reference": "6e719200c8e540e0c0effeb31f96bdb344b94176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/67925d1cf0b84bd234a83bebf26d4eb281744c6d",
-                "reference": "67925d1cf0b84bd234a83bebf26d4eb281744c6d",
+                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/6e719200c8e540e0c0effeb31f96bdb344b94176",
+                "reference": "6e719200c8e540e0c0effeb31f96bdb344b94176",
                 "shasum": ""
             },
             "require": {
@@ -4274,7 +4327,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.5-dev"
+                    "dev-master": "1.6-dev"
                 }
             },
             "autoload": {
@@ -4304,20 +4357,20 @@
                 "polyfill",
                 "shim"
             ],
-            "time": "2017-07-05T15:09:33+00:00"
+            "time": "2017-10-11T12:05:26+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0"
+                "reference": "fdf89e57a723a29baf536e288d6e232c059697b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0",
-                "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0",
+                "url": "https://api.github.com/repos/symfony/process/zipball/fdf89e57a723a29baf536e288d6e232c059697b1",
+                "reference": "fdf89e57a723a29baf536e288d6e232c059697b1",
                 "shasum": ""
             },
             "require": {
@@ -4353,7 +4406,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2017-10-02T06:42:24+00:00"
         },
         {
             "name": "symfony/psr-http-message-bridge",
@@ -4417,16 +4470,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "970326dcd04522e1cd1fe128abaee54c225e27f9"
+                "reference": "2e26fa63da029dab49bf9377b3b4f60a8fecb009"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/970326dcd04522e1cd1fe128abaee54c225e27f9",
-                "reference": "970326dcd04522e1cd1fe128abaee54c225e27f9",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/2e26fa63da029dab49bf9377b3b4f60a8fecb009",
+                "reference": "2e26fa63da029dab49bf9377b3b4f60a8fecb009",
                 "shasum": ""
             },
             "require": {
@@ -4491,20 +4544,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2017-10-02T07:25:00+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "add53753d978f635492dfe8cd6953f6a7361ef90"
+                "reference": "409bf229cd552bf7e3faa8ab7e3980b07672073f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/add53753d978f635492dfe8cd6953f6a7361ef90",
-                "reference": "add53753d978f635492dfe8cd6953f6a7361ef90",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/409bf229cd552bf7e3faa8ab7e3980b07672073f",
+                "reference": "409bf229cd552bf7e3faa8ab7e3980b07672073f",
                 "shasum": ""
             },
             "require": {
@@ -4556,20 +4609,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2017-10-02T06:42:24+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "89fcb5a73e0ede2be2512234c4e40457bb22b35f"
+                "reference": "03e3693a36701f1c581dd24a6d6eea2eba2113f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89fcb5a73e0ede2be2512234c4e40457bb22b35f",
-                "reference": "89fcb5a73e0ede2be2512234c4e40457bb22b35f",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/03e3693a36701f1c581dd24a6d6eea2eba2113f6",
+                "reference": "03e3693a36701f1c581dd24a6d6eea2eba2113f6",
                 "shasum": ""
             },
             "require": {
@@ -4624,7 +4677,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2017-08-27T14:52:21+00:00"
+            "time": "2017-10-02T06:42:24+00:00"
         },
         {
             "name": "tecnickcom/tc-lib-barcode",
@@ -4983,16 +5036,16 @@
         },
         {
             "name": "watson/validating",
-            "version": "3.0.2",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dwightwatson/validating.git",
-                "reference": "c6e9194b034a24d3b6e447bbc7a94d88fad9a1fd"
+                "reference": "ade13078bf2e820e244603446114a28eda51b08c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dwightwatson/validating/zipball/c6e9194b034a24d3b6e447bbc7a94d88fad9a1fd",
-                "reference": "c6e9194b034a24d3b6e447bbc7a94d88fad9a1fd",
+                "url": "https://api.github.com/repos/dwightwatson/validating/zipball/ade13078bf2e820e244603446114a28eda51b08c",
+                "reference": "ade13078bf2e820e244603446114a28eda51b08c",
                 "shasum": ""
             },
             "require": {
@@ -5029,7 +5082,7 @@
                 "laravel",
                 "validation"
             ],
-            "time": "2017-08-25T02:12:38+00:00"
+            "time": "2017-10-08T22:42:01+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -5083,16 +5136,16 @@
         },
         {
             "name": "zendframework/zend-diactoros",
-            "version": "1.6.0",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-diactoros.git",
-                "reference": "2faa791b66bac33ca40031d8bce03b7dc8143490"
+                "reference": "c8664b92a6d5bc229e48b0923486c097e45a7877"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/2faa791b66bac33ca40031d8bce03b7dc8143490",
-                "reference": "2faa791b66bac33ca40031d8bce03b7dc8143490",
+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/c8664b92a6d5bc229e48b0923486c097e45a7877",
+                "reference": "c8664b92a6d5bc229e48b0923486c097e45a7877",
                 "shasum": ""
             },
             "require": {
@@ -5131,7 +5184,7 @@
                 "psr",
                 "psr-7"
             ],
-            "time": "2017-09-13T14:47:08+00:00"
+            "time": "2017-10-12T15:24:51+00:00"
         }
     ],
     "packages-dev": [
@@ -5392,37 +5445,40 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.6.1",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102"
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
-                "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
-                "doctrine/collections": "1.*",
-                "phpunit/phpunit": "~4.1"
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^4.1"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
                     "DeepCopy\\": "src/DeepCopy/"
-                }
+                },
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "description": "Create deep copies (clones) of your objects",
-            "homepage": "https://github.com/myclabs/DeepCopy",
             "keywords": [
                 "clone",
                 "copy",
@@ -5430,7 +5486,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2017-04-12T18:52:22+00:00"
+            "time": "2017-10-19T19:58:43+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -5683,16 +5739,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "5.7.22",
+            "version": "5.7.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "10df877596c9906d4110b5b905313829043f2ada"
+                "reference": "78532d5269d984660080d8e0f4c99c5c2ea65ffe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/10df877596c9906d4110b5b905313829043f2ada",
-                "reference": "10df877596c9906d4110b5b905313829043f2ada",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/78532d5269d984660080d8e0f4c99c5c2ea65ffe",
+                "reference": "78532d5269d984660080d8e0f4c99c5c2ea65ffe",
                 "shasum": ""
             },
             "require": {
@@ -5761,7 +5817,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-09-24T07:23:38+00:00"
+            "time": "2017-10-15T06:13:55+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -6101,16 +6157,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.1.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "3c2d0a0fe39684ba0c1eb842a6a775d0b938d699"
+                "reference": "d667e245d5dcd4d7bf80f26f2c947d476b66213e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/3c2d0a0fe39684ba0c1eb842a6a775d0b938d699",
-                "reference": "3c2d0a0fe39684ba0c1eb842a6a775d0b938d699",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d667e245d5dcd4d7bf80f26f2c947d476b66213e",
+                "reference": "d667e245d5dcd4d7bf80f26f2c947d476b66213e",
                 "shasum": ""
             },
             "require": {
@@ -6148,7 +6204,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2017-09-19T22:47:14+00:00"
+            "time": "2017-10-16T22:40:25+00:00"
         },
         {
             "name": "stecman/symfony-console-completion",
@@ -6197,16 +6253,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "aee7120b058c268363e606ff5fe8271da849a1b5"
+                "reference": "317d5bdf0127f06db7ea294186132b4f5b036839"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/aee7120b058c268363e606ff5fe8271da849a1b5",
-                "reference": "aee7120b058c268363e606ff5fe8271da849a1b5",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/317d5bdf0127f06db7ea294186132b4f5b036839",
+                "reference": "317d5bdf0127f06db7ea294186132b4f5b036839",
                 "shasum": ""
             },
             "require": {
@@ -6250,7 +6306,7 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2017-10-02T06:42:24+00:00"
         },
         {
             "name": "symfony/dom-crawler",
@@ -6310,16 +6366,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.3.9",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0"
+                "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/1d8c2a99c80862bdc3af94c1781bf70f86bccac0",
-                "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46",
+                "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46",
                 "shasum": ""
             },
             "require": {
@@ -6361,7 +6417,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2017-10-05T14:43:42+00:00"
         }
     ],
     "aliases": [],
@@ -6372,5 +6428,8 @@
     "platform": {
         "php": ">=5.6.4"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "platform-overrides": {
+        "php": "5.6.4"
+    }
 }

config/app.php

@@ -121,8 +121,41 @@ return [
     |
     */
 
-    'log' => env('APP_LOG', 'single'),
-    'log-level' => env('APP_LOG_LEVEL', 'error'),
+    'log' => env('APP_LOG', 'daily'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Logging Max Files
+    |--------------------------------------------------------------------------
+    |
+    | When using the daily log mode, Laravel will only retain 5
+    | days of log files by default.
+    |
+    | To change this, set the APP_LOG_MAX_FILES option in your .env.
+    |
+    */
+
+    'log_max_files' => env('APP_LOG_MAX_FILES', 5),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Logging Detail
+    |--------------------------------------------------------------------------
+    |
+    | By default, Laravel writes all log levels to storage. However, in your 
+    | production environment, you may wish to configure the minimum severity that 
+    | should be logged by editing your APP_LOG_LEVEL env config.
+    |
+    | Laravel will log all levels greater than or equal to the specified severity.
+    | For example, a default log_level of error will log error, critical, alert,
+    | and emergency messages.
+    |
+    | APP_LOG_LEVEL options are:
+    | "debug", "info", "notice", "warning", "error", "critical", "alert", "emergency"
+    |
+    */
+    
+    'log_level' => env('APP_LOG_LEVEL', 'error'),
 
 
     /*

config/mail.php

@@ -132,12 +132,9 @@ return [
 
     'sendmail' => '/usr/sbin/sendmail -bs',
 
-    
-    
-    
+
     'markdown' => [
         'theme' => 'default',
-
         'paths' => [
             resource_path('views/vendor/mail'),
         ],

config/session.php

@@ -109,7 +109,7 @@ return [
     |
     */
 
-    'cookie' => env('COOKIE_NAME', 'sl53_session'),
+    'cookie' => env('COOKIE_NAME', 'snipeitv4_session'),
 
     /*
     |--------------------------------------------------------------------------

config/version.php

@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v4.0.9',
-  'build_version' => '120',
-  'hash_version' => 'gf66e222',
-  'full_hash' => 'v4.0.9-120-gf66e222',
+  'app_version' => 'v4.0.15',
+  'build_version' => '339',
+  'hash_version' => 'g17b2719',
+  'full_hash' => 'v4.0.15-339-g17b2719',
 );

database/factories/AccessoryFactory.php

@@ -0,0 +1,70 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Asset Model Factories
+|--------------------------------------------------------------------------
+|
+| Factories related exclusively to creating models ..
+|
+*/
+
+$factory->define(App\Models\Accessory::class, function (Faker\Generator $faker) {
+    return [
+        'user_id' => 1,
+        'model_number' => $faker->numberBetween(1000000, 50000000),
+        'location_id' => rand(1,5),
+    ];
+});
+
+$factory->state(App\Models\Accessory::class, 'apple-bt-keyboard', function ($faker) {
+
+    return [
+        'name' => 'Bluetooth Keyboard',
+        'category_id' => 8,
+        'manufacturer_id' => 1,
+        'qty' => 10,
+        'min_amt' => 2,
+        'supplier_id' => rand(1,5)
+    ];
+
+});
+
+$factory->state(App\Models\Accessory::class, 'apple-usb-keyboard', function ($faker) {
+
+    return [
+        'name' => 'USB Keyboard',
+        'category_id' => 8,
+        'manufacturer_id' => 1,
+        'qty' => 15,
+        'min_amt' => 2,
+        'supplier_id' => rand(1,5)
+    ];
+
+});
+
+$factory->state(App\Models\Accessory::class, 'apple-mouse', function ($faker) {
+
+    return [
+        'name' => 'Magic Mouse',
+        'category_id' => 9,
+        'manufacturer_id' => 1,
+        'qty' => 13,
+        'min_amt' => 2,
+        'supplier_id' => rand(1,5)
+    ];
+
+});
+
+$factory->state(App\Models\Accessory::class, 'microsoft-mouse', function ($faker) {
+
+    return [
+        'name' => 'Sculpt Comfort Mouse',
+        'category_id' => 9,
+        'manufacturer_id' => 2,
+        'qty' => 13,
+        'min_amt' => 2
+    ];
+
+});
+

database/factories/ActionLogFactory.php

@@ -1,76 +1,112 @@
 <?php
 
 use App\Models\Actionlog;
+use App\Models\Company;
+use App\Models\User;
+use App\Models\Location;
+use App\Models\Asset;
+
+
+$factory->define(Actionlog::class, function (Faker\Generator $faker) {
+    return [
+        'note' => 'Sample checkout from DB seeder!',
+    ];
+});
+
 
 $factory->defineAs(App\Models\Actionlog::class, 'asset-upload', function ($faker) {
     $asset = factory(App\Models\Asset::class)->create();
     return [
         'item_type' => get_class($asset),
-        'item_id' => $asset->id,
-        'user_id' => function () {
-            return factory(App\Models\User::class)->create()->id;
-        },
+        'item_id' => 1,
+        'user_id' => 1,
         'filename' => $faker->word,
         'action_type' => 'uploaded'
     ];
 });
 
-$factory->defineAs(Actionlog::class, 'asset-checkout', function (Faker\Generator $faker) {
-    $company =  factory(App\Models\Company::class)->create();
-    $user = factory(App\Models\User::class)->create(['company_id' => $company->id]);
-    $target = factory(App\Models\User::class)->create(['company_id' => $company->id]);
-    do {
-        $item = factory(App\Models\Asset::class)->create(['company_id' => $company->id]);
-    } while (!$item->isValid());
-// dd($item);
+
+$factory->defineAs(Actionlog::class, 'asset-checkout-user', function (Faker\Generator $faker) {
+    $target = User::inRandomOrder()->first();
+    $item = Asset::inRandomOrder()->RTD()->first();
+    $user_id = rand(1,2); // keep it simple - make it one of the two superadmins
+    $asset = App\Models\Asset::where('id', $item->id)
+        ->update(
+            [
+                'assigned_to' => $target->id,
+                'assigned_type' => App\Models\User::class
+            ]
+        );
+
     return [
-        'user_id' => $user->id,
+        'created_at'  => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()),
+        'user_id' => $user_id,
         'action_type' => 'checkout',
         'item_id' => $item->id,
         'item_type'  => App\Models\Asset::class,
         'target_id' => $target->id,
         'target_type' => get_class($target),
-        'created_at'  => $faker->dateTime(),
-        'note' => $faker->sentence,
-        'company_id' => $company->id
+
+
     ];
 });
 
-$factory->defineAs(Actionlog::class, 'license-checkout-asset', function (Faker\Generator $faker) {
-    $company =  factory(App\Models\Company::class)->create();
-    $user = factory(App\Models\User::class)->create(['company_id' => $company->id]);
-    $target = factory(App\Models\Asset::class)->create(['company_id' => $company->id]);
-    $item = factory(App\Models\License::class)->create(['company_id' => $company->id]);
+$factory->defineAs(Actionlog::class, 'asset-checkout-location', function (Faker\Generator $faker) {
+    $target = Location::inRandomOrder()->first();
+    $item = Asset::inRandomOrder()->RTD()->first();
+    $user_id = rand(1,2); // keep it simple - make it one of the two superadmins
+    $asset = App\Models\Asset::where('id', $item->id)
+        ->update(
+            [
+                'assigned_to' => $target->id,
+                'assigned_type' => App\Models\Location::class
+            ]
+        );
 
     return [
-        'user_id' => $user->id,
+        'created_at'  => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()),
+        'user_id' => $user_id,
+        'action_type' => 'checkout',
+        'item_id' => $item->id,
+        'item_type'  => App\Models\Asset::class,
+        'target_id' => $target->id,
+        'target_type' => get_class($target),
+    ];
+});
+
+// This doesn't work - we need to assign a seat
+$factory->defineAs(Actionlog::class, 'license-checkout-asset', function (Faker\Generator $faker) {
+    $target = Asset::inRandomOrder()->RTD()->first();
+    $item = License::inRandomOrder()->first();
+    $user_id = rand(1,2); // keep it simple - make it one of the two superadmins
+
+    return [
+        'user_id' => $user_id,
         'action_type' => 'checkout',
         'item_id' => $item->id,
         'item_type'  => get_class($item),
         'target_id' => $target->id,
         'target_type' => get_class($target),
         'created_at'  => $faker->dateTime(),
-        'note' => $faker->sentence,
-        'company_id' => $company->id
+        'note' => $faker->sentence
     ];
 });
 
+
 $factory->defineAs(Actionlog::class, 'accessory-checkout', function (Faker\Generator $faker) {
-    $company =  factory(App\Models\Company::class)->create();
-    $user = factory(App\Models\User::class)->create(['company_id' => $company->id]);
-    $target = factory(App\Models\User::class)->create(['company_id' => $company->id]);
-    $item = factory(App\Models\Accessory::class)->create(['company_id' => $company->id]);
+    $target = Asset::inRandomOrder()->RTD()->first();
+    $item = Accessory::inRandomOrder()->first();
+    $user_id = rand(1,2); // keep it simple - make it one of the two superadmins
 
     return [
-        'user_id' => $user->id,
+        'user_id' => $user_id,
         'action_type' => 'checkout',
         'item_id' => $item->id,
         'item_type'  => get_class($item),
         'target_id' => $target->id,
         'target_type' => get_class($target),
         'created_at'  => $faker->dateTime(),
-        'note' => $faker->sentence,
-        'company_id' => $company->id
+        'note' => $faker->sentence
     ];
 });
 

database/factories/AssetFactory.php

@@ -15,89 +15,186 @@ use App\Models\Category;
 
 $factory->define(Asset::class, function (Faker\Generator $faker) {
     return [
-        'name' => $faker->catchPhrase,
-        'model_id' => function () {
-            return factory(App\Models\AssetModel::class)->create()->id;
-        },
-        'rtd_location_id' => function () {
-            return factory(App\Models\Location::class)->create()->id;
-        },
+        'name' => null,
+        'rtd_location_id' => 1,
         'serial' => $faker->uuid,
-        'status_id' => function () {
-            return factory(App\Models\Statuslabel::class)->states('rtd')->create()->id;
-        },
-        'user_id' => function () {
-            return factory(App\Models\User::class)->create()->id;
-        },
+        'status_id' => 1,
+        'user_id' => 1,
         'asset_tag' => $faker->unixTime('now'),
-        'notes'   => $faker->sentence,
-        'purchase_date' => $faker->dateTime(),
-        'purchase_cost' => $faker->randomFloat(2),
+        'notes'   => 'Created by DB seeder',
+        'purchase_date' => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()),
+        'purchase_cost' => $faker->randomFloat(2, '299.99', '2999.99'),
         'order_number' => $faker->numberBetween(1000000, 50000000),
-        'supplier_id' => function () {
-            return factory(App\Models\Supplier::class)->create()->id;
-        },
-        'company_id' => function () {
-            return factory(App\Models\Company::class)->create()->id;
-        },
+        'supplier_id' => 1,
         'requestable' => $faker->boolean()
     ];
 });
 
-$factory->state(Asset::class, 'deleted', function ($faker) {
+
+
+
+$factory->state(Asset::class, 'laptop-mbp', function ($faker) {
     return [
-        'deleted_at' => $faker->dateTime(),
+        'model_id' => 1
     ];
 });
 
+$factory->state(Asset::class, 'laptop-mbp-pending', function ($faker) {
+    return [
+        'model_id' => 1,
+         'status_id' => 2,
+    ];
+});
+
+$factory->state(Asset::class, 'laptop-mbp-archived', function ($faker) {
+    return [
+        'model_id' => 1,
+        'status_id' => 3,
+    ];
+});
+
+$factory->state(Asset::class, 'laptop-air', function ($faker) {
+    return [
+        'model_id' => 2
+    ];
+});
+
+$factory->state(Asset::class, 'laptop-surface', function ($faker) {
+    return [
+        'model_id' => 3
+    ];
+});
+
+$factory->state(Asset::class, 'laptop-xps', function ($faker) {
+    return [
+        'model_id' => 4
+    ];
+});
+
+$factory->state(Asset::class, 'laptop-spectre', function ($faker) {
+    return [
+        'model_id' => 5
+    ];
+});
+
+$factory->state(Asset::class, 'laptop-zenbook', function ($faker) {
+    return [
+        'model_id' => 6
+    ];
+});
+
+$factory->state(Asset::class, 'laptop-yoga', function ($faker) {
+    return [
+        'model_id' => 7
+    ];
+});
+
+$factory->state(Asset::class, 'desktop-macpro', function ($faker) {
+    return [
+        'model_id' => 8
+    ];
+});
+
+$factory->state(Asset::class, 'desktop-lenovo-i5', function ($faker) {
+    return [
+        'model_id' => 9
+    ];
+});
+
+$factory->state(Asset::class, 'desktop-optiplex', function ($faker) {
+    return [
+        'model_id' => 10
+    ];
+});
+
+$factory->state(Asset::class, 'conf-polycom', function ($faker) {
+    return [
+        'model_id' => 11
+    ];
+});
+
+$factory->state(Asset::class, 'conf-polycomcx', function ($faker) {
+    return [
+        'model_id' => 12
+    ];
+});
+
+$factory->state(Asset::class, 'tablet-ipad', function ($faker) {
+    return [
+        'model_id' => 13
+    ];
+});
+
+$factory->state(Asset::class, 'tablet-tab3', function ($faker) {
+    return [
+        'model_id' => 14
+    ];
+});
+
+$factory->state(Asset::class, 'phone-iphone6s', function ($faker) {
+    return [
+        'model_id' => 15
+    ];
+});
+
+$factory->state(Asset::class, 'phone-iphone7', function ($faker) {
+    return [
+        'model_id' => 16
+    ];
+});
+
+$factory->state(Asset::class, 'ultrafine', function ($faker) {
+    return [
+        'model_id' => 17
+    ];
+});
+
+$factory->state(Asset::class, 'ultrasharp', function ($faker) {
+    return [
+        'model_id' => 18
+    ];
+});
+
+
+// These are just for unit tests, not to generate data
+
 $factory->state(Asset::class, 'assigned-to-user', function ($faker) {
     return [
+        'model_id' => 1,
         'assigned_to' => factory(App\Models\User::class)->create()->id,
         'assigned_type' => App\Models\User::class,
     ];
 });
-
 $factory->state(Asset::class, 'assigned-to-location', function ($faker) {
     return [
+        'model_id' => 1,
         'assigned_to' => factory(App\Models\Location::class)->create()->id,
         'assigned_type' => App\Models\Location::class,
     ];
 });
-
 $factory->state(Asset::class, 'assigned-to-asset', function ($faker) {
     return [
+        'model_id' => 1,
         'assigned_to' => factory(App\Models\Asset::class)->create()->id,
         'assigned_type' => App\Models\Asset::class,
     ];
 });
 
 $factory->state(Asset::class, 'requires-acceptance', function ($faker) {
-    $cat = factory(Category::class)->states('asset-category', 'requires-acceptance')->create();
-    $model = factory(AssetModel::class)->create(['category_id' => $cat->id]);
     return [
-        'model_id' => $model->id
+        'model_id' => 1,
     ];
 });
 
-$factory->define(App\Models\AssetModel::class, function (Faker\Generator $faker) {
+
+$factory->state(Asset::class, 'deleted', function ($faker) {
     return [
-    'name' => $faker->catchPhrase,
-    'manufacturer_id' => function () {
-        return factory(App\Models\Manufacturer::class)->create()->id;
-    },
-    'category_id' => function () {
-        return factory(App\Models\Category::class)->states('asset-category')->create()->id;
-    },
-    'model_number' => $faker->numberBetween(1000000, 50000000),
-    'eol' => 1,
-    'notes' => $faker->paragraph(),
-    'requestable' => $faker->boolean(),
-    'depreciation_id' => function () {
-        return factory(App\Models\Depreciation::class)->create()->id;
-    },
+        'model_id' => 1,
+        'deleted_at' => $faker->dateTime()
     ];
 });
 
+
 $factory->define(App\Models\AssetMaintenance::class, function (Faker\Generator $faker) {
     return [
         'asset_id' => function () {

database/factories/AssetModelFactory.php

@@ -0,0 +1,255 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Asset Model Factories
+|--------------------------------------------------------------------------
+|
+| Factories related exclusively to creating models ..
+|
+*/
+
+/*
+|--------------------------------------------------------------------------
+| Laptops
+|--------------------------------------------------------------------------
+*/
+$factory->define(App\Models\AssetModel::class, function (Faker\Generator $faker) {
+    return [
+        'user_id' => 1,
+        'model_number' => $faker->creditCardNumber(),
+        'notes' => 'Created by demo seeder',
+
+    ];
+});
+
+
+// 1
+$factory->state(App\Models\AssetModel::class, 'mbp-13-model', function ($faker) {
+    return [
+        'name' => 'Macbook Pro 13"',
+        'category_id' => 1,
+        'manufacturer_id' => 1,
+        'eol' => '36',
+        'depreciation_id' => 1,
+    ];
+});
+
+// 2
+$factory->state(App\Models\AssetModel::class, 'mbp-air-model', function ($faker) {
+    return [
+        'name' => 'Macbook Air',
+        'category_id' => 1,
+        'manufacturer_id' => 1,
+        'eol' => '36',
+        'depreciation_id' => 1,
+    ];
+});
+
+// 3
+$factory->state(App\Models\AssetModel::class, 'surface-model', function ($faker) {
+    return [
+        'name' => 'Surface',
+        'category_id' => 1,
+        'manufacturer_id' => 2,
+        'eol' => '36',
+        'depreciation_id' => 1,
+    ];
+});
+
+// 4
+$factory->state(App\Models\AssetModel::class, 'xps13-model', function ($faker) {
+    return [
+        'name' => 'XPS 13',
+        'category_id' => 1,
+        'manufacturer_id' => 3,
+        'eol' => '36',
+        'depreciation_id' => 1,
+    ];
+});
+
+// 5
+$factory->state(App\Models\AssetModel::class, 'zenbook-model', function ($faker) {
+    return [
+        'name' => 'ZenBook UX310',
+        'category_id' => 1,
+        'manufacturer_id' => 4,
+        'eol' => '36',
+        'depreciation_id' => 1,
+    ];
+});
+
+// 6
+$factory->state(App\Models\AssetModel::class, 'spectre-model', function ($faker) {
+    return [
+        'name' => 'Spectre',
+        'category_id' => 1,
+        'manufacturer_id' => 5,
+        'eol' => '36',
+        'depreciation_id' => 1,
+    ];
+});
+
+// 7
+$factory->state(App\Models\AssetModel::class, 'yoga-model', function ($faker) {
+    return [
+        'name' => 'Yoga 910',
+        'category_id' => 1,
+        'manufacturer_id' => 6,
+        'eol' => '36',
+        'depreciation_id' => 1,
+    ];
+});
+
+/*
+|--------------------------------------------------------------------------
+| Desktops
+|--------------------------------------------------------------------------
+*/
+
+
+$factory->state(App\Models\AssetModel::class, 'macpro-model', function ($faker) {
+    return [
+        'name' => 'iMac Pro',
+        'category_id' => 2,
+        'manufacturer_id' => 1,
+        'eol' => '24',
+        'depreciation_id' => 1,
+    ];
+});
+
+$factory->state(App\Models\AssetModel::class, 'lenovo-i5-model', function ($faker) {
+    return [
+        'name' => 'Lenovo Intel Core i5',
+        'category_id' => 2,
+        'manufacturer_id' => 6,
+        'eol' => '24',
+        'depreciation_id' => 1,
+    ];
+});
+
+$factory->state(App\Models\AssetModel::class, 'optiplex-model', function ($faker) {
+    return [
+        'name' => 'OptiPlex',
+        'category_id' => 2,
+        'manufacturer_id' => 3,
+        'model_number' => '5040 (MRR81)',
+        'eol' => '24',
+        'depreciation_id' => 1,
+    ];
+});
+
+
+/*
+|--------------------------------------------------------------------------
+| Conference Phones
+|--------------------------------------------------------------------------
+*/
+
+
+$factory->state(App\Models\AssetModel::class, 'polycom-model', function ($faker) {
+    return [
+        'name' => 'SoundStation 2',
+        'category_id' => 6,
+        'manufacturer_id' => 8,
+        'eol' => '12',
+        'depreciation_id' => 1,
+    ];
+});
+
+$factory->state(App\Models\AssetModel::class, 'polycomcx-model', function ($faker) {
+    return [
+        'name' => 'Polycom CX3000 IP Conference Phone',
+        'category_id' => 6,
+        'manufacturer_id' => 8,
+        'eol' => '12',
+        'depreciation_id' => 1,
+    ];
+});
+
+
+/*
+|--------------------------------------------------------------------------
+| Tablets
+|--------------------------------------------------------------------------
+*/
+
+$factory->state(App\Models\AssetModel::class, 'ipad-model', function ($faker) {
+    return [
+        'name' => 'iPad Pro',
+        'category_id' => 3,
+        'manufacturer_id' => 1,
+        'eol' => '12',
+        'depreciation_id' => 1,
+    ];
+});
+
+
+$factory->state(App\Models\AssetModel::class, 'tab3-model', function ($faker) {
+    return [
+        'name' => 'Tab3',
+        'category_id' => 3,
+        'manufacturer_id' => 6,
+        'eol' => '12',
+        'depreciation_id' => 1,
+    ];
+});
+
+
+/*
+|--------------------------------------------------------------------------
+| Mobile Phones
+|--------------------------------------------------------------------------
+*/
+
+$factory->state(App\Models\AssetModel::class, 'iphone6s-model', function ($faker) {
+    return [
+        'name' => 'iPhone 6s',
+        'category_id' => 4,
+        'manufacturer_id' => 1,
+        'eol' => '12',
+        'depreciation_id' => 3,
+    ];
+});
+
+$factory->state(App\Models\AssetModel::class, 'iphone7-model', function ($faker) {
+    return [
+        'name' => 'iPhone 7',
+        'category_id' => 4,
+        'manufacturer_id' => 1,
+        'eol' => '12',
+        'depreciation_id' => 1,
+    ];
+});
+
+/*
+|--------------------------------------------------------------------------
+| Displays
+|--------------------------------------------------------------------------
+*/
+
+$factory->state(App\Models\AssetModel::class, 'ultrafine', function ($faker) {
+    return [
+        'name' => 'Ultrafine 4k',
+        'category_id' => 5,
+        'manufacturer_id' => 7,
+        'eol' => '12',
+        'depreciation_id' => 2,
+    ];
+});
+
+$factory->state(App\Models\AssetModel::class, 'ultrasharp', function ($faker) {
+    return [
+        'name' => 'Ultrasharp U2415',
+        'category_id' => 5,
+        'manufacturer_id' => 3,
+        'eol' => '12',
+        'depreciation_id' => 2,
+    ];
+});
+
+
+
+
+
+

database/factories/CategoryFactory.php

@@ -12,41 +12,105 @@
 
 $factory->define(App\Models\Category::class, function (Faker\Generator $faker) {
     return [
-    'name' => $faker->text(20),
-    'category_type' => $faker->randomElement(['asset', 'accessory', 'component', 'consumable']),
-    'eula_text' => $faker->paragraph(),
-    'require_acceptance' => false,
-    'use_default_eula' => $faker->boolean(),
-    'checkin_email' => $faker->boolean()
+        'user_id' => 1,
+        'eula_text' => $faker->paragraph(),
+        'require_acceptance' => false,
+        'use_default_eula' => $faker->boolean(),
+        'checkin_email' => $faker->boolean()
+     ];
+});
+
+$factory->state(App\Models\Category::class, 'asset-laptop-category', function ($faker) {
+    return [
+        'name' => 'Laptops',
+        'category_type' => 'asset',
+        'require_acceptance' => true,
     ];
 });
 
-$factory->state(App\Models\Category::class, 'asset-category', function ($faker) {
+$factory->state(App\Models\Category::class, 'asset-desktop-category', function ($faker) {
     return [
+        'name' => 'Desktops',
         'category_type' => 'asset',
     ];
 });
 
-$factory->state(App\Models\Category::class, 'accessory-category', function ($faker) {
+$factory->state(App\Models\Category::class, 'asset-display-category', function ($faker) {
     return [
+        'name' => 'Displays',
+        'category_type' => 'asset',
+    ];
+});
+
+$factory->state(App\Models\Category::class, 'asset-tablet-category', function ($faker) {
+    return [
+        'name' => 'Tablets',
+        'category_type' => 'asset',
+    ];
+});
+
+$factory->state(App\Models\Category::class, 'asset-mobile-category', function ($faker) {
+    return [
+        'name' => 'Mobile Phones',
+        'category_type' => 'asset',
+    ];
+});
+
+$factory->state(App\Models\Category::class, 'asset-conference-category', function ($faker) {
+    return [
+        'name' => 'Conference Phones',
+        'category_type' => 'asset',
+    ];
+});
+
+$factory->state(App\Models\Category::class, 'asset-voip-category', function ($faker) {
+    return [
+        'name' => 'VOIP Phones',
+        'category_type' => 'asset',
+    ];
+});
+
+
+$factory->state(App\Models\Category::class, 'accessory-keyboard-category', function ($faker) {
+    return [
+        'name' => 'Keyboards',
         'category_type' => 'accessory',
     ];
 });
 
-$factory->state(App\Models\Category::class, 'component-category', function ($faker) {
+$factory->state(App\Models\Category::class, 'accessory-mouse-category', function ($faker) {
     return [
+        'name' => 'Mouse',
+        'category_type' => 'accessory',
+    ];
+});
+
+
+$factory->state(App\Models\Category::class, 'component-hdd-category', function ($faker) {
+    return [
+        'name' => 'HDD/SSD',
         'category_type' => 'component',
     ];
 });
 
-$factory->state(App\Models\Category::class, 'consumable-category', function ($faker) {
+$factory->state(App\Models\Category::class, 'component-ram-category', function ($faker) {
     return [
+        'name' => 'RAM',
+        'category_type' => 'component',
+    ];
+});
+
+$factory->state(App\Models\Category::class, 'consumable-paper-category', function ($faker) {
+    return [
+        'name' => 'Printer Paper',
         'category_type' => 'consumable',
     ];
 });
 
-$factory->state(App\Models\Category::class, 'requires-acceptance', function ($faker) {
+$factory->state(App\Models\Category::class, 'consumable-ink-category', function ($faker) {
     return [
-        'require_acceptance' => true,
+        'name' => 'Printer Ink',
+        'category_type' => 'consumable',
     ];
 });
+

database/factories/ComponentsFactory.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Components Factories
+|--------------------------------------------------------------------------
+|
+| Factories related exclusively to creating components ..
+|
+*/
+
+$factory->define(App\Models\Component::class, function (Faker\Generator $faker) {
+    return [
+        'user_id' => 1,
+        'order_number' => $faker->numberBetween(1000000, 50000000),
+        'purchase_date' => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()),
+        'purchase_cost' => $faker->randomFloat(2, 1, 50),
+        'qty' => $faker->numberBetween(5, 10),
+        'min_amt' => $faker->numberBetween($min = 1, $max = 2),
+    ];
+});
+
+$factory->state(App\Models\Component::class, 'ram-crucial4', function ($faker) {
+
+    return [
+        'name' => 'Crucial 4GB DDR3L-1600 SODIMM',
+        'category_id' => 13,
+        'qty' => 10,
+        'min_amt' => 2
+    ];
+});
+
+$factory->state(App\Models\Component::class, 'ram-crucial8', function ($faker) {
+
+    return [
+        'name' => 'Crucial 8GB DDR3L-1600 SODIMM Memory for Mac',
+        'category_id' => 13,
+        'qty' => 10,
+        'min_amt' => 2
+    ];
+});
+
+$factory->state(App\Models\Component::class, 'ssd-crucial120', function ($faker) {
+
+    return [
+        'name' => 'Crucial BX300 120GB SATA Internal SSD',
+        'category_id' => 12,
+        'qty' => 10,
+        'min_amt' => 2
+    ];
+});
+
+$factory->state(App\Models\Component::class, 'ssd-crucial240', function ($faker) {
+
+    return [
+        'name' => 'Crucial BX300 240GB SATA Internal SSD',
+        'category_id' => 12,
+        'qty' => 10,
+        'min_amt' => 2
+    ];
+});
+
+
+

database/factories/ConsumableFactory.php

@@ -0,0 +1,58 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Consumables Factories
+|--------------------------------------------------------------------------
+|
+| Factories related exclusively to creating consumables ..
+|
+*/
+
+$factory->define(App\Models\Consumable::class, function (Faker\Generator $faker) {
+    return [
+        'user_id' => 1,
+        'item_no' => $faker->numberBetween(1000000, 50000000),
+        'order_number' => $faker->numberBetween(1000000, 50000000),
+        'purchase_date' => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()),
+        'purchase_cost' => $faker->randomFloat(2, 1, 50),
+        'qty' => $faker->numberBetween(5, 10),
+        'min_amt' => $faker->numberBetween($min = 1, $max = 2),
+    ];
+});
+
+$factory->state(App\Models\Consumable::class, 'cardstock', function ($faker) {
+
+    return [
+        'name' => 'Cardstock (White)',
+        'category_id' => 10,
+        'manufacturer_id' => 10,
+        'qty' => 10,
+        'min_amt' => 2
+    ];
+});
+
+$factory->state(App\Models\Consumable::class, 'paper', function ($faker) {
+
+    return [
+        'name' => 'Laserjet Paper (Ream)',
+        'category_id' => 10,
+        'manufacturer_id' => 10,
+        'qty' => 20,
+        'min_amt' => 2
+    ];
+});
+
+$factory->state(App\Models\Consumable::class, 'ink', function ($faker) {
+
+    return [
+        'name' => 'Laserjet Toner (black)',
+        'category_id' => 11,
+        'manufacturer_id' => 5,
+        'qty' => 20,
+        'min_amt' => 2
+    ];
+});
+
+
+

database/factories/DepartmentsFactory.php

@@ -0,0 +1,62 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Asset Model Factories
+|--------------------------------------------------------------------------
+|
+| Factories related exclusively to creating models ..
+|
+*/
+
+$factory->define(App\Models\Department::class, function (Faker\Generator $faker) {
+    return [
+        'user_id' => 1,
+        'location_id' => rand(1,5),
+    ];
+});
+
+$factory->state(App\Models\Department::class, 'hr', function ($faker) {
+    return [
+        'name' => 'Human Resources',
+    ];
+});
+
+$factory->state(App\Models\Department::class, 'engineering', function ($faker) {
+    return [
+        'name' => 'Engineering',
+    ];
+});
+
+$factory->state(App\Models\Department::class, 'marketing', function ($faker) {
+    return [
+        'name' => 'Marketing',
+    ];
+});
+
+$factory->state(App\Models\Department::class, 'client', function ($faker) {
+    return [
+        'name' => 'Client Services',
+    ];
+});
+
+$factory->state(App\Models\Department::class, 'design', function ($faker) {
+    return [
+        'name' => 'Graphic Design',
+    ];
+});
+
+$factory->state(App\Models\Department::class, 'product', function ($faker) {
+    return [
+        'name' => 'Product Management',
+    ];
+});
+
+$factory->state(App\Models\Department::class, 'silly', function ($faker) {
+    return [
+        'name' => 'Dept of Silly Walks',
+    ];
+});
+
+
+

database/factories/DepreciationFactory.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Asset Model Factories
+|--------------------------------------------------------------------------
+|
+| Factories related exclusively to creating models ..
+|
+*/
+
+$factory->define(App\Models\Depreciation::class, function (Faker\Generator $faker) {
+    return [
+        'user_id' => 1,
+    ];
+});
+
+$factory->state(App\Models\Depreciation::class, 'computer', function ($faker) {
+    return [
+        'name' => 'Computer Depreciation',
+        'months' => 36,
+    ];
+});
+
+$factory->state(App\Models\Depreciation::class, 'display', function ($faker) {
+    return [
+        'name' => 'Display Depreciation',
+        'months' => 12,
+    ];
+});
+
+$factory->state(App\Models\Depreciation::class, 'mobile-phones', function ($faker) {
+    return [
+        'name' => 'Mobile Phone Depreciation',
+        'months' => 24,
+    ];
+});
+
+
+
+

database/factories/LicenseFactory.php

@@ -0,0 +1,79 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Asset Model Factories
+|--------------------------------------------------------------------------
+|
+| Factories related exclusively to creating models ..
+|
+*/
+
+$factory->define(App\Models\License::class, function (Faker\Generator $faker) {
+
+    return [
+        'user_id' => 1,
+        'license_name' => $faker->name,
+        'license_email' => $faker->safeEmail,
+        'serial' => $faker->uuid,
+        'notes'   => 'Created by DB seeder',
+        'purchase_date' => $faker->dateTimeBetween('-1 years','now', date_default_timezone_get()),
+        'order_number' => $faker->numberBetween(1000000, 50000000),
+    ];
+});
+
+// 1
+$factory->state(App\Models\License::class, 'photoshop', function ($faker) {
+    $data =  [
+        'name' => 'Photoshop',
+        'manufacturer_id' => 9,
+        'purchase_cost' => '299.99',
+        'seats' => 10,
+    ];
+    
+    return $data;
+
+});
+
+// 2
+$factory->state(App\Models\License::class, 'acrobat', function ($faker) {
+
+    $data =  [
+        'name' => 'Acrobat',
+        'manufacturer_id' => 9,
+        'purchase_cost' => '29.99',
+        'seats' => 10,
+    ];
+    
+
+    return $data;
+});
+
+// 3
+$factory->state(App\Models\License::class, 'indesign', function ($faker) {
+    $data =  [
+        'name' => 'InDesign',
+        'manufacturer_id' => 9,
+        'purchase_cost' => '199.99',
+        'seats' => 10,
+    ];
+    
+
+    return $data;
+});
+
+
+// 4
+$factory->state(App\Models\License::class, 'office', function ($faker) {
+    $data =  [
+        'name' => 'Office',
+        'manufacturer_id' => 2,
+        'purchase_cost' => '49.99',
+        'seats' => 20,
+    ];
+
+
+    return $data;
+});
+
+

database/factories/ManufacturerFactory.php

@@ -0,0 +1,123 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Asset Model Factories
+|--------------------------------------------------------------------------
+|
+| Factories related exclusively to creating models ..
+|
+*/
+
+$factory->define(App\Models\Manufacturer::class, function (Faker\Generator $faker) {
+    return [
+        'user_id' => 1,
+        'support_phone' => $faker->phoneNumber(),
+        'url' => $faker->url(),
+        'support_email' => $faker->safeEmail(),
+    ];
+});
+
+
+// 1
+$factory->state(App\Models\Manufacturer::class, 'apple', function ($faker) {
+    return [
+        'name' => 'Apple',
+        'url' => 'https://apple.com',
+        'support_url' => 'https://support.apple.com'
+    ];
+});
+
+// 2
+$factory->state(App\Models\Manufacturer::class, 'microsoft', function ($faker) {
+    return [
+        'name' => 'Microsoft',
+        'url' => 'https://microsoft.com',
+        'support_url' => 'https://support.microsoft.com'
+    ];
+});
+
+// 3
+$factory->state(App\Models\Manufacturer::class, 'dell', function ($faker) {
+    return [
+        'name' => 'Dell',
+        'url' => 'https://dell.com',
+        'support_url' => 'https://support.dell.com'
+    ];
+});
+
+// 4
+$factory->state(App\Models\Manufacturer::class, 'asus', function ($faker) {
+    return [
+        'name' => 'Asus',
+        'url' => 'https://asus.com',
+        'support_url' => 'https://support.asus.com'
+    ];
+});
+
+// 5
+$factory->state(App\Models\Manufacturer::class, 'hp', function ($faker) {
+    return [
+        'name' => 'HP',
+        'url' => 'https://hp.com',
+        'support_url' => 'https://support.hp.com'
+    ];
+});
+
+// 6
+$factory->state(App\Models\Manufacturer::class, 'lenovo', function ($faker) {
+    return [
+        'name' => 'Lenovo',
+        'url' => 'https://lenovo.com',
+        'support_url' => 'https://support.lenovo.com'
+    ];
+});
+
+// 7
+$factory->state(App\Models\Manufacturer::class, 'lg', function ($faker) {
+    return [
+        'name' => 'LG',
+        'url' => 'https://lg.com',
+        'support_url' => 'https://support.lg.com'
+    ];
+});
+
+// 8
+$factory->state(App\Models\Manufacturer::class, 'polycom', function ($faker) {
+    return [
+        'name' => 'Polycom',
+        'url' => 'https://polycom.com',
+        'support_url' => 'https://support.polycom.com'
+    ];
+});
+
+// 9
+$factory->state(App\Models\Manufacturer::class, 'adobe', function ($faker) {
+    return [
+        'name' => 'Adobe',
+        'url' => 'https://adobe.com',
+        'support_url' => 'https://support.adobe.com'
+    ];
+});
+
+
+// 10
+$factory->state(App\Models\Manufacturer::class, 'avery', function ($faker) {
+    return [
+        'name' => 'Avery',
+        'url' => 'https://avery.com',
+        'support_url' => 'https://support.avery.com'
+    ];
+});
+
+// 11
+$factory->state(App\Models\Manufacturer::class, 'crucial', function ($faker) {
+    return [
+        'name' => 'Crucial',
+        'url' => 'https://crucial.com',
+        'support_url' => 'https://support.crucial.com'
+    ];
+});
+
+
+

database/factories/ModelFactory.php

@@ -19,28 +19,6 @@ use App\Models\Manufacturer;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
 
-$factory->define(App\Models\Accessory::class, function (Faker\Generator $faker) {
-    return [
-    'company_id' => function () {
-        return factory(App\Models\Company::class)->create()->id;
-    },
-    'name' => $faker->text(20),
-    'category_id' => function () {
-        return factory(App\Models\Category::class)->states('accessory-category')->create()->id;
-    },
-    'manufacturer_id' => function () {
-        return factory(App\Models\Manufacturer::class)->create()->id;
-    },
-    'location_id' => function () {
-        return factory(App\Models\Location::class)->create()->id;
-    },
-    'order_number' => $faker->numberBetween(1000000, 50000000),
-    'purchase_date' => $faker->dateTime(),
-    'purchase_cost' => $faker->randomFloat(2),
-    'qty' => $faker->numberBetween(5, 10),
-    'min_amt' => $faker->numberBetween($min = 1, $max = 2),
-    ];
-});
 
 $factory->define(App\Models\Company::class, function (Faker\Generator $faker) {
     return [
@@ -54,9 +32,7 @@ $factory->define(App\Models\Component::class, function (Faker\Generator $faker)
         'category_id' => function () {
             return factory(App\Models\Category::class)->create()->id;
         },
-        'location_id' => function () {
-            return factory(App\Models\Location::class)->create()->id;
-        },
+        'location_id' => 1,
         'serial'   => $faker->uuid,
         'qty' => $faker->numberBetween(3, 10),
         'order_number' => $faker->numberBetween(1000000, 50000000),
@@ -69,94 +45,10 @@ $factory->define(App\Models\Component::class, function (Faker\Generator $faker)
     ];
 });
 
-$factory->define(App\Models\Consumable::class, function (Faker\Generator $faker) {
-    return [
-    'name' => $faker->text(20),
-    'company_id' => function () {
-            return factory(App\Models\Company::class)->create()->id;
-    },
-    'category_id' => function () {
-            return factory(App\Models\Category::class)->create()->id;
-    },
-    'location_id' => function () {
-            return factory(App\Models\Location::class)->create()->id;
-    },
-    'manufacturer_id' => function () {
-        return factory(App\Models\Manufacturer::class)->create()->id;
-    },
-    'user_id' => function () {
-        return factory(App\Models\User::class)->create()->id;
-    },
-    'model_number' => $faker->numberBetween(1000000, 50000000),
-    'item_no' => $faker->numberBetween(1000000, 50000000),
-    'order_number' => $faker->numberBetween(1000000, 50000000),
-    'purchase_date' => $faker->dateTime(),
-    'purchase_cost' => $faker->randomFloat(2),
-    'qty' => $faker->numberBetween(5, 10),
-    'min_amt' => $faker->numberBetween($min = 1, $max = 2),
-    ];
-});
-
-$factory->define(App\Models\Department::class, function (Faker\Generator $faker) {
-    return [
-    'name' => $faker->catchPhrase,
-    'user_id' => '1',
-    'location_id' => function () {
-        return factory(App\Models\Location::class)->create()->id;
-    },
-    'company_id' => function () {
-        return factory(App\Models\Company::class)->create()->id;
-    },
-    'manager_id' => function () {
-        return factory(App\Models\User::class)->create()->id;
-    },
-
-    ];
-});
-
-$factory->define(App\Models\Depreciation::class, function (Faker\Generator $faker) {
-    return [
-    'name' => $faker->text(20),
-    'months' => $faker->numberBetween(1, 10),
-    ];
-});
-
-$factory->define(App\Models\License::class, function (Faker\Generator $faker) {
-    return [
-    'name'   => $faker->catchPhrase,
-    'serial'   => $faker->uuid,
-    'seats'   => $faker->numberBetween(1, 10),
-    'license_email'   => $faker->safeEmail,
-    'license_name'   => $faker->name,
-    'order_number' => $faker->numberBetween(1500, 13250),
-    'purchase_order' => $faker->numberBetween(1500, 13250),
-    'purchase_date' => $faker->dateTime(),
-    'purchase_cost' => $faker->randomFloat(2),
-    'notes' => $faker->sentence,
-    'supplier_id' => function () {
-        return factory(App\Models\Supplier::class)->create()->id;
-    },
-    'company_id' =>function () {
-        return factory(App\Models\Company::class)->create()->id;
-    },
-    ];
-});
-
-$factory->define(App\Models\LicenseSeat::class, function (Faker\Generator $faker) {
-    return [
-    'license_id' => function () {
-        return factory(App\Models\License::class)->create()->id;
-    },
-    'created_at' => $faker->dateTime(),
-    'updated_at' => $faker->dateTime(),
-    'notes' => $faker->sentence,
-    'user_id' => '1',
-    ];
-});
 
 $factory->define(App\Models\Location::class, function (Faker\Generator $faker) {
     return [
-    'name' => $faker->catchPhrase,
+    'name' => $faker->city,
     'address' => $faker->streetAddress,
     'address2' => $faker->secondaryAddress,
     'city' => $faker->city,
@@ -167,11 +59,6 @@ $factory->define(App\Models\Location::class, function (Faker\Generator $faker) {
     ];
 });
 
-$factory->define(App\Models\Manufacturer::class, function (Faker\Generator $faker) {
-    return [
-    'name' => $faker->company,
-    ];
-});
 
 $factory->define(App\Models\Supplier::class, function (Faker\Generator $faker) {
     return [

database/factories/UserFactory.php

@@ -2,12 +2,14 @@
 
 use App\Models\Company;
 
+
+
 $factory->define(App\Models\User::class, function (Faker\Generator $faker) {
     return [
         'first_name' => $faker->firstName,
         'last_name' => $faker->lastName,
         'username' => $faker->username,
-        'password' => $faker->password,
+        'password' => bcrypt('password'),
         'permissions' => '{"user":"0"}',
         'email' => $faker->safeEmail,
         'company_id' => function () {
@@ -15,14 +17,36 @@ $factory->define(App\Models\User::class, function (Faker\Generator $faker) {
         },
         'locale' => $faker->locale,
         'employee_num' => $faker->numberBetween(3500, 35050),
-        'jobtitle' => $faker->word,
+        'jobtitle' => $faker->jobTitle,
+        'department_id' => rand(1,6),
         'phone' => $faker->phoneNumber,
-        'notes' => $faker->sentence,
-        'location_id' => function () {
-            return factory(App\Models\Location::class)->create()->id;
-        },
+        'notes' => 'Created by DB seeder',
+        'location_id' => rand(1,5),
+        'activated' => 1,
     ];
 });
+
+
+$factory->state(App\Models\User::class, 'first-admin', function ($faker) {
+    return [
+        'first_name' => 'Admin',
+        'last_name' => 'User',
+        'username' => 'admin',
+        'permissions' => '{"superuser":"1"}',
+    ];
+});
+
+$factory->state(App\Models\User::class, 'snipe-admin', function ($faker) {
+    return [
+        'first_name' => 'Snipe E.',
+        'last_name' => 'Head',
+        'username' => 'snipe',
+        'email' => 'snipe@snipe.net',
+        'permissions' => '{"superuser":"1"}',
+    ];
+});
+
+
 // USER GLOBAL PERMISSION STATES
 $factory->state(App\Models\User::class, 'superuser', function ($faker) {
     return [
@@ -33,6 +57,7 @@ $factory->state(App\Models\User::class, 'superuser', function ($faker) {
 $factory->state(App\Models\User::class, 'admin', function ($faker) {
     return [
         'permissions' => '{"admin":"1"}',
+        'manager_id' => rand(1,2),
     ];
 });
 // USER ASSET PERMISSION STATES

database/migrations/2017_10_10_123504_allow_nullable_depreciation_id_in_models.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AllowNullableDepreciationIdInModels extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('models', function (Blueprint $table) {
+            $table->integer('depreciation_id')->nullable()->default(null)->change();
+        });
+        Schema::table('licenses', function (Blueprint $table) {
+            $table->integer('depreciation_id')->nullable()->default(null)->change();
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2017_10_17_133709_add_display_url_to_settings.php

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

database/migrations/2017_10_19_120002_add_custom_forgot_password_url.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddCustomForgotPasswordUrl extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('custom_forgot_pass_url')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('custom_forgot_pass_url');
+        });
+    }
+}

database/migrations/2017_10_19_130406_add_image_and_supplier_to_accessories.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddImageAndSupplierToAccessories extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('accessories', function (Blueprint $table) {
+            $table->string('image')->nullable()->default(null);
+            $table->integer('supplier_id')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('accessories', function (Blueprint $table) {
+            $table->dropColumn('image');
+            $table->dropColumn('supplier_id');
+        });
+    }
+}